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

Added depth to lbpm_disc_pp as command line argument

Browse Source
This commit is contained in:
James E McClure 2015-07-09 20:31:27 -04:00
parent 7d3e600417
commit bdcd2619fd
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/lbpm_disc_pp.cpp
View File

@ -151,6 +151,8 @@ int main(int argc, char **argv)
MPI_Request req1[18],req2[18]; MPI_Request req1[18],req2[18];
MPI_Status stat1[18],stat2[18]; MPI_Status stat1[18],stat2[18];
int depth;
if (rank == 0){ if (rank == 0){
printf("********************************************************\n"); printf("********************************************************\n");
printf("Running Disc Packing Pre-Processor for LBPM-WIA \n"); printf("Running Disc Packing Pre-Processor for LBPM-WIA \n");
@ -202,6 +204,8 @@ int main(int argc, char **argv)
MPI_Barrier(MPI_COMM_WORLD); MPI_Barrier(MPI_COMM_WORLD);
// ************************************************************** // **************************************************************
if (argc > 1) depth=atoi(argv[1]);
else depth=Nz;
if (nprocs != nprocx*nprocy*nprocz){ if (nprocs != nprocx*nprocy*nprocz){
printf("nprocx = %i \n",nprocx); printf("nprocx = %i \n",nprocx);
@ -227,6 +231,7 @@ int main(int argc, char **argv)
printf("Process grid = %ix%ix%i \n", nprocx,nprocy,nprocz); printf("Process grid = %ix%ix%i \n", nprocx,nprocy,nprocz);
printf("Sub-domain size = %ix%ix%i \n", Nx,Ny,Nz); printf("Sub-domain size = %ix%ix%i \n", Nx,Ny,Nz);
printf("Physical domain size = %fx%fx%f \n",Lx,Ly,Lz); printf("Physical domain size = %fx%fx%f \n",Lx,Ly,Lz);
printf("Micromodel depth = %i voxels" depth);
} }
@ -284,6 +289,7 @@ int main(int argc, char **argv)
printf("************ \n"); printf("************ \n");
} }
if (nprocz > 1 && rank==0) printf("Disc packs are 2D -- are you sure you want nprocz > 1? \n");
//....................................................................... //.......................................................................
SignedDistanceDiscPack(SignDist.get(),ndiscs,cx,cy,rad,Lx,Ly,Lz,Nx,Ny,Nz, SignedDistanceDiscPack(SignDist.get(),ndiscs,cx,cy,rad,Lx,Ly,Lz,Nx,Ny,Nz,
iproc,jproc,kproc,nprocx,nprocy,nprocz); iproc,jproc,kproc,nprocx,nprocy,nprocz);
@ -300,6 +306,11 @@ int main(int argc, char **argv)
// Assign the Signed Distance where valid // Assign the Signed Distance where valid
if (dst < SignDist(i,j,k)) SignDist(i,j,k) = dst; if (dst < SignDist(i,j,k)) SignDist(i,j,k) = dst;
// Assign the micromodel depth
dst = 1.0*(k-2);
if (1.0*(depth+2-k) < dst) dst = 1.0*(depth+2-k);
if (dst < SignDist(i,j,k)) SignDist(i,j,k) = dst;
n = k*Nx*Ny+j*Nx+i; n = k*Nx*Ny+j*Nx+i;
id[n] = 0; id[n] = 0;
} }