diff --git a/docs/Users_Guide/glossary.rst b/docs/Users_Guide/glossary.rst index 5da4da815e..27ddf852e0 100644 --- 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 index daf201eb69..3432ba0210 100644 --- a/docs/Users_Guide/wrappers.rst +++ b/docs/Users_Guide/wrappers.rst @@ -4062,14 +4062,14 @@ METplus Configuration | :term:`FCST_MODE_VAR_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_NAME` | :term:`OBS_MODE_VAR_LEVELS` | :term:`OBS_MODE_VAR_THRESH` | :term:`OBS_MODE_VAR_OPTIONS` | :term:`MODE_OBS_FILE_TYPE` | :term:`MODE_OBS_MULTIVAR_NAME` -| :term:`MODE_OBS_MULTIVAR_UNITS` +| :term:`MODE_OBS_MULTIVAR_LEVEL` | .. warning:: **DEPRECATED:** @@ -4285,7 +4285,7 @@ see :ref:`How METplus controls MET config file settings`. * - :term:`MODE_FCST_MULTIVAR_NAME` - fcst.multivar_name -**${METPLUS_FCST_MULTIVAR_UNITS}** +**${METPLUS_FCST_MULTIVAR_LEVEL}** .. list-table:: :widths: 5 5 @@ -4293,8 +4293,8 @@ see :ref:`How METplus controls MET config file settings`. * - 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,7 +4382,7 @@ see :ref:`How METplus controls MET config file settings`. * - :term:`MODE_OBS_MULTIVAR_NAME` - obs.multivar_name -**${METPLUS_OBS_MULTIVAR_UNITS}** +**${METPLUS_OBS_MULTIVAR_LEVEL}** .. list-table:: :widths: 5 5 @@ -4390,8 +4390,8 @@ see :ref:`How METplus controls MET config file settings`. * - 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 index 4781dfe073..556d89f04d 100644 --- 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 index e4bbd089ec..249c00cd11 100755 --- 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 index bb5108b418..025e1479b1 100644 --- 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 index 69fc6e7f6e..36633aed67 100644 --- 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 = ###