(bugfix) Change MPIRUN from mpiexec to srun for ctest (#161)

* change mpiexec to srun for ctest * remove comments
ufs-community · Oct 24, 2024 · 0d93612 · 0d93612
1 parent 8c93fad
commit 0d93612
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -97,12 +97,7 @@ 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}"
 ${MPIRUN} -n ${NPROCS_FORECAST} ./ufs_model
 
 #

diff --git 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