Merge remote-tracking branch 'upstream/develop' into skeb_fix

.gitignore

@@ -73,3 +73,8 @@ tests/fv3_conf/compile_qsub.IN
 tests/fv3_conf/fv3_slurm.IN
 tests/fv3_conf/fv3_qsub.IN
 build*.log*
+rocoto_workflow*
+fail_compile_*
+fail_test_*
+tests/run_dir
+tests/logs/log_*

doc/UsersGuide/requirements.txt

@@ -8,7 +8,7 @@ alabaster==0.7.16
  # via sphinx
 babel==2.14.0
  # via sphinx
-certifi==2024.2.2
+certifi==2024.7.4
  # via requests
 charset-normalizer==3.3.2
  # via requests

modulefiles/ufs_frontera.intel.lua

@@ -0,0 +1,33 @@
+help([[
+loads UFS Model prerequisites for Frontera/Intel
+]])
+
+prepend_path("MODULEPATH", "/work2/06146/tg854455/frontera/spack-stack/modulefiles")
+load("ecflow/5.8.4")
+
+prepend_path("MODULEPATH", "/work2/01118/tg803972/frontera/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+
+stack_intel_ver=os.getenv("stack_intel_ver") or "19.1.1.217"
+load(pathJoin("stack-intel", stack_intel_ver))
+
+stack_impi_ver=os.getenv("stack_impi_ver") or "2020.4.304"
+load(pathJoin("stack-intel-mpi", stack_impi_ver))
+
+cmake_ver=os.getenv("cmake_ver") or "3.24.2"
+load(pathJoin("cmake", cmake_ver))
+--load("cmake/3.24.2")
+
+load("ufs_common")
+
+stack_python_ver=os.getenv("stack_python_ver") or "3.10.13"
+load(pathJoin("stack-python", stack_python_ver))
+
+nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
+load(pathJoin("nccmp", nccmp_ver))
+
+setenv("CC", "mpiicc")
+setenv("CXX", "mpiicpc")
+setenv("FC", "mpiifort")
+setenv("CMAKE_Platform", "frontera.intel")
+
+whatis("Description: UFS build environment")

tests/detect_machine.sh

@@ -48,6 +48,9 @@ case $(hostname -f) in
 
  login[1-4].stampede2.tacc.utexas.edu) MACHINE_ID=stampede ;; ### stampede1-4
 
+ login[1-4].frontera.tacc.utexas.edu) MACHINE_ID=frontera ;; ### frontera1-4
+ c*.frontera.tacc.utexas.edu) MACHINE_ID=frontera ;; ### frontera compute 
+
  login0[1-2].expanse.sdsc.edu) MACHINE_ID=expanse ;; ### expanse1-2
 
  discover3[1-5].prv.cube) MACHINE_ID=discover ;; ### discover31-35

tests/error-test.conf

@@ -0,0 +1,27 @@
+# This file is an alternative to rt.conf that tests whether the regression test system rt.sh can detect failure conditions.
+#
+# ./rt.sh [options] -l error-test.conf
+#
+# If the rt.sh detects errors correctly, the workflow shouldn't finish. Some jobs should be failed or not submitted, and some should succeed.
+# See details below.
+
+# This should succeed
+COMPILE | atm_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1 -D32BIT=ON | | fv3 |
+
+# This should succeed
+RUN | control_c48.v2.sfc | | baseline |
+
+# These tests should always fail, and prevent the workflow from completing.
+RUN | fail_to_copy | | baseline |
+RUN | fail_to_run | | baseline |
+
+# Using 64-bit dynamics ensures results change, but the test runs. The workflow jobs should complete
+# for the COMPILE and RUN, but the results should change.
+COMPILE | atm_dyn64 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1 | | fv3 |
+RUN | control_c48 | | baseline |
+
+# This compile job should fail, and prevent the workflow from completing.
+COMPILE | fail_to_compile | intel | --invalid-argument -DAPP=ATM -DCCPP_SUITES=whatever | | fv3 |
+
+# This test should not be submitted, because its compile job has failed.
+RUN | dependency_unmet | | baseline |

tests/fv3_conf/fv3_qsub.IN_acorn

@@ -30,6 +30,13 @@ export ESMF_RUNTIME_COMPLIANCECHECK=OFF:depth=4
 export ESMF_RUNTIME_PROFILE=ON
 export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"
 
+# 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
+
 mpiexec -n @[TASKS] -ppn @[TPN] -depth @[THRD] ./fv3.exe
 
 echo "Model ended: " `date`

tests/fv3_conf/fv3_qsub.IN_derecho

@@ -35,6 +35,13 @@ export MPICH_COLL_OPT_OFF=1
 # 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
+
 mpiexec -n @[UFS_TASKS] -ppn @[PPN] --hostfile $PBS_NODEFILE ./fv3.exe
 
 echo "Model ended: " `date`

tests/fv3_conf/fv3_qsub.IN_wcoss2

@@ -30,6 +30,13 @@ export ESMF_RUNTIME_COMPLIANCECHECK=OFF:depth=4
 export ESMF_RUNTIME_PROFILE=ON
 export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"
 
+# 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
+
 mpiexec -n @[TASKS] -ppn @[TPN] -depth @[THRD] ./fv3.exe
 
 echo "Model ended: " `date`

tests/fv3_conf/fv3_slurm.IN_expanse

