From 5ac15eac6855ca8250bb18042e15df22789b5c17 Mon Sep 17 00:00:00 2001
From: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Date: Mon, 30 Aug 2021 16:27:44 -0600
Subject: [PATCH] per #1103, added support for setting orank in the output_flag
 dict of PointStat

---
 docs/Users_Guide/glossary.rst                               | 5 +++++
 docs/Users_Guide/wrappers.rst                               | 3 +++
 .../pytests/point_stat/test_point_stat_wrapper.py           | 6 +++++-
 metplus/wrappers/point_stat_wrapper.py                      | 1 +
 parm/use_cases/met_tool_wrapper/PointStat/PointStat.conf    | 1 +
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/Users_Guide/glossary.rst b/docs/Users_Guide/glossary.rst
index e2804652b7..9b79c01189 100644
--- a/docs/Users_Guide/glossary.rst
+++ b/docs/Users_Guide/glossary.rst
@@ -6753,6 +6753,11 @@ METplus Configuration Glossary
 
      | *Used by:* PointStat
 
+   POINT_STAT_OUTPUT_FLAG_ORANK
+     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.
 
diff --git a/docs/Users_Guide/wrappers.rst b/docs/Users_Guide/wrappers.rst
index 6b1dd4ad37..baba211696 100644
--- a/docs/Users_Guide/wrappers.rst
+++ b/docs/Users_Guide/wrappers.rst
@@ -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`
@@ -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}**
 
diff --git a/internal_tests/pytests/point_stat/test_point_stat_wrapper.py b/internal_tests/pytests/point_stat/test_point_stat_wrapper.py
index d9672498a7..7155d1d1b8 100755
--- a/internal_tests/pytests/point_stat/test_point_stat_wrapper.py
+++ b/internal_tests/pytests/point_stat/test_point_stat_wrapper.py
@@ -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',
@@ -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;}'}),
diff --git a/metplus/wrappers/point_stat_wrapper.py b/metplus/wrappers/point_stat_wrapper.py
index 77374c5585..e461fed985 100755
--- a/metplus/wrappers/point_stat_wrapper.py
+++ b/metplus/wrappers/point_stat_wrapper.py
@@ -66,6 +66,7 @@ class PointStatWrapper(CompareGriddedWrapper):
                     'rps',
                     'eclv',
                     'mpr',
+                    'orank',
                     ]
 
     def __init__(self, config, instance=None, config_overrides={}):
diff --git a/parm/use_cases/met_tool_wrapper/PointStat/PointStat.conf b/parm/use_cases/met_tool_wrapper/PointStat/PointStat.conf
index 5b35b41d06..a290427772 100644
--- a/parm/use_cases/met_tool_wrapper/PointStat/PointStat.conf
+++ b/parm/use_cases/met_tool_wrapper/PointStat/PointStat.conf
@@ -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