Feature 1166 series analysis field info

docs/Users_Guide/glossary.rst

@@ -8694,6 +8694,26 @@ METplus Configuration Glossary
 
      | *Used by:* All
 
+   FCST_SERIES_ANALYSIS_CAT_THRESH
+     Specify the value for 'fcst.cat_thresh' in the MET configuration file for SeriesAnalysis.
+
+     | *Used by:* SeriesAnalysis
+
+   OBS_SERIES_ANALYSIS_CAT_THRESH
+     Specify the value for 'obs.cat_thresh' in the MET configuration file for SeriesAnalysis.
+
+     | *Used by:* SeriesAnalysis
+
+   SERIES_ANALYSIS_CLIMO_MEAN_FILE_TYPE
+     Specify the value for 'climo_mean.file_type' in the MET configuration file for SeriesAnalysis.
+
+     | *Used by:* SeriesAnalysis
+
+   SERIES_ANALYSIS_CLIMO_STDEV_FILE_TYPE
+     Specify the value for 'climo_stdev.file_type' in the MET configuration file for SeriesAnalysis.
+
+     | *Used by:* SeriesAnalysis
+
    OMP_NUM_THREADS
      Sets environment variable of the same name that determines the number
      of threads to use in the MET executables. Defaults to 1 thread.

docs/Users_Guide/wrappers.rst

@@ -5871,6 +5871,7 @@ METplus Configuration
 | :term:`SERIES_ANALYSIS_CLIMO_MEAN_MATCH_MONTH`
 | :term:`SERIES_ANALYSIS_CLIMO_MEAN_DAY_INTERVAL`
 | :term:`SERIES_ANALYSIS_CLIMO_MEAN_HOUR_INTERVAL`
+| :term:`SERIES_ANALYSIS_CLIMO_MEAN_FILE_TYPE`
 | :term:`SERIES_ANALYSIS_CLIMO_STDEV_FILE_NAME`
 | :term:`SERIES_ANALYSIS_CLIMO_STDEV_FIELD`
 | :term:`SERIES_ANALYSIS_CLIMO_STDEV_REGRID_METHOD`
@@ -5881,6 +5882,7 @@ METplus Configuration
 | :term:`SERIES_ANALYSIS_CLIMO_STDEV_MATCH_MONTH`
 | :term:`SERIES_ANALYSIS_CLIMO_STDEV_DAY_INTERVAL`
 | :term:`SERIES_ANALYSIS_CLIMO_STDEV_HOUR_INTERVAL`
+| :term:`SERIES_ANALYSIS_CLIMO_STDEV_FILE_TYPE`
 | :term:`SERIES_ANALYSIS_HSS_EC_VALUE`
 | :term:`SERIES_ANALYSIS_OUTPUT_STATS_FHO`
 | :term:`SERIES_ANALYSIS_OUTPUT_STATS_CTC`
@@ -5894,6 +5896,8 @@ METplus Configuration
 | :term:`SERIES_ANALYSIS_OUTPUT_STATS_PSTD`
 | :term:`SERIES_ANALYSIS_OUTPUT_STATS_PJC`
 | :term:`SERIES_ANALYSIS_OUTPUT_STATS_PRC`
+| :term:`FCST_SERIES_ANALYSIS_CAT_THRESH`
+| :term:`OBS_SERIES_ANALYSIS_CAT_THRESH`
 |
 
 .. warning:: **DEPRECATED:**
@@ -6076,6 +6080,8 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
      - climo_mean.day_interval
    * - :term:`SERIES_ANALYSIS_CLIMO_MEAN_HOUR_INTERVAL`
      - climo_mean.hour_interval
+   * - :term:`SERIES_ANALYSIS_CLIMO_MEAN_FILE_TYPE`
+     - climo_mean.file_type
 
 **${METPLUS_CLIMO_STDEV_DICT}**
 
@@ -6105,6 +6111,8 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
      - climo_stdev.day_interval
    * - :term:`SERIES_ANALYSIS_CLIMO_STDEV_HOUR_INTERVAL`
      - climo_stdev.hour_interval
+   * - :term:`SERIES_ANALYSIS_CLIMO_STDEV_FILE_TYPE`
+     - climo_stdev.file_type
 
 
 **${METPLUS_BLOCK_SIZE}**
@@ -6184,6 +6192,28 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
    * - :term:`SERIES_ANALYSIS_OUTPUT_STATS_PRC`
      - output_stats.prc
 
+**${METPLUS_FCST_CAT_THRESH}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`FCST_SERIES_ANALYSIS_CAT_THRESH`
+     - fcst.cat_thresh
+
+**${METPLUS_OBS_CAT_THRESH}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`OBS_SERIES_ANALYSIS_CAT_THRESH`
+     - obs.cat_thresh
+
 
 SeriesByInit
 ============

internal_tests/pytests/series_analysis/test_series_analysis.py

