per #1816, update use case config files that run EnsembleStat with ne…

…w config variables and remove variables that are no longer used - ci-run-all-cases
dtcenter · Sep 20, 2022 · 792f1b5 · 792f1b5
1 parent 2e4f3e3
commit 792f1b5
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 80 deletions.
diff --git a/parm/use_cases/met_tool_wrapper/EnsembleStat/EnsembleStat.conf b/parm/use_cases/met_tool_wrapper/EnsembleStat/EnsembleStat.conf
@@ -85,29 +85,6 @@ OBS_VAR1_LEVELS = {FCST_VAR1_LEVELS}
 OBS_VAR1_OPTIONS = {FCST_VAR1_OPTIONS}
 
 
-ENS_VAR1_NAME = APCP
-ENS_VAR1_LEVELS = A24
-ENS_VAR1_THRESH = >0.0, >=10.0
-
-ENS_VAR2_NAME = REFC
-ENS_VAR2_LEVELS = L0
-ENS_VAR2_THRESH = >=35.0
-
-ENS_VAR2_OPTIONS = GRIB1_ptv = 129;
-
-ENS_VAR3_NAME = UGRD
-ENS_VAR3_LEVELS = Z10
-ENS_VAR3_THRESH = >=5.0
-
-ENS_VAR4_NAME = VGRD
-ENS_VAR4_LEVELS = Z10
-ENS_VAR4_THRESH = >=5.0
-
-ENS_VAR5_NAME = WIND
-ENS_VAR5_LEVELS = Z10
-ENS_VAR5_THRESH = >=5.0
-
-
 ###
 # EnsembleStat Settings
 # https://metplus.readthedocs.io/en/latest/Users_Guide/wrappers.html#ensemblestat
@@ -121,12 +98,12 @@ ENSEMBLE_STAT_CONFIG_FILE = {PARM_BASE}/met_config/EnsembleStatConfig_wrapped
 
 ENSEMBLE_STAT_DESC = NA
 
-OBS_ENSEMBLE_STAT_WINDOW_BEGIN = -5400
-OBS_ENSEMBLE_STAT_WINDOW_END = 5400
+ENSEMBLE_STAT_OBS_WINDOW_BEGIN = -5400
+ENSEMBLE_STAT_OBS_WINDOW_END = 5400
 
 ENSEMBLE_STAT_ENS_THRESH = 1.0
 
-ENSEMBLE_STAT_ENS_VLD_THRESH = 1.0
+ENSEMBLE_STAT_VLD_THRESH = 1.0
 
 ENSEMBLE_STAT_OUTPUT_PREFIX = 
 
@@ -146,7 +123,7 @@ ENSEMBLE_STAT_CENSOR_VAL =
 #ENSEMBLE_STAT_ECLV_POINTS = 0.05
 
 ENSEMBLE_STAT_MESSAGE_TYPE = ADPSFC
-
+#ENSEMBLE_STAT_OBS_THRESH =
 ENSEMBLE_STAT_DUPLICATE_FLAG = NONE
 ENSEMBLE_STAT_SKIP_CONST = False
 

diff --git a/parm/use_cases/met_tool_wrapper/EnsembleStat/EnsembleStat_python_embedding.conf b/parm/use_cases/met_tool_wrapper/EnsembleStat/EnsembleStat_python_embedding.conf
@@ -41,8 +41,6 @@ LOOP_ORDER = times
 # https://metplus.readthedocs.io/en/latest/Users_Guide/systemconfiguration.html#directory-and-filename-template-info
 ###
 
-ENS_ENSEMBLE_STAT_INPUT_DATATYPE = PYTHON_NUMPY
-
 FCST_ENSEMBLE_STAT_INPUT_DATATYPE = PYTHON_NUMPY
 
 OBS_ENSEMBLE_STAT_INPUT_GRID_DATATYPE = PYTHON_NUMPY
