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

Juanes bench again...

Browse Source
This commit is contained in:
James E McClure 2017-08-16 10:15:26 -04:00
parent a11c48edb1
commit 04ce3bbb68
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sample_scripts/configure_desktop
View File

@ -13,7 +13,7 @@ cmake \
-D CMAKE_BUILD_TYPE:STRING=Debug \
-D CUDA_FLAGS="-arch sm_35" \
-D CUDA_HOST_COMPILER="/usr/bin/gcc" \
-D USE_NETCDF=1 \
-D USE_NETCDF=0 \
-D HDF5_DIRECTORY="/apps/hdf5/" \
-D NETCDF_DIRECTORY="/apps/netcdf/" \
-D USE_CUDA=0 \

11
tests/lbpm_juanes_bench_disc_pp.cpp
View File

@ -214,7 +214,7 @@ int main(int argc, char **argv)
outlet_radius=atoi(argv[2]);
}
else{
INSIST(argc==3,"Did not provide correct input arguments!");
INSIST(argc==3,"Did not provide correct input arguments!");
}
if (nprocs != nprocx*nprocy*nprocz){
@ -299,7 +299,7 @@ int main(int argc, char **argv)
printf("************ \n");
}
if (nprocx > 1 && rank==0) printf("Disc packs are 2D -- are you sure you want nprocx > 1? \n");
if (nprocz > 1 && rank==0) printf("Disc packs are 2D -- are you sure you want nprocz > 1? \n");
//.......................................................................
SignedDistanceDiscPack(SignDist.data(),ndiscs,cx,cy,rad,Lx,Ly,Lz,Nx,Ny,Nz,
iproc,jproc,kproc,nprocx,nprocy,nprocz);
@ -307,8 +307,8 @@ int main(int argc, char **argv)
// Assign walls in the signed distance functions (x,y boundaries)
double dst;
int center_x = nprocx*Nx/2;
int center_y = nprocy*Ny/2;
int center_x=nprocx*Nx/2;
int center_y=nprocy*Ny/2;
for (k=0;k<Nz;k++){
for (j=0;j<Ny;j++){
@ -332,10 +332,11 @@ int main(int argc, char **argv)
// distance map for the solid boundary at the outlet layer
dst = min(dist_to_top,dist_to_outlet);
}
if (k<5) SignDist(i,j,k) = dst;
else if (Nz-k<5) SignDist(i,j,k) = dst;
else if (dst < SignDist(i,j,k)) SignDist(i,j,k) = dst;
}
}
}
}