From eb17358237d4fc5d04c685acf98906cc6cd8f73e Mon Sep 17 00:00:00 2001
From: "Walter.Kolczynski" <Walter.Kolczynski@noaa.gov>
Date: Thu, 25 Jul 2024 17:31:07 -0500
Subject: [PATCH] Clean up remaining bugs in fcst segment update

---
 workflow/rocoto/gefs_tasks.py | 6 +++---
 workflow/rocoto/gfs_tasks.py  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/workflow/rocoto/gefs_tasks.py b/workflow/rocoto/gefs_tasks.py
index 7c04cf8dba..2da47f2512 100644
--- a/workflow/rocoto/gefs_tasks.py
+++ b/workflow/rocoto/gefs_tasks.py
@@ -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)
 
@@ -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)
 
@@ -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#'}
diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py
index bc5ef6bfe9..f48e594c74 100644
--- a/workflow/rocoto/gfs_tasks.py
+++ b/workflow/rocoto/gfs_tasks.py
@@ -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)
 
@@ -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)))
 
@@ -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)
@@ -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))