add ocean ice prodgen for gefs

parm/config/gefs/config.oceanice_products

@@ -0,0 +1 @@
+../gfs/config.oceanice_products

parm/config/gefs/config.resources

@@ -224,6 +224,14 @@ case ${step} in
     export is_exclusive=True
     ;;
 
+  "oceanice_products")
+    export wtime_oceanice_products="00:15:00"
+    export npe_oceanice_products=1
+    export npe_node_oceanice_products=1
+    export nth_oceanice_products=1
+    export memory_oceanice_products="96GB"
+    ;;
+
   "stage_ic")
     export wtime_stage_ic="00:15:00"
     export npe_stage_ic=1

parm/config/gfs/config.resources

@@ -645,7 +645,7 @@ case ${step} in
     ;;
 
   "oceanice_products")
-    export wtime_oceanice_products="00:30:00"
+    export wtime_oceanice_products="00:15:00"
     export npe_oceanice_products=1
     export npe_node_oceanice_products=1
     export nth_oceanice_products=1

workflow/applications/gefs.py

@@ -22,6 +22,9 @@ def _get_app_configs(self):
         if self.do_wave:
             configs += ['waveinit']
 
+        if self.do_ocean or self.do_ice:
+            configs += ['oceanice_products']
+
         return configs
 
     @staticmethod
@@ -47,4 +50,10 @@ def get_task_names(self):
 
         tasks += ['atmos_prod']
 
+        if self.do_ocean:
+            tasks += ['ocean_prod']
+
+        if self.do_ice:
+            tasks += ['ice_prod']
+
         return {f"{self._base['CDUMP']}": tasks}

workflow/rocoto/gefs_tasks.py

@@ -160,47 +160,74 @@ def efcs(self):
         return task
 
     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)
+        return self._atmosoceaniceprod('atmos')
+
+    def ocean_prod(self):
+        return self._atmosoceaniceprod('ocean')
+
+    def ice_prod(self):
+        return self._atmosoceaniceprod('ice')
+
+    def _atmosoceaniceprod(self, component: str):
+
+        products_dict = {'atmos': {'config': 'atmos_products',
+                                   'history_path_tmpl': 'COM_ATMOS_MASTER_TMPL',
+                                   'history_file_tmpl': f'{self.cdump}.t@Hz.master.grb2#dep#'},
+                         'ocean': {'config': 'oceanice_products',
+                                   'history_path_tmpl': 'COM_OCEAN_HISTORY_TMPL',
+                                   'history_file_tmpl': f'{self.cdump}.ocean.t@Hz.6hr_avg.#dep#.nc'},
+                         'ice': {'config': 'oceanice_products',
+                                 'history_path_tmpl': 'COM_ICE_HISTORY_TMPL',
+                                 'history_file_tmpl': f'{self.cdump}.ice.t@Hz.6hr_avg.#dep#.nc'}}
 
-        atmos_prod_envars = self.envars.copy()
+        component_dict = products_dict[component]
+        config = component_dict['config']
+        history_path_tmpl = component_dict['history_path_tmpl']
+        history_file_tmpl = component_dict['history_file_tmpl']
+
+        varname1, varname2, varname3 = 'grp', 'dep', 'lst'
+        varval1, varval2, varval3 = self._get_ufs_postproc_grps(self.cdump, self._configs[config], component=component)
+        var_dict = {varname1: varval1, varname2: varval2, varname3: varval3}
+
+        postenvars = self.envars.copy()
         postenvar_dict = {'ENSMEM': '#member#',
                           'MEMDIR': 'mem#member#',
                           'FHRLST': '#fhr#',
-                          }
+                          'COMPONENT': component}
         for key, value in postenvar_dict.items():
-            atmos_prod_envars.append(rocoto.create_envar(name=key, value=str(value)))
+            postenvars.append(rocoto.create_envar(name=key, value=str(value)))
 
-        resources = self.get_resource('atmos_products')
+        resources = self.get_resource(component_dict['config'])
+
+        history_path = self._template_to_rocoto_cycstring(self._base[history_path_tmpl])
+        deps = []
+        data = f'{history_path}/{history_file_tmpl}'
+        dep_dict = {'type': 'data', 'data': data, 'age': 120}
+        deps.append(rocoto.add_dependency(dep_dict))
+        dependencies = rocoto.create_dependency(dep=deps)
 
-        task_name = f'atmos_prod_mem#member#_f#fhr#'
+        task_name = f'{component}_prod_mem#member#_f#fhr#'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
-                     'envars': atmos_prod_envars,
+                     'envars': postenvars,
                      'cycledef': 'gefs',
-                     'command': f'{self.HOMEgfs}/jobs/rocoto/atmos_products.sh',
+                     'command': f'{self.HOMEgfs}/jobs/rocoto/{config}.sh',
                      'job_name': f'{self.pslot}_{task_name}_@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
                      }
 
         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': 'atmos_prod_#member#',
+                                         self._get_forecast_hours('gefs', self._configs[config])])}
+        fhr_metatask_dict = {'task_name': f'{component}_prod_#member#',
                              'task_dict': task_dict,
-                             'var_dict': fhr_var_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': 'atmos_prod',
+        member_metatask_dict = {'task_name': f'{component}_prod',
                                 'task_dict': fhr_metatask_dict,
-                                'var_dict': member_var_dict
-                                }
+                                'var_dict': member_var_dict}
 
         task = rocoto.create_task(member_metatask_dict)
 

workflow/rocoto/gfs_tasks.py

@@ -1070,7 +1070,7 @@ def _atmosoceaniceprod(self, component: str):
                      'maxtries': '&MAXTRIES;'
                      }
 
-        metatask_dict = {'task_name': f'{self.cdump}{component}prod',
+        metatask_dict = {'task_name': f'{self.cdump}{component}_prod',
                          'task_dict': task_dict,
                          'var_dict': var_dict
                          }