From c64c10a7b1d6092b211a23b088598fc871f38bb1 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Tue, 4 Sep 2018 22:12:54 -0400 Subject: [PATCH 1/2] titan build script fix for hdf5 --- sample_scripts/config_build_titan | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sample_scripts/config_build_titan b/sample_scripts/config_build_titan index 2acba264..18d50e1a 100755 --- a/sample_scripts/config_build_titan +++ b/sample_scripts/config_build_titan @@ -7,7 +7,7 @@ module swap PrgEnv-pgi PrgEnv-gnu #module load PrgEnv-pgi #module swap gcc gcc/4.8.2 module load cudatoolkit -module load cray-hdf5 silo +#module load cray-hdf5 silo # Remove CMake files from previous configures rm -rf CMake* @@ -19,7 +19,7 @@ cmake \ -D CMAKE_C_COMPILER:PATH=cc \ -D CMAKE_CXX_COMPILER:PATH=CC \ -D CMAKE_CXX_COMPILER:PATH=CC \ - -D CMAKE_CXX_FLAGS="" \ + -D CMAKE_CXX_FLAGS="-fPIC" \ -D CXX_STD=11 \ -D USE_CUDA=1 \ -D CMAKE_CUDA_FLAGS="-arch sm_35" \ @@ -29,14 +29,14 @@ cmake \ -D MPIEXEC=aprun \ -D USE_EXT_MPI_FOR_SERIAL_TESTS:BOOL=TRUE \ -D USE_SILO=1 \ - -D SILO_DIRECTORY=/sw/xk6/silo/4.8/sles11.1_gnu4.5.3 \ - -D HDF5_DIRECTORY=/opt/cray/hdf5/1.8.16/GNU/4.9 \ + -D SILO_DIRECTORY=/ccs/proj/geo106/titan/TPLS/silo \ + -D HDF5_DIRECTORY=/ccs/proj/geo106/titan/TPLS/hdf5 \ -D USE_TIMER=0 \ ${HOME}/LBPM-WIA + # -D SILO_DIRECTORY=/sw/xk6/silo/4.8/sles11.1_gnu4.5.3 \ + # -D HDF5_DIRECTORY=/opt/cray/hdf5/1.8.16/GNU/4.9 \ -# -D SILO_DIRECTORY=/ccs/proj/geo106/titan/TPLS/silo \ -# -D HDF5_DIRECTORY=/ccs/proj/geo106/titan/TPLS/hdf5 \ # Build the code From 09d42d7cf90b4be833d6a1d21fb136f111f50afc Mon Sep 17 00:00:00 2001 From: James E McClure Date: Tue, 4 Sep 2018 23:26:28 -0400 Subject: [PATCH 2/2] fixed bug --- analysis/runAnalysis.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analysis/runAnalysis.cpp b/analysis/runAnalysis.cpp index 222248a6..b3b5196f 100644 --- a/analysis/runAnalysis.cpp +++ b/analysis/runAnalysis.cpp @@ -621,7 +621,7 @@ void runAnalysis::run( int timestep, TwoPhase& Averages, const double *Phi, if (d_regular) d_ScaLBL_Comm->RegularLayout(d_Map,Phi,*phase); else - ScaLBL_CopyToHost(*phase,Phi,N*sizeof(double)); + ScaLBL_CopyToHost(phase->data(),Phi,N*sizeof(double)); BlobIDstruct new_index(new std::pair(0,IntArray())); BlobIDstruct new_ids(new std::pair(0,IntArray()));