From 1fdff326e46eada766daeb8a5b970a0ceb955062 Mon Sep 17 00:00:00 2001 From: George McCabe <23407799+georgemccabe@users.noreply.github.com> Date: Thu, 16 May 2024 09:28:48 -0600 Subject: [PATCH] Added support for setting time_offset_warning now that the changes for other wrappers was merged into develop. Also added support for MET_CONFIG_OVERRIDES for Point2Grid --- docs/Users_Guide/glossary.rst | 19 ++++++++++++++ docs/Users_Guide/wrappers.rst | 25 +++++++++++++++++++ .../wrappers/point2grid/test_point2grid.py | 2 ++ parm/met_config/Point2GridConfig_wrapped | 3 +++ .../Point2Grid/Point2Grid.conf | 3 +++ 5 files changed, 52 insertions(+) diff --git a/docs/Users_Guide/glossary.rst b/docs/Users_Guide/glossary.rst index 2f631c90f..30c4e63cf 100644 --- a/docs/Users_Guide/glossary.rst +++ b/docs/Users_Guide/glossary.rst @@ -11773,3 +11773,22 @@ METplus Configuration Glossary Specify the value for 'time_offset_warning' in the MET configuration file for WaveletStat. | *Used by:* WaveletStat + + POINT2GRID_TIME_OFFSET_WARNING + Specify the value for 'time_offset_warning' in the MET configuration file for Point2Grid. + + | *Used by:* Point2Grid + + POINT2GRID_MET_CONFIG_OVERRIDES + Override any variables in the MET configuration file that are not + supported by the wrapper. This should be set to the full variable name + and value that you want to override, including the equal sign and the + ending semi-colon. The value is directly appended to the end of the + wrapped MET config file. + + Example: + POINT2GRID_MET_CONFIG_OVERRIDES = desc = "override_desc"; model = "override_model"; + + See :ref:`Overriding Unsupported MET config file settings` for more information + + | *Used by:* Point2Grid diff --git a/docs/Users_Guide/wrappers.rst b/docs/Users_Guide/wrappers.rst index d76372a74..df4a42319 100644 --- a/docs/Users_Guide/wrappers.rst +++ b/docs/Users_Guide/wrappers.rst @@ -6412,6 +6412,8 @@ METplus Configuration | :term:`POINT2GRID_QUALITY_MARK_THRESH` | :term:`POINT2GRID_OBS_QUALITY_INC` | :term:`POINT2GRID_OBS_QUALITY_EXC` +| :term:`POINT2GRID_TIME_OFFSET_WARNING` +| :term:`POINT2GRID_MET_CONFIG_OVERRIDES` | .. warning:: **DEPRECATED:** @@ -6531,6 +6533,29 @@ ${METPLUS_OBS_QUALITY_EXC} * - :term:`POINT2GRID_OBS_QUALITY_EXC` - obs_quality_exc +${METPLUS_TIME_OFFSET_WARNING} +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. list-table:: + :widths: 5 5 + :header-rows: 1 + + * - METplus Config(s) + - MET Config File + * - :term:`POINT2GRID_TIME_OFFSET_WARNING` + - time_offset_warning + +${METPLUS_MET_CONFIG_OVERRIDES} +""""""""""""""""""""""""""""""" + +.. list-table:: + :widths: 5 5 + :header-rows: 1 + + * - METplus Config(s) + - MET Config File + * - :term:`POINT2GRID_MET_CONFIG_OVERRIDES` + - n/a .. _point_stat_wrapper: diff --git a/internal/tests/pytests/wrappers/point2grid/test_point2grid.py b/internal/tests/pytests/wrappers/point2grid/test_point2grid.py index 1e9a4246a..d8b1c484f 100644 --- a/internal/tests/pytests/wrappers/point2grid/test_point2grid.py +++ b/internal/tests/pytests/wrappers/point2grid/test_point2grid.py @@ -124,6 +124,8 @@ def test_point2grid_missing_inputs(metplus_config, get_test_data_dir, {'METPLUS_OBS_QUALITY_EXC': 'obs_quality_exc = ["3", "4", "5"];'}, []), ({'POINT2GRID_QC_FLAGS': '0,1'}, {'METPLUS_OBS_QUALITY_INC': 'obs_quality_inc = ["0", "1"];'}, []), + ({'POINT2GRID_TIME_OFFSET_WARNING': '5', }, + {'METPLUS_TIME_OFFSET_WARNING': 'time_offset_warning = 5;'}, []), ] ) diff --git a/parm/met_config/Point2GridConfig_wrapped b/parm/met_config/Point2GridConfig_wrapped index 222097a5d..6f7744f16 100644 --- a/parm/met_config/Point2GridConfig_wrapped +++ b/parm/met_config/Point2GridConfig_wrapped @@ -55,3 +55,6 @@ tmp_dir = "${MET_TMP_DIR}"; //version = "V12.0.0"; //////////////////////////////////////////////////////////////////////////////// + +${METPLUS_TIME_OFFSET_WARNING} +${METPLUS_MET_CONFIG_OVERRIDES} diff --git a/parm/use_cases/met_tool_wrapper/Point2Grid/Point2Grid.conf b/parm/use_cases/met_tool_wrapper/Point2Grid/Point2Grid.conf index 3a9d44444..e0514f07d 100644 --- a/parm/use_cases/met_tool_wrapper/Point2Grid/Point2Grid.conf +++ b/parm/use_cases/met_tool_wrapper/Point2Grid/Point2Grid.conf @@ -86,3 +86,6 @@ POINT2GRID_VLD_THRESH = #POINT2GRID_QUALITY_MARK_THRESH = #POINT2GRID_OBS_QUALITY_INC = #POINT2GRID_OBS_QUALITY_EXC = + +#POINT2GRID_TIME_OFFSET_WARNING = +#POINT2GRID_MET_CONFIG_OVERRIDES =