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

updates

Browse Source
This commit is contained in:
James E McClure 2018-04-11 05:23:31 -04:00
parent 7efc2c774e
commit 30c5535610
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
analysis/eikonal.hpp
View File

@ -167,8 +167,10 @@ inline double Eikonal(DoubleArray &Distance, char *ID, Domain &Dm, int timesteps
count++;
if (count%50 == 0 && Dm.rank==0 )
if (count%50 == 0 && Dm.rank==0 ){
printf("Time=%i, Max variation=%f, Global variation=%f \n",count,GlobalMax,GlobalVar);
fflush(stdout);
}
if (fabs(GlobalMax) < 1e-5){
if (Dm.rank==0) printf("Exiting with max tolerance of 1e-5 \n");

1
tests/CMakeLists.txt
View File

@ -12,6 +12,7 @@ ADD_LBPM_EXECUTABLE( lbpm_morphdrain_pp )
ADD_LBPM_EXECUTABLE( lbpm_morphopen_pp )
ADD_LBPM_EXECUTABLE( lbpm_morph_pp )
ADD_LBPM_EXECUTABLE( lbpm_segmented_pp )
ADD_LBPM_EXECUTABLE( lbpm_block_pp )
ADD_LBPM_EXECUTABLE( lbpm_segmented_decomp )
ADD_LBPM_EXECUTABLE( lbpm_serial_decomp )
ADD_LBPM_EXECUTABLE( lbpm_disc_pp )

5
tests/DataAggregator.cpp
View File

@ -49,6 +49,9 @@ int main(int argc, char **argv){
Bx=NX/Nx+1;
By=NY/Ny+1;
Bz=NZ/Nz+1;
if (Bx>8) Bx=8;
if (By>8) By=8;
if (Bz>8) Bz=8;
printf("System size (output) is: %i x %i x %i \n",NX,NY,NZ);
printf("Block size (read) is: %i x %i x %i \n",Nx,Ny,Nz);
@ -79,7 +82,7 @@ int main(int argc, char **argv){
sprintf(sx,"%d",bx);
sprintf(sy,"%d",by);
sprintf(sz,"%d",bz);
sprintf(LocalRankFilename,"%s%s%s%s%s%s%s","a1_x",sx,"_y",sy,"_z",sz,".gbd");
sprintf(LocalRankFilename,"%s%s%s%s%s%s%s","a2_x",sx,"_y",sy,"_z",sz,".gbd");
//sprintf(LocalRankFilename,"%s%s%s%s%s%s%s","dis_",sx,"x_",sy,"y_",sz,"z.gbd");
printf("Reading file: %s \n", LocalRankFilename);
fflush(stdout);

5
tests/lbpm_segmented_pp.cpp
View File

@ -134,8 +134,10 @@ int main(int argc, char **argv)
// char fluidValue,solidValue;
int MAXTIME=1000;
int READ_FROM_BLOCK=0;
if (argc > 2){
if (argc > 1){
MAXTIME=atoi(argv[1]);
}
if (argc > 2){
READ_FROM_BLOCK=atoi(argv[2]);
}
@ -208,6 +210,7 @@ int main(int argc, char **argv)
fflush(stdout);
porosity = ReadFromBlock(Dm.id,Dm.iproc,Dm.jproc,Dm.kproc,nx,ny,nz);
MPI_Barrier(MPI_COMM_WORLD);
if (rank==0) printf("Writing local ID files (poros=%f) \n",porosity);
fflush(stdout);
FILE *ID = fopen(LocalRankFilename,"wb");