Feature #2210 MODE multi-variate variable rename (#2211)

dtcenter · Jun 15, 2023 · 6ad1d5e · 6ad1d5e
1 parent 55bae4b
commit 6ad1d5e
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 29 deletions.
diff --git a/.github/parm/use_case_groups.json b/.github/parm/use_case_groups.json
@@ -137,7 +137,7 @@
   {
     "category": "s2s",
     "index_list": "3",
-    "run": true
+    "run": false
   },
   {
     "category": "s2s",

diff --git a/docs/Users_Guide/glossary.rst b/docs/Users_Guide/glossary.rst
@@ -10671,8 +10671,8 @@ METplus Configuration Glossary
 
      | *Used by:* MODE
 
-   MODE_FCST_MULTIVAR_UNITS
-     Specify the value for 'fcst.multivar_units' in the MET configuration file for MODE.
+   MODE_FCST_MULTIVAR_LEVEL
+     Specify the value for 'fcst.multivar_level' in the MET configuration file for MODE.
 
      | *Used by:* MODE
 
@@ -10681,7 +10681,7 @@ METplus Configuration Glossary
 
      | *Used by:* MODE
 
-   MODE_OBS_MULTIVAR_UNITS
-     Specify the value for 'obs.multivar_units' in the MET configuration file for MODE.
+   MODE_OBS_MULTIVAR_LEVEL
+     Specify the value for 'obs.multivar_level' in the MET configuration file for MODE.
 
      | *Used by:* MODE
diff --git a/docs/Users_Guide/wrappers.rst b/docs/Users_Guide/wrappers.rst
@@ -4062,14 +4062,14 @@ METplus Configuration
 | :term:`FCST_MODE_VAR<n>_OPTIONS`
 | :term:`MODE_FCST_FILE_TYPE`
 | :term:`MODE_FCST_MULTIVAR_NAME`
-| :term:`MODE_FCST_MULTIVAR_UNITS`
+| :term:`MODE_FCST_MULTIVAR_LEVEL`
 | :term:`OBS_MODE_VAR<n>_NAME`
 | :term:`OBS_MODE_VAR<n>_LEVELS`
 | :term:`OBS_MODE_VAR<n>_THRESH`
 | :term:`OBS_MODE_VAR<n>_OPTIONS`
 | :term:`MODE_OBS_FILE_TYPE`
 | :term:`MODE_OBS_MULTIVAR_NAME`
-| :term:`MODE_OBS_MULTIVAR_UNITS`
+| :term:`MODE_OBS_MULTIVAR_LEVEL`
 |
 
 .. warning:: **DEPRECATED:**
@@ -4285,16 +4285,16 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
    * - :term:`MODE_FCST_MULTIVAR_NAME`
      - fcst.multivar_name
 
-**${METPLUS_FCST_MULTIVAR_UNITS}**
+**${METPLUS_FCST_MULTIVAR_LEVEL}**
 
 .. list-table::
    :widths: 5 5
    :header-rows: 0
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`MODE_FCST_MULTIVAR_UNITS`
-     - fcst.multivar_units
+   * - :term:`MODE_FCST_MULTIVAR_LEVEL`
+     - fcst.multivar_level
 
 
 **${METPLUS_OBS_FIELD}**
@@ -4382,16 +4382,16 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
    * - :term:`MODE_OBS_MULTIVAR_NAME`
      - obs.multivar_name
 
-**${METPLUS_OBS_MULTIVAR_UNITS}**
+**${METPLUS_OBS_MULTIVAR_LEVEL}**
 
 .. list-table::
    :widths: 5 5
    :header-rows: 0
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`MODE_OBS_MULTIVAR_UNITS`
-     - obs.multivar_units
+   * - :term:`MODE_OBS_MULTIVAR_LEVEL`
+     - obs.multivar_level
 
 **${METPLUS_MASK_POLY}**
 

diff --git a/internal/tests/pytests/wrappers/mode/test_mode_wrapper.py b/internal/tests/pytests/wrappers/mode/test_mode_wrapper.py
@@ -335,14 +335,14 @@ def set_minimum_config_settings(config):
         ({'MODE_FCST_MULTIVAR_NAME': 'Snow', },
          {'METPLUS_FCST_MULTIVAR_NAME': 'multivar_name = "Snow";'}),
 
-        ({'MODE_FCST_MULTIVAR_UNITS': 'L0', },
-         {'METPLUS_FCST_MULTIVAR_UNITS': 'multivar_units = "L0";'}),
+        ({'MODE_FCST_MULTIVAR_LEVEL': 'L0', },
+         {'METPLUS_FCST_MULTIVAR_LEVEL': 'multivar_level = "L0";'}),
 
         ({'MODE_OBS_MULTIVAR_NAME': 'Precip', },
          {'METPLUS_OBS_MULTIVAR_NAME': 'multivar_name = "Precip";'}),
 
-        ({'MODE_OBS_MULTIVAR_UNITS': 'Z10', },
-         {'METPLUS_OBS_MULTIVAR_UNITS': 'multivar_units = "Z10";'}),
+        ({'MODE_OBS_MULTIVAR_LEVEL': 'Z10', },
+         {'METPLUS_OBS_MULTIVAR_LEVEL': 'multivar_level = "Z10";'}),
 
     ]
 )

