Merge branch 'feature/snow-ensemble' of https://github.com/corymartin…

…-noaa/global-workflow into feature/snow-ensemble
NOAA-EMC · Jul 17, 2024 · 591fe9d · 591fe9d
2 parents 4a2af93 + 2a1e544
commit 591fe9d
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 17 deletions.
diff --git a/modulefiles/module_base.hera.lua b/modulefiles/module_base.hera.lua
@@ -47,8 +47,7 @@ setenv("WGRIB2","wgrib2")
 setenv("WGRIB","wgrib")
 setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
---prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
-prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/dev-gfsv17/modulefiles"))
+prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
 
 prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))

diff --git a/modulefiles/module_base.hercules.lua b/modulefiles/module_base.hercules.lua
@@ -43,10 +43,12 @@ setenv("WGRIB2","wgrib2")
 setenv("WGRIB","wgrib")
 setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
-prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
+--prepend_path("MODULEPATH", pathJoin"/work/noaa/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles")
+prepend_path("MODULEPATH", pathJoin("/work/noaa/global/kfriedma/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
 
-prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
+--prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
+prepend_path("MODULEPATH", pathJoin("/work/noaa/global/kfriedma/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
 load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None")))
 
 whatis("Description: GFS run environment")
diff --git a/modulefiles/module_base.jet.lua b/modulefiles/module_base.jet.lua
@@ -49,8 +49,7 @@ setenv("WGRIB2","wgrib2")
 setenv("WGRIB","wgrib")
 setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
---prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
-prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
+prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
 
 prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))

diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua
@@ -42,7 +42,7 @@ setenv("WGRIB2","wgrib2")
 setenv("WGRIB","wgrib")
 setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 
---prepend_path("MODULEPATH", "/work/noaa/global/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles")
+--prepend_path("MODULEPATH", pathJoin"/work/noaa/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles")
 prepend_path("MODULEPATH", pathJoin("/work/noaa/global/kfriedma/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
 

diff --git a/modulefiles/module_base.wcoss2.lua b/modulefiles/module_base.wcoss2.lua
@@ -36,8 +36,7 @@ setenv("HPC_OPT", "/apps/ops/para/libs")
 load(pathJoin("met", (os.getenv("met_ver") or "None")))
 load(pathJoin("metplus", (os.getenv("metplus_ver") or "None")))
 
---prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
-prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
+prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
 load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
 
 prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))

diff --git a/versions/run.spack.ver b/versions/run.spack.ver
@@ -29,7 +29,7 @@ export metplus_ver=3.1.1
 export py_xarray_ver=2023.7.0
 
 export obsproc_run_ver=1.1.2
-export prepobs_run_ver=1.0.1
+export prepobs_run_ver=1.0.2
 
 export ens_tracker_ver=feature-GFSv17_com_reorg
-export fit2obs_ver=1.1.1
+export fit2obs_ver=1.1.2
diff --git a/versions/run.wcoss2.ver b/versions/run.wcoss2.ver
@@ -45,9 +45,9 @@ export metplus_ver=3.1.1
 # Development-only below
 
 export obsproc_run_ver=1.1.2
-export prepobs_run_ver=1.0.1
+export prepobs_run_ver=1.0.2
 
 export ens_tracker_ver=feature-GFSv17_com_reorg
-export fit2obs_ver=1.0.0
+export fit2obs_ver=1.1.2
 export mos_ver=5.4.3
 export mos_shared_ver=2.7.2
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
@@ -883,7 +883,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']: