Remove variable ACCUM_HH in METplus conf files (and replace with jinj…

…a varrriable {{accum_hh}}); simplify comments.
ufs-community · Nov 25, 2023 · f356a6c · f356a6c
1 parent fda85e8
commit f356a6c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 53 deletions.
diff --git a/parm/metplus/EnsembleStat_APCP.conf b/parm/metplus/EnsembleStat_APCP.conf
@@ -179,21 +179,17 @@ ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE
 ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = FALSE
 ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE
 #
-# Accumulation interval in 2-digit hours.
-#
-ACCUM_HH = {{accum_hh}}
-#
 # Forecast and observation variables and levels as specified in the fcst
 # field dictionary of the MET configuration file.  Specify as FCST_VARn_NAME,
 # FCST_VARn_LEVELS, (optional) FCST_VARn_OPTION and OBS_VARn_NAME,
 # OBS_VARn_LEVELS, (optional) OBS_VARn_OPTION.
 #
 FCST_VAR1_NAME = {{fieldname_in_met_output}}
-FCST_VAR1_LEVELS = A{ACCUM_HH}
+FCST_VAR1_LEVELS = A{{accum_hh}}
 FCST_VAR1_OPTIONS = ens_ssvar_bin_size = 50.0;
                     ens_phist_bin_size = 0.05;
 OBS_VAR1_NAME = {{fieldname_in_met_output}}
-OBS_VAR1_LEVELS = A{ACCUM_HH}
+OBS_VAR1_LEVELS = A{{accum_hh}}
 OBS_VAR1_OPTIONS = {FCST_VAR1_OPTIONS}
 
 [dir]

diff --git a/parm/metplus/EnsembleStat_ASNOW.conf b/parm/metplus/EnsembleStat_ASNOW.conf
@@ -179,21 +179,17 @@ ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE
 ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = FALSE
 ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE
 #
-# Accumulation interval in 2-digit hours.
-#
-ACCUM_HH = {{accum_hh}}
-#
 # Forecast and observation variables and levels as specified in the fcst
 # field dictionary of the MET configuration file.  Specify as FCST_VARn_NAME,
 # FCST_VARn_LEVELS, (optional) FCST_VARn_OPTION and OBS_VARn_NAME,
 # OBS_VARn_LEVELS, (optional) OBS_VARn_OPTION.
 #
 FCST_VAR1_NAME = {{fieldname_in_met_output}}
-FCST_VAR1_LEVELS = A{ACCUM_HH}
+FCST_VAR1_LEVELS = A{{accum_hh}}
 FCST_VAR1_OPTIONS = ens_ssvar_bin_size = 50.0;
                     ens_phist_bin_size = 0.05;
 OBS_VAR1_NAME = {{fieldname_in_obs_input}}
-OBS_VAR1_LEVELS = A{ACCUM_HH}
+OBS_VAR1_LEVELS = A{{accum_hh}}
 OBS_VAR1_OPTIONS = {FCST_VAR1_OPTIONS}; convert(x) = 100.0*x;
 
 [dir]

diff --git a/parm/metplus/GridStat_APCP.conf b/parm/metplus/GridStat_APCP.conf
@@ -113,10 +113,6 @@ GRID_STAT_DESC = NA
 
 GRID_STAT_MET_CONFIG_OVERRIDES = cat_thresh = [NA]; cnt_thresh = [NA]; cnt_logic = UNION; wind_thresh = [NA]; wind_logic = UNION; ci_alpha = [0.05]; rank_corr_flag = FALSE;
 #
-# Accumulation interval in 2-digit hours.
-#
-ACCUM_HH = {{accum_hh}}
-#
 # List of forecast and corresponding observation fields to process.
 #
 # Note on use of set_attr_lead and ensemble member time-lagging:
@@ -135,11 +131,11 @@ ACCUM_HH = {{accum_hh}}
 # corresponding to the nominal cdate.
 #
 FCST_VAR1_NAME = {{fieldname_in_met_output}}
-FCST_VAR1_LEVELS = A{ACCUM_HH}
+FCST_VAR1_LEVELS = A{{accum_hh}}
 FCST_VAR1_THRESH = {{field_thresholds}}
 FCST_VAR1_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
 OBS_VAR1_NAME = {{fieldname_in_met_output}}
-OBS_VAR1_LEVELS = A{ACCUM_HH}
+OBS_VAR1_LEVELS = A{{accum_hh}}
 OBS_VAR1_THRESH = {{field_thresholds}}
 
 #

diff --git a/parm/metplus/GridStat_ASNOW.conf b/parm/metplus/GridStat_ASNOW.conf
@@ -93,10 +93,6 @@ OBTYPE = {{obtype}}
 # Value to enter under the DESC column in the output stat file.
 #
 GRID_STAT_DESC = NA
