diff --git a/sample_scripts/configure_desktop b/sample_scripts/configure_desktop index dc7d6a7c..625469f8 100755 --- a/sample_scripts/configure_desktop +++ b/sample_scripts/configure_desktop @@ -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 \ diff --git a/tests/lbpm_juanes_bench_disc_pp.cpp b/tests/lbpm_juanes_bench_disc_pp.cpp index 1cbb7a79..760ae803 100644 --- a/tests/lbpm_juanes_bench_disc_pp.cpp +++ b/tests/lbpm_juanes_bench_disc_pp.cpp @@ -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