clean up ctest scripts

jedwards4b · Dec 17, 2018 · 4bc9b01 · 4bc9b01
1 parent fbd27d8
commit 4bc9b01
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 41 deletions.
diff --git a/cmake/mpiexec.nwsc b/cmake/mpiexec.nwsc
@@ -8,5 +8,9 @@
 
 NP=$1
 shift
-
-mpirun.lsf $@ -n$NP
+if [ $LMOD_FAMILY_MPI -eq "openmpi" ]
+then
+  mpirun -np $NP $@
+else
+  mpiexec_mpt -n $NP $@
+fi
diff --git a/cmake/mpiexec.nwscla b/cmake/mpiexec.nwscla
@@ -8,5 +8,9 @@
 
 NP=$1
 shift
-
-mpiexec_mpt -n $NP $@
+if [ $LMOD_FAMILY_MPI -eq "openmpi" ]
+then
+  mpirun -np $NP $@
+else
+  mpiexec_mpt -n $NP $@
+fi
diff --git a/ctest/CTestEnvironment-nwsc.cmake b/ctest/CTestEnvironment-nwsc.cmake
diff --git a/ctest/runcdash-nwsc-gnu.sh → ctest/runcdash-nwscla-gnu.sh b/ctest/runcdash-nwsc-gnu.sh → ctest/runcdash-nwscla-gnu.sh
diff --git a/ctest/runctest-nwsc.sh b/ctest/runctest-nwsc.sh