Bug fix and remove unnecesary code in exregional_run_met_gridstat_or_…

…pointstat_vx.sh; rewrite lines in config_defaults.yaml to be more legible.
gsketefian · Nov 30, 2024 · a581502 · a581502
1 parent a86ad7e
commit a581502
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 28 deletions.
diff --git a/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh b/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh
@@ -103,33 +103,12 @@ echo "VX_VERIFY_AGAINST_BENCHMARK_FCST = |${VX_VERIFY_AGAINST_BENCHMARK_FCST}|"
 
 if [ $(boolify "${VX_VERIFY_AGAINST_BENCHMARK_FCST}") = "TRUE" ]; then
 
-  OBTYPE="${VX_BENCHMARK_FCST_MODEL_NAME}"
+  obtype="${VX_BENCHMARK_FCST_MODEL_NAME}"
   grid_or_point="grid"
   FIELDNAME_IN_MET_FILEDIR_NAMES="${VX_BENCHMARK_FCST_MODEL_NAME}"
 
 else
 
-  case "${FIELD_GROUP}" in
-    "APCP")
-      OBTYPE="CCPA"
-      ;;
-    "ASNOW")
-      OBTYPE="NOHRSC"
-      ;;
-    "REFC")
-      OBTYPE="MRMS"
-      ;;
-    "RETOP")
-      OBTYPE="MRMS"
-      ;;
-    "SFC")
-      OBTYPE="NDAS"
-      ;;
-    "UPA")
-      OBTYPE="NDAS"
-      ;;
-  esac
-
 # Note that ACCUM_HH will not be defined for the REFC, RETOP, SFC, and
 # UPA field groups.
   set_vx_params \

diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml
@@ -2557,12 +2557,10 @@ verification:
   #   cannot be done due to limitations in the workflow on converting
   #   python dictionaries to bash variables.
   #
-  OBS_CCPA_FN_TEMPLATES: [ 'APCP',
-                           '{%- set obs_avail_intvl_hrs = "%02d" % CCPA_OBS_AVAIL_INTVL_HRS %}
-                            {{- "{valid?fmt=%Y%m%d}/ccpa.t{valid?fmt=%H}z." ~ obs_avail_intvl_hrs ~ "h.hrap.conus.gb2" }}' ]
-  OBS_NOHRSC_FN_TEMPLATES: [ 'ASNOW',
-                             '{%- set obs_avail_intvl_hrs = "%d" % NOHRSC_OBS_AVAIL_INTVL_HRS %}
-                              {{- "sfav2_CONUS_" ~ obs_avail_intvl_hrs ~ "h_{valid?fmt=%Y%m%d%H}_grid184.grb2" }}' ]
+  OBS_CCPA_FN_TEMPLATES: [ 'APCP', '{%- set obs_avail_intvl_hrs = "%02d" % CCPA_OBS_AVAIL_INTVL_HRS %}
+                                    {{- "{valid?fmt=%Y%m%d}/ccpa.t{valid?fmt=%H}z." ~ obs_avail_intvl_hrs ~ "h.hrap.conus.gb2" }}' ]
+  OBS_NOHRSC_FN_TEMPLATES: [ 'ASNOW', '{%- set obs_avail_intvl_hrs = "%d" % NOHRSC_OBS_AVAIL_INTVL_HRS %}
+                                       {{- "sfav2_CONUS_" ~ obs_avail_intvl_hrs ~ "h_{valid?fmt=%Y%m%d%H}_grid184.grb2" }}' ]
   OBS_MRMS_FN_TEMPLATES: [ 'REFC', '{valid?fmt=%Y%m%d}/MergedReflectivityQCComposite_00.50_{valid?fmt=%Y%m%d}-{valid?fmt=%H%M%S}.grib2',
                            'RETOP', '{valid?fmt=%Y%m%d}/EchoTop_18_00.50_{valid?fmt=%Y%m%d}-{valid?fmt=%H%M%S}.grib2' ]
   OBS_NDAS_FN_TEMPLATES: [ 'SFCandUPA', 'prepbufr.ndas.{valid?fmt=%Y%m%d%H}' ]