From aebfb6bfe4d36378f5a80030fb3a995b725c0252 Mon Sep 17 00:00:00 2001 From: George McCabe <23407799+georgemccabe@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:50:48 -0700 Subject: [PATCH 1/6] added seeps items for output_flag and nc_pairs_flag --- metplus/wrappers/grid_stat_wrapper.py | 74 ++++++++++++++------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/metplus/wrappers/grid_stat_wrapper.py b/metplus/wrappers/grid_stat_wrapper.py index 379e6a6282..34e1573627 100755 --- a/metplus/wrappers/grid_stat_wrapper.py +++ b/metplus/wrappers/grid_stat_wrapper.py @@ -60,41 +60,45 @@ class GridStatWrapper(CompareGriddedWrapper): 'VERIF_MASK', ] - OUTPUT_FLAGS = ['fho', - 'ctc', - 'cts', - 'mctc', - 'mcts', - 'cnt', - 'sl1l2', - 'sal1l2', - 'vl1l2', - 'val1l2', - 'vcnt', - 'pct', - 'pstd', - 'pjc', - 'prc', - 'eclv', - 'nbrctc', - 'nbrcts', - 'nbrcnt', - 'grad', - 'dmap', - ] - - NC_PAIRS_FLAGS = ['latlon', - 'raw', - 'diff', - 'climo', - 'climo_cdp', - 'weight', - 'nbrhd', - 'fourier', - 'gradient', - 'distance_map', - 'apply_mask', - ] + OUTPUT_FLAGS = [ + 'fho', + 'ctc', + 'cts', + 'mctc', + 'mcts', + 'cnt', + 'sl1l2', + 'sal1l2', + 'vl1l2', + 'val1l2', + 'vcnt', + 'pct', + 'pstd', + 'pjc', + 'prc', + 'eclv', + 'nbrctc', + 'nbrcts', + 'nbrcnt', + 'grad', + 'dmap', + 'seeps', + ] + + NC_PAIRS_FLAGS = [ + 'latlon', + 'raw', + 'diff', + 'climo', + 'climo_cdp', + 'weight', + 'nbrhd', + 'fourier', + 'gradient', + 'distance_map', + 'apply_mask', + 'seeps', + ] def __init__(self, config, instance=None): self.app_name = 'grid_stat' From e71310ae1d146b0fa7aa0cda11b455c384501ba4 Mon Sep 17 00:00:00 2001 From: George McCabe <23407799+georgemccabe@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:55:58 -0700 Subject: [PATCH 2/6] change comment block --- metplus/wrappers/grid_stat_wrapper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metplus/wrappers/grid_stat_wrapper.py b/metplus/wrappers/grid_stat_wrapper.py index 34e1573627..846ad3f9b3 100755 --- a/metplus/wrappers/grid_stat_wrapper.py +++ b/metplus/wrappers/grid_stat_wrapper.py @@ -20,9 +20,9 @@ @endcode """ + class GridStatWrapper(CompareGriddedWrapper): - '''!Wraps the MET tool grid_stat to compare gridded datasets - ''' + """!Wraps the MET tool grid_stat to compare gridded datasets""" WRAPPER_ENV_VAR_KEYS = [ 'METPLUS_MODEL', From 73a2b9d641154eeacc96993623d450d7291a142f Mon Sep 17 00:00:00 2001 From: George McCabe <23407799+georgemccabe@users.noreply.github.com> Date: Wed, 16 Nov 2022 16:36:12 -0700 Subject: [PATCH 3/6] per #1953, add support for setting output_flag.seeps, nc_pairs_flag.seeps, and seeps_p1_thresh in GridStat and seeps_p1_thresh in PointStat --- docs/Users_Guide/glossary.rst | 20 ++ docs/Users_Guide/wrappers.rst | 225 ++++++++++-------- .../grid_stat/test_grid_stat_wrapper.py | 21 +- .../point_stat/test_point_stat_wrapper.py | 2 + metplus/wrappers/grid_stat_wrapper.py | 5 + metplus/wrappers/point_stat_wrapper.py | 5 + parm/met_config/GridStatConfig_wrapped | 6 + parm/met_config/PointStatConfig_wrapped | 6 + .../met_tool_wrapper/GridStat/GridStat.conf | 5 + .../met_tool_wrapper/PointStat/PointStat.conf | 2 + 10 files changed, 197 insertions(+), 100 deletions(-) diff --git a/docs/Users_Guide/glossary.rst b/docs/Users_Guide/glossary.rst index 7a270558c4..3300d1d37a 100644 --- a/docs/Users_Guide/glossary.rst +++ b/docs/Users_Guide/glossary.rst @@ -6629,6 +6629,11 @@ METplus Configuration Glossary | *Used by:* GridStat + GRID_STAT_OUTPUT_FLAG_SEEPS + Specify the value for 'output_flag.seeps' in the MET configuration file for GridStat. + + | *Used by:* GridStat + GRID_STAT_NC_PAIRS_FLAG_LATLON Specify the value for 'nc_pairs_flag.latlon' in the MET configuration file for GridStat. @@ -6684,6 +6689,11 @@ METplus Configuration Glossary | *Used by:* GridStat + GRID_STAT_NC_PAIRS_FLAG_SEEPS + Specify the value for 'nc_pairs_flag.seeps' in the MET configuration file for GridStat. + + | *Used by:* GridStat + TC_STAT_COLUMN_STR_EXC_NAME Specify the value for 'column_str_exc_name' in the MET configuration file for TCStat. @@ -10203,3 +10213,13 @@ METplus Configuration Glossary Specify the value for 'mask.poly' in the MET configuration file for SeriesAnalysis. | *Used by:* SeriesAnalysis + + GRID_STAT_SEEPS_P1_THRESH + Specify the value for 'seeps_p1_thresh' in the MET configuration file for GridStat. + + | *Used by:* GridStat + + POINT_STAT_SEEPS_P1_THRESH + Specify the value for 'seeps_p1_thresh' in the MET configuration file for PointStat. + + | *Used by:* PointStat diff --git a/docs/Users_Guide/wrappers.rst b/docs/Users_Guide/wrappers.rst index 6f86e71335..69d05e44ba 100644 --- a/docs/Users_Guide/wrappers.rst +++ b/docs/Users_Guide/wrappers.rst @@ -295,19 +295,19 @@ METplus Configuration | :term:`ENSEMBLE_STAT_ECLV_POINTS` | :term:`FCST_ENSEMBLE_STAT_IS_PROB` | :term:`FCST_ENSEMBLE_STAT_PROB_IN_GRIB_PDS` -| :term:`ENSEMBLE_STAT_VERIFICATION_MASK_TEMPLATE` (optional) -| :term:`ENS_VAR_NAME` (optional) -| :term:`ENS_VAR_LEVELS` (optional) -| :term:`ENS_VAR_THRESH` (optional) -| :term:`ENS_VAR_OPTIONS` (optional) -| :term:`FCST_ENSEMBLE_STAT_VAR_NAME` (optional) -| :term:`FCST_ENSEMBLE_STAT_VAR_LEVELS` (optional) -| :term:`FCST_ENSEMBLE_STAT_VAR_THRESH` (optional) -| :term:`FCST_ENSEMBLE_STAT_VAR_OPTIONS` (optional) -| :term:`OBS_ENSEMBLE_STAT_VAR_NAME` (optional) -| :term:`OBS_ENSEMBLE_STAT_VAR_LEVELS` (optional) -| :term:`OBS_ENSEMBLE_STAT_VAR_THRESH` (optional) -| :term:`OBS_ENSEMBLE_STAT_VAR_OPTIONS` (optional) +| :term:`ENSEMBLE_STAT_VERIFICATION_MASK_TEMPLATE` +| :term:`ENS_VAR_NAME` +| :term:`ENS_VAR_LEVELS` +| :term:`ENS_VAR_THRESH` +| :term:`ENS_VAR_OPTIONS` +| :term:`FCST_ENSEMBLE_STAT_VAR_NAME` +| :term:`FCST_ENSEMBLE_STAT_VAR_LEVELS` +| :term:`FCST_ENSEMBLE_STAT_VAR_THRESH` +| :term:`FCST_ENSEMBLE_STAT_VAR_OPTIONS` +| :term:`OBS_ENSEMBLE_STAT_VAR_NAME` +| :term:`OBS_ENSEMBLE_STAT_VAR_LEVELS` +| :term:`OBS_ENSEMBLE_STAT_VAR_THRESH` +| :term:`OBS_ENSEMBLE_STAT_VAR_OPTIONS` | .. warning:: **DEPRECATED:** @@ -2657,7 +2657,7 @@ METplus Configuration | :term:`GRID_DIAG_OUTPUT_DIR` | :term:`GRID_DIAG_INPUT_TEMPLATE` | :term:`GRID_DIAG_OUTPUT_TEMPLATE` -| :term:`GRID_DIAG_VERIFICATION_MASK_TEMPLATE` (optional) +| :term:`GRID_DIAG_VERIFICATION_MASK_TEMPLATE` | :term:`LOG_GRID_DIAG_VERBOSITY` | :term:`GRID_DIAG_CONFIG_FILE` | :term:`GRID_DIAG_CUSTOM_LOOP_LIST` @@ -2809,7 +2809,7 @@ METplus Configuration | :term:`FCST_GRID_STAT_INPUT_TEMPLATE` | :term:`OBS_GRID_STAT_INPUT_TEMPLATE` | :term:`GRID_STAT_OUTPUT_TEMPLATE` -| :term:`GRID_STAT_VERIFICATION_MASK_TEMPLATE` (optional) +| :term:`GRID_STAT_VERIFICATION_MASK_TEMPLATE` | :term:`LOG_GRID_STAT_VERBOSITY` | :term:`GRID_STAT_OUTPUT_PREFIX` | :term:`GRID_STAT_CONFIG_FILE` @@ -2849,6 +2849,7 @@ METplus Configuration | :term:`GRID_STAT_OUTPUT_FLAG_NBRCNT` | :term:`GRID_STAT_OUTPUT_FLAG_GRAD` | :term:`GRID_STAT_OUTPUT_FLAG_DMAP` +| :term:`GRID_STAT_OUTPUT_FLAG_SEEPS` | :term:`GRID_STAT_NC_PAIRS_FLAG_LATLON` | :term:`GRID_STAT_NC_PAIRS_FLAG_RAW` | :term:`GRID_STAT_NC_PAIRS_FLAG_DIFF` @@ -2860,6 +2861,7 @@ METplus Configuration | :term:`GRID_STAT_NC_PAIRS_FLAG_GRADIENT` | :term:`GRID_STAT_NC_PAIRS_FLAG_DISTANCE_MAP` | :term:`GRID_STAT_NC_PAIRS_FLAG_APPLY_MASK` +| :term:`GRID_STAT_NC_PAIRS_FLAG_SEEPS` | :term:`GRID_STAT_INTERP_FIELD` | :term:`GRID_STAT_INTERP_VLD_THRESH` | :term:`GRID_STAT_INTERP_SHAPE` @@ -2911,30 +2913,31 @@ METplus Configuration | :term:`GRID_STAT_CENSOR_VAL` | :term:`FCST_GRID_STAT_IS_PROB` | :term:`FCST_GRID_STAT_PROB_IN_GRIB_PDS` -| :term:`GRID_STAT_MASK_GRID` (optional) -| :term:`GRID_STAT_MASK_POLY` (optional) +| :term:`GRID_STAT_MASK_GRID` +| :term:`GRID_STAT_MASK_POLY` | :term:`GRID_STAT_MET_CONFIG_OVERRIDES` -| :term:`FCST_GRID_STAT_PROB_THRESH` (optional) -| :term:`OBS_GRID_STAT_PROB_THRESH` (optional) -| :term:`GRID_STAT_NEIGHBORHOOD_WIDTH` (optional) -| :term:`GRID_STAT_NEIGHBORHOOD_SHAPE` (optional) -| :term:`GRID_STAT_NEIGHBORHOOD_COV_THRESH` (optional) -| :term:`FCST_GRID_STAT_WINDOW_BEGIN` (optional) -| :term:`FCST_GRID_STAT_WINDOW_END` (optional) -| :term:`OBS_GRID_STAT_WINDOW_BEGIN` (optional) -| :term:`OBS_GRID_STAT_WINDOW_END` (optional) -| :term:`FCST_GRID_STAT_FILE_WINDOW_BEGIN` (optional) -| :term:`FCST_GRID_STAT_FILE_WINDOW_END` (optional) -| :term:`OBS_GRID_STAT_FILE_WINDOW_BEGIN` (optional) -| :term:`OBS_GRID_STAT_FILE_WINDOW_END` (optional) -| :term:`FCST_GRID_STAT_VAR_NAME` (optional) -| :term:`FCST_GRID_STAT_VAR_LEVELS` (optional) -| :term:`FCST_GRID_STAT_VAR_THRESH` (optional) -| :term:`FCST_GRID_STAT_VAR_OPTIONS` (optional) -| :term:`OBS_GRID_STAT_VAR_NAME` (optional) -| :term:`OBS_GRID_STAT_VAR_LEVELS` (optional) -| :term:`OBS_GRID_STAT_VAR_THRESH` (optional) -| :term:`OBS_GRID_STAT_VAR_OPTIONS` (optional) +| :term:`FCST_GRID_STAT_PROB_THRESH` +| :term:`OBS_GRID_STAT_PROB_THRESH` +| :term:`GRID_STAT_NEIGHBORHOOD_WIDTH` +| :term:`GRID_STAT_NEIGHBORHOOD_SHAPE` +| :term:`GRID_STAT_NEIGHBORHOOD_COV_THRESH` +| :term:`FCST_GRID_STAT_WINDOW_BEGIN` +| :term:`FCST_GRID_STAT_WINDOW_END` +| :term:`OBS_GRID_STAT_WINDOW_BEGIN` +| :term:`OBS_GRID_STAT_WINDOW_END` +| :term:`FCST_GRID_STAT_FILE_WINDOW_BEGIN` +| :term:`FCST_GRID_STAT_FILE_WINDOW_END` +| :term:`OBS_GRID_STAT_FILE_WINDOW_BEGIN` +| :term:`OBS_GRID_STAT_FILE_WINDOW_END` +| :term:`FCST_GRID_STAT_VAR_NAME` +| :term:`FCST_GRID_STAT_VAR_LEVELS` +| :term:`FCST_GRID_STAT_VAR_THRESH` +| :term:`FCST_GRID_STAT_VAR_OPTIONS` +| :term:`OBS_GRID_STAT_VAR_NAME` +| :term:`OBS_GRID_STAT_VAR_LEVELS` +| :term:`OBS_GRID_STAT_VAR_THRESH` +| :term:`OBS_GRID_STAT_VAR_OPTIONS` +| :term:`GRID_STAT_SEEPS_P1_THRESH` | .. warning:: **DEPRECATED** @@ -3276,6 +3279,8 @@ see :ref:`How METplus controls MET config file settings`. - output_flag.grad * - :term:`GRID_STAT_OUTPUT_FLAG_DMAP` - output_flag.dmap + * - :term:`GRID_STAT_OUTPUT_FLAG_SEEPS` + - output_flag.seeps **${METPLUS_NC_PAIRS_FLAG_DICT}** @@ -3307,6 +3312,8 @@ see :ref:`How METplus controls MET config file settings`. - nc_pairs_flag.distance_map * - :term:`GRID_STAT_NC_PAIRS_FLAG_APPLY_MASK` - nc_pairs_flag.apply_mask + * - :term:`GRID_STAT_NC_PAIRS_FLAG_SEEPS` + - nc_pairs_flag.seeps **${METPLUS_INTERP_DICT}** @@ -3414,6 +3421,17 @@ see :ref:`How METplus controls MET config file settings`. * - :term:`GRID_STAT_CENSOR_VAL` - censor_val +**${METPLUS_SEEPS_P1_THRESH}** + +.. list-table:: + :widths: 5 5 + :header-rows: 0 + + * - METplus Config(s) + - MET Config File + * - :term:`GRID_STAT_SEEPS_P1_THRESH` + - seeps_p1_thresh + .. _ioda2nc_wrapper: @@ -3996,16 +4014,16 @@ METplus Configuration | :term:`FCST_MODE_IS_PROB` | :term:`FCST_MODE_PROB_IN_GRIB_PDS` | :term:`MODE_MULTIVAR_LOGIC` -| :term:`FCST_MODE_VAR_NAME` (optional) -| :term:`FCST_MODE_VAR_LEVELS` (optional) -| :term:`FCST_MODE_VAR_THRESH` (optional) -| :term:`FCST_MODE_VAR_OPTIONS` (optional) -| :term:`MODE_FCST_FILE_TYPE` (optional) -| :term:`OBS_MODE_VAR_NAME` (optional) -| :term:`OBS_MODE_VAR_LEVELS` (optional) -| :term:`OBS_MODE_VAR_THRESH` (optional) -| :term:`OBS_MODE_VAR_OPTIONS` (optional) -| :term:`MODE_OBS_FILE_TYPE` (optional) +| :term:`FCST_MODE_VAR_NAME` +| :term:`FCST_MODE_VAR_LEVELS` +| :term:`FCST_MODE_VAR_THRESH` +| :term:`FCST_MODE_VAR_OPTIONS` +| :term:`MODE_FCST_FILE_TYPE` +| :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` | .. warning:: **DEPRECATED:** @@ -4622,14 +4640,14 @@ METplus Configuration | :term:`MTD_MET_CONFIG_OVERRIDES` | :term:`FCST_MTD_IS_PROB` | :term:`FCST_MTD_PROB_IN_GRIB_PDS` -| :term:`FCST_MTD_VAR_NAME` (optional) -| :term:`FCST_MTD_VAR_LEVELS` (optional) -| :term:`FCST_MTD_VAR_THRESH` (optional) -| :term:`FCST_MTD_VAR_OPTIONS` (optional) -| :term:`OBS_MTD_VAR_NAME` (optional) -| :term:`OBS_MTD_VAR_LEVELS` (optional) -| :term:`OBS_MTD_VAR_THRESH` (optional) -| :term:`OBS_MTD_VAR_OPTIONS` (optional) +| :term:`FCST_MTD_VAR_NAME` +| :term:`FCST_MTD_VAR_LEVELS` +| :term:`FCST_MTD_VAR_THRESH` +| :term:`FCST_MTD_VAR_OPTIONS` +| :term:`OBS_MTD_VAR_NAME` +| :term:`OBS_MTD_VAR_LEVELS` +| :term:`OBS_MTD_VAR_THRESH` +| :term:`OBS_MTD_VAR_OPTIONS` | .. warning:: **DEPRECATED:** @@ -4870,11 +4888,11 @@ METplus Configuration | :term:`PB2NC_OFFSETS` | :term:`PB2NC_INPUT_DATATYPE` | :term:`PB2NC_CONFIG_FILE` -| :term:`PB2NC_MESSAGE_TYPE` (optional) -| :term:`PB2NC_STATION_ID` (optional) -| :term:`PB2NC_GRID` (optional) +| :term:`PB2NC_MESSAGE_TYPE` +| :term:`PB2NC_STATION_ID` +| :term:`PB2NC_GRID` | :term:`PB2NC_POLY` -| :term:`PB2NC_OBS_BUFR_VAR_LIST` (optional) +| :term:`PB2NC_OBS_BUFR_VAR_LIST` | :term:`PB2NC_TIME_SUMMARY_FLAG` | :term:`PB2NC_TIME_SUMMARY_BEG` | :term:`PB2NC_TIME_SUMMARY_END` @@ -5147,16 +5165,16 @@ METplus Configuration | :term:`OBS_PCP_COMBINE_LOOKBACK` | :term:`FCST_PCP_COMBINE_USE_ZERO_ACCUM` | :term:`OBS_PCP_COMBINE_USE_ZERO_ACCUM` -| :term:`FCST_PCP_COMBINE_EXTRA_NAMES` (optional) -| :term:`FCST_PCP_COMBINE_EXTRA_LEVELS` (optional) -| :term:`FCST_PCP_COMBINE_EXTRA_OUTPUT_NAMES` (optional) -| :term:`OBS_PCP_COMBINE_EXTRA_NAMES` (optional) -| :term:`OBS_PCP_COMBINE_EXTRA_LEVELS` (optional) -| :term:`OBS_PCP_COMBINE_EXTRA_OUTPUT_NAMES` (optional) -| :term:`FCST_PCP_COMBINE_OUTPUT_ACCUM` (optional) -| :term:`FCST_PCP_COMBINE_OUTPUT_NAME` (optional) -| :term:`OBS_PCP_COMBINE_OUTPUT_ACCUM` (optional) -| :term:`OBS_PCP_COMBINE_OUTPUT_NAME` (optional) +| :term:`FCST_PCP_COMBINE_EXTRA_NAMES` +| :term:`FCST_PCP_COMBINE_EXTRA_LEVELS` +| :term:`FCST_PCP_COMBINE_EXTRA_OUTPUT_NAMES` +| :term:`OBS_PCP_COMBINE_EXTRA_NAMES` +| :term:`OBS_PCP_COMBINE_EXTRA_LEVELS` +| :term:`OBS_PCP_COMBINE_EXTRA_OUTPUT_NAMES` +| :term:`FCST_PCP_COMBINE_OUTPUT_ACCUM` +| :term:`FCST_PCP_COMBINE_OUTPUT_NAME` +| :term:`OBS_PCP_COMBINE_OUTPUT_ACCUM` +| :term:`OBS_PCP_COMBINE_OUTPUT_NAME` | .. warning:: **DEPRECATED:** @@ -5638,7 +5656,7 @@ Configuration | :term:`POINT_STAT_OUTPUT_DIR` | :term:`FCST_POINT_STAT_INPUT_TEMPLATE` | :term:`OBS_POINT_STAT_INPUT_TEMPLATE` -| :term:`POINT_STAT_VERIFICATION_MASK_TEMPLATE` (optional) +| :term:`POINT_STAT_VERIFICATION_MASK_TEMPLATE` | :term:`POINT_STAT_OUTPUT_PREFIX` | :term:`LOG_POINT_STAT_VERBOSITY` | :term:`POINT_STAT_OFFSETS` @@ -5732,22 +5750,23 @@ Configuration | :term:`POINT_STAT_MESSAGE_TYPE_GROUP_MAP` | :term:`FCST_POINT_STAT_IS_PROB` | :term:`FCST_POINT_STAT_PROB_IN_GRIB_PDS` -| :term:`FCST_POINT_STAT_WINDOW_BEGIN` (optional) -| :term:`FCST_POINT_STAT_WINDOW_END` (optional) -| :term:`OBS_POINT_STAT_WINDOW_BEGIN` (optional) -| :term:`OBS_POINT_STAT_WINDOW_END` (optional) -| :term:`POINT_STAT_NEIGHBORHOOD_WIDTH` (optional) -| :term:`POINT_STAT_NEIGHBORHOOD_SHAPE` (optional) -| :term:`FCST_POINT_STAT_VAR_NAME` (optional) -| :term:`FCST_POINT_STAT_VAR_LEVELS` (optional) -| :term:`FCST_POINT_STAT_VAR_THRESH` (optional) -| :term:`FCST_POINT_STAT_VAR_OPTIONS` (optional) -| :term:`OBS_POINT_STAT_VAR_NAME` (optional) -| :term:`OBS_POINT_STAT_VAR_LEVELS` (optional) -| :term:`OBS_POINT_STAT_VAR_THRESH` (optional) -| :term:`OBS_POINT_STAT_VAR_OPTIONS` (optional) -| :term:`POINT_STAT_OBS_VALID_BEG` (optional) -| :term:`POINT_STAT_OBS_VALID_END` (optional) +| :term:`FCST_POINT_STAT_WINDOW_BEGIN` +| :term:`FCST_POINT_STAT_WINDOW_END` +| :term:`OBS_POINT_STAT_WINDOW_BEGIN` +| :term:`OBS_POINT_STAT_WINDOW_END` +| :term:`POINT_STAT_NEIGHBORHOOD_WIDTH` +| :term:`POINT_STAT_NEIGHBORHOOD_SHAPE` +| :term:`FCST_POINT_STAT_VAR_NAME` +| :term:`FCST_POINT_STAT_VAR_LEVELS` +| :term:`FCST_POINT_STAT_VAR_THRESH` +| :term:`FCST_POINT_STAT_VAR_OPTIONS` +| :term:`OBS_POINT_STAT_VAR_NAME` +| :term:`OBS_POINT_STAT_VAR_LEVELS` +| :term:`OBS_POINT_STAT_VAR_THRESH` +| :term:`OBS_POINT_STAT_VAR_OPTIONS` +| :term:`POINT_STAT_OBS_VALID_BEG` +| :term:`POINT_STAT_OBS_VALID_END` +| :term:`POINT_STAT_SEEPS_P1_THRESH` | .. warning:: **DEPRECATED:** @@ -6195,6 +6214,18 @@ see :ref:`How METplus controls MET config file settings`. * - :term:`POINT_STAT_MESSAGE_TYPE_GROUP_MAP` - message_type_group_map +**${METPLUS_SEEPS_P1_THRESH}** + +.. list-table:: + :widths: 5 5 + :header-rows: 0 + + * - METplus Config(s) + - MET Config File + * - :term:`POINT_STAT_SEEPS_P1_THRESH` + - seeps_p1_thresh + + .. _py_embed_ingest_wrapper: PyEmbedIngest @@ -6260,12 +6291,12 @@ METplus Configuration | :term:`REGRID_DATA_PLANE_METHOD` | :term:`REGRID_DATA_PLANE_CUSTOM_LOOP_LIST` | :term:`REGRID_DATA_PLANE_ONCE_PER_FIELD` -| :term:`FCST_REGRID_DATA_PLANE_VAR_INPUT_FIELD_NAME` (optional) -| :term:`FCST_REGRID_DATA_PLANE_VAR_INPUT_LEVEL` (optional) -| :term:`FCST_REGRID_DATA_PLANE_VAR_OUTPUT_FIELD_NAME` (optional) -| :term:`OBS_REGRID_DATA_PLANE_VAR_INPUT_FIELD_NAME` (optional) -| :term:`OBS_REGRID_DATA_PLANE_VAR_INPUT_LEVEL` (optional) -| :term:`OBS_REGRID_DATA_PLANE_VAR_OUTPUT_FIELD_NAME` (optional) +| :term:`FCST_REGRID_DATA_PLANE_VAR_INPUT_FIELD_NAME` +| :term:`FCST_REGRID_DATA_PLANE_VAR_INPUT_LEVEL` +| :term:`FCST_REGRID_DATA_PLANE_VAR_OUTPUT_FIELD_NAME` +| :term:`OBS_REGRID_DATA_PLANE_VAR_INPUT_FIELD_NAME` +| :term:`OBS_REGRID_DATA_PLANE_VAR_INPUT_LEVEL` +| :term:`OBS_REGRID_DATA_PLANE_VAR_OUTPUT_FIELD_NAME` | .. warning:: **DEPRECATED:** @@ -8869,7 +8900,7 @@ METplus Configuration | :term:`TC_STAT_LOOKIN_DIR` | :term:`TC_STAT_OUTPUT_DIR` -| :term:`TC_STAT_OUTPUT_TEMPLATE` (optional) +| :term:`TC_STAT_OUTPUT_TEMPLATE` | :term:`TC_STAT_CONFIG_FILE` | :term:`TC_STAT_JOB_ARGS` | :term:`TC_STAT_AMODEL` @@ -9536,7 +9567,7 @@ METplus Configuration | :term:`USER_SCRIPT_COMMAND` | :term:`USER_SCRIPT_CUSTOM_LOOP_LIST` | :term:`USER_SCRIPT_SKIP_TIMES` -| :term:`USER_SCRIPT_INPUT_DIR` (optional) -| :term:`USER_SCRIPT_INPUT_TEMPLATE` (optional) -| :term:`USER_SCRIPT_INPUT_TEMPLATE_LABELS` (optional) +| :term:`USER_SCRIPT_INPUT_DIR` +| :term:`USER_SCRIPT_INPUT_TEMPLATE` +| :term:`USER_SCRIPT_INPUT_TEMPLATE_LABELS` | diff --git a/internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py b/internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py index f8337d8650..bdc8bc03f4 100644 --- a/internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py +++ b/internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py @@ -334,6 +334,9 @@ def test_handle_climo_file_variables(metplus_config, config_overrides, ({'GRID_STAT_OUTPUT_FLAG_DMAP': 'STAT', }, {'METPLUS_OUTPUT_FLAG_DICT': 'output_flag = {dmap = STAT;}'}), + ({'GRID_STAT_OUTPUT_FLAG_SEEPS': 'STAT', }, + {'METPLUS_OUTPUT_FLAG_DICT': 'output_flag = {seeps = STAT;}'}), + ({ 'GRID_STAT_OUTPUT_FLAG_FHO': 'STAT', 'GRID_STAT_OUTPUT_FLAG_CTC': 'STAT', @@ -356,6 +359,7 @@ def test_handle_climo_file_variables(metplus_config, config_overrides, 'GRID_STAT_OUTPUT_FLAG_NBRCNT': 'STAT', 'GRID_STAT_OUTPUT_FLAG_GRAD': 'STAT', 'GRID_STAT_OUTPUT_FLAG_DMAP': 'STAT', + 'GRID_STAT_OUTPUT_FLAG_SEEPS': 'STAT', }, { 'METPLUS_OUTPUT_FLAG_DICT': ( @@ -364,7 +368,7 @@ def test_handle_climo_file_variables(metplus_config, config_overrides, 'sal1l2 = STAT;vl1l2 = STAT;val1l2 = STAT;' 'vcnt = STAT;pct = STAT;pstd = STAT;pjc = STAT;' 'prc = STAT;eclv = STAT;nbrctc = STAT;nbrcts = STAT;' - 'nbrcnt = STAT;grad = STAT;dmap = STAT;}')}), + 'nbrcnt = STAT;grad = STAT;dmap = STAT;seeps = STAT;}')}), ({'GRID_STAT_NC_PAIRS_FLAG_LATLON': 'TRUE', }, {'METPLUS_NC_PAIRS_FLAG_DICT': 'nc_pairs_flag = {latlon = TRUE;}'}), @@ -403,6 +407,9 @@ def test_handle_climo_file_variables(metplus_config, config_overrides, { 'METPLUS_NC_PAIRS_FLAG_DICT': 'nc_pairs_flag = {apply_mask = TRUE;}'}), + ({'GRID_STAT_NC_PAIRS_FLAG_SEEPS': 'TRUE', }, + {'METPLUS_NC_PAIRS_FLAG_DICT': 'nc_pairs_flag = {seeps = TRUE;}'}), + ({ 'GRID_STAT_NC_PAIRS_FLAG_LATLON': 'TRUE', 'GRID_STAT_NC_PAIRS_FLAG_RAW': 'TRUE', @@ -415,9 +422,14 @@ def test_handle_climo_file_variables(metplus_config, config_overrides, 'GRID_STAT_NC_PAIRS_FLAG_GRADIENT': 'TRUE', 'GRID_STAT_NC_PAIRS_FLAG_DISTANCE_MAP': 'TRUE', 'GRID_STAT_NC_PAIRS_FLAG_APPLY_MASK': 'TRUE', + 'GRID_STAT_NC_PAIRS_FLAG_SEEPS': 'TRUE', }, - { - 'METPLUS_NC_PAIRS_FLAG_DICT': 'nc_pairs_flag = {latlon = TRUE;raw = TRUE;diff = TRUE;climo = TRUE;climo_cdp = TRUE;weight = TRUE;nbrhd = TRUE;fourier = TRUE;gradient = TRUE;distance_map = TRUE;apply_mask = TRUE;}'}), + {'METPLUS_NC_PAIRS_FLAG_DICT': ( + 'nc_pairs_flag = {latlon = TRUE;raw = TRUE;diff = TRUE;' + 'climo = TRUE;climo_cdp = TRUE;weight = TRUE;nbrhd = TRUE;' + 'fourier = TRUE;gradient = TRUE;distance_map = TRUE;' + 'apply_mask = TRUE;seeps = TRUE;}' + )}), ({'GRID_STAT_CLIMO_CDF_CDF_BINS': '1', }, {'METPLUS_CLIMO_CDF_DICT': 'climo_cdf = {cdf_bins = 1.0;}'}), @@ -689,6 +701,9 @@ def test_handle_climo_file_variables(metplus_config, config_overrides, ({'GRID_STAT_CENSOR_VAL': '12000, 5000', }, {'METPLUS_CENSOR_VAL': 'censor_val = [12000, 5000];'}), + ({'GRID_STAT_SEEPS_P1_THRESH': 'gt4', }, + {'METPLUS_SEEPS_P1_THRESH': 'seeps_p1_thresh = gt4;'}), + ] ) @pytest.mark.wrapper_b diff --git a/internal/tests/pytests/wrappers/point_stat/test_point_stat_wrapper.py b/internal/tests/pytests/wrappers/point_stat/test_point_stat_wrapper.py index f06035ab77..b650b57e45 100755 --- a/internal/tests/pytests/wrappers/point_stat/test_point_stat_wrapper.py +++ b/internal/tests/pytests/wrappers/point_stat/test_point_stat_wrapper.py @@ -468,6 +468,8 @@ def test_met_dictionary_in_var_options(metplus_config): {'METPLUS_FCST_FILE_TYPE': 'file_type = NETCDF_PINT;'}), ({'POINT_STAT_FCST_FILE_TYPE': 'NETCDF_PINT', }, {'METPLUS_FCST_FILE_TYPE': 'file_type = NETCDF_PINT;'}), + ({'POINT_STAT_SEEPS_P1_THRESH': 'gt4', }, + {'METPLUS_SEEPS_P1_THRESH': 'seeps_p1_thresh = gt4;'}), ] ) @pytest.mark.wrapper_a diff --git a/metplus/wrappers/grid_stat_wrapper.py b/metplus/wrappers/grid_stat_wrapper.py index 846ad3f9b3..666a148e63 100755 --- a/metplus/wrappers/grid_stat_wrapper.py +++ b/metplus/wrappers/grid_stat_wrapper.py @@ -51,6 +51,7 @@ class GridStatWrapper(CompareGriddedWrapper): 'METPLUS_FOURIER_DICT', 'METPLUS_CENSOR_THRESH', 'METPLUS_CENSOR_VAL', + 'METPLUS_SEEPS_P1_THRESH', ] # handle deprecated env vars used pre v4.0.0 @@ -274,6 +275,10 @@ def create_c_dict(self): data_type='list', extra_args={'remove_quotes': True}) + self.add_met_config(name='seeps_p1_thresh', + data_type='string', + extra_args={'remove_quotes': True}) + return c_dict def set_environment_variables(self, time_info): diff --git a/metplus/wrappers/point_stat_wrapper.py b/metplus/wrappers/point_stat_wrapper.py index 3115b0c80e..5b9abd8607 100755 --- a/metplus/wrappers/point_stat_wrapper.py +++ b/metplus/wrappers/point_stat_wrapper.py @@ -45,6 +45,7 @@ class PointStatWrapper(CompareGriddedWrapper): 'METPLUS_MESSAGE_TYPE_GROUP_MAP', 'METPLUS_FCST_FILE_TYPE', 'METPLUS_OBS_FILE_TYPE', + 'METPLUS_SEEPS_P1_THRESH', ] # handle deprecated env vars used pre v4.0.0 @@ -275,6 +276,10 @@ def create_c_dict(self): data_type='list', extra_args={'remove_quotes': True}) + self.add_met_config(name='seeps_p1_thresh', + data_type='string', + extra_args={'remove_quotes': True}) + if not c_dict['FCST_INPUT_TEMPLATE']: self.log_error('Must set FCST_POINT_STAT_INPUT_TEMPLATE ' 'in config file') diff --git a/parm/met_config/GridStatConfig_wrapped b/parm/met_config/GridStatConfig_wrapped index 29abe3a6d2..c3c382916e 100644 --- a/parm/met_config/GridStatConfig_wrapped +++ b/parm/met_config/GridStatConfig_wrapped @@ -174,6 +174,12 @@ ${METPLUS_OUTPUT_FLAG_DICT} // nc_pairs_flag = { ${METPLUS_NC_PAIRS_FLAG_DICT} +//////////////////////////////////////////////////////////////////////////////// +// Threshold for SEEPS p1 (Probability of being dry) + +//seeps_p1_thresh = +${METPLUS_SEEPS_P1_THRESH} + //////////////////////////////////////////////////////////////////////////////// //grid_weight_flag = diff --git a/parm/met_config/PointStatConfig_wrapped b/parm/met_config/PointStatConfig_wrapped index 6204a192e3..a65ff43b3a 100644 --- a/parm/met_config/PointStatConfig_wrapped +++ b/parm/met_config/PointStatConfig_wrapped @@ -160,6 +160,12 @@ ${METPLUS_HIRA_DICT} //output_flag = { ${METPLUS_OUTPUT_FLAG_DICT} +//////////////////////////////////////////////////////////////////////////////// +// Threshold for SEEPS p1 (Probability of being dry) + +//seeps_p1_thresh = +${METPLUS_SEEPS_P1_THRESH} + //////////////////////////////////////////////////////////////////////////////// tmp_dir = "${MET_TMP_DIR}"; diff --git a/parm/use_cases/met_tool_wrapper/GridStat/GridStat.conf b/parm/use_cases/met_tool_wrapper/GridStat/GridStat.conf index e35f9dd74c..ce378efb9b 100644 --- a/parm/use_cases/met_tool_wrapper/GridStat/GridStat.conf +++ b/parm/use_cases/met_tool_wrapper/GridStat/GridStat.conf @@ -167,6 +167,8 @@ GRID_STAT_OUTPUT_FLAG_ECLV = BOTH #GRID_STAT_OUTPUT_FLAG_NBRCNT = NONE GRID_STAT_OUTPUT_FLAG_GRAD = BOTH #GRID_STAT_OUTPUT_FLAG_DMAP = NONE +#GRID_STAT_OUTPUT_FLAG_SEEPS = + GRID_STAT_NC_PAIRS_FLAG_LATLON = FALSE GRID_STAT_NC_PAIRS_FLAG_RAW = FALSE @@ -179,6 +181,9 @@ GRID_STAT_NC_PAIRS_FLAG_CLIMO = FALSE #GRID_STAT_NC_PAIRS_FLAG_GRADIENT = FALSE #GRID_STAT_NC_PAIRS_FLAG_DISTANCE_MAP = FALSE GRID_STAT_NC_PAIRS_FLAG_APPLY_MASK = FALSE +#GRID_STAT_NC_PAIRS_FLAG_SEEPS = + +#GRID_STAT_SEEPS_P1_THRESH = #GRID_STAT_HSS_EC_VALUE = diff --git a/parm/use_cases/met_tool_wrapper/PointStat/PointStat.conf b/parm/use_cases/met_tool_wrapper/PointStat/PointStat.conf index 0a5d9e61fb..18c7fab310 100644 --- a/parm/use_cases/met_tool_wrapper/PointStat/PointStat.conf +++ b/parm/use_cases/met_tool_wrapper/PointStat/PointStat.conf @@ -134,6 +134,8 @@ POINT_STAT_OUTPUT_FLAG_VL1L2 = STAT #POINT_STAT_HSS_EC_VALUE = +#POINT_STAT_SEEPS_P1_THRESH = + OBS_POINT_STAT_WINDOW_BEGIN = -5400 OBS_POINT_STAT_WINDOW_END = 5400 From bcb312ff9cd0033d4211ebda8367ca7a9b7c1481 Mon Sep 17 00:00:00 2001 From: George McCabe <23407799+georgemccabe@users.noreply.github.com> Date: Thu, 17 Nov 2022 13:01:35 -0700 Subject: [PATCH 4/6] Update internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py Co-authored-by: johnhg --- .../tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py b/internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py index bdc8bc03f4..b813c28a45 100644 --- a/internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py +++ b/internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py @@ -701,7 +701,7 @@ def test_handle_climo_file_variables(metplus_config, config_overrides, ({'GRID_STAT_CENSOR_VAL': '12000, 5000', }, {'METPLUS_CENSOR_VAL': 'censor_val = [12000, 5000];'}), - ({'GRID_STAT_SEEPS_P1_THRESH': 'gt4', }, + ({'GRID_STAT_SEEPS_P1_THRESH': 'ge0.1&&le0.85', }, {'METPLUS_SEEPS_P1_THRESH': 'seeps_p1_thresh = gt4;'}), ] From 5d87ae0210ef268d06e35169d001efbb7bccec7f Mon Sep 17 00:00:00 2001 From: George McCabe <23407799+georgemccabe@users.noreply.github.com> Date: Thu, 17 Nov 2022 13:01:43 -0700 Subject: [PATCH 5/6] Update internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py Co-authored-by: johnhg --- .../tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py b/internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py index b813c28a45..280103c68e 100644 --- a/internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py +++ b/internal/tests/pytests/wrappers/grid_stat/test_grid_stat_wrapper.py @@ -702,7 +702,7 @@ def test_handle_climo_file_variables(metplus_config, config_overrides, {'METPLUS_CENSOR_VAL': 'censor_val = [12000, 5000];'}), ({'GRID_STAT_SEEPS_P1_THRESH': 'ge0.1&&le0.85', }, - {'METPLUS_SEEPS_P1_THRESH': 'seeps_p1_thresh = gt4;'}), + {'METPLUS_SEEPS_P1_THRESH': 'seeps_p1_thresh = ge0.1&&le0.85;'}), ] ) From ee24ef6f553ee12497c67f05ec04b993e8c354ea Mon Sep 17 00:00:00 2001 From: George McCabe <23407799+georgemccabe@users.noreply.github.com> Date: Thu, 17 Nov 2022 13:08:35 -0700 Subject: [PATCH 6/6] update point_stat test to use more realistic value --- .../pytests/wrappers/point_stat/test_point_stat_wrapper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/tests/pytests/wrappers/point_stat/test_point_stat_wrapper.py b/internal/tests/pytests/wrappers/point_stat/test_point_stat_wrapper.py index b650b57e45..ba262a2da0 100755 --- a/internal/tests/pytests/wrappers/point_stat/test_point_stat_wrapper.py +++ b/internal/tests/pytests/wrappers/point_stat/test_point_stat_wrapper.py @@ -468,8 +468,8 @@ def test_met_dictionary_in_var_options(metplus_config): {'METPLUS_FCST_FILE_TYPE': 'file_type = NETCDF_PINT;'}), ({'POINT_STAT_FCST_FILE_TYPE': 'NETCDF_PINT', }, {'METPLUS_FCST_FILE_TYPE': 'file_type = NETCDF_PINT;'}), - ({'POINT_STAT_SEEPS_P1_THRESH': 'gt4', }, - {'METPLUS_SEEPS_P1_THRESH': 'seeps_p1_thresh = gt4;'}), + ({'POINT_STAT_SEEPS_P1_THRESH': 'ge0.1&&le0.85', }, + {'METPLUS_SEEPS_P1_THRESH': 'seeps_p1_thresh = ge0.1&&le0.85;'}), ] ) @pytest.mark.wrapper_a