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

refactor open

Browse Source
This commit is contained in:
James E McClure 2018-06-19 07:12:03 -04:00
parent 4581fa6b77
commit 2d2666ebd5
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/lbpm_morphopen_pp.cpp
View File

@ -70,10 +70,10 @@ int main(int argc, char **argv)
string filename; string filename;
double Rcrit_new, SW; double Rcrit_new, SW;
if (argc > 2){ if (argc > 1){
filename=argv[1]; filename=argv[1];
Rcrit_new=0.f; Rcrit_new=0.f;
SW=strtod(argv[2],NULL); //SW=strtod(argv[2],NULL);
if (rank==0) printf("Target saturation %f \n",SW); if (rank==0) printf("Target saturation %f \n",SW);
} }
else ERROR("No input database provided\n"); else ERROR("No input database provided\n");
@ -87,6 +87,7 @@ int main(int argc, char **argv)
auto nproc = domain_db->getVector<int>( "nproc" ); auto nproc = domain_db->getVector<int>( "nproc" );
auto ReadValues = domain_db->getVector<char>( "ReadValues" ); auto ReadValues = domain_db->getVector<char>( "ReadValues" );
auto WriteValues = domain_db->getVector<char>( "WriteValues" ); auto WriteValues = domain_db->getVector<char>( "WriteValues" );
SW = domain_db->getScalar<double>("Sw");
nx = size[0]; nx = size[0];
ny = size[1]; ny = size[1];
@ -267,8 +268,6 @@ int main(int argc, char **argv)
} }
} }
} }
// Pack and send the updated ID values // Pack and send the updated ID values
PackID(Dm->sendList_x, Dm->sendCount_x ,sendID_x, id); PackID(Dm->sendList_x, Dm->sendCount_x ,sendID_x, id);
PackID(Dm->sendList_X, Dm->sendCount_X ,sendID_X, id); PackID(Dm->sendList_X, Dm->sendCount_X ,sendID_X, id);
@ -362,29 +361,21 @@ int main(int argc, char **argv)
MPI_Allreduce(&count,&countGlobal,1,MPI_DOUBLE,MPI_SUM,comm); MPI_Allreduce(&count,&countGlobal,1,MPI_DOUBLE,MPI_SUM,comm);
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
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){ if (sw_diff_new<sw_diff_old){
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);
} }
} }
else{ else{
if (rank==0){ if (rank==0){
printf("Final saturation=%f\n",sw_old); printf("Final saturation=%f\n",sw_old);
printf("Final critical radius=%f\n",Rcrit_old); printf("Final critical radius=%f\n",Rcrit_old);
} }
} }
sprintf(LocalRankFilename,"ID.%05i",rank); sprintf(LocalRankFilename,"ID.%05i",rank);
FILE *ID = fopen(LocalRankFilename,"wb"); FILE *ID = fopen(LocalRankFilename,"wb");
fwrite(id,1,N,ID); fwrite(id,1,N,ID);