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

Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA

Browse Source
This commit is contained in:
James E McClure 2018-09-04 23:49:16 -04:00
commit ede1d6679a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
analysis/runAnalysis.cpp
View File

@ -621,7 +621,7 @@ void runAnalysis::run( int timestep, TwoPhase& Averages, const double *Phi,
if (d_regular) if (d_regular)
d_ScaLBL_Comm->RegularLayout(d_Map,Phi,*phase); d_ScaLBL_Comm->RegularLayout(d_Map,Phi,*phase);
else else
ScaLBL_CopyToHost(*phase,Phi,N*sizeof(double)); ScaLBL_CopyToHost(phase->data(),Phi,N*sizeof(double));
BlobIDstruct new_index(new std::pair<int,IntArray>(0,IntArray())); BlobIDstruct new_index(new std::pair<int,IntArray>(0,IntArray()));
BlobIDstruct new_ids(new std::pair<int,IntArray>(0,IntArray())); BlobIDstruct new_ids(new std::pair<int,IntArray>(0,IntArray()));

12
sample_scripts/config_build_titan
View File

@ -7,7 +7,7 @@ module swap PrgEnv-pgi PrgEnv-gnu
#module load PrgEnv-pgi #module load PrgEnv-pgi
#module swap gcc gcc/4.8.2 #module swap gcc gcc/4.8.2
module load cudatoolkit module load cudatoolkit
module load cray-hdf5 silo #module load cray-hdf5 silo
# Remove CMake files from previous configures # Remove CMake files from previous configures
rm -rf CMake* rm -rf CMake*
@ -19,7 +19,7 @@ cmake \
-D CMAKE_C_COMPILER:PATH=cc \ -D CMAKE_C_COMPILER:PATH=cc \
-D CMAKE_CXX_COMPILER:PATH=CC \ -D CMAKE_CXX_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 CXX_STD=11 \
-D USE_CUDA=1 \ -D USE_CUDA=1 \
-D CMAKE_CUDA_FLAGS="-arch sm_35" \ -D CMAKE_CUDA_FLAGS="-arch sm_35" \
@ -29,14 +29,14 @@ cmake \
-D MPIEXEC=aprun \ -D MPIEXEC=aprun \
-D USE_EXT_MPI_FOR_SERIAL_TESTS:BOOL=TRUE \ -D USE_EXT_MPI_FOR_SERIAL_TESTS:BOOL=TRUE \
-D USE_SILO=1 \ -D USE_SILO=1 \
-D SILO_DIRECTORY=/sw/xk6/silo/4.8/sles11.1_gnu4.5.3 \ -D SILO_DIRECTORY=/ccs/proj/geo106/titan/TPLS/silo \
-D HDF5_DIRECTORY=/opt/cray/hdf5/1.8.16/GNU/4.9 \ -D HDF5_DIRECTORY=/ccs/proj/geo106/titan/TPLS/hdf5 \
-D USE_TIMER=0 \ -D USE_TIMER=0 \
${HOME}/LBPM-WIA ${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 # Build the code