From 0e2d7676ab93a654e75feb4920a258a35745ce9f Mon Sep 17 00:00:00 2001
From: Natalie Perlin <Natalie.Perlin@noaa.gov>
Date: Wed, 6 Nov 2024 16:27:00 -0600
Subject: [PATCH] update for HSD baroclinic_wave test on Jet, new file
 fv3_slurm.IN_jet

---
 .../test_cases/exp_conf/fv3_slurm.IN_jet      | 51 +++++++++++++++++++
 tests-dev/test_cases/tests/baroclinic_wave    |  9 ++--
 tests/fv3_conf/fv3_slurm.IN_jet               |  7 ++-
 3 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 tests-dev/test_cases/exp_conf/fv3_slurm.IN_jet

diff --git a/tests-dev/test_cases/exp_conf/fv3_slurm.IN_jet b/tests-dev/test_cases/exp_conf/fv3_slurm.IN_jet
new file mode 100644
index 0000000000..0c2451a688
--- /dev/null
+++ b/tests-dev/test_cases/exp_conf/fv3_slurm.IN_jet
@@ -0,0 +1,51 @@
+#!/bin/sh
+#SBATCH -e err
+#SBATCH -o out
+#SBATCH --account=@[ACCNR]
+#SBATCH --partition=@[PARTITION]
+#SBATCH --qos=@[QUEUE]
+#SBATCH --nodes=@[NODES]
+#SBATCH --mem=0
+#SBATCH --ntasks-per-node=@[TPN]
+#SBATCH --cpus-per-task=1
+#SBATCH --time=00:@[WLCLK]:00
+#SBATCH --job-name="@[JBNME]"
+#SBATCH --exclusive
+
+set -eux
+ulimit -u unlimited
+echo -n " $( date +%s )," >  job_timestamp.txt
+
+set +x
+MACHINE_ID=jet
+source ./module-setup.sh
+module use $PWD/modulefiles
+module load modules.fv3
+module list
+set -x
+
+echo "Model started:  " `date`
+
+export MPI_TYPE_DEPTH=20
+export OMP_STACKSIZE=512M
+export OMP_NUM_THREADS=@[THRD]
+export ESMF_RUNTIME_COMPLIANCECHECK=OFF:depth=4
+export PSM_RANKS_PER_CONTEXT=4
+export PSM_SHAREDCONTEXTS=1
+export ESMF_RUNTIME_PROFILE=ON
+export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"
+
+# Avoid job errors because of filesystem synchronization delays
+sync && sleep 1
+
+# This "if" block is part of the rt.sh self-tests in error-test.conf. It emulates the model failing to run.
+if [ "${JOB_SHOULD_FAIL:-NO}" = WHEN_RUNNING ] ; then
+    echo "The job should abort now, with exit status 1." 1>&2
+    echo "If error checking is working, the metascheduler should mark the job as failed." 1>&2
+    false
+fi
+
+srun --label -n @[TASKS] --cpus-per-task=@[THRD] ./fv3.exe
+
+echo "Model ended:    " `date`
+echo -n " $( date +%s )," >> job_timestamp.txt
diff --git a/tests-dev/test_cases/tests/baroclinic_wave b/tests-dev/test_cases/tests/baroclinic_wave
index eb4f638d43..62b6105301 100644
--- a/tests-dev/test_cases/tests/baroclinic_wave
+++ b/tests-dev/test_cases/tests/baroclinic_wave
@@ -23,6 +23,9 @@ export_fv3
 export_tiled
 export_ugwpv1
 
+if [[ $MACHINE_ID = jet ]]; then
+  export TPN=6
+fi
 export INPES=4
 export WRTTASK_PER_GROUP=12
 export NPZ=127
@@ -33,11 +36,7 @@ export SYEAR=2019
 export SMONTH=12
 export SDAY=03
 export SHOUR=00
-if [[ $MACHINE_ID = jet ]]; then
-  export FHMAX=120
-else
-  export FHMAX=240
-fi
+export FHMAX=240
 export DT_ATMOS=450
 export RESTART_INTERVAL='480 -1'
 export OUTPUT_GRID='gaussian_grid'
diff --git a/tests/fv3_conf/fv3_slurm.IN_jet b/tests/fv3_conf/fv3_slurm.IN_jet
index 2d4e93f2e3..e2cd86c5fa 100644
--- a/tests/fv3_conf/fv3_slurm.IN_jet
+++ b/tests/fv3_conf/fv3_slurm.IN_jet
@@ -4,15 +4,14 @@
 #SBATCH --account=@[ACCNR]
 #SBATCH --partition=@[PARTITION]
 #SBATCH --qos=@[QUEUE]
+##SBATCH --ntasks=@[TASKS]
 #SBATCH --nodes=@[NODES]
 #SBATCH --ntasks-per-node=@[TPN]
-#SBATCH --mem-per-cpu=2500M
-#SBATCH --time=00:@[WLCLK]:00
+#SBATCH --time=@[WLCLK]
 #SBATCH --job-name="@[JBNME]"
-#SBATCH --exclusive
+### #SBATCH --exclusive
 
 set -eux
-ulimit -u unlimited
 echo -n " $( date +%s )," >  job_timestamp.txt
 
 set +x