Final round of suggested changes from reviewers

ufs-community · Feb 27, 2025 · cfefb8a · cfefb8a
1 parent 0990e00
commit cfefb8a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/jobs/JREGIONAL_RUN_MET_ASCII2NC_OBS b/jobs/JREGIONAL_RUN_MET_ASCII2NC_OBS
@@ -1,5 +1,25 @@
 #!/usr/bin/env bash
 
+#
+#-----------------------------------------------------------------------
+#
+#
+# The J-Job that runs METplus for point-stat by initialization time for
+# all forecast hours.
+#
+# Run-time environment variables:
+#
+#    GLOBAL_VAR_DEFNS_FP
+#
+# Experiment variables
+#
+#  user:
+#    SCRIPTSdir
+#    USHdir
+#
+#-----------------------------------------------------------------------
+#
+
 #
 #-----------------------------------------------------------------------
 #
@@ -10,8 +30,6 @@
 . $USHdir/source_util_funcs.sh
 sections=(
   user
-  nco
-  workflow
 )
 for sect in ${sections[*]} ; do
   source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}

diff --git a/ush/generate_FV3LAM_wflow.py b/ush/generate_FV3LAM_wflow.py
@@ -326,7 +326,7 @@ def generate_FV3LAM_wflow(
     # dictionaries, instead.
     # pylint: disable=undefined-variable
     import_vars(dictionary=flatten_dict(expt_config))
-    export_vars(source_dict=flatten_dict(expt_config))
+    export_vars(source_dict=expt_config["global"])
     settings = {}
     settings["gfs_physics_nml"] = {
         "do_shum": DO_SHUM,

diff --git a/ush/setup.py b/ush/setup.py
@@ -800,15 +800,9 @@ def _remove_tag(tasks, tag):
         vx_field_groups_all_by_obtype["AIRNOW"] = ["PM25", "PM10"]
         vx_metatasks_all_by_obtype["AIRNOW"] \
         = ["task_get_obs_airnow",
-           "metatask_ASCII2nc_obs"
+           "metatask_ASCII2nc_obs",
            "metatask_PcpCombine_fcst_PM_all_mems"]
 
-        vx_field_groups_all_by_obtype["AERONET"] = ["AOD"]
-        vx_metatasks_all_by_obtype["AERONET"] = ["task_get_obs_aeronet","metatask_ASCII2nc_obs"]
-
-        vx_field_groups_all_by_obtype["AIRNOW"] = ["PM25","PM10"]
-        vx_metatasks_all_by_obtype["AIRNOW"] = ["task_get_obs_airnow","metatask_ASCII2nc_obs","metatask_PcpCombine_fcst_PM_all_mems"]
-
         # If there are no field groups specified for verification, remove those
         # tasks that are common to all observation types.
         vx_field_groups = vx_config["VX_FIELD_GROUPS"]