Skip to content

Commit

Permalink
fix bug introduced with recent changes and run use cases that failed …
Browse files Browse the repository at this point in the history
…to test that the fix is correct
  • Loading branch information
georgemccabe committed Dec 30, 2024
1 parent a6dfac7 commit 766a5a0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/parm/use_case_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
{
"category": "s2s",
"index_list": "0",
"run": false
"run": true
},
{
"category": "s2s",
Expand All @@ -204,7 +204,7 @@
{
"category": "s2s",
"index_list": "4",
"run": false
"run": true
},
{
"category": "s2s",
Expand Down
11 changes: 6 additions & 5 deletions metplus/wrappers/series_analysis_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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']:

Expand Down Expand Up @@ -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')
Expand Down

0 comments on commit 766a5a0

Please sign in to comment.