@@ -270,6 +270,11 @@ def set_minimum_config_settings(config):
                                         'pstd = ["RMSE10", "FBAR", "OBAR"];'
                                         'pjc = ["RMSE11", "FBAR", "OBAR"];'
                                         'prc = ["RMSE12", "FBAR", "OBAR"];}')}),
+        ({'SERIES_ANALYSIS_FCST_CAT_THRESH': '>=0.0, >=0.3, >=1.0', },
+         {'METPLUS_FCST_CAT_THRESH': 'cat_thresh = [>=0.0, >=0.3, >=1.0];'}),
+
+        ({'SERIES_ANALYSIS_OBS_CAT_THRESH': '<=CDP33', },
+         {'METPLUS_OBS_CAT_THRESH': 'cat_thresh = [<=CDP33];'}),
 
     ]
 )
@@ -738,29 +743,23 @@ def test_create_ascii_storm_files_list(metplus_config, config_overrides,
         leads = lead_group[1]
     else:
         leads = None
-    fcst_list_file = wrapper.get_ascii_filename('FCST', storm_id, leads)
+    fcst_list_file = wrapper._get_ascii_filename('FCST', storm_id, leads)
     fcst_file_path = os.path.join(output_dir,
                                   output_prefix,
                                   fcst_list_file)
     if os.path.exists(fcst_file_path):
         os.remove(fcst_file_path)
 
-    obs_list_file = wrapper.get_ascii_filename('OBS', storm_id, leads)
+    obs_list_file = wrapper._get_ascii_filename('OBS', storm_id, leads)
     obs_file_path = os.path.join(output_dir,
                                   output_prefix,
                                   obs_list_file)
     if os.path.exists(obs_file_path):
         os.remove(obs_file_path)
 
-    # perform string substitution on var list
-    wrapper.c_dict['VAR_LIST'] = (
-        sub_var_list(wrapper.c_dict['VAR_LIST_TEMP'],
-                     time_info)
-    )
-
-    fcst_path, obs_path = wrapper.create_ascii_storm_files_list(time_info,
-                                                                storm_id,
-                                                                lead_group)
+    fcst_path, obs_path = wrapper._create_ascii_storm_files_list(time_info,
+                                                                 storm_id,
+                                                                 lead_group)
     assert(fcst_path == fcst_file_path and obs_path == obs_file_path)
 
     with open(fcst_file_path, 'r') as file_handle:
@@ -813,7 +812,7 @@ def test_get_ascii_filename(metplus_config, storm_id, leads,
                             expected_result):
     wrapper = series_analysis_wrapper(metplus_config)
     for data_type in ['FCST', 'OBS']:
-        actual_result = wrapper.get_ascii_filename(data_type,
+        actual_result = wrapper._get_ascii_filename(data_type,
                                                    storm_id,
                                                    leads)
         assert(actual_result == f"{data_type}{expected_result}")
@@ -822,7 +821,7 @@ def test_get_ascii_filename(metplus_config, storm_id, leads,
             return
 
         lead_seconds = [ti_get_seconds_from_lead(item) for item in leads]
-        actual_result = wrapper.get_ascii_filename(data_type,
+        actual_result = wrapper._get_ascii_filename(data_type,
                                                    storm_id,
                                                    lead_seconds)
         assert(actual_result == f"{data_type}{expected_result}")
@@ -865,7 +864,7 @@ def test_get_netcdf_min_max(metplus_config):
                             'tc_data',
                             'basin_global_tenth_degree.nc')
     variable_name = 'basin'
-    min, max = wrapper.get_netcdf_min_max(filepath, variable_name)
+    min, max = wrapper._get_netcdf_min_max(filepath, variable_name)
     assert(min == expected_min)
     assert(max == expected_max)
 

metplus/util/string_template_substitution.py

@@ -773,8 +773,8 @@ def add_date_matches_to_output_dict(match_dict, output_dict, time_type, valid_sh
     time_values = {
         'Y': -1,
         'y': -1,
-        'm': -1,
-        'd': -1,
+        'm': 1,
+        'd': 1,
         'j': -1,
         'H': 0,
         'M': 0,

metplus/wrappers/command_builder.py

@@ -993,12 +993,15 @@ def find_and_check_output_file(self, time_info=None,
             output_path = do_string_sub(output_path,
                                         **time_info)
 
+        # replace wildcard character * with all
+        output_path.replace('*', 'all')
+
         skip_if_output_exists = self.c_dict.get('SKIP_IF_OUTPUT_EXISTS', False)
 
         # get directory that the output file will exist
         if is_directory:
             parent_dir = output_path
-            if time_info:
+            if time_info and time_info['valid'] != '*':
                 valid_format = time_info['valid'].strftime('%Y%m%d_%H%M%S')
             else:
                 valid_format = ''
@@ -1523,6 +1526,7 @@ def handle_climo_dict(self):
             'match_month': ('bool', 'uppercase'),
             'day_interval': 'int',
             'hour_interval': 'int',
+            'file_type': ('string', 'remove_quotes'),
         }
         for climo_type in self.climo_types:
             dict_name = f'climo_{climo_type.lower()}'