diff --git a/docs/Users_Guide/glossary.rst b/docs/Users_Guide/glossary.rst index 514411f2f..3a0ea22c3 100644 --- a/docs/Users_Guide/glossary.rst +++ b/docs/Users_Guide/glossary.rst @@ -8653,3 +8653,13 @@ METplus Configuration Glossary Specify the value for 'output_stats.prc' in the MET configuration file for SeriesAnalysis. | *Used by:* SeriesAnalysis + + MODE_PS_PLOT_FLAG + Specify the value for 'ps_plot_flag' in the MET configuration file for MODE. + + | *Used by:* MODE + + MODE_CT_STATS_FLAG + Specify the value for 'ct_stats_flag' in the MET configuration file for MODE. + + | *Used by:* MODE diff --git a/docs/Users_Guide/wrappers.rst b/docs/Users_Guide/wrappers.rst index 03e97c8ad..5a6551c0e 100644 --- a/docs/Users_Guide/wrappers.rst +++ b/docs/Users_Guide/wrappers.rst @@ -3941,6 +3941,8 @@ METplus Configuration | :term:`MODE_INTEREST_FUNCTION_CENTROID_DIST` | :term:`MODE_INTEREST_FUNCTION_BOUNDARY_DIST` | :term:`MODE_INTEREST_FUNCTION_CONVEX_HULL_DIST` +| :term:`MODE_PS_PLOT_FLAG` +| :term:`MODE_CT_STATS_FLAG` | :term:`FCST_MODE_VAR_NAME` (optional) | :term:`FCST_MODE_VAR_LEVELS` (optional) | :term:`FCST_MODE_VAR_THRESH` (optional) @@ -4455,7 +4457,27 @@ see :ref:`How METplus controls MET config file settings`. * - :term:`MODE_TOTAL_INTEREST_THRESH` - total_interest_thresh +**${METPLUS_PS_PLOT_FLAG}** +.. list-table:: + :widths: 5 5 + :header-rows: 0 + + * - METplus Config(s) + - MET Config File + * - :term:`MODE_PS_PLOT_FLAG` + - ps_plot_flag + +**${METPLUS_CT_STATS_FLAG}** + +.. list-table:: + :widths: 5 5 + :header-rows: 0 + + * - METplus Config(s) + - MET Config File + * - :term:`MODE_CT_STATS_FLAG` + - ct_stats_flag .. _mtd_wrapper: diff --git a/internal_tests/pytests/mode/test_mode_wrapper.py b/internal_tests/pytests/mode/test_mode_wrapper.py index 8c4144fd6..4ee11d41e 100644 --- a/internal_tests/pytests/mode/test_mode_wrapper.py +++ b/internal_tests/pytests/mode/test_mode_wrapper.py @@ -302,7 +302,10 @@ def set_minimum_config_settings(config): '(0.0, 2.0) ' '200.0/grid_res, 1.0)' ');')}), - + ({'MODE_PS_PLOT_FLAG': 'True', }, + {'METPLUS_PS_PLOT_FLAG': 'ps_plot_flag = TRUE;'}), + ({'MODE_CT_STATS_FLAG': 'True', }, + {'METPLUS_CT_STATS_FLAG': 'ct_stats_flag = TRUE;'}), ] ) def test_mode_single_field(metplus_config, config_overrides, diff --git a/metplus/wrappers/mode_wrapper.py b/metplus/wrappers/mode_wrapper.py index af4237c4d..23f958ac1 100755 --- a/metplus/wrappers/mode_wrapper.py +++ b/metplus/wrappers/mode_wrapper.py @@ -56,6 +56,8 @@ class MODEWrapper(CompareGriddedWrapper): 'METPLUS_INTEREST_FUNCTION_CENTROID_DIST', 'METPLUS_INTEREST_FUNCTION_BOUNDARY_DIST', 'METPLUS_INTEREST_FUNCTION_CONVEX_HULL_DIST', + 'METPLUS_PS_PLOT_FLAG', + 'METPLUS_CT_STATS_FLAG', ] WEIGHTS = { @@ -347,6 +349,13 @@ def create_c_dict(self): } ) + self.add_met_config(name='ps_plot_flag', + data_type='bool') + + self.add_met_config(name='ct_stats_flag', + data_type='bool') + + c_dict['ALLOW_MULTIPLE_FILES'] = False c_dict['MERGE_CONFIG_FILE'] = ( diff --git a/parm/met_config/MODEConfig_wrapped b/parm/met_config/MODEConfig_wrapped index 5f0442add..a5ae8e4d4 100644 --- a/parm/met_config/MODEConfig_wrapped +++ b/parm/met_config/MODEConfig_wrapped @@ -210,12 +210,15 @@ plot_gcarc_flag = FALSE; // // NetCDF matched pairs, PostScript, and contingency table output files // -ps_plot_flag = TRUE; +//ps_plot_flag = +${METPLUS_PS_PLOT_FLAG} //nc_pairs_flag = { ${METPLUS_NC_PAIRS_FLAG_DICT} -ct_stats_flag = TRUE; +//ct_stats_flag = +${METPLUS_CT_STATS_FLAG} + //////////////////////////////////////////////////////////////////////////////// diff --git a/parm/use_cases/met_tool_wrapper/MODE/MODE.conf b/parm/use_cases/met_tool_wrapper/MODE/MODE.conf index 35bc4c2f6..6cbc26952 100644 --- a/parm/use_cases/met_tool_wrapper/MODE/MODE.conf +++ b/parm/use_cases/met_tool_wrapper/MODE/MODE.conf @@ -1,7 +1,5 @@ [config] -# MODE METplus Configuration - PROCESS_LIST = MODE LOOP_ORDER = times @@ -119,3 +117,6 @@ MODE_GRID_RES = 40 #MODE_NC_PAIRS_FLAG_POLYLINES = MODE_QUILT = True + +#MODE_PS_PLOT_FLAG = +#MODE_CT_STATS_FLAG =