diff --git a/workflow/applications/applications.py b/workflow/applications/applications.py index 64440830c1..6a4d240fe5 100644 --- a/workflow/applications/applications.py +++ b/workflow/applications/applications.py @@ -79,18 +79,12 @@ 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 index 938a514896..e219032551 100644 --- a/workflow/applications/gfs_forecast_only.py +++ b/workflow/applications/gfs_forecast_only.py @@ -25,8 +25,7 @@ def _get_app_configs(self): configs += ['atmos_products'] if self.do_aero: - if not self._base['EXP_WARM_START']: - configs += ['aerosol_init'] + configs += ['aerosol_init'] if self.do_tracker: configs += ['tracker'] @@ -88,10 +87,9 @@ def get_task_names(self): tasks = ['stage_ic'] if self.do_aero: - aero_fcst_cdump = self._base.get('AERO_FCST_CDUMP', 'BOTH').lower() + aero_fcst_cdump = _base.get('AERO_FCST_CDUMP', 'BOTH').lower() if self._base['CDUMP'] in aero_fcst_cdump or aero_fcst_cdump == "both": - if not self._base['EXP_WARM_START']: - tasks += ['aerosol_init'] + tasks += ['aerosol_init'] if self.do_wave: tasks += ['waveinit'] diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py index c14c3e2898..530ea465c4 100644 --- a/workflow/rocoto/gfs_tasks.py +++ b/workflow/rocoto/gfs_tasks.py @@ -856,9 +856,7 @@ 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 and \ - not self._base['EXP_WARM_START']: + if self.app_config.do_aero and self.cdump in self.app_config.aero_fcst_cdumps: # Calculate offset based on CDUMP = gfs | gdas interval = None if self.cdump in ['gfs']: