From 18d56445b75ab9a3b178b3d0aaae17d2a51bcd69 Mon Sep 17 00:00:00 2001
From: Nick Szapiro <Nick.Szapiro@noaa.gov>
Date: Mon, 21 Oct 2024 15:58:26 +0000
Subject: [PATCH] cleanup GEFS RT suite

---
 tests/parm/model_configure.IN | 2 --
 tests/tests/cpld_control_gefs | 4 +---
 tests/tests/cpld_dcp_gefs     | 5 ++---
 tests/tests/cpld_debug_gefs   | 5 +++--
 tests/tests/cpld_restart_gefs | 9 +++------
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/tests/parm/model_configure.IN b/tests/parm/model_configure.IN
index 45164466ad..a112bc0a01 100644
--- a/tests/parm/model_configure.IN
+++ b/tests/parm/model_configure.IN
@@ -8,9 +8,7 @@ nhours_fcst:             @[FHMAX]
 fhrot:                   @[FHROT]
 
 dt_atmos:                @[DT_ATMOS]
-calendar:                'julian'
 restart_interval:        @[RESTART_INTERVAL]
-output_1st_tstep_rst:    .false.
 
 quilting:                @[QUILTING]
 quilting_restart:        @[QUILTING_RESTART]
diff --git a/tests/tests/cpld_control_gefs b/tests/tests/cpld_control_gefs
index 85915bf69f..cb1c7b9a75 100644
--- a/tests/tests/cpld_control_gefs
+++ b/tests/tests/cpld_control_gefs
@@ -67,12 +67,11 @@ export BMIC=.true.
 
 export DAYS=0.5
 export FHMAX=12
-export RESTART_N=3 #$((FHMAX-FHROT))
+export RESTART_N=3
 export RESTART_INTERVAL="${RESTART_N} -1"
 export OUTPUT_FH="3 -1"
 export FHZERO=3
 
-#export DOMAINS_STACK_SIZE=16000000
 export INPES=$INPES_cpl_bmrk
 export JNPES=$JNPES_cpl_bmrk
 export THRD=$THRD_cpl_bmrk
@@ -233,7 +232,6 @@ export IOPT_TRS=2
 export IOPT_DIAG=1
 
 export IAER=2011
-#export CDMBWD=${CDMBWD_c384}
 
 export DOGP_CLDOPTICS_LUT=.false.
 export DOGP_LWSCAT=.false.
diff --git a/tests/tests/cpld_dcp_gefs b/tests/tests/cpld_dcp_gefs
index 42d0834570..46c7fc5a61 100644
--- a/tests/tests/cpld_dcp_gefs
+++ b/tests/tests/cpld_dcp_gefs
@@ -1,11 +1,10 @@
 #
 #  decomposition gefs test
 #
-export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - dcp test"
 
-export CNTL_DIR=cpld_control_gefs
+source ${PATHRT}/tests/cpld_control_gefs
 
-source ${PATHRT}/tests/${CNTL_DIR}
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - dcp test"
 
 export INPES=$((INPES/2))
 export JNPES=$((JNPES*2))
diff --git a/tests/tests/cpld_debug_gefs b/tests/tests/cpld_debug_gefs
index 778db0c3db..11f186ee74 100644
--- a/tests/tests/cpld_debug_gefs
+++ b/tests/tests/cpld_debug_gefs
@@ -1,6 +1,9 @@
 #
 #  debug gefs test
 #
+
+source ${PATHRT}/tests/cpld_control_gefs
+
 export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - debug test"
 
 export CNTL_DIR=cpld_debug_gefs
@@ -50,8 +53,6 @@ export LIST_FILES="sfcf003.nc \
                    20210325.090000.out_grd.ww3 \
                    RESTART/ufs.cpld.cpl.r.2021-03-25-32400.nc"
 
-source ${PATHRT}/tests/cpld_control_gefs
-
 export DAYS=0.125
 export FHMAX=3
 export CICE_DIAGFREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
diff --git a/tests/tests/cpld_restart_gefs b/tests/tests/cpld_restart_gefs
index 61bdca82c9..48012800e6 100644
--- a/tests/tests/cpld_restart_gefs
+++ b/tests/tests/cpld_restart_gefs
@@ -1,16 +1,13 @@
 #
 #  restart gefs test
 #
-export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - restart test"
 
-export CNTL_DIR=cpld_control_gefs
+source ${PATHRT}/tests/cpld_control_gefs
 
-source ${PATHRT}/tests/${CNTL_DIR}
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - restart test"
 
-#export FHROT_REST=6 #After any IAU
-export FHROT_REST=9
+export FHROT_REST=9 #restart after any IAU
 export FHROT=$((FHROT+FHROT_REST))
-#export FHMAX=$((FHMAX-FHROT_REST))
 export RESTART_N=$((FHMAX-FHROT))
 export RESTART_INTERVAL="${RESTART_N} -1"
 export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $(( (${FHROT}+ ${SHOUR})*3600 )))"