@@ -74,7 +72,6 @@ OBS_FILE_WINDOW_END = 0
 # https://metplus.readthedocs.io/en/latest/Users_Guide/systemconfiguration.html#field-info
 ###
 
-ENS_VAR1_NAME = {MET_INSTALL_DIR}/share/met/python/read_ascii_numpy.py MET_PYTHON_INPUT_ARG FCST
 FCST_VAR1_NAME = {MET_INSTALL_DIR}/share/met/python/read_ascii_numpy.py MET_PYTHON_INPUT_ARG FCST
 OBS_VAR1_NAME = {MET_INSTALL_DIR}/share/met/python/read_ascii_numpy.py MET_PYTHON_INPUT_ARG OBS
 
@@ -99,7 +96,7 @@ OBS_ENSEMBLE_STAT_WINDOW_END = 5400
 ENSEMBLE_STAT_N_MEMBERS = 2
 
 ENSEMBLE_STAT_ENS_THRESH = 1.0
-ENSEMBLE_STAT_ENS_VLD_THRESH = 1.0
+ENSEMBLE_STAT_VLD_THRESH = 1.0
 
 ENSEMBLE_STAT_REGRID_TO_GRID = NONE
 
@@ -114,20 +111,13 @@ ENSEMBLE_STAT_OUTPUT_FLAG_ORANK = BOTH
 ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR = BOTH
 ENSEMBLE_STAT_OUTPUT_FLAG_RELP = BOTH
 
-ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_MINUS = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_PLUS = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_MIN = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_MAX = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_RANGE = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_VLD_COUNT = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_FREQUENCY = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_NEP = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE
+ENSEMBLE_STAT_NC_ORANK_FLAG_LATLON = TRUE
+ENSEMBLE_STAT_NC_ORANK_FLAG_MEAN = TRUE
+ENSEMBLE_STAT_NC_ORANK_FLAG_RAW = TRUE
+ENSEMBLE_STAT_NC_ORANK_FLAG_RANK = TRUE
+ENSEMBLE_STAT_NC_ORANK_FLAG_PIT = TRUE
+ENSEMBLE_STAT_NC_ORANK_FLAG_VLD_COUNT = TRUE
+ENSEMBLE_STAT_NC_ORANK_FLAG_WEIGHT = TRUE
 
 #ENSEMBLE_STAT_MET_OBS_ERR_TABLE = 
 

diff --git a/...use_cases/model_applications/air_quality_and_comp/EnsembleStat_fcstICAP_obsMODIS_aod.conf b/...use_cases/model_applications/air_quality_and_comp/EnsembleStat_fcstICAP_obsMODIS_aod.conf
@@ -41,8 +41,6 @@ LOOP_ORDER = times
 # https://metplus.readthedocs.io/en/latest/Users_Guide/systemconfiguration.html#directory-and-filename-template-info
 ###
 
-ENS_ENSEMBLE_STAT_INPUT_DATATYPE = PYTHON_NUMPY
-
 FCST_ENSEMBLE_STAT_INPUT_DATATYPE = PYTHON_NUMPY
 FCST_ENSEMBLE_STAT_INPUT_DIR =
 FCST_ENSEMBLE_STAT_INPUT_TEMPLATE = 0, 1, 2, 3, 4, 5, 6
@@ -61,8 +59,6 @@ ENSEMBLE_STAT_OUTPUT_DIR = {OUTPUT_BASE}
 
 CONFIG_DIR = {PARM_BASE}/use_cases/model_applications/air_quality_and_comp/EnsembleStat_fcstICAP_obsMODIS_aod
 
