rename {component}{prod} to {component}_{prod}. add ocean/ice product…

…s for RUN=gfs in cycled

workflow/applications/gefs.py

@@ -45,6 +45,6 @@ def get_task_names(self):
         if self.nens > 0:
             tasks += ['efcs']
 
-        tasks += ['atmosprod']
+        tasks += ['atmos_prod']
 
         return {f"{self._base['CDUMP']}": tasks}

workflow/applications/gfs_cycled.py

@@ -175,7 +175,7 @@ def get_task_names(self):
 
         if self.do_upp:
             gdas_tasks += ['atmupp']
-        gdas_tasks += ['atmosprod']
+        gdas_tasks += ['atmos_prod']
 
         if self.do_wave and 'gdas' in self.wave_cdumps:
             if self.do_wave_bnd:
@@ -207,9 +207,15 @@ def get_task_names(self):
 
         gfs_tasks += ['atmanlupp', 'atmanlprod', 'fcst']
 
+        if self.do_ocean:
+            gfs_tasks += ['ocean_prod']
+
+        if self.do_ice:
+            gfs_tasks += ['ice_prod']
+
         if self.do_upp:
             gfs_tasks += ['atmupp']
-        gfs_tasks += ['atmosprod']
+        gfs_tasks += ['atmos_prod']
 
         if self.do_goes:
             gfs_tasks += ['goesupp']

workflow/applications/gfs_forecast_only.py

@@ -100,7 +100,7 @@ def get_task_names(self):
             if self.do_upp:
                 tasks += ['atmupp']
 
-            tasks += ['atmosprod']
+            tasks += ['atmos_prod']
 
             if self.do_goes:
                 tasks += ['goesupp']
@@ -127,10 +127,10 @@ def get_task_names(self):
                 tasks += ['awips_20km_1p0deg', 'awips_g2', 'fbwind']
 
         if self.do_ocean:
-            tasks += ['oceanprod']
+            tasks += ['ocean_prod']
 
         if self.do_ice:
-            tasks += ['iceprod']
+            tasks += ['ice_prod']
 
         if self.do_wave:
             if self.do_wave_bnd:

workflow/rocoto/gefs_tasks.py

@@ -159,29 +159,29 @@ def efcs(self):
 
         return task
 
-    def atmosprod(self):
+    def atmos_prod(self):
         atm_master_path = self._template_to_rocoto_cycstring(self._base["COM_ATMOS_MASTER_TMPL"], {'MEMDIR': 'mem#member#'})
         deps = []
         data = f'{atm_master_path}/{self.cdump}.t@Hz.master.grb2f#fhr#'
         dep_dict = {'type': 'data', 'data': data, 'age': 120}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
-        atmosprod_envars = self.envars.copy()
+        atmos_prod_envars = self.envars.copy()
         postenvar_dict = {'ENSMEM': '#member#',
                           'MEMDIR': 'mem#member#',
                           'FHRLST': '#fhr#',
                           }
         for key, value in postenvar_dict.items():
-            atmosprod_envars.append(rocoto.create_envar(name=key, value=str(value)))
+            atmos_prod_envars.append(rocoto.create_envar(name=key, value=str(value)))
 
         resources = self.get_resource('atmos_products')
 
-        task_name = f'atmosprod_mem#member#_f#fhr#'
+        task_name = f'atmos_prod_mem#member#_f#fhr#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
-                     'envars': atmosprod_envars,
+                     'envars': atmos_prod_envars,
                      'cycledef': 'gefs',
                      'command': f'{self.HOMEgfs}/jobs/rocoto/atmos_products.sh',
                      'job_name': f'{self.pslot}_{task_name}_@H',
@@ -191,13 +191,13 @@ def atmosprod(self):
 
         fhr_var_dict = {'fhr': ' '.join([str(fhr).zfill(3) for fhr in
                                          self._get_forecast_hours('gefs', self._configs['atmos_products'])])}
