fix open bug

This commit is contained in:
JamesEMcclure
2019-05-02 21:52:51 -04:00
parent 8822d5036d
commit 1b8e6cbbd5
2 changed files with 3 additions and 1 deletions

View File

@@ -17,12 +17,14 @@ ReadSubphase<-function(PATH){
ReadTimelog<-function(PATH){ ReadTimelog<-function(PATH){
FILE=paste0(PATH,"/timelog.csv") FILE=paste0(PATH,"/timelog.csv")
D<-read.csv(file=FILE,head=TRUE,sep=" ") D<-read.csv(file=FILE,head=TRUE,sep=" ")
D$time<-seq(0,nrow(D))
return(D) return(D)
} }
ReadRelperm<-function(PATH){ ReadRelperm<-function(PATH){
FILE=paste0(PATH,"/relperm.csv") FILE=paste0(PATH,"/relperm.csv")
D<-read.csv(file=FILE,head=TRUE,sep=" ") D<-read.csv(file=FILE,head=TRUE,sep=" ")
D$Case<-PATH
p<-ggplot(D)+ p<-ggplot(D)+
geom_line(aes(sat.water,eff.perm.oil,color="oil"))+ geom_line(aes(sat.water,eff.perm.oil,color="oil"))+

View File

@@ -735,7 +735,7 @@ void ScaLBL_ColorModel::Run(){
} }
else if (USE_MORPHOPEN_OIL){ else if (USE_MORPHOPEN_OIL){
if (rank==0) printf("***Morphological opening of connected oil, with target volume change ***\n", delta_volume_target); if (rank==0) printf("***Morphological opening of connected oil, with target volume change ***\n", delta_volume_target);
MorphologicalOpening(delta_volume_target); MorphOpenConnected(delta_volume_target);
} }
else{ else{
if (rank==0) printf("***Morphological step with target volume change %f ***\n", delta_volume_target); if (rank==0) printf("***Morphological step with target volume change %f ***\n", delta_volume_target);