Fix IAU forecast hour 00 averaging // Machine cleanup for Jet, Frontera, and S4 #3158

.cicd/Jenkinsfile.combined

@@ -37,12 +37,7 @@ def generateStage(nodeLabel) {
                        export SSH_ORIGIN=$(curl --silent https://api.github.com/repos/ufs-community/ufs-weather-model/pulls/$CHANGE_ID | jq -r '.head.repo.ssh_url')
                        export FORK_BRANCH=$(curl --silent https://api.github.com/repos/ufs-community/ufs-weather-model/pulls/$CHANGE_ID | jq -r '.head.ref')
 
-                          if [[ $machine =~ "Jet" ]] 
-                          then
-                            echo "Creating baselines on $machine"
-                            export dprefix=/lfs1/NAGAPE/$ACCNR/$USER
-                            ./rt.sh -a ${ACCNR} -c -r -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
-                          elif [[ $machine =~ "Hercules" ]]
+                          if [[ $machine =~ "Hercules" ]]
                           then
                             echo "Creating baselines on $machine"
                             export dprefix=/work2/noaa/$ACCNR/$USER
@@ -195,12 +190,7 @@ def generateStage(nodeLabel) {
                        export SSH_ORIGIN=$(curl --silent https://api.github.com/repos/ufs-community/ufs-weather-model/pulls/$CHANGE_ID | jq -r '.head.repo.ssh_url')
                        export FORK_BRANCH=$(curl --silent https://api.github.com/repos/ufs-community/ufs-weather-model/pulls/$CHANGE_ID | jq -r '.head.ref')
 
-                          if [[ $machine =~ "Jet" ]] 
-                          then
-                           echo "Running regression tests on $machine"
-                            export dprefix=/lfs1/NAGAPE/$ACCNR/$USER
-                            ./rt.sh -a ${ACCNR} -r -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
-                          elif [[ $machine =~ "Hercules" ]]
+                          if [[ $machine =~ "Hercules" ]]
                           then
                           echo "Running regression tests on $machine"
                             export dprefix=/work2/noaa/$ACCNR/$USER

.cicd/scripts/create_baseline.sh

@@ -7,7 +7,6 @@ export ACCNR=epic
 
 export account="-a ${ACCNR}"
 export workflow="-e"
-	#[[ ${UFS_PLATFORM} =  jet         ]] && workflow="-r"
 	#[[ ${UFS_PLATFORM} =  hera        ]] && workflow="-r"
 	#[[ ${UFS_PLATFORM} =~ clusternoaa ]] && workflow=""
 
@@ -59,16 +58,7 @@ function create_baseline() {
 		BL_DATE=$(cut -d '=' -f2 bl_date.conf)
 		export BL_DATE
 
-		if [[ ${machine} =~ "Jet" ]]
-		then
-		    echo "Creating baselines on ${machine}"
-		    export dprefix=/lfs5/NAGAPE/${ACCNR}/${USER}
-		    sed 's|/lfs4/HFIP/${ACCNR}/${USER}|/lfs4/HFIP/hfv3gfs/${USER}|g' -i rt.sh
-		    sed 's|/lfs5/HFIP/${ACCNR}/${USER}|/lfs5/NAGAPE/${ACCNR}/${USER}|g' -i rt.sh
-		    local workflow="-r"
-		    ./rt.sh -a "${ACCNR}" -c "${workflow}" "${opt}" "${suite}" | tee "${WORKSPACE}/tests/logs/RT-run-${machine}.log"
-		    status=${PIPESTATUS[0]}
-		elif [[ ${machine} =~ "Hercules" ]]
+		if [[ ${machine} =~ "Hercules" ]]
 		then
 		    echo "Creating baselines on ${machine}"
 		    export dprefix=/work2/noaa/${ACCNR}/${USER}

.cicd/scripts/regression_test.sh

@@ -7,7 +7,6 @@ export ACCNR=epic
 
 export account="-a ${ACCNR}"
 export workflow="-e"
-	#[[ ${UFS_PLATFORM} =  jet         ]] && workflow="-r"
 	#[[ ${UFS_PLATFORM} =  hera        ]] && workflow="-r"
 	#[[ ${UFS_PLATFORM} =~ clusternoaa ]] && workflow=""
 
@@ -59,16 +58,7 @@ function regression_test() {
 		BL_DATE=$(cut -d '=' -f2 bl_date.conf)
 		export BL_DATE
 
-		if [[ ${machine} =~ "Jet" ]]
-		then
-		    echo "Running regression tests on ${machine}"
-		    export dprefix=/lfs5/NAGAPE/${ACCNR}/${USER}
-		    sed 's|/lfs4/HFIP/${ACCNR}/${USER}|/lfs4/HFIP/hfv3gfs/${USER}|g' -i rt.sh
-		    sed 's|/lfs5/HFIP/${ACCNR}/${USER}|/lfs5/NAGAPE/${ACCNR}/${USER}|g' -i rt.sh
-		    local workflow="-r"
-		    ./rt.sh -a "${ACCNR}" "${workflow}" "${opt}" "${suite}" | tee "${WORKSPACE}/tests/logs/RT-run-${machine}.log"
-		    status=${PIPESTATUS[0]}
-		elif [[ ${machine} =~ "Hercules" ]]
+		if [[ ${machine} =~ "Hercules" ]]
 		then
 		    echo "Running regression tests on ${machine}"
 		    export dprefix=/work2/noaa/${ACCNR}/${USER}

.cicd/scripts/wm_test.sh

@@ -55,7 +55,6 @@ ls -l build/ufs_model || : # just checking
 status=$?
 
 [[ -n "${WM_REGRESSION_TESTS:-""}"    ]] || WM_REGRESSION_TESTS=true     # default
-#[[ ${UFS_PLATFORM} == jet         ]] && WM_REGRESSION_TESTS=false   # takes too long
 #[[ ${UFS_PLATFORM} == derecho     ]] && WM_REGRESSION_TESTS=false
 #[[ ${UFS_PLATFORM} =~ clusternoaa ]] && WM_REGRESSION_TESTS=false || :
 export WM_REGRESSION_TESTS

.gitmodules

@@ -1,7 +1,9 @@
 [submodule "UFSATM"]
   path = UFSATM
-  url = https://github.com/NOAA-EMC/ufsatm
-  branch = develop
+  #url = https://github.com/NOAA-EMC/ufsatm
+  #branch = develop
+  url = https://github.com/dpsarmie/ufsatm
+  branch = fix/IAU_avg_at_f000
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

tests-dev/baseline_setup.yaml

@@ -89,16 +89,3 @@ noaacloud:
   INPUTDATA_ROOT: /contrib/ufs-weather-model/RT/NEMSfv3gfs/input-data-20251015
   INPUTDATA_ROOT_WW3: /contrib/ufs-weather-model/RT/NEMSfv3gfs/input-data-20251015/WW3_input_data_20250225
   INPUTDATA_ROOT_BMIC: /contrib/ufs-weather-model/RT/NEMSfv3gfs/BM_IC-20220207
-s4:
-  QUEUE: s4
-  COMPILE_QUEUE: s4
-  PARTITION: s4
-  dprefix: /data/prod
-  DISKNM: /data/prod/emc.nemspara/RT
-  STMP: /scratch/short/users
-  PTMP: /scratch/users
-  RUNDIR_ROOT:
-  SCHEDULER: slurm
-  INPUTDATA_ROOT: /data/prod/emc.nemspara/RT/NEMSfv3gfs/input-data-20251015
-  INPUTDATA_ROOT_WW3: /data/prod/emc.nemspara/RT/NEMSfv3gfs/input-data-20251015/WW3_input_data_20250225
-  INPUTDATA_ROOT_BMIC: /data/prod/emc.nemspara/RT/NEMSfv3gfs/BM_IC-20220207

tests-dev/create_xml.py

@@ -54,18 +54,16 @@ def rocoto_create_compile_task(MACHINE_ID,COMPILE_ID,ROCOTO_COMPILE_MAXTRIES,MAK
         MAKE_OPT (str): Make build options
         ACCNR (str): Account to run the job with
         COMPILE_QUEUE (str): Quality of Service (QOS), i.e., batch, windfall, normal, etc.
-        PARTITION (str): System partition i.e., xjet, c5
+        PARTITION (str): System partition i.e., c5
         ROCOTO_XML (str): Rocoto XML filename to write to
     """
     NATIVE=""
     BUILD_CORES="8"
     BUILD_WALLTIME="00:30:00"
-    if ( MACHINE_ID == 'jet' ):  BUILD_WALLTIME="02:00:00"
     if ( MACHINE_ID == 'hera'):  BUILD_WALLTIME="01:00:00"
     if ( MACHINE_ID == 'ursa'):  BUILD_WALLTIME="01:00:00"
     if ( MACHINE_ID == 'orion'): BUILD_WALLTIME="01:00:00"
     if ( MACHINE_ID == 'hercules'): BUILD_WALLTIME="01:00:00"
-    if ( MACHINE_ID == 's4' ):   BUILD_WALLTIME="01:00:00"
     if ( MACHINE_ID == 'gaeac6' ): BUILD_WALLTIME="01:00:00"
     compile_task = f"""  <task name="compile_{COMPILE_ID}" maxtries="{ROCOTO_COMPILE_MAXTRIES}">
     <command>&PATHRT;/run_compile.sh &PATHRT; &RUNDIR_ROOT; "{MAKE_OPT}" {COMPILE_ID} 2>&amp;1 | tee &LOG;/compile_{COMPILE_ID}.log</\
@@ -122,7 +120,7 @@ def write_compile_env(SCHEDULER,PARTITION,JOB_NR,COMPILE_QUEUE,RUNDIR_ROOT):
 
     Args:
         SCHEDULER (str): Job scheduler, e.g., pbs, slurm
-        PARTITION (str): System partition, i.e., xjet, c5
+        PARTITION (str): System partition, i.e., c5
         JOB_NR (str): Job number
         COMPILE_QUEUE (str): Quality of Service (QOS), i.e., batch, windfall, normal, etc.
         RUNDIR_ROOT (str): Test run directory
@@ -218,9 +216,6 @@ def write_runtest_env():
 export WLCLK={WLCLK}
 export RTVERBOSE=false
 """
-    if ( MACHINE_ID == 'jet' ):
-        runtest_envs += f"export PATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/bin:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/bin:$PATH\n"
-        runtest_envs += f"export PYTHONPATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/lib/python3.8/site-packages:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/lib/python3.8/site-packages\n"
 
     with open(filename,"w+") as f:
         f.writelines(runtest_envs)
@@ -231,7 +226,7 @@ def make_loghead(ACCNR,MACHINE_ID,RUNDIR_ROOT,RTPWD,REGRESSIONTEST_LOG):
 
     Args:
         ACCNR (str): Account to run the job with
-        MACHINE_ID (str): Machine ID i.e. Hera, GaeaC6, Jet, etc.
+        MACHINE_ID (str): Machine ID i.e. Hera, GaeaC6,  etc.
         RUNDIR_ROOT (str): Test run directory
         RTPWD (str): Baseline directory
         REGRESSIONTEST_LOG (str): Regression Test log filename