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

example/Sph1896/Color.in

@@ -1,6 +1,6 @@
-1.0
-1.0e-2 0.95 0.75
+0.7
+1.0e-2 0.95 0.8
 0.7
 0.0 0.0 0.0
-0 1 1.05 0.95
-10000 1000 1e-5
+0 0 1.05 0.95
+1000 20000 1e-5

example/Sph1896/Domain.in

@@ -1,4 +1,4 @@
-2 2 2
-120 120 120
+3 3 3
+180 180 180
 1896
 1.0 1.0 1.0

example/Sph1896/Titan-Submit.pbs

@@ -1,9 +1,9 @@
 #!/bin/bash
-#PBS -A GEO019
+#PBS -A GEO106
 #PBS -N LB-WIA-Color
 #PBS -j oe
-#PBS -l walltime=0:30:00,nodes=27
-#PBS -l gres=widow2%widow3
+#PBS -l walltime=0:20:00,nodes=27
+##PBS -l gres=widow2%widow3
 ##PBS -q killable
 #PBS -q debug
 
@@ -12,9 +12,14 @@ date
 
 cd $PBS_O_WORKDIR
 
+LBPM_WIA_INSTALL_DIR=/lustre/atlas/scratch/mcclurej/geo106/install-LBPM-WIA
+
 #echo "PBS_O_WORKDIR: `echo $PBS_O_WORKDIR`"
 source $MODULESHOME/init/bash
-module swap cray-mpich2 cray-mpich2/5.6.3
+#module swap cray-mpich2 cray-mpich2/5.6.3
+module load cudatoolkit
+
 export LD_LIBRARY_PATH=${CRAY_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH}
 export MPICH_RDMA_ENABLED_CUDA=1
-aprun -n 27 -N 1 ~/LBPM-WIA/bin/Color-WIA
+#aprun -n 27 -N 1 /lustre/atlas/scratch/mcclurej/geo106/LBPM-WIA/bin/lb2_Color_wia_mpi
+aprun -n 27 -N 1 $LBPM_WIA_INSTALL_DIR/bin/lb2_Color_wia_mpi

sample_scripts/configure_titan_jem

@@ -0,0 +1,37 @@
+# Set the modules and enviornmental variables
+source $MODULESHOME/init/bash
+module load cudatoolkit
+module load cmake
+export MPICH_RDMA_ENABLED_CUDA=1
+module swap cray-mpich2 cray-mpich2/5.6.3
+
+
+# Remove CMake files from previous configures
+rm -rf CMake*
+
+
+# Configure
+cmake                                    \
+    -D CMAKE_C_COMPILER:PATH=cc          \
+    -D CMAKE_CXX_COMPILER:PATH=CC        \
+    -D CMAKE_CXX_COMPILER:PATH=CC        \
+    -D MPI_COMPILER:BOOL=TRUE            \
+    -D MPIEXEC=aprun                     \
+    -D USE_EXT_MPI_FOR_SERIAL_TESTS:BOOL=TRUE \
+    -D CMAKE_BUILD_TYPE:STRING=Debug     \
+    -D CUDA_FLAGS="-arch sm_35"          \
+    -D CUDA_HOST_COMPILER="/usr/bin/gcc" \
+    -D USE_CUDA=1                        \
+    /ccs/home/mcclurej/LBPM-WIA
+
+
+# Build the code
+make install -j 8
+
+
+# Run the fast tests
+#ctest -E WEEKLY
+
+
+# Run the slow tests
+# ctest -R WEEKLY -VV