Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA
This commit is contained in:
@@ -358,7 +358,7 @@ int main(int argc, char **argv)
|
||||
sw_diff_old = sw_diff_new;
|
||||
sw_old = sw_new;
|
||||
Rcrit_old = Rcrit_new;
|
||||
Rcrit_new -= deltaR;
|
||||
Rcrit_new -= deltaR*Rcrit_old;
|
||||
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
|
||||
// and sw<Sw will be immediately broken
|
||||
@@ -489,11 +489,10 @@ int main(int argc, char **argv)
|
||||
sw_new = countGlobal/totalGlobal;
|
||||
sw_diff_new = abs(sw_new-SW);
|
||||
// for test only
|
||||
// if (rank==0){
|
||||
// printf("Final saturation=%f\n",sw_new);
|
||||
// printf("Final critical radius=%f\n",Rcrit_new);
|
||||
//
|
||||
// }
|
||||
if (rank==0){
|
||||
printf("Final saturation=%f\n",sw_new);
|
||||
printf("Final critical radius=%f\n",Rcrit_new);
|
||||
}
|
||||
}
|
||||
|
||||
if (sw_diff_new<sw_diff_old){
|
||||
|
||||
Reference in New Issue
Block a user