diff --git a/metplus/wrappers/mode_wrapper.py b/metplus/wrappers/mode_wrapper.py
@@ -63,9 +63,9 @@ class MODEWrapper(CompareGriddedWrapper):
         'METPLUS_MULTIVAR_LOGIC',
         'METPLUS_MULTIVAR_INTENSITY',
         'METPLUS_FCST_MULTIVAR_NAME',
-        'METPLUS_FCST_MULTIVAR_UNITS',
+        'METPLUS_FCST_MULTIVAR_LEVEL',
         'METPLUS_OBS_MULTIVAR_NAME',
-        'METPLUS_OBS_MULTIVAR_UNITS',
+        'METPLUS_OBS_MULTIVAR_LEVEL',
     ]
 
     # handle deprecated env vars used pre v4.0.0
@@ -416,16 +416,16 @@ def create_c_dict(self):
         self.add_met_config(name='multivar_name', data_type='string',
                             env_var_name='FCST_MULTIVAR_NAME',
                             metplus_configs=[f'{tool}_FCST_MULTIVAR_NAME'])
-        self.add_met_config(name='multivar_units', data_type='string',
-                            env_var_name='FCST_MULTIVAR_UNITS',
-                            metplus_configs=[f'{tool}_FCST_MULTIVAR_UNITS'])
+        self.add_met_config(name='multivar_level', data_type='string',
+                            env_var_name='FCST_MULTIVAR_LEVEL',
+                            metplus_configs=[f'{tool}_FCST_MULTIVAR_LEVEL'])
 
         self.add_met_config(name='multivar_name', data_type='string',
                             env_var_name='OBS_MULTIVAR_NAME',
                             metplus_configs=[f'{tool}_OBS_MULTIVAR_NAME'])
-        self.add_met_config(name='multivar_units', data_type='string',
-                            env_var_name='OBS_MULTIVAR_UNITS',
-                            metplus_configs=[f'{tool}_OBS_MULTIVAR_UNITS'])
+        self.add_met_config(name='multivar_level', data_type='string',
+                            env_var_name='OBS_MULTIVAR_LEVEL',
+                            metplus_configs=[f'{tool}_OBS_MULTIVAR_LEVEL'])
 
         c_dict['MERGE_CONFIG_FILE'] = (
             self.config.getraw('config', f'{tool}_MERGE_CONFIG_FILE', '')

diff --git a/parm/met_config/MODEConfig_wrapped b/parm/met_config/MODEConfig_wrapped
@@ -74,7 +74,7 @@ fcst = {
    ${METPLUS_FCST_MERGE_FLAG}
    ${METPLUS_FCST_FILE_TYPE}
    ${METPLUS_FCST_MULTIVAR_NAME}
-   ${METPLUS_FCST_MULTIVAR_UNITS}
+   ${METPLUS_FCST_MULTIVAR_LEVEL}
 }
 
 obs = {
@@ -91,7 +91,7 @@ obs = {
    ${METPLUS_OBS_MERGE_FLAG}
    ${METPLUS_OBS_FILE_TYPE}
    ${METPLUS_OBS_MULTIVAR_NAME}
-   ${METPLUS_OBS_MULTIVAR_UNITS}
+   ${METPLUS_OBS_MULTIVAR_LEVEL}
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/parm/use_cases/met_tool_wrapper/MODE/MODE.conf b/parm/use_cases/met_tool_wrapper/MODE/MODE.conf
@@ -76,7 +76,7 @@ FCST_MODE_MERGE_FLAG = NONE
 #MODE_FCST_VLD_THRESH =
 
 #MODE_FCST_MULTIVAR_NAME =
-#MODE_FCST_MULTIVAR_UNITS =
+#MODE_FCST_MULTIVAR_LEVEL =
 
 
 OBS_VAR1_NAME = RH
@@ -96,7 +96,7 @@ OBS_MODE_MERGE_FLAG = NONE
 #MODE_OBS_VLD_THRESH =
 
 #MODE_OBS_MULTIVAR_NAME =
-#MODE_OBS_MULTIVAR_UNITS =
+#MODE_OBS_MULTIVAR_LEVEL =
 
 
 ###