Address reviewer's comments.

NOAA-EMC · Sep 27, 2024 · 3c08705 · 3c08705
1 parent 0bfbff7
commit 3c08705
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/workflow/rocoto/gfs_cycled_xml.py b/workflow/rocoto/gfs_cycled_xml.py
@@ -27,7 +27,7 @@ def get_cycledefs(self):
         if self._app_config.do_jedisnowda:
             sdate_snocvr = self._base['SDATE']
             edate_snocvr = self._base['EDATE']
-            interval_snocvr = to_timedelta(f"24:00:00H")
+            interval_snocvr = to_timedelta('24H')
             sdate_snocvr = sdate_snocvr + interval_snocvr
             sdate_snocvr_str = sdate_snocvr.replace(hour=0, minute=0, second=0).strftime("%Y%m%d%H%M")
             edate_snocvr_str = edate_snocvr.strftime("%Y%m%d%H%M")

diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py
@@ -571,14 +571,13 @@ def prepsnowcover(self):
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
-        cycledef = 'gdas_prep_snocvr'
         resources = self.get_resource('prepsnowcover')
         task_name = f'{self.run}prepsnowcover'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': self.envars,
-                     'cycledef': cycledef,
+                     'cycledef': 'gdas_prep_snocvr',
                      'command': f'{self.HOMEgfs}/jobs/rocoto/prepsnowcover.sh',
                      'job_name': f'{self.pslot}_{task_name}_@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
@@ -592,12 +591,11 @@ def prepsnowcover(self):
     def snowanl(self):
 
         deps = []
-        if f'@H' == '00':
-            dep_dict = {'type': 'task', 'name': f'{self.run}prepsnowcover'}
-        else:
-            dep_dict = {'type': 'task', 'name': f'{self.run}prep'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}prep'}
         deps.append(rocoto.add_dependency(dep_dict))
-        dependencies = rocoto.create_dependency(dep=deps)
+        dep_dict = {'type': 'task', 'name': f'{self.run}prepsnowcover'}
+        deps.append(rocoto.add_dependency(dep_dict))
+        dependencies = rocoto.create_dependency(dep_condition='or', dep=deps)
 
         resources = self.get_resource('snowanl')
         task_name = f'{self.run}snowanl'