Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature 1103 PointStat orank output_flag #1124

Merged
merged 1 commit into from
Aug 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/Users_Guide/glossary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6753,6 +6753,11 @@ METplus Configuration Glossary

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_ORANK
Copy link
Collaborator

@JohnHalleyGotway JohnHalleyGotway Aug 31, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I realize that order doesn't matter to the code, but it may matter to the user's understanding. I'd recommend moving the ORANK settings up in the list of options. I'd recommend listing it immediately after the ECNT entries... since the ECNT, ORANK, and RPS output are only compute for HiRA algorithm in Point-Stat. So it's useful to group them. That's why I listed them in that order here.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The glossary is sorted alphabetically automatically so the order of items listed in this file won't affect the order. I can change the order in the wrappers.rst file so that it comes after ECNT.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commit 35846c4 reordered these values in wrappers.rst

Specify the value for 'output_flag.orank' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_INTERP_VLD_THRESH
Specify the value for 'interp.vld_thresh' in the MET configuration file for PointStat.

Expand Down
3 changes: 3 additions & 0 deletions docs/Users_Guide/wrappers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4464,6 +4464,7 @@ Configuration
| :term:`POINT_STAT_OUTPUT_FLAG_RPS`
| :term:`POINT_STAT_OUTPUT_FLAG_ECLV`
| :term:`POINT_STAT_OUTPUT_FLAG_MPR`
| :term:`POINT_STAT_OUTPUT_FLAG_ORANK`
| :term:`POINT_STAT_INTERP_VLD_THRESH`
| :term:`POINT_STAT_INTERP_SHAPE`
| :term:`POINT_STAT_INTERP_TYPE_METHOD`
Expand Down Expand Up @@ -4842,6 +4843,8 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
- output_flag.eclv
* - :term:`POINT_STAT_OUTPUT_FLAG_MPR`
- output_flag.mpr
* - :term:`POINT_STAT_OUTPUT_FLAG_ORANK`
- output_flag.orank

**${METPLUS_INTERP_DICT}**

Expand Down
6 changes: 5 additions & 1 deletion internal_tests/pytests/point_stat/test_point_stat_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,9 @@ def test_met_dictionary_in_var_options(metplus_config):
({'POINT_STAT_OUTPUT_FLAG_MPR': 'BOTH', },
{'METPLUS_OUTPUT_FLAG_DICT': 'output_flag = {mpr = BOTH;}'}),

({'POINT_STAT_OUTPUT_FLAG_ORANK': 'BOTH', },
{'METPLUS_OUTPUT_FLAG_DICT': 'output_flag = {orank = BOTH;}'}),

({
'POINT_STAT_OUTPUT_FLAG_FHO': 'BOTH',
'POINT_STAT_OUTPUT_FLAG_CTC': 'BOTH',
Expand All @@ -258,9 +261,10 @@ def test_met_dictionary_in_var_options(metplus_config):
'POINT_STAT_OUTPUT_FLAG_RPS': 'BOTH',
'POINT_STAT_OUTPUT_FLAG_ECLV': 'BOTH',
'POINT_STAT_OUTPUT_FLAG_MPR': 'BOTH',
'POINT_STAT_OUTPUT_FLAG_ORANK': 'BOTH',
},
{
'METPLUS_OUTPUT_FLAG_DICT': 'output_flag = {fho = BOTH;ctc = BOTH;cts = BOTH;mctc = BOTH;mcts = BOTH;cnt = BOTH;sl1l2 = BOTH;sal1l2 = BOTH;vl1l2 = BOTH;val1l2 = BOTH;vcnt = BOTH;pct = BOTH;pstd = BOTH;pjc = BOTH;prc = BOTH;ecnt = BOTH;rps = BOTH;eclv = BOTH;mpr = BOTH;}'}),
'METPLUS_OUTPUT_FLAG_DICT': 'output_flag = {fho = BOTH;ctc = BOTH;cts = BOTH;mctc = BOTH;mcts = BOTH;cnt = BOTH;sl1l2 = BOTH;sal1l2 = BOTH;vl1l2 = BOTH;val1l2 = BOTH;vcnt = BOTH;pct = BOTH;pstd = BOTH;pjc = BOTH;prc = BOTH;ecnt = BOTH;rps = BOTH;eclv = BOTH;mpr = BOTH;orank = BOTH;}'}),

({'POINT_STAT_INTERP_VLD_THRESH': '0.5', },
{'METPLUS_INTERP_DICT': 'interp = {vld_thresh = 0.5;}'}),
Expand Down
1 change: 1 addition & 0 deletions metplus/wrappers/point_stat_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ class PointStatWrapper(CompareGriddedWrapper):
'rps',
'eclv',
'mpr',
'orank',
]

def __init__(self, config, instance=None, config_overrides={}):
Expand Down
1 change: 1 addition & 0 deletions parm/use_cases/met_tool_wrapper/PointStat/PointStat.conf
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ POINT_STAT_OUTPUT_FLAG_VL1L2 = STAT
#POINT_STAT_OUTPUT_FLAG_RPS =
#POINT_STAT_OUTPUT_FLAG_ECLV =
#POINT_STAT_OUTPUT_FLAG_MPR =
#POINT_STAT_OUTPUT_FLAG_ORANK =

#POINT_STAT_CLIMO_CDF_BINS = 1
#POINT_STAT_CLIMO_CDF_CENTER_BINS = False
Expand Down