From 766a5a04901222008c6b4b06324eedb7494db252 Mon Sep 17 00:00:00 2001 From: George McCabe <23407799+georgemccabe@users.noreply.github.com> Date: Mon, 30 Dec 2024 11:00:27 -0700 Subject: [PATCH] fix bug introduced with recent changes and run use cases that failed to test that the fix is correct --- .github/parm/use_case_groups.json | 4 ++-- metplus/wrappers/series_analysis_wrapper.py | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/parm/use_case_groups.json b/.github/parm/use_case_groups.json index c4a3b5b7c..9489b85c3 100644 --- a/.github/parm/use_case_groups.json +++ b/.github/parm/use_case_groups.json @@ -184,7 +184,7 @@ { "category": "s2s", "index_list": "0", - "run": false + "run": true }, { "category": "s2s", @@ -204,7 +204,7 @@ { "category": "s2s", "index_list": "4", - "run": false + "run": true }, { "category": "s2s", diff --git a/metplus/wrappers/series_analysis_wrapper.py b/metplus/wrappers/series_analysis_wrapper.py index 4a98e91ef..1276ee388 100755 --- a/metplus/wrappers/series_analysis_wrapper.py +++ b/metplus/wrappers/series_analysis_wrapper.py @@ -158,13 +158,14 @@ def create_c_dict(self): data_types=('FCST', 'OBS'), app_name=self.app_name) - self.get_input_templates(c_dict, { + input_info = { 'FCST': {'prefix': 'FCST_SERIES_ANALYSIS', 'required': False}, 'OBS': {'prefix': 'OBS_SERIES_ANALYSIS', 'required': False}, 'BOTH': {'prefix': 'BOTH_SERIES_ANALYSIS', 'required': False}, 'TC_STAT': {'prefix': 'SERIES_ANALYSIS_TC_STAT', 'required': False}, 'AGGR': {'prefix': 'SERIES_ANALYSIS_AGGR', 'required': False}, - }) + } + self.get_input_templates(c_dict, input_info) self._handle_fcst_obs_or_both_c_dict(c_dict) @@ -299,8 +300,8 @@ def _handle_fcst_obs_or_both_c_dict(self, c_dict): extra_args={'remove_quotes': True} ) - c_dict['USING_BOTH'] = (c_dict['BOTH_INPUT_TEMPLATE'] or - c_dict.get('BOTH_INPUT_FILE_LIST')) + c_dict['USING_BOTH'] = bool(c_dict['BOTH_INPUT_TEMPLATE'] or + c_dict.get('BOTH_INPUT_FILE_LIST')) if c_dict['USING_BOTH']: @@ -564,7 +565,7 @@ def get_files_from_time(self, time_info): file_dict = {'time_info': time_info.copy()} if self.c_dict['USING_BOTH']: fcst_files = self.find_input_files(time_info, 'BOTH') - obs_files = fcst_files + obs_files = fcst_files.copy() else: fcst_files = self.find_input_files(time_info, 'FCST') obs_files = self.find_input_files(time_info, 'OBS')