Add fhzero ort to coupled tests

tests/detect_machine.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
-# Default account "nems"
-export ACCNR=${ACCNR:-nems}
+# Do not set ACCNR here or it will break the per-system defaults in rt.sh.
 
 case $(hostname -f) in
 
@@ -117,5 +116,3 @@ if [ $MACHINE_ID = orion ] || [ $MACHINE_ID = hera ] || [ $MACHINE_ID = cheyenne
    [ $MACHINE_ID = gaea ] || [ $MACHINE_ID = stampede ] || [ $MACHINE_ID = s4 ] || [ $MACHINE_ID = expanse ] ; then
     MACHINE_ID=${MACHINE_ID}.${RT_COMPILER}
 fi
-
-echo "Machine: " $MACHINE_ID "    Account: " $ACCNR

tests/opnReqTest

@@ -243,6 +243,7 @@ run_opnReqTests() {
 			export REGRESSIONTEST_LOG=${REGRESSIONTEST_LOG}
 			export LOG_DIR=${LOG_DIR}
 			export skip_check_results=${skip_check_results}
+			export delete_rundir=${delete_rundir}
 			EOF
 
     if [[ $ECFLOW == true ]]; then
@@ -407,6 +408,7 @@ keep_rundir=false
 skip_compile=false
 skip_run=false
 skip_check_results=false
+delete_rundir=false
 
 # parse command line arguments to fill-in/modify the above default variables
 while getopts :n:c:ekhbdsxz opt; do

tests/opnReqTests/dbg.sh

@@ -23,9 +23,12 @@ elif [[ $application == 'cpld' ]]; then
   NFHOUT_HF=1
   RESTART_INTERVAL=${FHMAX}
   RESTART_N=${FHMAX}
+  OUTPUT_FH="0 ${FHMAX}"
   LIST_FILES=$(echo -n $LIST_FILES | sed -E "s/sfcf024/sfcf006/g" \
                                    | sed -E "s/atmf024/atmf006/g" \
                                    | sed -E "s/2021-03-23-21600/2021-03-22-43200/g" \
+                                   | sed -E "s/sfcf021.tile[1-6].nc ?//g" \
+                                   | sed -E "s/atmf021.tile[1-6].nc ?//g" \
                                    | sed -e "s/^ *//" -e "s/ *$//")
 fi
 

tests/opnReqTests/fhz.sh

@@ -10,6 +10,16 @@ if [[ $application == 'global' ]]; then
                                    | sed -E "s/GFSFLX.GrbF24 ?//g" \
                                    | sed -E "s/GFSPRS.GrbF24 ?//g" \
                                    | sed -e "s/^ *//" -e "s/ *$//")
+elif [[ $application == 'cpld' ]]; then
+  if [[ $TEST_NAME == 'cpld_control_c96_p7' ]] || [[ $TEST_NAME == 'cpld_control_p7' ]]; then
+    FHZERO=3
+    LIST_FILES=$(echo -n $LIST_FILES | sed -E "s/sfcf024.tile[1-6].nc ?//g" \
+                                     | sed -E "s/atmf024.tile[1-6].nc ?//g" \
+                                     | sed -e "s/^ *//" -e "s/ *$//")
+  else
+    echo "This test is not yet set up for the fhzero test"
+    exit 1
+  fi
 else
   echo "This test is not yet set up for the fhzero test"
   exit 1

tests/rt.sh

@@ -116,7 +116,7 @@ fi
 # Default compiler "intel"
 export RT_COMPILER=${RT_COMPILER:-intel}
 
-source detect_machine.sh
+source detect_machine.sh # Note: this does not set ACCNR. The "if" block below does.
 source rt_utils.sh
 
 source module-setup.sh
@@ -142,7 +142,7 @@ if [[ $MACHINE_ID = wcoss_cray ]]; then
   QUEUE=debug
   COMPILE_QUEUE=dev
   PARTITION=
-  ACCNR=GFS-DEV
+  ACCNR="${ACCNR:-GFS-DEV}"
   if [[ -d /gpfs/hps3/ptmp ]] ; then
       STMP=/gpfs/hps3/stmp
       PTMP=/gpfs/hps3/stmp
@@ -175,7 +175,7 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then
   QUEUE=debug
   COMPILE_QUEUE=dev_transfer
   PARTITION=
-  ACCNR=GFS-DEV
+  ACCNR="${ACCNR:-GFS-DEV}"
   STMP=/gpfs/dell2/stmp
   PTMP=/gpfs/dell2/ptmp
   SCHEDULER=lsf
@@ -205,7 +205,7 @@ elif [[ $MACHINE_ID = wcoss2 ]]; then
   QUEUE=dev
   COMPILE_QUEUE=dev
   PARTITION=
-  ACCNR=GFS-DEV
+  ACCNR="${ACCNR:-GFS-DEV}"
   STMP=/lfs/h1/emc/ptmp
   PTMP=/lfs/h1/emc/ptmp
   SCHEDULER=pbs
@@ -222,7 +222,7 @@ elif [[ $MACHINE_ID = gaea.* ]]; then
   DISKNM=/lustre/f2/pdata/ncep_shared/emc.nemspara/RT
   QUEUE=normal
   COMPILE_QUEUE=normal
-#  ACCNR=cmp
+#  ACCNR="${ACCNR:-cmp}"
   PARTITION=c4
   STMP=/lustre/f2/scratch
   PTMP=/lustre/f2/scratch
@@ -249,7 +249,7 @@ elif [[ $MACHINE_ID = hera.* ]]; then
   QUEUE=batch
   COMPILE_QUEUE=batch
 
-  #ACCNR=fv3-cpu
+  #ACCNR="${ACCNR:-fv3-cpu}  
   PARTITION=
   dprefix=/scratch1/NCEPDEV
   DISKNM=$dprefix/nems/emc.nemspara/RT
@@ -275,7 +275,6 @@ elif [[ $MACHINE_ID = orion.* ]]; then
 
   QUEUE=batch
   COMPILE_QUEUE=batch
-#  ACCNR= # detected in detect_machine.sh
   PARTITION=orion
   dprefix=/work/noaa/stmp/${USER}
   DISKNM=/work/noaa/nems/emc.nemspara/RT
@@ -301,7 +300,7 @@ elif [[ $MACHINE_ID = jet.* ]]; then
 
   QUEUE=batch
   COMPILE_QUEUE=batch
-  ACCNR=${ACCNR:-h-nems}
+  ACCNR="${ACCNR:-h-nems}"
   PARTITION=xjet
   DISKNM=/lfs4/HFIP/h-nems/emc.nemspara/RT
   dprefix=${dprefix:-/lfs4/HFIP/$ACCNR/$USER}
@@ -328,7 +327,7 @@ elif [[ $MACHINE_ID = s4.* ]]; then
   QUEUE=s4
   COMPILE_QUEUE=s4
 
-  ACCNR=star
+  ACCNR="${ACCNR:-star}"
   PARTITION=s4
   dprefix=/data/users/dhuber/save
   DISKNM=$dprefix/nems/emc.nemspara/RT
@@ -364,7 +363,7 @@ elif [[ $MACHINE_ID = stampede.* ]]; then
   QUEUE=skx-normal
   COMPILE_QUEUE=skx-dev
   PARTITION=
-  ACCNR=TG-EES200015
+  ACCNR="${ACCNR:-TG-EES200015}"
   dprefix=$SCRATCH/ufs-weather-model/run
   DISKNM=/work2/07736/minsukji/stampede2/ufs-weather-model/RT
   STMP=$dprefix
@@ -381,7 +380,7 @@ elif [[ $MACHINE_ID = expanse.* ]]; then
   QUEUE=compute
   COMPILE_QUEUE=shared
   PARTITION=
-  ACCNR=TG-EES200015
+  ACCNR="${ACCNR:-TG-EES200015}"
   dprefix=/expanse/lustre/scratch/$USER/temp_project/run
   DISKNM=/expanse/lustre/scratch/domh/temp_project/RT
   STMP=$dprefix
@@ -393,6 +392,13 @@ else
   die "Unknown machine ID, please edit detect_machine.sh file"
 fi
 
+# If account is unspecified, assume the machine has a "nems"
+# accounting code.
+export ACCNR="${ACCNR:-nems}"
+
+# Display the machine and account using the format detect_machine.sh used:
+echo "Machine: " $MACHINE_ID "    Account: " $ACCNR
+
 mkdir -p ${STMP}/${USER}
 
 # Different own baseline directories for different compilers on Theia/Cheyenne
@@ -473,7 +479,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20220120
+BL_DATE=20220121
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else

tests/rt_utils.sh

@@ -5,6 +5,10 @@ if [[ "$0" = "${BASH_SOURCE[0]}" ]]; then
   exit 1
 fi
 
+# Note: this file must only contain subroutines, and variables that
+# are not dependent on the caller. Most regression test variables
+# (such as ACCNR) are not set until after rt.sh sources this file.
+
 OPNREQ_TEST=${OPNREQ_TEST:-false}
 
 qsub_id=0

tests/tests/cpld_control_c96_p8

@@ -6,7 +6,19 @@ export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100"
 
 export CNTL_DIR="cpld_control_c96_p8"
 
-export LIST_FILES="sfcf024.tile1.nc \
+export LIST_FILES="sfcf021.tile1.nc \
+                   sfcf021.tile2.nc \
+                   sfcf021.tile3.nc \
+                   sfcf021.tile4.nc \
+                   sfcf021.tile5.nc \
+                   sfcf021.tile6.nc \
+                   atmf021.tile1.nc \
+                   atmf021.tile2.nc \
+                   atmf021.tile3.nc \
+                   atmf021.tile4.nc \
+                   atmf021.tile5.nc \
+                   atmf021.tile6.nc \
+                   sfcf024.tile1.nc \
                    sfcf024.tile2.nc \
                    sfcf024.tile3.nc \
                    sfcf024.tile4.nc \
@@ -61,6 +73,7 @@ export_cpl
 
 export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
+export OUTPUT_FH='0 21 24'
 
 export TASKS=$TASKS_cpl_c96
 export TPN=$TPN_cpl_c96

tests/tests/cpld_control_p8

@@ -6,7 +6,19 @@ export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100"
 
 export CNTL_DIR="cpld_control_p8"
 
-export LIST_FILES="sfcf024.tile1.nc \
+export LIST_FILES="sfcf021.tile1.nc \
+                   sfcf021.tile2.nc \
+                   sfcf021.tile3.nc \
+                   sfcf021.tile4.nc \
+                   sfcf021.tile5.nc \
+                   sfcf021.tile6.nc \
+                   atmf021.tile1.nc \
+                   atmf021.tile2.nc \
+                   atmf021.tile3.nc \
+                   atmf021.tile4.nc \
+                   atmf021.tile5.nc \
+                   atmf021.tile6.nc \
+                   sfcf024.tile1.nc \
                    sfcf024.tile2.nc \
                    sfcf024.tile3.nc \
                    sfcf024.tile4.nc \
@@ -62,6 +74,7 @@ export_cpl
 
 export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
+export OUTPUT_FH='0 21 24'
 
 export eps_imesh=2.5e-1