From 29a2888ef3ec7f39a5ba518656708676d3abd1fb Mon Sep 17 00:00:00 2001
From: Walter Kolczynski <Walter.Kolczynski@noaa.gov>
Date: Tue, 6 Sep 2022 18:29:54 +0000
Subject: [PATCH] Add WCOSS2 support for tests

No mpiexec script to submit jobs had been added to run the test suite
on WCOSS2. Now one has been added, and other necessary updates to
recognize Cactus and Dogwood have been made.

Fixes #690
---
 cmake/LibMPI.cmake   |  4 +++-
 cmake/mpiexec.wcoss2 | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100755 cmake/mpiexec.wcoss2

diff --git a/cmake/LibMPI.cmake b/cmake/LibMPI.cmake
index 27c2683be..f5a4d5f35 100644
--- a/cmake/LibMPI.cmake
+++ b/cmake/LibMPI.cmake
@@ -47,7 +47,9 @@ function (platform_name RETURN_VARIABLE)
 
   # wcoss2
   elseif (SITENAME MATCHES "^along01" OR
-      SITENAME MATCHES "^alogin02")
+      SITENAME MATCHES "^alogin02" OR
+      SITENAME MATCHES "^clogin" OR
+      SITENAME MATCHES "^dlogin")
 
     set (${RETURN_VARIABLE} "wcoss2" PARENT_SCOPE)
 
diff --git a/cmake/mpiexec.wcoss2 b/cmake/mpiexec.wcoss2
new file mode 100755
index 000000000..1365ad45d
--- /dev/null
+++ b/cmake/mpiexec.wcoss2
@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# Arguments:
+#
+#   $1  - Number of MPI Tasks
+#   $2+ - Executable and its arguments
+#
+
+ACCOUNT=GFS-DEV
+QUEUE=dev
+
+NP=$1
+shift
+
+qsub -A $ACCOUNT -q $QUEUE -l select=1:ncpus=$NP:mem=1GB -l place=vscatter -l walltime=00:10:00 $@