Skip to content

Commit

Permalink
Clean up remaining bugs in fcst segment update
Browse files Browse the repository at this point in the history
  • Loading branch information
WalterKolczynski-NOAA committed Jul 26, 2024
1 parent 47d3346 commit eb17358
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions workflow/rocoto/gefs_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ def wavepostsbs(self):

def wavepostbndpnt(self):
deps = []
dep_dict = {'type': 'task', 'name': f'fcst_mem#member#'}
dep_dict = {'type': 'metatask', 'name': f'fcst_mem#member#'}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep=deps)

Expand Down Expand Up @@ -450,7 +450,7 @@ def wavepostbndpntbll(self):
dep_dict = {'type': 'data', 'data': data}
deps.append(rocoto.add_dependency(dep_dict))

dep_dict = {'type': 'task', 'name': f'fcst_mem#member#'}
dep_dict = {'type': 'metatask', 'name': f'fcst_mem#member#'}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep_condition='or', dep=deps)

Expand Down Expand Up @@ -486,7 +486,7 @@ def wavepostbndpntbll(self):

def wavepostpnt(self):
deps = []
dep_dict = {'type': 'task', 'name': f'fcst_mem#member#'}
dep_dict = {'type': 'metatask', 'name': f'fcst_mem#member#'}
deps.append(rocoto.add_dependency(dep_dict))
if self.app_config.do_wave_bnd:
dep_dict = {'type': 'task', 'name': f'wave_post_bndpnt_bull_mem#member#'}
Expand Down
8 changes: 4 additions & 4 deletions workflow/rocoto/gfs_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ def ocnanalprep(self):
deps.append(rocoto.add_dependency(dep_dict))
dep_dict = {'type': 'task', 'name': f'{self.cdump}marinebmat'}
deps.append(rocoto.add_dependency(dep_dict))
dep_dict = {'type': 'task', 'name': 'gdasfcst', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
dep_dict = {'type': 'metatask', 'name': 'gdasfcst', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)

Expand Down Expand Up @@ -952,7 +952,7 @@ def _fcst_cycled(self):
num_fcst_segments = 1

fcst_vars = self.envars.copy()
fcst_envars_dict = {'FCST_SEGMENT', '#seg#'}
fcst_envars_dict = {'FCST_SEGMENT': '#seg#'}
for key, value in fcst_envars_dict.items():
fcst_vars.append(rocoto.create_envar(name=key, value=str(value)))

Expand Down Expand Up @@ -2554,7 +2554,7 @@ def ecen(self):
def _get_ecengroups():

if self._base.get('DOIAU_ENKF', False):
fhrs = list(self._base.get('IAUFHRS', '6').split(','))
fhrs = self._base.get('IAUFHRS', '[6]')

necengrp = self._configs['ecen']['NECENGRP']
ngrps = necengrp if len(fhrs) > necengrp else len(fhrs)
Expand Down Expand Up @@ -2696,7 +2696,7 @@ def echgres(self):
self._is_this_a_gdas_task(self.cdump, 'echgres')

deps = []
dep_dict = {'type': 'task', 'name': f'{self.cdump.replace("enkf","")}fcst'}
dep_dict = {'type': 'metatask', 'name': f'{self.cdump.replace("enkf","")}fcst'}
deps.append(rocoto.add_dependency(dep_dict))
dep_dict = {'type': 'task', 'name': f'{self.cdump}fcst_mem001'}
deps.append(rocoto.add_dependency(dep_dict))
Expand Down

0 comments on commit eb17358

Please sign in to comment.