ufs-community · InnocentSouopgui-NOAA · Jan 16, 2025 · Jan 16, 2025 · Jan 16, 2025 · Jan 16, 2025
diff --git a/modulefiles/ufs_s4.intel.lua b/modulefiles/ufs_s4.intel.lua
@@ -2,12 +2,15 @@ help([[
 loads UFS Model prerequisites for S4/Intel
 ]])
 
-prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
+-- set the path to ecflow – ecflow/5.13.4
+prepend_path("MODULEPATH", "/data/prod/jedi/rocky8/modulefiles")
 
-stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
+prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/fms-2024.01-ue-intel-2021.10.0/install/modulefiles/Core")
+
+stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
 load(pathJoin("stack-intel", stack_intel_ver))
 
-stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.0"
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.10.0"
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
 
 stack_python_ver=os.getenv("stack_python_ver") or "3.10.13"

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -435,7 +435,11 @@ else
 fi
 
 export WLCLK_dflt=30
-
+# extend WLCLK for s4, needed for cpld_debug_gfsv17 and cpld_debug_pdlib_p8
+if [[ ${MACHINE_ID} = s4 ]]; then
+  export WLCLK_dflt=45
+fi
+
 export WLCLK=${WLCLK_dflt}
 export CMP_DATAONLY=false
 

diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_s4.log b/tests/logs/RegressionTests_s4.log
diff --git a/tests/module-setup.sh b/tests/module-setup.sh
@@ -34,7 +34,6 @@ elif [[ ${MACHINE_ID} = s4 ]] ; then
     if ( ! eval module help > /dev/null 2>&1 ) ; then
         source /usr/share/lmod/lmod/init/bash
     fi
-    module purge
 
 elif [[ ${MACHINE_ID} = wcoss2 || ${MACHINE_ID} = acorn ]] ; then
     # We are on NOAA Cactus or Dogwood

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -882,18 +882,18 @@ case ${MACHINE_ID} in
     ;;
   s4)
     echo "rt.sh: Setting up s4..."
+    module use /data/prod/jedi/rocky8/modulefiles
     if [[ "${ROCOTO:-false}" == true ]] ; then
-      module load rocoto/1.3.2
+      module load rocoto/1.3.7
       ROCOTO_SCHEDULER=slurm
     fi
     if [[ "${ECFLOW:-false}" == true ]] ; then
-      module load ecflow/5.6.0
+      module load ecflow/5.13.4
     fi
     module load miniconda/3.8-s4
 
-    module use /data/prod/jedi/spack-stack/modulefiles
     if [[ "${ECFLOW:-false}" == true ]] ; then
-      module load ecflow/5.8.4
+      module load ecflow/5.13.4
       ECF_HOST=$(hostname)
       ECF_PORT="$(( $(id -u) + 1500 ))"
       export ECF_PORT ECF_HOST
@@ -1157,8 +1157,6 @@ if [[ ${ECFLOW} == true ]]; then
   # Reduce maximum number of compile jobs on jet and s4 because of licensing issues
   if [[ ${MACHINE_ID} = jet ]]; then
     MAX_BUILDS=5
-  elif [[ ${MACHINE_ID} = s4 ]]; then
-    MAX_BUILDS=1
   fi
 
   ECFLOW_RUN=${PATHRT}/ecflow_run

diff --git a/tests/run_test.sh b/tests/run_test.sh
@@ -108,9 +108,9 @@ case ${MACHINE_ID} in
     module load nccmp
     ;;
   s4)
-    module use /data/prod/jedi/spack-stack/spack-stack-1.4.1/envs/ufs-pio-2.5.10/install/modulefiles/Core
-    module load stack-intel/2021.5.0 stack-intel-oneapi-mpi/2021.5.0
-    module load miniconda/3.9.12
+    module use /data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/fms-2024.01-ue-intel-2021.10.0/install/modulefiles/Core
+    module load stack-intel/2021.10.0 stack-intel-oneapi-mpi/2021.10.0
+    module load miniconda/3.8-s4
     module load nccmp/1.9.0.1
     ;;
   stampede|expanse|noaacloud)

diff --git a/tests/test_changes.list b/tests/test_changes.list
@@ -1,70 +0,0 @@
-cpld_control_p8_mixedmode intel
-cpld_control_gfsv17 intel
-cpld_control_gfsv17_iau intel
-cpld_restart_gfsv17 intel
-cpld_mpi_gfsv17 intel
-cpld_control_sfs intel
-cpld_debug_gfsv17 intel
-cpld_control_p8 intel
-cpld_control_p8.v2.sfc intel
-cpld_restart_p8 intel
-cpld_control_qr_p8 intel
-cpld_restart_qr_p8 intel
-cpld_2threads_p8 intel
-cpld_decomp_p8 intel
-cpld_mpi_p8 intel
-cpld_control_ciceC_p8 intel
-cpld_bmark_p8 intel
-cpld_restart_bmark_p8 intel
-cpld_s2sa_p8 intel
-cpld_control_noaero_p8 intel
-cpld_control_nowave_noaero_p8 intel
-cpld_debug_p8 intel
-cpld_debug_noaero_p8 intel
-cpld_control_noaero_p8_agrid intel
-cpld_control_c48 intel
-cpld_warmstart_c48 intel
-cpld_restart_c48 intel
-cpld_control_p8_faster intel
-cpld_control_pdlib_p8 intel
-cpld_restart_pdlib_p8 intel
-cpld_mpi_pdlib_p8 intel
-cpld_debug_pdlib_p8 intel
-control_CubedSphereGrid intel
-control_CubedSphereGrid_parallel intel
-control_latlon intel
-control_wrtGauss_netcdf_parallel intel
-control_c48 intel
-control_c48_lnd_iau intel
-control_c192 intel
-control_c384 intel
-control_p8 intel
-control_p8.v2.sfc intel
-control_p8_ugwpv1 intel
-control_restart_p8 intel
-control_noqr_p8 intel
-control_restart_noqr_p8 intel
-control_decomp_p8 intel
-control_2threads_p8 intel
-control_p8_lndp intel
-merra2_thompson intel
-control_p8_faster intel
-control_CubedSphereGrid_debug intel
-control_wrtGauss_netcdf_parallel_debug intel
-control_debug_p8 intel
-atm_ds2s_docn_pcice intel
-atm_ds2s_docn_dice intel
-control_p8_atmlnd_sbs intel
-control_p8_atmlnd intel
-control_restart_p8_atmlnd intel
-control_p8_atmlnd_debug intel
-atmwav_control_noaero_p8 intel
-atmaero_control_p8 intel
-atmaero_control_p8_rad intel
-atmaero_control_p8_rad_micro intel
-control_c48 gnu
-control_p8 gnu
-control_p8_ugwpv1 gnu
-control_debug_p8 gnu
-cpld_control_nowave_noaero_p8 gnu
-cpld_control_pdlib_p8 gnu