-#
-# Accumulation interval in 2-digit hours.
-#
-ACCUM_HH = {{accum_hh}}
 
 # List of variables to compare in GridStat - FCST_VAR1 variables correspond
 #  to OBS_VAR1 variables
@@ -105,16 +101,14 @@ ACCUM_HH = {{accum_hh}}
 
 GRID_STAT_MET_CONFIG_OVERRIDES = cat_thresh = [NA]; cnt_thresh = [NA]; cnt_logic = UNION; wind_thresh = [NA]; wind_logic = UNION; ci_alpha = [0.05]; rank_corr_flag = FALSE;
 #
-# String to search for in the foreast input files for forecast variable
-# 1.
+# List of forecast and corresponding observation fields to process.
 #
 FCST_VAR1_NAME = {{fieldname_in_met_output}}
-FCST_VAR1_LEVELS = A{ACCUM_HH}
+FCST_VAR1_LEVELS = A{{accum_hh}}
 FCST_VAR1_THRESH = {{field_thresholds}}
 FCST_VAR1_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
-
 OBS_VAR1_NAME = {{fieldname_in_obs_input}}
-OBS_VAR1_LEVELS = A{ACCUM_HH}
+OBS_VAR1_LEVELS = A{{accum_hh}}
 OBS_VAR1_THRESH = {{field_thresholds}}
 OBS_VAR1_OPTIONS = convert(x) = 100.0*x;
 #

diff --git a/parm/metplus/GridStat_ensmean_APCP.conf b/parm/metplus/GridStat_ensmean_APCP.conf
@@ -101,17 +101,13 @@ GRID_STAT_DESC = NA
 
 GRID_STAT_MET_CONFIG_OVERRIDES = cat_thresh = [NA]; cnt_thresh = [NA]; cnt_logic = UNION; wind_thresh = [NA]; wind_logic = UNION; ci_alpha = [0.05]; rank_corr_flag = FALSE;
 #
-# Accumulation interval in 2-digit hours.
-#
-ACCUM_HH = {{accum_hh}}
-#
 # List of forecast and corresponding observation fields to process.
 #
 FCST_VAR1_NAME = {{fieldname_in_met_output}}_A{{accum_no_pad}}_ENS_MEAN
-FCST_VAR1_LEVELS = A{ACCUM_HH}
+FCST_VAR1_LEVELS = A{{accum_hh}}
 FCST_VAR1_THRESH = {{field_thresholds}}
 OBS_VAR1_NAME = {{fieldname_in_met_output}}
-OBS_VAR1_LEVELS = A{ACCUM_HH}
+OBS_VAR1_LEVELS = A{{accum_hh}}
 OBS_VAR1_THRESH = {{field_thresholds}}
 
 #

diff --git a/parm/metplus/GridStat_ensmean_ASNOW.conf b/parm/metplus/GridStat_ensmean_ASNOW.conf
@@ -106,31 +106,13 @@ GRID_STAT_DESC = NA
 
 GRID_STAT_MET_CONFIG_OVERRIDES = cat_thresh = [NA]; cnt_thresh = [NA]; cnt_logic = UNION; wind_thresh = [NA]; wind_logic = UNION; ci_alpha = [0.05]; rank_corr_flag = FALSE;
 #
-# Accumulation interval in 2-digit hours.
-#
-ACCUM_HH = {{accum_hh}}
-#
 # List of forecast and corresponding observation fields to process.
 #
-ACCUM_HH = {{accum_hh}}
 FCST_VAR1_NAME = {{fieldname_in_met_output}}_A{{accum_no_pad}}_ENS_MEAN
-FCST_VAR1_LEVELS = A{ACCUM_HH}
+FCST_VAR1_LEVELS = A{{accum_hh}}
 FCST_VAR1_THRESH = {{field_thresholds}}
-#
-# String to search for in the observation input files for observation
-# variable 1.
-#
-# Note:
-# This is the name of the field in the grib2 observation file.  Thus,
-# it should not be set to {{fieldname_in_met_output}} because the
-# value of fieldname_in_met_output is in general not the same as the
-# name of the field in the grib2 observation file (although it can be
-# for certain fields).  If you do and it doesn't match, you may get an
-# error like this from METplus:
-#   ERROR  : VarInfoGrib2::set_dict() -> unrecognized GRIB2 field abbreviation ...
-#
 OBS_VAR1_NAME = {{fieldname_in_obs_input}}
-OBS_VAR1_LEVELS = A{ACCUM_HH}
+OBS_VAR1_LEVELS = A{{accum_hh}}
 OBS_VAR1_THRESH = {{field_thresholds}}
 OBS_VAR1_OPTIONS = convert(x) = 100.0*x;
 #