@@ -26,6 +26,14 @@ echo "Model started: "`date`
 export OMP_STACK_SIZE=512M
 export OMP_NUM_THREADS=@[THRD]
 export I_MPI_PMI_LIBRARY=/cm/shared/apps/slurm/current/lib64/libpmi.so
+
+# 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 -n @[TASKS] ./fv3.exe
 
 echo "Model ended: " `date`

tests/fv3_conf/fv3_slurm.IN_gaea

@@ -32,6 +32,13 @@ 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] ./fv3.exe
 
 echo "Model ended: " `date`

tests/fv3_conf/fv3_slurm.IN_hera

@@ -38,6 +38,13 @@ export PSM_SHAREDCONTEXTS=1
 # 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
+
 # shellcheck disable=SC2102
 srun --label -n @[TASKS] ./fv3.exe
 

tests/fv3_conf/fv3_slurm.IN_hercules

@@ -46,6 +46,13 @@ fi
 # 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] ./fv3.exe
 
 echo "Model ended: " `date`

tests/fv3_conf/fv3_slurm.IN_jet

@@ -36,6 +36,13 @@ 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`

tests/fv3_conf/fv3_slurm.IN_noaacloud

@@ -39,6 +39,13 @@ export OMP_NUM_THREADS=1
 # 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 --mpi=pmi2 --label -n @[TASKS] ./fv3.exe
 
 echo "Model ended: " `date`

tests/fv3_conf/fv3_slurm.IN_orion

@@ -39,6 +39,13 @@ 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] ./fv3.exe
 
 echo "Model ended: " `date`

tests/fv3_conf/fv3_slurm.IN_s4

@@ -35,6 +35,13 @@ export PSM_SHAREDCONTEXTS=1
 # 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] ./fv3.exe
 
 echo "Model ended: " `date`

tests/fv3_conf/fv3_slurm.IN_stampede

@@ -29,6 +29,13 @@ export LD_BIND_NOW=1
 # 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
+
 #mpirun -prepend-rank -np $SBATCH_NP ./fv3.exe
 ibrun -n @[TASKS] ./fv3.exe
 

tests/logs/OpnReqTests_control_p8_hera.log

@@ -1,9 +1,9 @@
-Mon Jul 15 01:41:25 UTC 2024
+Wed Jul 17 03:56:39 UTC 2024
 Start Operation Requirement Test
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1044457/bit_base_bit_base
+working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_618270/bit_base_bit_base
 Checking test bit_base results ....
 Moving baseline bit_base files ....
  Moving sfcf000.nc .........OK
@@ -51,14 +51,14 @@ Moving baseline bit_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time = 275.756850
- 0: The maximum resident set size (KB) = 1445808
+ 0: The total amount of wall time = 279.926730
+ 0: The maximum resident set size (KB) = 1464436
 
 Test bit_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1044457/dbg_base_dbg_base
+working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_618270/dbg_base_dbg_base
 Checking test dbg_base results ....
 Moving baseline dbg_base files ....
  Moving sfcf000.nc .........OK
@@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time = 959.187361
- 0: The maximum resident set size (KB) = 1435516
+ 0: The total amount of wall time = 981.451585
+ 0: The maximum resident set size (KB) = 1435700
 
 Test dbg_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1044457/dcp_dcp
+working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_618270/dcp_dcp
 Checking test dcp results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -160,14 +160,14 @@ Checking test dcp results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
- 0: The total amount of wall time = 247.513262
- 0: The maximum resident set size (KB) = 1422624
+ 0: The total amount of wall time = 251.528579
+ 0: The maximum resident set size (KB) = 1422160
 
 Test dcp PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1044457/mpi_mpi
+working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_618270/mpi_mpi
 Checking test mpi results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -214,14 +214,14 @@ Checking test mpi results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
- 0: The total amount of wall time = 248.067150
- 0: The maximum resident set size (KB) = 1440744
+ 0: The total amount of wall time = 247.727184
+ 0: The maximum resident set size (KB) = 1422076
 
 Test mpi PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1044457/rst_rst
+working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_618270/rst_rst
 Checking test rst results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -268,14 +268,14 @@ Checking test rst results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
- 0: The total amount of wall time = 251.468799
- 0: The maximum resident set size (KB) = 1432440
+ 0: The total amount of wall time = 252.564799
+ 0: The maximum resident set size (KB) = 1432092
 
 Test rst PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1044457/std_base_std_base
+working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_618270/std_base_std_base
 Checking test std_base results ....
 Moving baseline std_base files ....
  Moving sfcf000.nc .........OK
@@ -323,14 +323,14 @@ Moving baseline std_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time = 251.979239
- 0: The maximum resident set size (KB) = 1418388
+ 0: The total amount of wall time = 248.590179
+ 0: The maximum resident set size (KB) = 1429984
 
 Test std_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1044457/thr_thr
+working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_618270/thr_thr
 Checking test thr results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -377,11 +377,11 @@ Checking test thr results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
- 0: The total amount of wall time = 250.614339
- 0: The maximum resident set size (KB) = 1423620
+ 0: The total amount of wall time = 252.979968
+ 0: The maximum resident set size (KB) = 1430948
 
 Test thr PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Mon Jul 15 02:47:28 UTC 2024
-Elapsed time: 01h:06m:04s. Have a nice day!
+Wed Jul 17 05:20:20 UTC 2024
+Elapsed time: 01h:23m:41s. Have a nice day!