From 7588d2bd17ef345216ae096d088b5470b6f31bcd Mon Sep 17 00:00:00 2001 From: Kate Friedman Date: Tue, 17 Sep 2024 20:59:59 -0400 Subject: [PATCH] Update to obsproc/v1.2.0 and prepobs/v1.1.0 (#2903) This PR updates the `develop` branch to use the newer operational `obsproc/v1.2.0` and `prepobs/v1.1.0`. The obsproc/prepobs installs in glopara space on supported platforms use tags cut from the `dev/gfsv17` branches in the respective repos. The installation of `prepobs/v1.1.0` on WCOSS2 is called "gfsv17_v1.1.0" to help avoid GFSv16 users using it instead of the operational module. Also, the `HOMEobsproc` path is updated to set an empty default for `obsproc_run_ver`. This both removes the need to set a default (and constantly update it, which is duplication) and avoid the unset variable error when the fcst jobs use their own load module script that does not know `obsproc_run_ver`: ``` export HOMEobsproc="${BASE_GIT:-}/obsproc/v${obsproc_run_ver:-}" ``` This PR also reverts the prepobs and fit2obs installs on MSU back to the glopara space from the temporary `/work/noaa/global/kfriedma/glopara` space installs. Lastly, this PR also includes updates to complete issue #2844 (merge `build.spack.ver` and `run.spack.ver`). Resolves #2291 Resolves #2840 Resolves #2844 --- modulefiles/module_base.gaea.lua | 6 ++---- modulefiles/module_base.hercules.lua | 6 ++---- modulefiles/module_base.jet.lua | 2 +- modulefiles/module_base.orion.lua | 6 ++---- modulefiles/module_base.wcoss2.lua | 2 +- parm/config/gfs/config.base | 2 +- versions/build.gaea.ver | 3 +-- versions/build.hera.ver | 2 +- versions/build.hercules.ver | 2 +- versions/build.jet.ver | 2 +- versions/build.noaacloud.ver | 2 +- versions/build.orion.ver | 2 +- versions/build.s4.ver | 2 +- versions/build.spack.ver | 27 --------------------------- versions/run.gaea.ver | 2 +- versions/run.hera.ver | 2 +- versions/run.hercules.ver | 3 +-- versions/run.jet.ver | 2 +- versions/run.noaacloud.ver | 2 +- versions/run.orion.ver | 3 +-- versions/run.s4.ver | 2 +- versions/run.wcoss2.ver | 6 +++--- versions/{run.spack.ver => spack.ver} | 17 ++++++++++++++--- workflow/hosts/orion.yaml | 2 +- 24 files changed, 41 insertions(+), 66 deletions(-) delete mode 100644 versions/build.spack.ver rename versions/{run.spack.ver => spack.ver} (68%) diff --git a/modulefiles/module_base.gaea.lua b/modulefiles/module_base.gaea.lua index b08e79c274..f379225380 100644 --- a/modulefiles/module_base.gaea.lua +++ b/modulefiles/module_base.gaea.lua @@ -38,10 +38,8 @@ load(pathJoin("py-xarray", (os.getenv("py_xarray_ver") or "None"))) setenv("WGRIB2","wgrib2") setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None")) ---prepend_path("MODULEPATH", pathJoin("/gpfs/f5/ufs-ard/world-shared/global/glopara/data/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("/gpfs/f5/ufs-ard/world-shared/global/glopara/data/git/prepobs/v1.1.0", "modulefiles")) -load(pathJoin("prepobs", "1.1.0")) +prepend_path("MODULEPATH", pathJoin("/gpfs/f5/ufs-ard/world-shared/global/glopara/data/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("/gpfs/f5/ufs-ard/world-shared/global/glopara/data/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles")) load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None"))) diff --git a/modulefiles/module_base.hercules.lua b/modulefiles/module_base.hercules.lua index fdc5f58698..4245b0d6f9 100644 --- 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_rocky9/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_rocky9/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 index 76320688b0..2f00c301df 100644 --- 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 index 5cee9e5e31..e7b51ed563 100644 --- 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_rocky9/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_rocky9/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.wcoss2.lua b/modulefiles/module_base.wcoss2.lua index 49d5abc678..830ea78b05 100644 --- a/modulefiles/module_base.wcoss2.lua +++ b/modulefiles/module_base.wcoss2.lua @@ -36,7 +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/gfsv17_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/parm/config/gfs/config.base b/parm/config/gfs/config.base index 81b18030fa..784c334d82 100644 --- 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/build.gaea.ver b/versions/build.gaea.ver index b92fe8c1db..8b6e641eb6 100644 --- a/versions/build.gaea.ver +++ b/versions/build.gaea.ver @@ -1,6 +1,5 @@ export stack_intel_ver=2023.1.0 export stack_cray_mpich_ver=8.1.25 export spack_env=gsi-addon-dev - -source "${HOMEgfs:-}/versions/run.spack.ver" +source "${HOMEgfs:-}/versions/spack.ver" export spack_mod_path="/ncrc/proj/epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" diff --git a/versions/build.hera.ver b/versions/build.hera.ver index 337d5c32da..70afb90a29 100644 --- a/versions/build.hera.ver +++ b/versions/build.hera.ver @@ -1,5 +1,5 @@ export stack_intel_ver=2021.5.0 export stack_impi_ver=2021.5.1 export spack_env=gsi-addon-dev-rocky8 -source "${HOMEgfs:-}/versions/build.spack.ver" +source "${HOMEgfs:-}/versions/spack.ver" export spack_mod_path="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" diff --git a/versions/build.hercules.ver b/versions/build.hercules.ver index cab0c92111..2d7185d5e7 100644 --- a/versions/build.hercules.ver +++ b/versions/build.hercules.ver @@ -2,5 +2,5 @@ export stack_intel_ver=2021.9.0 export stack_impi_ver=2021.9.0 export intel_mkl_ver=2023.1.0 export spack_env=gsi-addon-env -source "${HOMEgfs:-}/versions/build.spack.ver" +source "${HOMEgfs:-}/versions/spack.ver" export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" diff --git a/versions/build.jet.ver b/versions/build.jet.ver index 55c0ea0bd1..e103725d41 100644 --- a/versions/build.jet.ver +++ b/versions/build.jet.ver @@ -1,5 +1,5 @@ export stack_intel_ver=2021.5.0 export stack_impi_ver=2021.5.1 export spack_env=gsi-addon-dev -source "${HOMEgfs:-}/versions/build.spack.ver" +source "${HOMEgfs:-}/versions/spack.ver" export spack_mod_path="/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" diff --git a/versions/build.noaacloud.ver b/versions/build.noaacloud.ver index ba47313675..fc288b76b5 100644 --- a/versions/build.noaacloud.ver +++ b/versions/build.noaacloud.ver @@ -1,5 +1,5 @@ export stack_intel_ver=2021.3.0 export stack_impi_ver=2021.3.0 export spack_env=gsi-addon-env -source "${HOMEgfs:-}/versions/build.spack.ver" +source "${HOMEgfs:-}/versions/spack.ver" export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core" diff --git a/versions/build.orion.ver b/versions/build.orion.ver index 834ecfc166..29e02f0873 100644 --- a/versions/build.orion.ver +++ b/versions/build.orion.ver @@ -1,5 +1,5 @@ export stack_intel_ver=2021.9.0 export stack_impi_ver=2021.9.0 export spack_env=gsi-addon-env-rocky9 -source "${HOMEgfs:-}/versions/build.spack.ver" +source "${HOMEgfs:-}/versions/spack.ver" export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" diff --git a/versions/build.s4.ver b/versions/build.s4.ver index e2731ccfb3..e2641c124f 100644 --- a/versions/build.s4.ver +++ b/versions/build.s4.ver @@ -1,5 +1,5 @@ export stack_intel_ver=2021.5.0 export stack_impi_ver=2021.5.0 export spack_env=gsi-addon-env -source "${HOMEgfs:-}/versions/build.spack.ver" +source "${HOMEgfs:-}/versions/spack.ver" export spack_mod_path="/data/prod/jedi/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" diff --git a/versions/build.spack.ver b/versions/build.spack.ver deleted file mode 100644 index 808f85dd16..0000000000 --- a/versions/build.spack.ver +++ /dev/null @@ -1,27 +0,0 @@ -export spack_stack_ver=1.6.0 - -export cmake_ver=3.23.1 - -export jasper_ver=2.0.32 -export libpng_ver=1.6.37 -export zlib_ver=1.2.13 -export esmf_ver=8.5.0 -export fms_ver=2023.02.01 - -export hdf5_ver=1.14.0 -export netcdf_c_ver=4.9.2 -export netcdf_fortran_ver=4.6.1 - -export bacio_ver=2.4.1 -export nemsio_ver=2.5.4 -export sigio_ver=2.3.2 -export w3emc_ver=2.10.0 -export bufr_ver=11.7.0 -export g2_ver=3.4.5 -export sp_ver=2.5.0 -export ip_ver=4.3.0 -export gsi_ncdiag_ver=1.1.2 -export g2tmpl_ver=1.10.2 -export crtm_ver=2.4.0.1 -export wgrib2_ver=2.0.8 -export grib_util_ver=1.3.0 diff --git a/versions/run.gaea.ver b/versions/run.gaea.ver index c3aceb445d..81aa70df57 100644 --- a/versions/run.gaea.ver +++ b/versions/run.gaea.ver @@ -4,5 +4,5 @@ export spack_env=gsi-addon-dev export perl_ver=5.38.2 -source "${HOMEgfs:-}/versions/run.spack.ver" +source "${HOMEgfs:-}/versions/spack.ver" export spack_mod_path="/ncrc/proj/epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" diff --git a/versions/run.hera.ver b/versions/run.hera.ver index 34f81bfe96..6ebc64d9f2 100644 --- a/versions/run.hera.ver +++ b/versions/run.hera.ver @@ -9,5 +9,5 @@ export R_ver=3.6.1 export gempak_ver=7.17.0 export perl_ver=5.38.0 -source "${HOMEgfs:-}/versions/run.spack.ver" +source "${HOMEgfs:-}/versions/spack.ver" export spack_mod_path="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" diff --git a/versions/run.hercules.ver b/versions/run.hercules.ver index ee8e4f8aea..2d7185d5e7 100644 --- a/versions/run.hercules.ver +++ b/versions/run.hercules.ver @@ -2,6 +2,5 @@ export stack_intel_ver=2021.9.0 export stack_impi_ver=2021.9.0 export intel_mkl_ver=2023.1.0 export spack_env=gsi-addon-env - -source "${HOMEgfs:-}/versions/run.spack.ver" +source "${HOMEgfs:-}/versions/spack.ver" export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" diff --git a/versions/run.jet.ver b/versions/run.jet.ver index 3aa586ee42..1e41fd0036 100644 --- a/versions/run.jet.ver +++ b/versions/run.jet.ver @@ -10,5 +10,5 @@ export gempak_ver=7.4.2 # Adding perl as a module; With Rocky8, perl packages will not be from the OS export perl_ver=5.38.0 -source "${HOMEgfs:-}/versions/run.spack.ver" +source "${HOMEgfs:-}/versions/spack.ver" export spack_mod_path="/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" diff --git a/versions/run.noaacloud.ver b/versions/run.noaacloud.ver index 4c9ac3cd42..1fc3779b2e 100644 --- a/versions/run.noaacloud.ver +++ b/versions/run.noaacloud.ver @@ -2,7 +2,7 @@ export stack_intel_ver=2021.3.0 export stack_impi_ver=2021.3.0 export spack_env=gsi-addon-env -source "${HOMEgfs:-}/versions/run.spack.ver" +source "${HOMEgfs:-}/versions/spack.ver" export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core" export cdo_ver=2.2.0 diff --git a/versions/run.orion.ver b/versions/run.orion.ver index 112636fb20..29e02f0873 100644 --- a/versions/run.orion.ver +++ b/versions/run.orion.ver @@ -1,6 +1,5 @@ export stack_intel_ver=2021.9.0 export stack_impi_ver=2021.9.0 export spack_env=gsi-addon-env-rocky9 - -source "${HOMEgfs:-}/versions/run.spack.ver" +source "${HOMEgfs:-}/versions/spack.ver" export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" diff --git a/versions/run.s4.ver b/versions/run.s4.ver index 6d0f4cbaca..43e690e19b 100644 --- a/versions/run.s4.ver +++ b/versions/run.s4.ver @@ -4,5 +4,5 @@ export spack_env=gsi-addon-env export ncl_ver=6.4.0-precompiled -source "${HOMEgfs:-}/versions/run.spack.ver" +source "${HOMEgfs:-}/versions/spack.ver" export spack_mod_path="/data/prod/jedi/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" diff --git a/versions/run.wcoss2.ver b/versions/run.wcoss2.ver index 7f653dd50e..f5b11b3a6f 100644 --- a/versions/run.wcoss2.ver +++ b/versions/run.wcoss2.ver @@ -44,10 +44,10 @@ 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 +export fit2obs_ver=1.1.4 export mos_ver=5.4.3 export mos_shared_ver=2.7.2 diff --git a/versions/run.spack.ver b/versions/spack.ver similarity index 68% rename from versions/run.spack.ver rename to versions/spack.ver index 4a17d0ef27..1f553134f0 100644 --- a/versions/run.spack.ver +++ b/versions/spack.ver @@ -1,8 +1,12 @@ export spack_stack_ver=1.6.0 +export cmake_ver=3.23.1 export python_ver=3.11.6 export jasper_ver=2.0.32 export libpng_ver=1.6.37 +export zlib_ver=1.2.13 +export esmf_ver=8.5.0 +export fms_ver=2023.02.01 export cdo_ver=2.2.0 export nco_ver=5.0.6 @@ -10,7 +14,14 @@ export hdf5_ver=1.14.0 export netcdf_c_ver=4.9.2 export netcdf_fortran_ver=4.6.1 +export bacio_ver=2.4.1 +export nemsio_ver=2.5.4 +export sigio_ver=2.3.2 +export w3emc_ver=2.10.0 export bufr_ver=11.7.0 +export g2_ver=3.4.5 +export sp_ver=2.5.0 +export ip_ver=4.3.0 export gsi_ncdiag_ver=1.1.2 export g2tmpl_ver=1.10.2 export crtm_ver=2.4.0.1 @@ -29,8 +40,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 +export fit2obs_ver=1.1.4 diff --git a/workflow/hosts/orion.yaml b/workflow/hosts/orion.yaml index 81daea6168..4ec78fc8cc 100644 --- a/workflow/hosts/orion.yaml +++ b/workflow/hosts/orion.yaml @@ -1,4 +1,4 @@ -BASE_GIT: '/work/noaa/global/glopara/git' +BASE_GIT: '/work/noaa/global/glopara/git_rocky9' DMPDIR: '/work/noaa/rstprod/dump' BASE_IC: '/work/noaa/global/glopara/data/ICSDIR' PACKAGEROOT: '/work/noaa/global/glopara/nwpara'