-ENS_VAR1_NAME = {CONFIG_DIR}/forecast_embedded.py {OBS_ENSEMBLE_STAT_GRID_INPUT_DIR}/icap_{init?fmt=%Y%m%d%H}_aod.nc:total_aod:{valid?fmt=%Y%m%d%H%M}:MET_PYTHON_INPUT_ARG
-
 FCST_VAR1_NAME = {CONFIG_DIR}/forecast_embedded.py {OBS_ENSEMBLE_STAT_GRID_INPUT_DIR}/icap_{init?fmt=%Y%m%d%H}_aod.nc:total_aod:{valid?fmt=%Y%m%d%H%M}:MET_PYTHON_INPUT_ARG
 
 OBS_VAR1_NAME = {CONFIG_DIR}/analysis_embedded.py {OBS_ENSEMBLE_STAT_GRID_INPUT_DIR}/AGGR_HOURLY_{valid?fmt=%Y%m%d}T{valid?fmt=%H%M}_1deg_global_archive.nc:aod_nrl_total:Mean
@@ -76,8 +72,8 @@ OBS_VAR1_NAME = {CONFIG_DIR}/analysis_embedded.py {OBS_ENSEMBLE_STAT_GRID_INPUT_
 MODEL = ICAP
 OBTYPE = NRL_AOD
 
-OBS_ENSEMBLE_STAT_WINDOW_BEGIN = -5400
-OBS_ENSEMBLE_STAT_WINDOW_END = 5400
+ENSEMBLE_STAT_OBS_WINDOW_BEGIN = -5400
+ENSEMBLE_STAT_OBS_WINDOW_END = 5400
 
 ENSEMBLE_STAT_N_MEMBERS = 7
 

diff --git a/parm/use_cases/model_applications/precipitation/EnsembleStat_fcstWOFS_obsWOFS.conf b/parm/use_cases/model_applications/precipitation/EnsembleStat_fcstWOFS_obsWOFS.conf
@@ -361,20 +361,13 @@ ENSEMBLE_STAT_OUTPUT_FLAG_ORANK = STAT
 ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR = STAT
 ENSEMBLE_STAT_OUTPUT_FLAG_RELP = STAT
 
-ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_MINUS = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_PLUS = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_MIN = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_MAX = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_RANGE = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_VLD_COUNT = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_FREQUENCY = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_NEP = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE
+ENSEMBLE_STAT_NC_ORANK_FLAG_LATLON = TRUE
+ENSEMBLE_STAT_NC_ORANK_FLAG_MEAN = TRUE
+ENSEMBLE_STAT_NC_ORANK_FLAG_RAW = FALSE
+ENSEMBLE_STAT_NC_ORANK_FLAG_RANK = TRUE
+ENSEMBLE_STAT_NC_ORANK_FLAG_PIT = TRUE
+ENSEMBLE_STAT_NC_ORANK_FLAG_VLD_COUNT = FALSE
+ENSEMBLE_STAT_NC_ORANK_FLAG_WEIGHT = FALSE
 
 ENSEMBLE_STAT_OUTPUT_PREFIX = {MODEL}_PCP_{init?fmt=%H%M}_{lead?fmt=%H%M}00L_A1
 

diff --git a/..._cases/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf b/..._cases/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf
@@ -11,7 +11,7 @@
 # https://metplus.readthedocs.io/en/latest/Users_Guide/systemconfiguration.html#process-list
 ###
 
-PROCESS_LIST = PB2NC, EnsembleStat
+PROCESS_LIST = PB2NC, EnsembleStat, GenEnsProd
 
 
 ###
@@ -71,6 +71,12 @@ ENSEMBLE_STAT_VERIFICATION_MASK_TEMPLATE =
 ENSEMBLE_STAT_OUTPUT_DIR = {OUTPUT_BASE}/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField/EnsembleStat
 ENSEMBLE_STAT_OUTPUT_TEMPLATE = {init?fmt=%Y%m%d%H%M}
 
+# GenEnsProd
+GEN_ENS_PROD_INPUT_DIR = {FCST_ENSEMBLE_STAT_INPUT_DIR}
+GEN_ENS_PROD_INPUT_TEMPLATE = {FCST_ENSEMBLE_STAT_INPUT_TEMPLATE}
+
+GEN_ENS_PROD_OUTPUT_DIR = {ENSEMBLE_STAT_OUTPUT_DIR}
+GEN_ENS_PROD_OUTPUT_TEMPLATE = {init?fmt=%Y%m%d%H%M}/ensemble_stat_{ENSEMBLE_STAT_OUTPUT_PREFIX}_{valid?fmt=%Y%m%d_%H%M%S}V_ens.nc
 
 ###
 # Field Info
@@ -179,22 +185,47 @@ ENSEMBLE_STAT_OUTPUT_FLAG_ORANK = BOTH
 ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR = BOTH
 ENSEMBLE_STAT_OUTPUT_FLAG_RELP = BOTH
 
-ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_MINUS = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_PLUS = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_MIN = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_MAX = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_RANGE = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_VLD_COUNT = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_FREQUENCY = TRUE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_NEP = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = FALSE
-ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE
+
+ENSEMBLE_STAT_NC_ORANK_FLAG_LATLON = TRUE
+ENSEMBLE_STAT_NC_ORANK_FLAG_MEAN = TRUE
+ENSEMBLE_STAT_NC_ORANK_FLAG_RANK = FALSE
+ENSEMBLE_STAT_NC_ORANK_FLAG_PIT = TRUE
+ENSEMBLE_STAT_NC_ORANK_FLAG_VLD_COUNT = TRUE
+ENSEMBLE_STAT_NC_ORANK_FLAG_WEIGHT = FALSE
 
 CONFIG_DIR={PARM_BASE}/use_cases/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField
 ENSEMBLE_STAT_MET_OBS_ERR_TABLE = {CONFIG_DIR}/obs_error_table_V8.0.txt
 
 ENSEMBLE_STAT_OUTPUT_PREFIX = HRRRE_F{lead?fmt=%3H}_ADPSFC
+
+###
+# GenEnsProd Settings
+# https://metplus.readthedocs.io/en/latest/Users_Guide/wrappers.html#genensprod
+###
+
+
+GEN_ENS_PROD_OBS_WINDOW_BEGIN = -900
+GEN_ENS_PROD_OBS_WINDOW_END = 900
+
+GEN_ENS_PROD_N_MEMBERS = 2
+
+GEN_ENS_PROD_ENS_THRESH = 1.0
+
+GEN_ENS_PROD_REGRID_TO_GRID = FCST
+GEN_ENS_PROD_REGRID_METHOD = BILIN
+GEN_ENS_PROD_REGRID_WIDTH = 2
+
+GEN_ENS_PROD_ENSEMBLE_FLAG_LATLON = TRUE
+GEN_ENS_PROD_ENSEMBLE_FLAG_MEAN = TRUE
+GEN_ENS_PROD_ENSEMBLE_FLAG_STDEV = TRUE
+GEN_ENS_PROD_ENSEMBLE_FLAG_MINUS = FALSE
+GEN_ENS_PROD_ENSEMBLE_FLAG_PLUS = FALSE
+GEN_ENS_PROD_ENSEMBLE_FLAG_MIN = FALSE
+GEN_ENS_PROD_ENSEMBLE_FLAG_MAX = FALSE
+GEN_ENS_PROD_ENSEMBLE_FLAG_RANGE = FALSE
+GEN_ENS_PROD_ENSEMBLE_FLAG_VLD_COUNT = TRUE
+GEN_ENS_PROD_ENSEMBLE_FLAG_FREQUENCY = TRUE
+GEN_ENS_PROD_ENSEMBLE_FLAG_NEP = FALSE
+GEN_ENS_PROD_ENSEMBLE_FLAG_NMEP = FALSE
+GEN_ENS_PROD_ENSEMBLE_FLAG_RANK = FALSE
+GEN_ENS_PROD_ENSEMBLE_FLAG_WEIGHT = FALSE