From 4bc9b011991ced34f649e2c450365e280f6294f3 Mon Sep 17 00:00:00 2001
From: Jim Edwards <jedwards@ucar.edu>
Date: Mon, 17 Dec 2018 14:08:51 -0700
Subject: [PATCH] clean up ctest scripts

---
 cmake/mpiexec.nwsc                            |  8 ++++++--
 cmake/mpiexec.nwscla                          |  8 ++++++--
 ctest/CTestEnvironment-nwsc.cmake             | 18 ------------------
 ...ash-nwsc-gnu.sh => runcdash-nwscla-gnu.sh} |  0
 ctest/runctest-nwsc.sh                        | 19 -------------------
 5 files changed, 12 insertions(+), 41 deletions(-)
 delete mode 100644 ctest/CTestEnvironment-nwsc.cmake
 rename ctest/{runcdash-nwsc-gnu.sh => runcdash-nwscla-gnu.sh} (100%)
 delete mode 100755 ctest/runctest-nwsc.sh

diff --git a/cmake/mpiexec.nwsc b/cmake/mpiexec.nwsc
index a6242b66712..1004e573333 100755
--- 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
index bb7018bf92c..1004e573333 100755
--- 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
deleted file mode 100644
index 4a0d6fd3acd..00000000000
--- a/ctest/CTestEnvironment-nwsc.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-#==============================================================================
-#
-#  This file sets the environment variables needed to configure and build
-#  on the NCAR Wyoming Supercomputing Center systems
-#  (yellowstone/caldera/geyser).
-#
-#==============================================================================
-
-# Assume all package locations (NetCDF, PnetCDF, HDF5, etc) are already
-# set with existing environment variables: NETCDF, PNETCDF, HDF5, etc.
-
-# Define the extra CMake configure options
-set (CTEST_CONFIGURE_OPTIONS "-DCMAKE_VERBOSE_MAKEFILE=TRUE -DPIO_ENABLE_DOC=OFF")
-
-# If MPISERIAL environment variable is set, then enable MPISERIAL
-if (DEFINED ENV{MPISERIAL})
-    set (CTEST_CONFIGURE_OPTIONS "${CTEST_CONFIGURE_OPTIONS} -DPIO_USE_MPISERIAL=ON -DPIO_ENABLE_EXAMPLES=OFF ")
-endif ()
diff --git a/ctest/runcdash-nwsc-gnu.sh b/ctest/runcdash-nwscla-gnu.sh
similarity index 100%
rename from ctest/runcdash-nwsc-gnu.sh
rename to ctest/runcdash-nwscla-gnu.sh
diff --git a/ctest/runctest-nwsc.sh b/ctest/runctest-nwsc.sh
deleted file mode 100755
index 64b8e9a8181..00000000000
--- a/ctest/runctest-nwsc.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#==============================================================================
-#
-#  This script defines how to run CTest on the NCAR Wyoming Supercomputing 
-#  Center systems (yellowstone/caldera/geyser).
-#
-#  This assumes the CTest model name (e.g., "Nightly") is passed to it when
-#  run.
-#
-#==============================================================================
-
-# Get the CTest script directory
-scrdir=$1
-
-# Get the CTest model name
-model=$2
-
-# Run the "ctest" command through an interactive parallel session
-DAV_CORES=4 execca ctest -S ${scrdir}/CTestScript-Test.cmake,${model} -V