OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA

Browse Source
This commit is contained in:
James E McClure
2017-07-09 18:57:42 -04:00
parent 778900e0b5 3807039a60
commit e75fb46517
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/lbpm_morphdrain_pp.cpp
View File

@@ -288,7 +288,7 @@ int main(int argc, char **argv)
while (sw_new > SW && Rcrit_new > 0.99){ while (sw_new > SW && Rcrit_new > 0.99){
Rcrit_old = Rcrit_new; Rcrit_old = Rcrit_new;
Rcrit_new -= deltaR;// decrease critical radius Rcrit_new -= deltaR*Rcrit_old;// decrease critical radius
sw_old = sw_new; sw_old = sw_new;
sw_diff_old = sw_diff_new; sw_diff_old = sw_diff_new;

11
tests/lbpm_morphopen_pp.cpp
View File

@@ -358,7 +358,7 @@ int main(int argc, char **argv)
sw_diff_old = sw_diff_new; sw_diff_old = sw_diff_new;
sw_old = sw_new; sw_old = sw_new;
Rcrit_old = Rcrit_new; Rcrit_old = Rcrit_new;
Rcrit_new -= deltaR; Rcrit_new -= deltaR*Rcrit_old;
int Window=round(Rcrit_new); int Window=round(Rcrit_new);
if (Window == 0) Window = 1; // If Window = 0 at the begining, after the following process will have sw=1.0 if (Window == 0) Window = 1; // If Window = 0 at the begining, after the following process will have sw=1.0
// and sw<Sw will be immediately broken // and sw<Sw will be immediately broken
@@ -489,11 +489,10 @@ int main(int argc, char **argv)
sw_new = countGlobal/totalGlobal; sw_new = countGlobal/totalGlobal;
sw_diff_new = abs(sw_new-SW); sw_diff_new = abs(sw_new-SW);
// for test only // for test only
// if (rank==0){ if (rank==0){
// printf("Final saturation=%f\n",sw_new); printf("Final saturation=%f\n",sw_new);
// printf("Final critical radius=%f\n",Rcrit_new); printf("Final critical radius=%f\n",Rcrit_new);
// }
// }
} }
if (sw_diff_new<sw_diff_old){ if (sw_diff_new<sw_diff_old){