From 3f732c18eb5cd2dc0b6406082ca355c69c29712a Mon Sep 17 00:00:00 2001
From: "Chan-hoo.Jeon" <chan-hoo.jeon@noaa.gov>
Date: Thu, 24 Oct 2024 16:47:03 +0000
Subject: [PATCH 1/2] change mpiexec to srun for ctest

---
 sorc/test/hera_ctest.sh          |  2 ++
 sorc/test/hercules_ctest.sh      |  2 ++
 sorc/test/orion_ctest.sh         |  2 ++
 sorc/test/run_ufs_datm_lnd.sh    | 12 ++++++------
 sorc/test/test_letkfoi_snowda.sh |  2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/sorc/test/hera_ctest.sh b/sorc/test/hera_ctest.sh
index 8ca14c75..65484d4a 100755
--- a/sorc/test/hera_ctest.sh
+++ b/sorc/test/hera_ctest.sh
@@ -7,6 +7,8 @@ source ../../versions/build.ver_hera
 module use ../../modulefiles
 module load build_hera_intel
 
+export MPIRUN="srun"
+
 ctest
 
 wait
diff --git a/sorc/test/hercules_ctest.sh b/sorc/test/hercules_ctest.sh
index 1a2355fb..5e6f3152 100755
--- a/sorc/test/hercules_ctest.sh
+++ b/sorc/test/hercules_ctest.sh
@@ -7,6 +7,8 @@ source ../../versions/build.ver_hercules
 module use ../../modulefiles
 module load build_hercules_intel
 
+export MPIRUN="srun"
+
 ctest
 
 wait
diff --git a/sorc/test/orion_ctest.sh b/sorc/test/orion_ctest.sh
index f8b3b25c..fc5a3127 100755
--- a/sorc/test/orion_ctest.sh
+++ b/sorc/test/orion_ctest.sh
@@ -7,6 +7,8 @@ source ../../versions/build.ver_orion
 module use ../../modulefiles
 module load build_orion_intel
 
+export MPIRUN="srun"
+
 ctest
 
 wait
diff --git a/sorc/test/run_ufs_datm_lnd.sh b/sorc/test/run_ufs_datm_lnd.sh
index 79974a09..6e488066 100755
--- a/sorc/test/run_ufs_datm_lnd.sh
+++ b/sorc/test/run_ufs_datm_lnd.sh
@@ -97,12 +97,12 @@ fi
 cp ${PATHRT}/parm/noahmptable.tbl noahmptable.tbl
 
 # start runs
-echo "Start ufs-weather-model run"
-if [ "${PLATFORM}" = "hera" ] || [ "${PLATFORM}" = "orion" ] || [ "${PLATFORM}" = "hercules" ]; then 
-  export MPIRUN="srun"
-else
-  export MPIRUN=${MPIRUN:-`which mpiexec`}
-fi
+echo "Start ufs-weather-model run with ${MPIRUN}"
+#if [ "${PLATFORM}" = "hera" ] || [ "${PLATFORM}" = "orion" ] || [ "${PLATFORM}" = "hercules" ]; then 
+#  export MPIRUN="srun"
+#else
+#  export MPIRUN=${MPIRUN:-`which mpiexec`}
+#fi
 ${MPIRUN} -n ${NPROCS_FORECAST} ./ufs_model
 
 #
diff --git a/sorc/test/test_letkfoi_snowda.sh b/sorc/test/test_letkfoi_snowda.sh
index 505baf6f..4f92a801 100755
--- a/sorc/test/test_letkfoi_snowda.sh
+++ b/sorc/test/test_letkfoi_snowda.sh
@@ -83,5 +83,5 @@ ln -fs $JEDI_STATICDIR ./
 cp $project_source_dir/../parm/jedi/gfs-land.yaml .
 
 #
-echo "============================= calling ${JEDI_EXEC}"
+echo "============================= calling ${JEDI_EXEC} with ${MPIRUN}"
 ${MPIRUN} -n $NPROC ${JEDI_EXEC} letkf_land.yaml

From 4a83349e49d38eec23752365fb65457cbf189abb Mon Sep 17 00:00:00 2001
From: "Chan-hoo.Jeon" <chan-hoo.jeon@noaa.gov>
Date: Thu, 24 Oct 2024 17:08:49 +0000
Subject: [PATCH 2/2] remove comments

---
 sorc/test/run_ufs_datm_lnd.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sorc/test/run_ufs_datm_lnd.sh b/sorc/test/run_ufs_datm_lnd.sh
index 6e488066..2eb6c73e 100755
--- a/sorc/test/run_ufs_datm_lnd.sh
+++ b/sorc/test/run_ufs_datm_lnd.sh
@@ -98,11 +98,6 @@ cp ${PATHRT}/parm/noahmptable.tbl noahmptable.tbl
 
 # start runs
 echo "Start ufs-weather-model run with ${MPIRUN}"
-#if [ "${PLATFORM}" = "hera" ] || [ "${PLATFORM}" = "orion" ] || [ "${PLATFORM}" = "hercules" ]; then 
-#  export MPIRUN="srun"
-#else
-#  export MPIRUN=${MPIRUN:-`which mpiexec`}
-#fi
 ${MPIRUN} -n ${NPROCS_FORECAST} ./ufs_model
 
 #