Update obsproc and prepobs versions

- Update to obsproc/v1.2.0 and prepobs/v1.1.0 - Revert back to glopara installs on Orion/Hercules - Remove default version for obsproc in config.base Refs NOAA-EMC#2291 Refs NOAA-EMC#2840 Refs NOAA-EMC#2841
KateFriedman-NOAA · Aug 26, 2024 · 7008246 · 7008246
1 parent ea22a73
commit 7008246
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/modulefiles/module_base.hercules.lua b/modulefiles/module_base.hercules.lua
@@ -43,12 +43,10 @@ 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/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"))
+prepend_path("MODULEPATH", pathJoin"/work/noaa/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("/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"))
+prepend_path("MODULEPATH", pathJoin("/work/noaa/global/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,7 +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("/lfs5/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,12 +42,10 @@ 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/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"))
+prepend_path("MODULEPATH", pathJoin"/work/noaa/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("/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"))
+prepend_path("MODULEPATH", pathJoin("/work/noaa/global/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/parm/config/gfs/config.base b/parm/config/gfs/config.base
@@ -95,7 +95,7 @@ export MODE="@MODE@" # cycled/forecast-only
 # Build paths relative to $HOMEgfs
 export FIXgsi="${HOMEgfs}/fix/gsi"
 export HOMEpost="${HOMEgfs}"
-export HOMEobsproc="${BASE_GIT:-}/obsproc/v${obsproc_run_ver:-1.1.2}"
+export HOMEobsproc="${BASE_GIT:-}/obsproc/v${obsproc_run_ver}"
 
 # CONVENIENT utility scripts and other environment parameters
 export NCP="/bin/cp -p"

diff --git a/versions/run.spack.ver b/versions/run.spack.ver
@@ -28,8 +28,8 @@ export met_ver=9.1.3
 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.2
+export obsproc_run_ver=1.2.0
+export prepobs_run_ver=1.1.0
 
 export ens_tracker_ver=feature-GFSv17_com_reorg
 export fit2obs_ver=1.1.2
diff --git a/versions/run.wcoss2.ver b/versions/run.wcoss2.ver
@@ -44,8 +44,8 @@ export metplus_ver=3.1.1
 
 # Development-only below
 
-export obsproc_run_ver=1.1.2
-export prepobs_run_ver=1.0.2
+export obsproc_run_ver=1.2.0
+export prepobs_run_ver=1.1.0
 
 export ens_tracker_ver=feature-GFSv17_com_reorg
 export fit2obs_ver=1.1.2