Adds GDAS GEMPAK jobs to rocoto task mesh

jobs/rocoto/gempak.sh

@@ -5,13 +5,13 @@ source "${HOMEgfs}/ush/preamble.sh"
 ###############################################################
 . "${HOMEgfs}/ush/load_fv3gfs_modules.sh"
 status=$?
-[[ ${status} -ne 0 ]] && exit ${status}
+if (( status != 0 )); then exit "${status}"; fi
 
 export job="gempak"
 export jobid="${job}.$$"
 
 # Execute the JJOB
-${HOMEgfs}/jobs/JGFS_ATMOS_GEMPAK
+"${HOMEgfs}/jobs/J${RUN^^}_ATMOS_GEMPAK"
 
 status=$?
-exit ${status}
+exit "${status}"

jobs/rocoto/gempakmeta.sh

@@ -0,0 +1,17 @@
+#! /usr/bin/env bash
+
+source "${HOMEgfs}/ush/preamble.sh"
+
+###############################################################
+. "${HOMEgfs}/ush/load_fv3gfs_modules.sh"
+status=$?
+if (( status != 0 )); then exit "${status}"; fi
+
+export job="gempakmeta"
+export jobid="${job}.$$"
+
+# Execute the JJOB
+"${HOMEgfs}/jobs/JGFS_ATMOS_GEMPAK_META"
+
+status=$?
+exit "${status}"

jobs/rocoto/gempakmetancdc.sh

@@ -0,0 +1,17 @@
+#! /usr/bin/env bash
+
+source "${HOMEgfs}/ush/preamble.sh"
+
+###############################################################
+. "${HOMEgfs}/ush/load_fv3gfs_modules.sh"
+status=$?
+if (( status != 0 )); then exit "${status}"; fi
+
+export job="gempakmetancdc"
+export jobid="${job}.$$"
+
+# Execute the JJOB
+"${HOMEgfs}/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC"
+
+status=$?
+exit "${status}"

jobs/rocoto/gempakncdcupapgif.sh

@@ -0,0 +1,17 @@
+#! /usr/bin/env bash
+
+source "${HOMEgfs}/ush/preamble.sh"
+
+###############################################################
+. "${HOMEgfs}/ush/load_fv3gfs_modules.sh"
+status=$?
+if (( status != 0 )); then exit "${status}"; fi
+
+export job="gempakncdcupapgif"
+export jobid="${job}.$$"
+
+# Execute the JJOB
+"${HOMEgfs}/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF"
+
+status=$?
+exit "${status}"

jobs/rocoto/gempakpgrb2spec.sh

@@ -0,0 +1,17 @@
+#! /usr/bin/env bash
+
+source "${HOMEgfs}/ush/preamble.sh"
+
+###############################################################
+. "${HOMEgfs}/ush/load_fv3gfs_modules.sh"
+status=$?
+if (( status != 0 )); then exit "${status}"; fi
+
+export job="gempakpgrb2spec"
+export jobid="${job}.$$"
+
+# Execute the JJOB
+"${HOMEgfs}/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC"
+
+status=$?
+exit "${status}"

jobs/rocoto/npoess.sh

@@ -7,7 +7,7 @@ source "${HOMEgfs}/ush/preamble.sh"
 status=$?
 if (( status != 0 )); then exit "${status}"; fi
 
-export job="npoess"
+export job="npoess_pgrb2_0p5deg"
 export jobid="${job}.$$"
 
 # Execute the JJOB

workflow/applications/applications.py

@@ -61,7 +61,6 @@ def __init__(self, conf: Configuration) -> None:
         self.do_genesis = _base.get('DO_GENESIS', True)
         self.do_genesis_fsu = _base.get('DO_GENESIS_FSU', False)
         self.do_metp = _base.get('DO_METP', False)
-        self.do_npoess = _base.get('DO_NPOESS', False)
         self.do_upp = not _base.get('WRITE_DOPOST', True)
 
         self.do_hpssarch = _base.get('HPSSARCH', False)

workflow/applications/gfs_cycled.py

@@ -89,9 +89,6 @@ def _get_app_configs(self):
         if self.do_awips:
             configs += ['awips']
 
-        if self.do_npoess:
-            configs += ['npoess']
-
         if self.do_wave:
             configs += ['waveinit', 'waveprep', 'wavepostsbs', 'wavepostpnt']
             if self.do_wave_bnd:
@@ -187,6 +184,10 @@ def get_task_names(self):
         if self.do_vminmon:
             gdas_tasks += ['vminmon']
 
+        if self.do_gempak:
+            gdas_tasks += ['gempak']
+            gdas_tasks += ['gempakmetancdc']
+
         gdas_tasks += gdas_gfs_common_cleanup_tasks
 
         # Collect "gfs" cycle tasks
@@ -230,12 +231,16 @@ def get_task_names(self):
 
         if self.do_gempak:
             gfs_tasks += ['gempak']
+            gfs_tasks += ['gempakmeta']
+            gfs_tasks += ['gempakncdcupapgif']
+            gfs_tasks += ['gempakpgrb2spec']
+            gfs_tasks += ['npoess_pgrb2_0p5deg']
 
         if self.do_awips:
             gfs_tasks += ['awips_20km_1p0deg', 'awips_g2', 'fbwinds']
 
-        if self.do_npoess:
-            gfs_tasks += ['npoess']
+        if self.do_wafs:
+            gfs_tasks += ['wafs', 'wafsgcip', 'wafsgrib2', 'wafsgrib20p25', 'wafsblending', 'wafsblending0p25']
 
         gfs_tasks += gdas_gfs_common_cleanup_tasks
 

workflow/applications/gfs_forecast_only.py

@@ -129,6 +129,23 @@ def get_task_names(self):
             if self.do_awips:
                 tasks += ['waveawipsbulls', 'waveawipsgridded']
 
+        if self.do_bufrsnd:
+            tasks += ['postsnd']
+
+        if self.do_gempak:
+            tasks += ['gempak']
+            tasks += ['gempakmeta']
+            tasks += ['gempakncdcupapgif']
+            tasks += ['gempakpgrb2spec']
+
+        if self.do_awips:
+            tasks += ['awips_20km_1p0deg']
+            tasks += ['awips_g2']
+            tasks += ['fbwinds']
+
+        if self.do_wafs:
+            tasks += ['wafs', 'wafsgcip', 'wafsgrib2', 'wafsgrib20p25', 'wafsblending', 'wafsblending0p25']
+
         tasks += ['arch', 'cleanup']  # arch and cleanup **must** be the last tasks
 
         return {f"{self._base['CDUMP']}": tasks}

workflow/rocoto/gfs_tasks.py

@@ -935,15 +935,58 @@ def gempak(self):
 
         return task
 
-    def npoess(self):
+    def gempakmeta(self):
+        deps = []
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}post'}
+        deps.append(rocoto.add_dependency(dep_dict))
+        dependencies = rocoto.create_dependency(dep=deps)
+
+        resources = self.get_resource('gempak')
+        task = create_wf_task('gempakmeta', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies)
+
+        return task
+
+    def gempakmetancdc(self):
+        deps = []
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}post'}
+        deps.append(rocoto.add_dependency(dep_dict))
+        dependencies = rocoto.create_dependency(dep=deps)
+
+        resources = self.get_resource('gempak')
+        task = create_wf_task('gempakmetancdc', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies)
+
+        return task
+
+    def gempakncdcupapgif(self):
+        deps = []
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}post'}
+        deps.append(rocoto.add_dependency(dep_dict))
+        dependencies = rocoto.create_dependency(dep=deps)
+
+        resources = self.get_resource('gempak')
+        task = create_wf_task('gempakncdcupapgif', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies)
+
+        return task
+
+    def gempakpgrb2spec(self):
+        deps = []
+        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}npoess_pgrb2_0p5deg'}
+        dependencies = rocoto.create_dependency(dep=deps)
+
+        resources = self.get_resource('gempak')
+        task = create_wf_task('gempakpgrb2spec', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies)
+
+        return task
+
+    def npoess_pgrb2_0p5deg(self):
 
         deps = []
         dep_dict = {'type': 'task', 'name': f'{self.cdump}atmanlprod'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
         resources = self.get_resource('npoess')
-        task = create_wf_task('npoess', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies)
+        task = create_wf_task('npoess_pgrb2_0p5deg', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies)
 
         return task
 

workflow/rocoto/tasks.py

@@ -25,10 +25,10 @@ class Tasks:
                    'verfozn', 'verfrad', 'vminmon',
                    'metp',
                    'tracker', 'genesis', 'genesis_fsu',
-                   'postsnd', 'awips_g2', 'awips_20km_1p0deg', 'fbwinds', 'gempak',
+                   'postsnd', 'awips_g2', 'awips_20km_1p0deg', 'fbwinds', 'gempak', 'gempakmeta', 'gempakmetancdc',
+                   'gempakncdcupapgif', 'gempakpgrb2spec', 'npoess_pgrb2_0p5deg',
                    'waveawipsbulls', 'waveawipsgridded', 'wavegempak', 'waveinit',
-                   'wavepostbndpnt', 'wavepostbndpntbll', 'wavepostpnt', 'wavepostsbs', 'waveprep',
-                   'npoess']
+                   'wavepostbndpnt', 'wavepostbndpntbll', 'wavepostpnt', 'wavepostsbs', 'waveprep']
 
     def __init__(self, app_config: AppConfig, cdump: str) -> None: