per #1816, fixed incorrect GenEnsProdConfig settings -- ensemble_flag…

… contains climo and climo_cdp instead of rank, weight, or climo_cdf
dtcenter · Sep 21, 2022 · 0e69e76 · 0e69e76
1 parent a7ae338
commit 0e69e76
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 20 deletions.
diff --git a/docs/Users_Guide/glossary.rst b/docs/Users_Guide/glossary.rst
@@ -8672,8 +8672,8 @@ METplus Configuration Glossary
 
      | *Used by:*  GenEnsProd
 
-   GEN_ENS_PROD_ENSEMBLE_FLAG_CLIMO_CDF
-     Specify the value for 'ensemble_flag.climo_cdf' in the MET configuration file for GenEnsProd.
+   GEN_ENS_PROD_ENSEMBLE_FLAG_CLIMO_CDP
+     Specify the value for 'ensemble_flag.climo_cdp' in the MET configuration file for GenEnsProd.
 
      | *Used by:*  GenEnsProd
 

diff --git a/docs/Users_Guide/wrappers.rst b/docs/Users_Guide/wrappers.rst
@@ -1107,7 +1107,7 @@ METplus Configuration
 | :term:`GEN_ENS_PROD_ENSEMBLE_FLAG_NEP`
 | :term:`GEN_ENS_PROD_ENSEMBLE_FLAG_NMEP`
 | :term:`GEN_ENS_PROD_ENSEMBLE_FLAG_CLIMO`
-| :term:`GEN_ENS_PROD_ENSEMBLE_FLAG_CLIMO_CDF`
+| :term:`GEN_ENS_PROD_ENSEMBLE_FLAG_CLIMO_CDP`
 | :term:`GEN_ENS_PROD_ENS_MEMBER_IDS`
 | :term:`GEN_ENS_PROD_CONTROL_ID`
 | :term:`GEN_ENS_PROD_MET_CONFIG_OVERRIDES`
@@ -1408,8 +1408,8 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
      - ensemble_flag.nmep
    * - :term:`GEN_ENS_PROD_ENSEMBLE_FLAG_CLIMO`
      - ensemble_flag.climo
-   * - :term:`GEN_ENS_PROD_ENSEMBLE_FLAG_CLIMO_CDF`
-     - ensemble_flag.climo_cdf
+   * - :term:`GEN_ENS_PROD_ENSEMBLE_FLAG_CLIMO_CDP`
+     - ensemble_flag.climo_cdp
 
 **${METPLUS_ENS_MEMBER_IDS}**
 

diff --git a/internal_tests/pytests/wrappers/gen_ens_prod/test_gen_ens_prod_wrapper.py b/internal_tests/pytests/wrappers/gen_ens_prod/test_gen_ens_prod_wrapper.py
@@ -149,11 +149,11 @@ def handle_input_dir(config):
         ({'GEN_ENS_PROD_ENSEMBLE_FLAG_NMEP': 'FALSE', },
          {'METPLUS_ENSEMBLE_FLAG_DICT': 'ensemble_flag = {nmep = FALSE;}'}),
         # 23
-        ({'GEN_ENS_PROD_ENSEMBLE_FLAG_RANK': 'FALSE', },
-         {'METPLUS_ENSEMBLE_FLAG_DICT': 'ensemble_flag = {rank = FALSE;}'}),
+        ({'GEN_ENS_PROD_ENSEMBLE_FLAG_CLIMO': 'FALSE', },
+         {'METPLUS_ENSEMBLE_FLAG_DICT': 'ensemble_flag = {climo = FALSE;}'}),
         # 24
-        ({'GEN_ENS_PROD_ENSEMBLE_FLAG_WEIGHT': 'FALSE', },
-         {'METPLUS_ENSEMBLE_FLAG_DICT': 'ensemble_flag = {weight = FALSE;}'}),
+        ({'GEN_ENS_PROD_ENSEMBLE_FLAG_CLIMO_CDP': 'FALSE', },
+         {'METPLUS_ENSEMBLE_FLAG_DICT': 'ensemble_flag = {climo_cdp = FALSE;}'}),
         # 25
         ({
              'GEN_ENS_PROD_ENSEMBLE_FLAG_LATLON': 'FALSE',
@@ -168,8 +168,8 @@ def handle_input_dir(config):
              'GEN_ENS_PROD_ENSEMBLE_FLAG_FREQUENCY': 'FALSE',
              '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',
+             'GEN_ENS_PROD_ENSEMBLE_FLAG_CLIMO': 'FALSE',
+             'GEN_ENS_PROD_ENSEMBLE_FLAG_CLIMO_CDP': 'FALSE',
          },
          {
              'METPLUS_ENSEMBLE_FLAG_DICT': ('ensemble_flag = {latlon = FALSE;'
@@ -178,8 +178,8 @@ def handle_input_dir(config):
                                             'min = FALSE;max = FALSE;'
                                             'range = FALSE;vld_count = FALSE;'
                                             'frequency = FALSE;nep = FALSE;'
-                                            'nmep = FALSE;rank = FALSE;'
-                                            'weight = FALSE;}')}),
+                                            'nmep = FALSE;climo = FALSE;'
+                                            'climo_cdp = FALSE;}')}),
         # 26
         ({'GEN_ENS_PROD_CLIMO_MEAN_FILE_NAME': '/some/climo_mean/file.txt', },
          {'METPLUS_CLIMO_MEAN_DICT': ('climo_mean = {file_name = '

diff --git a/metplus/wrappers/gen_ens_prod_wrapper.py b/metplus/wrappers/gen_ens_prod_wrapper.py
@@ -48,8 +48,8 @@ class GenEnsProdWrapper(LoopTimesWrapper):
         'frequency',
         'nep',
         'nmep',
-        'rank',
-        'weight',
+        'climo',
+        'climo_cdp',
     ]
 
     def __init__(self, config, instance=None):

diff --git a/parm/use_cases/met_tool_wrapper/GenEnsProd/GenEnsProd.conf b/parm/use_cases/met_tool_wrapper/GenEnsProd/GenEnsProd.conf
@@ -160,7 +160,7 @@ GEN_ENS_PROD_ENS_THRESH = 0.8
 #GEN_ENS_PROD_ENSEMBLE_FLAG_NEP = FALSE
 #GEN_ENS_PROD_ENSEMBLE_FLAG_NMEP = FALSE
 #GEN_ENS_PROD_ENSEMBLE_FLAG_CLIMO = FALSE
-#GEN_ENS_PROD_ENSEMBLE_FLAG_CLIMO_CDF = FALSE
+#GEN_ENS_PROD_ENSEMBLE_FLAG_CLIMO_CDP = FALSE
 
 #GEN_ENS_PROD_ENS_MEMBER_IDS =
 #GEN_ENS_PROD_CONTROL_ID =
diff --git a/parm/use_cases/model_applications/precipitation/GenEnsProd_fcstHRRRE_FcstOnly_NetCDF.conf b/parm/use_cases/model_applications/precipitation/GenEnsProd_fcstHRRRE_FcstOnly_NetCDF.conf
@@ -79,5 +79,3 @@ 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
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
@@ -227,5 +227,3 @@ 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