Skip to content

Commit

Permalink
Per #1898, added support for diag_thresh_name, diag_thresh_val, init_…
Browse files Browse the repository at this point in the history
…diag_thresh_name, and init_diag_thresh_val. Also added support for line_type, event_equal, event_equal_lead, out_init_mask, and valid_init_mask in case those are needed later. Fixed bug where variables ending with 'thresh_val' were not properly formatted without quotation marks. Added unit tests to ensure all env vars are set properly which uncovered some bugs in the logic
  • Loading branch information
georgemccabe committed Nov 9, 2022
1 parent d978916 commit 2adc563
Show file tree
Hide file tree
Showing 6 changed files with 488 additions and 42 deletions.
45 changes: 45 additions & 0 deletions docs/Users_Guide/glossary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10113,3 +10113,48 @@ METplus Configuration Glossary
Specify the value for the nth 'diag_convert_map.convert' in the MET configuration file for TCPairs.

| *Used by:* TCPairs
TC_STAT_DIAG_THRESH_NAME
Specify the value for 'diag_thresh_name' in the MET configuration file for TCStat.

| *Used by:* TCStat
TC_STAT_DIAG_THRESH_VAL
Specify the value for 'diag_thresh_val' in the MET configuration file for TCStat.

| *Used by:* TCStat
TC_STAT_INIT_DIAG_THRESH_NAME
Specify the value for 'init_diag_thresh_name' in the MET configuration file for TCStat.

| *Used by:* TCStat
TC_STAT_INIT_DIAG_THRESH_VAL
Specify the value for 'init_diag_thresh_val' in the MET configuration file for TCStat.

| *Used by:* TCStat
TC_STAT_LINE_TYPE
Specify the value for 'line_type' in the MET configuration file for TCStat.

| *Used by:* TCStat
TC_STAT_EVENT_EQUAL
Specify the value for 'event_equal' in the MET configuration file for TCStat.

| *Used by:* TCStat
TC_STAT_EVENT_EQUAL_LEAD
Specify the value for 'event_equal_lead' in the MET configuration file for TCStat.

| *Used by:* TCStat
TC_STAT_OUT_INIT_MASK
Specify the value for 'out_init_mask' in the MET configuration file for TCStat.

| *Used by:* TCStat
TC_STAT_OUT_VALID_MASK
Specify the value for 'out_valid_mask' in the MET configuration file for TCStat.

| *Used by:* TCStat
109 changes: 109 additions & 0 deletions docs/Users_Guide/wrappers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8883,6 +8883,15 @@ METplus Configuration
| :term:`TC_STAT_COLUMN_STR_EXC_VAL`
| :term:`TC_STAT_INIT_STR_EXC_NAME`
| :term:`TC_STAT_INIT_STR_EXC_VAL`
| :term:`TC_STAT_DIAG_THRESH_NAME`
| :term:`TC_STAT_DIAG_THRESH_VAL`
| :term:`TC_STAT_INIT_DIAG_THRESH_NAME`
| :term:`TC_STAT_INIT_DIAG_THRESH_VAL`
| :term:`TC_STAT_LINE_TYPE`
| :term:`TC_STAT_EVENT_EQUAL`
| :term:`TC_STAT_EVENT_EQUAL_LEAD`
| :term:`TC_STAT_OUT_INIT_MASK`
| :term:`TC_STAT_OUT_VALID_MASK`
|
.. warning:: **DEPRECATED:**
Expand Down Expand Up @@ -9144,6 +9153,17 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
* - :term:`TC_STAT_VALID_MASK`
- valid_mask

**${METPLUS_LINE_TYPE}**

.. list-table::
:widths: 5 5
:header-rows: 0

* - METplus Config(s)
- MET Config File
* - :term:`TC_STAT_LINE_TYPE`
- line_type

**${METPLUS_TRACK_WATCH_WARN}**

.. list-table::
Expand Down Expand Up @@ -9287,6 +9307,50 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
* - :term:`TC_STAT_INIT_STR_EXC_VAL`
- init_str_exc_val

**${METPLUS_DIAG_THRESH_NAME}**

.. list-table::
:widths: 5 5
:header-rows: 0

* - METplus Config(s)
- MET Config File
* - :term:`TC_STAT_DIAG_THRESH_NAME`
- diag_thresh_name

**${METPLUS_DIAG_THRESH_VAL}**

.. list-table::
:widths: 5 5
:header-rows: 0

* - METplus Config(s)
- MET Config File
* - :term:`TC_STAT_DIAG_THRESH_VAL`
- diag_thresh_val

**${METPLUS_INIT_DIAG_THRESH_NAME}**

.. list-table::
:widths: 5 5
:header-rows: 0

* - METplus Config(s)
- MET Config File
* - :term:`TC_STAT_INIT_DIAG_THRESH_NAME`
- init_diag_thresh_name

**${METPLUS_INIT_DIAG_THRESH_VAL}**

.. list-table::
:widths: 5 5
:header-rows: 0

* - METplus Config(s)
- MET Config File
* - :term:`TC_STAT_INIT_DIAG_THRESH_VAL`
- init_diag_thresh_val

**${METPLUS_WATER_ONLY}**

.. list-table::
Expand Down Expand Up @@ -9364,6 +9428,51 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
* - :term:`TC_STAT_MET_CONFIG_OVERRIDES`
- n/a

**${METPLUS_EVENT_EQUAL}**

.. list-table::
:widths: 5 5
:header-rows: 0

* - METplus Config(s)
- MET Config File
* - :term:`TC_STAT_EVENT_EQUAL`
- event_equal

**${METPLUS_EVENT_EQUAL_LEAD}**

.. list-table::
:widths: 5 5
:header-rows: 0

* - METplus Config(s)
- MET Config File
* - :term:`TC_STAT_EVENT_EQUAL_LEAD`
- event_equal_lead

**${METPLUS_OUT_INIT_MASK}**

.. list-table::
:widths: 5 5
:header-rows: 0

* - METplus Config(s)
- MET Config File
* - :term:`TC_STAT_OUT_INIT_MASK`
- out_init_mask

**${METPLUS_OUT_VALID_MASK}**

.. list-table::
:widths: 5 5
:header-rows: 0

* - METplus Config(s)
- MET Config File
* - :term:`TC_STAT_OUT_VALID_MASK`
- out_valid_mask


.. _user_script_wrapper:

UserScript
Expand Down
Loading

0 comments on commit 2adc563

Please sign in to comment.