[develop] Update ufs-weather-model hash and further clean the machine…

…s tested in PULL_REQUEST_TEMPLATE (ufs-community#1096)

* Update ufs-weather-model hash to b5a1976 (July 30)
* Add hera.gnu, remove cheyenne.intel, cheyenne.gnu, and gaeac5.intel, and alphabetize the machines in the TESTS CONDUCTED section of the PULL_REQUEST_TEMPLATE
* Correct behavior of Jenkins Functional WorkflowTaskTests. Currently, TASK_DEPTH is set to null, resulting in no tests being run during the Functional WorkflowTaskTests stage. Replaced env with params in Jenkinsfile for setting TASK_DEPTH. Testing shows that this will correctly set TASK_DEPTH to the default value of 9 and allow the tests to run
* Removed extraneous entries from the verification scripts to remove KeyError messages in the associated verification log files
* Reapplied necessary modification to modulefiles/tasks/noaacloud/plot_allvars.local.lua to allow plotting tasks to run on NOAA cloud platforms

.cicd/Jenkinsfile

@@ -193,9 +193,9 @@ pipeline {
                     // Try a few Workflow Task scripts to make sure E2E tests can be launched in a follow-on 'Test' stage
                     stage('Functional WorkflowTaskTests') {
                         environment {
-                            TASK_DEPTH = "${env.SRW_WRAPPER_TASK_DEPTH}"
+                            TASK_DEPTH = "${params.SRW_WRAPPER_TASK_DEPTH}"
                         }
-                        
+
                         steps {
                             dir ("${env.SRW_PLATFORM}") {
                             echo "Running ${TASK_DEPTH} simple workflow script task tests on ${env.SRW_PLATFORM} (using ${env.WORKSPACE}/${env.SRW_PLATFORM})"

.github/PULL_REQUEST_TEMPLATE

@@ -30,15 +30,13 @@
 <!-- Explicitly state what tests were run on these changes, or if any are still pending (for README or other text-only changes, just put "None required"). Make note of the compilers used, the platform/machine, and other relevant details as necessary. For more complicated changes, or those resulting in scientific changes, please be explicit! -->
 <!-- Add an X to check off a box. -->
 
-- [ ] hera.intel
-- [ ] orion.intel
-- [ ] hercules.intel
-- [ ] cheyenne.intel
-- [ ] cheyenne.gnu
 - [ ] derecho.intel
 - [ ] gaea.intel
-- [ ] gaeac5.intel
+- [ ] hera.gnu
+- [ ] hera.intel
+- [ ] hercules.intel
 - [ ] jet.intel
+- [ ] orion.intel
 - [ ] wcoss2.intel
 - [ ] NOAA Cloud (indicate which platform)
 - [ ] Jenkins

Externals.cfg

@@ -12,7 +12,7 @@ protocol = git
 repo_url = https://github.com/ufs-community/ufs-weather-model
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = 1c6b4d4
+hash = b5a1976
 local_path = sorc/ufs-weather-model
 required = True
 

doc/ContribGuide/contributing.rst

@@ -227,15 +227,13 @@ Here is the template that is provided when developers click "Create pull request
    <!-- Explicitly state what tests were run on these changes, or if any are still pending (for README or other text-only changes, just put "None required"). Make note of the compilers used, the platform/machine, and other relevant details as necessary. For more complicated changes, or those resulting in scientific changes, please be explicit! -->
    <!-- Add an X to check off a box. -->
 
-   - [ ] hera.intel
-   - [ ] orion.intel
-   - [ ] hercules.intel
-   - [ ] cheyenne.intel
-   - [ ] cheyenne.gnu
    - [ ] derecho.intel
    - [ ] gaea.intel
-   - [ ] gaeac5.intel
+   - [ ] hera.gnu
+   - [ ] hera.intel
+   - [ ] hercules.intel
    - [ ] jet.intel
+   - [ ] orion.intel
    - [ ] wcoss2.intel
    - [ ] NOAA Cloud (indicate which platform)
    - [ ] Jenkins

modulefiles/tasks/noaacloud/plot_allvars.local.lua

@@ -1,5 +1,2 @@
-unload("python")
-append_path("MODULEPATH","/contrib/EPIC/miniconda3/modulefiles")
-load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
-
-setenv("SRW_GRAPHICS_ENV", "regional_workflow")
+load("conda")
+setenv("SRW_GRAPHICS_ENV", "srw_graphics")

scripts/exregional_run_met_genensprod_or_ensemblestat.sh

@@ -10,7 +10,7 @@
 . $USHdir/source_util_funcs.sh
 for sect in user nco platform workflow nco global verification cpl_aqm_parm \
   constants fixed_files grid_params \
-  task_run_post task_run_vx_ensgrid ; do
+  task_run_post ; do
   source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

scripts/exregional_run_met_gridstat_or_pointstat_vx.sh

@@ -10,7 +10,7 @@
 . $USHdir/source_util_funcs.sh
 for sect in user nco platform workflow nco global verification cpl_aqm_parm \
   constants fixed_files grid_params \
-  task_run_post task_run_vx_gridstat task_run_vx_pointstat ; do
+  task_run_post ; do
   source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh

@@ -10,7 +10,7 @@
 . $USHdir/source_util_funcs.sh
 for sect in user nco platform workflow nco global verification cpl_aqm_parm \
   constants fixed_files grid_params \
-  task_run_post task_run_vx_ensgrid_mean task_run_vx_enspoint_mean ; do
+  task_run_post ; do
   source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh

@@ -10,7 +10,7 @@
 . $USHdir/source_util_funcs.sh
 for sect in user nco platform workflow nco global verification cpl_aqm_parm \
   constants fixed_files grid_params \
-  task_run_vx_ensgrid_prob task_run_vx_enspoint_prob task_run_post ; do
+  task_run_post ; do
   source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

scripts/exregional_run_met_pb2nc_obs.sh

@@ -9,8 +9,7 @@
 #
 . $USHdir/source_util_funcs.sh
 for sect in user nco platform workflow nco global verification cpl_aqm_parm \
-  constants fixed_files grid_params \
-  task_run_met_pb2nc_obs ; do
+  constants fixed_files grid_params ; do
   source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #

scripts/exregional_run_met_pcpcombine.sh

@@ -10,7 +10,7 @@
 . $USHdir/source_util_funcs.sh
 for sect in user nco platform workflow nco global verification cpl_aqm_parm \
   constants fixed_files grid_params \
-  task_run_met_pcpcombine task_run_post ; do
+  task_run_post ; do
   source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
 #