-        fhr_metatask_dict = {'task_name': 'atmosprod_#member#',
+        fhr_metatask_dict = {'task_name': 'atmos_prod_#member#',
                              'task_dict': task_dict,
                              'var_dict': fhr_var_dict
                              }
 
         member_var_dict = {'member': ' '.join([str(mem).zfill(3) for mem in range(0, self.nmem + 1)])}
-        member_metatask_dict = {'task_name': 'atmosprod',
+        member_metatask_dict = {'task_name': 'atmos_prod',
                                 'task_dict': fhr_metatask_dict,
                                 'var_dict': member_var_dict
                                 }

workflow/rocoto/gfs_tasks.py

@@ -99,7 +99,7 @@ def prep(self):
         gfs_enkf = True if self.app_config.do_hybvar and 'gfs' in self.app_config.eupd_cdumps else False
 
         deps = []
-        dep_dict = {'type': 'metatask', 'name': 'gdasatmosprod', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
+        dep_dict = {'type': 'metatask', 'name': 'gdasatmos_prod', 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
         deps.append(rocoto.add_dependency(dep_dict))
         data = f'{atm_hist_path}/gdas.t@Hz.atmf009.nc'
         dep_dict = {'type': 'data', 'data': data, 'offset': f"-{timedelta_to_HMS(self._base['cycle_interval'])}"}
@@ -1014,13 +1014,13 @@ def _upptask(self, upp_run="forecast", task_id="atmupp"):
 
         return task
 
-    def atmosprod(self):
+    def atmos_prod(self):
         return self._atmosoceaniceprod('atmos')
 
-    def oceanprod(self):
+    def ocean_prod(self):
         return self._atmosoceaniceprod('ocean')
 
-    def iceprod(self):
+    def ice_prod(self):
         return self._atmosoceaniceprod('ice')
 
     def _atmosoceaniceprod(self, component: str):
@@ -1058,7 +1058,7 @@ def _atmosoceaniceprod(self, component: str):
         cycledef = 'gdas_half,gdas' if self.cdump in ['gdas'] else self.cdump
         resources = self.get_resource(component_dict['config'])
 
-        task_name = f'{self.cdump}{component}prod#{varname1}#'
+        task_name = f'{self.cdump}{component}_prod#{varname1}#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
@@ -1349,7 +1349,7 @@ def _get_awipsgroups(cdump, config):
     def awips_20km_1p0deg(self):
 
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmosprod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -1390,7 +1390,7 @@ def awips_20km_1p0deg(self):
     def awips_g2(self):
 
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmosprod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -1431,7 +1431,7 @@ def awips_g2(self):
     def gempak(self):
 
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmosprod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -1454,7 +1454,7 @@ def gempak(self):
 
     def gempakmeta(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmosprod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -1477,7 +1477,7 @@ def gempakmeta(self):
 
     def gempakmetancdc(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmosprod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -1500,7 +1500,7 @@ def gempakmetancdc(self):
 
     def gempakncdcupapgif(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmosprod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -1639,7 +1639,7 @@ def vminmon(self):
 
     def tracker(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmosprod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -1662,7 +1662,7 @@ def tracker(self):
 
     def genesis(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmosprod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -1685,7 +1685,7 @@ def genesis(self):
 
     def genesis_fsu(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmosprod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -1708,7 +1708,7 @@ def genesis_fsu(self):
 
     def fit2obs(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmosprod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -1773,7 +1773,7 @@ def metp(self):
 
     def mos_stn_prep(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmosprod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -1796,7 +1796,7 @@ def mos_stn_prep(self):
 
     def mos_grd_prep(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmosprod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -1819,7 +1819,7 @@ def mos_grd_prep(self):
 
     def mos_ext_stn_prep(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmosprod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -1842,7 +1842,7 @@ def mos_ext_stn_prep(self):
 
     def mos_ext_grd_prep(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmosprod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -2160,7 +2160,7 @@ def arch(self):
             dep_dict = {'type': 'task', 'name': f'{self.cdump}genesis_fsu'}
             deps.append(rocoto.add_dependency(dep_dict))
         # Post job dependencies
-        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmosprod'}
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}atmos_prod'}
         deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_wave:
             dep_dict = {'type': 'task', 'name': f'{self.cdump}wavepostsbs'}
@@ -2171,12 +2171,12 @@ def arch(self):
                 dep_dict = {'type': 'task', 'name': f'{self.cdump}wavepostbndpnt'}
                 deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_ocean:
-            if self.app_config.mode in ['forecast-only']:
-                dep_dict = {'type': 'metatask', 'name': f'{self.cdump}oceanprod'}
+            if self.cdump in ['gfs']:
+                dep_dict = {'type': 'metatask', 'name': f'{self.cdump}ocean_prod'}
                 deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_ice:
-            if self.app_config.mode in ['forecast-only']:
-                dep_dict = {'type': 'metatask', 'name': f'{self.cdump}iceprod'}
+            if self.cdump in ['gfs']:
+                dep_dict = {'type': 'metatask', 'name': f'{self.cdump}ice_prod'}
                 deps.append(rocoto.add_dependency(dep_dict))
         # MOS job dependencies
         if self.cdump in ['gfs'] and self.app_config.do_mos: