Revert "Revert "Address issues in creating XML for GFS forecast-only …

…with app S2SWA (NOAA-EMC#2757)"" This reverts commit a3928d2.
DavidNew-NOAA · Jul 18, 2024 · b6c4316 · b6c4316
1 parent a3928d2
commit b6c4316
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/workflow/applications/applications.py b/workflow/applications/applications.py
@@ -79,12 +79,18 @@ def __init__(self, conf: Configuration) -> None:
                 self.wave_cdumps = [wave_cdump]
 
         self.aero_anl_cdumps = None
+        self.aero_fcst_cdumps = None
         if self.do_aero:
             aero_anl_cdump = _base.get('AERO_ANL_CDUMP', 'BOTH').lower()
             if aero_anl_cdump in ['both']:
                 self.aero_anl_cdumps = ['gfs', 'gdas']
             elif aero_anl_cdump in ['gfs', 'gdas']:
                 self.aero_anl_cdumps = [aero_anl_cdump]
+            aero_fcst_cdump = _base.get('AERO_FCST_CDUMP', None).lower()
+            if aero_fcst_cdump in ['both']:
+                self.aero_fcst_cdumps = ['gfs', 'gdas']
+            elif aero_fcst_cdump in ['gfs', 'gdas']:
+                self.aero_fcst_cdumps = [aero_fcst_cdump]
 
     def _init_finalize(self, conf: Configuration):
         print("Finalizing initialize")

diff --git a/workflow/applications/gfs_forecast_only.py b/workflow/applications/gfs_forecast_only.py
@@ -25,7 +25,8 @@ def _get_app_configs(self):
             configs += ['atmos_products']
 
             if self.do_aero:
-                configs += ['aerosol_init']
+                if not self._base['EXP_WARM_START']:
+                    configs += ['aerosol_init']
 
             if self.do_tracker:
                 configs += ['tracker']
@@ -87,9 +88,10 @@ def get_task_names(self):
         tasks = ['stage_ic']
 
         if self.do_aero:
-            aero_fcst_cdump = _base.get('AERO_FCST_CDUMP', 'BOTH').lower()
+            aero_fcst_cdump = self._base.get('AERO_FCST_CDUMP', 'BOTH').lower()
             if self._base['CDUMP'] in aero_fcst_cdump or aero_fcst_cdump == "both":
-                tasks += ['aerosol_init']
+                if not self._base['EXP_WARM_START']:
+                    tasks += ['aerosol_init']
 
         if self.do_wave:
             tasks += ['waveinit']

diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py
@@ -856,7 +856,9 @@ def _fcst_forecast_only(self):
             dep_dict = {'type': 'task', 'name': f'{self.cdump}{wave_job}'}
             dependencies.append(rocoto.add_dependency(dep_dict))
 
-        if self.app_config.do_aero and self.cdump in self.app_config.aero_fcst_cdumps:
+        if self.app_config.do_aero and \
+           self.cdump in self.app_config.aero_fcst_cdumps and \
+           not self._base['EXP_WARM_START']:
             # Calculate offset based on CDUMP = gfs | gdas
             interval = None
             if self.cdump in ['gfs']: