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

fix the build

Browse Source
This commit is contained in:
James McClure
2021-01-05 18:43:44 -05:00
parent 345b43d9f8
commit 7f4f74779c
40 changed files with 242 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/lbpm_morph_pp.cpp
View File

@@ -23,9 +23,9 @@
int main(int argc, char **argv)
{
// Initialize MPI
Utilities::startup( argc, argv );
Utilities::startup( argc, argv );
Utilities::MPI comm( MPI_COMM_WORLD );
int rank = comm.getRank();
int rank = comm.getRank();
{
//.......................................................................
// Reading the domain information file
@@ -125,13 +125,13 @@ int main(int argc, char **argv)
if (rank==0) printf("Initialized solid phase -- Converting to Signed Distance function \n");
CalcDist(SignDist,id_solid,*Dm);
MPI_Barrier(comm);
comm.barrier();
// Extract only the connected part of NWP
BlobIDstruct new_index;
double vF=0.0; double vS=0.0;
ComputeGlobalBlobIDs(nx-2,ny-2,nz-2,Dm->rank_info,phase,SignDist,vF,vS,phase_label,Dm->Comm);
MPI_Barrier(Dm->Comm);
Dm->Comm.barrier();
int count_connected=0;
int count_porespace=0;
@@ -153,9 +153,9 @@ int main(int argc, char **argv)
}
}
}
count_connected=sumReduce( Dm->Comm, count_connected);
count_porespace=sumReduce( Dm->Comm, count_porespace);
count_water=sumReduce( Dm->Comm, count_water);
count_connected = Dm->Comm.sumReduce( count_connected );
count_porespace = Dm->Comm.sumReduce( count_porespace );
count_water = Dm->Comm.sumReduce( count_water );
for (int k=0; k<nz; k++){
for (int j=0; j<ny; j++){
@@ -213,7 +213,7 @@ int main(int argc, char **argv)
}
}
}
count_water=sumReduce( Dm->Comm, count_water);
count_water = Dm->Comm.sumReduce( count_water );
SW = double(count_water) / count_porespace;
if(rank==0) printf("Final saturation: %f \n", SW);
@@ -234,12 +234,12 @@ int main(int argc, char **argv)
}
}
}
MPI_Barrier(comm);
comm.barrier();
auto filename2 = READFILE + ".morph.raw";
if (rank==0) printf("Writing file to: %s \n", filename2.c_str());
Mask->AggregateLabels(filename2);
}
Utilities::shutdown();
Utilities::shutdown();
}