per #2235, rename multivar_itensity to multivar_intensity_flag

dtcenter · Jul 5, 2023 · d8c4b25 · d8c4b25
1 parent 8700272
commit d8c4b25
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/docs/Users_Guide/glossary.rst b/docs/Users_Guide/glossary.rst
@@ -10661,8 +10661,8 @@ METplus Configuration Glossary
 
      | *Used by:* TCDiag
 
-   MODE_MULTIVAR_INTENSITY
-     Specify the value for 'multivar_intensity' in the MET configuration file for MODE.
+   MODE_MULTIVAR_INTENSITY_FLAG
+     Specify the value for 'multivar_intensity_flag' in the MET configuration file for MODE.
 
      | *Used by:* MODE
 

diff --git a/docs/Users_Guide/wrappers.rst b/docs/Users_Guide/wrappers.rst
@@ -4055,7 +4055,7 @@ METplus Configuration
 | :term:`FCST_MODE_IS_PROB`
 | :term:`FCST_MODE_PROB_IN_GRIB_PDS`
 | :term:`MODE_MULTIVAR_LOGIC`
-| :term:`MODE_MULTIVAR_INTENSITY`
+| :term:`MODE_MULTIVAR_INTENSITY_FLAG`
 | :term:`FCST_MODE_VAR<n>_NAME`
 | :term:`FCST_MODE_VAR<n>_LEVELS`
 | :term:`FCST_MODE_VAR<n>_THRESH`
@@ -4189,16 +4189,16 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
    * - :term:`MODE_MULTIVAR_LOGIC`
      - multivar_logic
 
-**${METPLUS_MULTIVAR_INTENSITY}**
+**${METPLUS_MULTIVAR_INTENSITY_FLAG}**
 
 .. list-table::
    :widths: 5 5
    :header-rows: 0
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`MODE_MULTIVAR_INTENSITY`
-     - multivar_intensity
+   * - :term:`MODE_MULTIVAR_INTENSITY_FLAG`
+     - multivar_intensity_flag
 
 **${METPLUS_FCST_FIELD}**
 

diff --git a/internal/tests/pytests/wrappers/mode/test_mode_wrapper.py b/internal/tests/pytests/wrappers/mode/test_mode_wrapper.py
@@ -329,8 +329,8 @@ def set_minimum_config_settings(config):
         ({'MODE_MASK_MISSING_FLAG': 'BOTH', },
          {'METPLUS_MASK_MISSING_FLAG': 'mask_missing_flag = BOTH;'}),
 
-        ({'MODE_MULTIVAR_INTENSITY': 'false, true,true', },
-         {'METPLUS_MULTIVAR_INTENSITY': 'multivar_intensity = [FALSE, TRUE, TRUE];'}),
+        ({'MODE_MULTIVAR_INTENSITY_FLAG': 'false, true,true', },
+         {'METPLUS_MULTIVAR_INTENSITY_FLAG': 'multivar_intensity_flag = [FALSE, TRUE, TRUE];'}),
 
         ({'MODE_FCST_MULTIVAR_NAME': 'Snow', },
          {'METPLUS_FCST_MULTIVAR_NAME': 'multivar_name = "Snow";'}),

diff --git a/metplus/wrappers/mode_wrapper.py b/metplus/wrappers/mode_wrapper.py
@@ -61,7 +61,7 @@ class MODEWrapper(CompareGriddedWrapper):
         'METPLUS_FCST_FILE_TYPE',
         'METPLUS_OBS_FILE_TYPE',
         'METPLUS_MULTIVAR_LOGIC',
-        'METPLUS_MULTIVAR_INTENSITY',
+        'METPLUS_MULTIVAR_INTENSITY_FLAG',
         'METPLUS_FCST_MULTIVAR_NAME',
         'METPLUS_FCST_MULTIVAR_LEVEL',
         'METPLUS_OBS_MULTIVAR_NAME',
@@ -433,7 +433,7 @@ def create_c_dict(self):
 
         self.handle_mask(single_value=True, get_flags=True)
 
-        self.add_met_config(name='multivar_intensity', data_type='list',
+        self.add_met_config(name='multivar_intensity_flag', data_type='list',
                             extra_args={'remove_quotes': True,
                                         'uppercase': True})
 

diff --git a/parm/met_config/MODEConfig_wrapped b/parm/met_config/MODEConfig_wrapped
@@ -54,8 +54,8 @@ ${METPLUS_QUILT}
 //multivar_logic =
 ${METPLUS_MULTIVAR_LOGIC}
 
-//multivar_intensity =
-${METPLUS_MULTIVAR_INTENSITY}
+//multivar_intensity_flag =
+${METPLUS_MULTIVAR_INTENSITY_FLAG}
 
 //
 // Forecast and observation fields to be verified

diff --git a/parm/use_cases/met_tool_wrapper/MODE/MODE.conf b/parm/use_cases/met_tool_wrapper/MODE/MODE.conf
@@ -115,7 +115,7 @@ OBTYPE = WRF
 MODE_CONFIG_FILE = {PARM_BASE}/met_config/MODEConfig_wrapped
 
 #MODE_MULTIVAR_LOGIC =
-#MODE_MULTIVAR_INTENSITY =
+#MODE_MULTIVAR_INTENSITY_FLAG =
 
 MODE_REGRID_TO_GRID = NONE
 #MODE_REGRID_METHOD =