Update modulefiles, submodules to spack-stack 1.6.0. NOAA-EMC#2195

kayeekayee · Jan 19, 2024 · 21ff645 · 21ff645
1 parent c590476
commit 21ff645
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 32 deletions.
diff --git a/modulefiles/module_gwci.hera.lua b/modulefiles/module_gwci.hera.lua
@@ -2,7 +2,7 @@ help([[
 Load environment to run GFS workflow setup scripts on Hera
 ]])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon/install/modulefiles/Core")
 
 load(pathJoin("stack-intel", os.getenv("2021.5.0")))
 load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.5.1")))

diff --git a/modulefiles/module_gwci.hercules.lua b/modulefiles/module_gwci.hercules.lua
@@ -2,7 +2,7 @@ help([[
 Load environment to run GFS workflow ci scripts on Hercules
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon/install/modulefiles/Core")
 
 load(pathJoin("stack-intel", os.getenv("2021.9.0")))
 load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.9.0")))

diff --git a/modulefiles/module_gwci.orion.lua b/modulefiles/module_gwci.orion.lua
@@ -2,7 +2,7 @@ help([[
 Load environment to run GFS workflow ci scripts on Orion
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon/install/modulefiles/Core")
 
 load(pathJoin("stack-intel", os.getenv("2022.0.2")))
 load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.5.1")))

diff --git a/modulefiles/module_gwsetup.hera.lua b/modulefiles/module_gwsetup.hera.lua
@@ -4,10 +4,10 @@ Load environment to run GFS workflow setup scripts on Hera
 
 load(pathJoin("rocoto"))
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon/install/modulefiles/Core")
 
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
-local python_ver=os.getenv("python_ver") or "3.10.8"
+local python_ver=os.getenv("python_ver") or "3.11.6"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("python", python_ver))

diff --git a/modulefiles/module_gwsetup.hercules.lua b/modulefiles/module_gwsetup.hercules.lua
@@ -5,10 +5,10 @@ Load environment to run GFS workflow ci scripts on Hercules
 load(pathJoin("contrib","0.1"))
 load(pathJoin("rocoto","1.3.5"))
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon/install/modulefiles/Core")
 
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
-local python_ver=os.getenv("python_ver") or "3.10.8"
+local python_ver=os.getenv("python_ver") or "3.11.6"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("python", python_ver))

diff --git a/modulefiles/module_gwsetup.jet.lua b/modulefiles/module_gwsetup.jet.lua
@@ -4,10 +4,10 @@ Load environment to run GFS workflow setup scripts on Jet
 
 load(pathJoin("rocoto", "1.3.3"))
 
-prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon/install/modulefiles/Core")
 
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
-local python_ver=os.getenv("python_ver") or "3.10.8"
+local python_ver=os.getenv("python_ver") or "3.11.6"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("python", python_ver))

diff --git a/modulefiles/module_gwsetup.orion.lua b/modulefiles/module_gwsetup.orion.lua
@@ -7,10 +7,10 @@ load(pathJoin("contrib","0.1"))
 load(pathJoin("rocoto","1.3.3"))
 load(pathJoin("git","2.28.0"))
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon/install/modulefiles/Core")
 
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
-local python_ver=os.getenv("python_ver") or "3.10.8"
+local python_ver=os.getenv("python_ver") or "3.11.6"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("python", python_ver))

diff --git a/modulefiles/module_gwsetup.s4.lua b/modulefiles/module_gwsetup.s4.lua
@@ -5,10 +5,10 @@ Load environment to run GFS workflow setup scripts on S4
 load(pathJoin("rocoto","1.3.5"))
 load(pathJoin("git","2.30.0"))
 
-prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/gsi-addon/install/modulefiles/Core")
 
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
-local python_ver=os.getenv("python_ver") or "3.10.8"
+local python_ver=os.getenv("python_ver") or "3.11.6"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("python", python_ver))

diff --git a/sorc/gfs_utils.fd b/sorc/gfs_utils.fd
diff --git a/sorc/gsi_enkf.fd b/sorc/gsi_enkf.fd
diff --git a/sorc/gsi_monitor.fd b/sorc/gsi_monitor.fd
diff --git a/sorc/gsi_utils.fd b/sorc/gsi_utils.fd
diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd
diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd
diff --git a/versions/build.spack.ver b/versions/build.spack.ver
@@ -1,4 +1,4 @@
-export spack_stack_ver=1.5.1
+export spack_stack_ver=1.6.0
 export spack_env=gsi-addon
 
 export cmake_ver=3.23.1
@@ -11,18 +11,18 @@ 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.0
+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.3.3
+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
+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.hercules.ver b/versions/run.hercules.ver
@@ -6,7 +6,3 @@ export ncl_ver=6.6.2
 export perl_ver=5.36.0
 
 source "${HOMEgfs:-}/versions/run.spack.ver"
-
-# wgrib2 and cdo are different on Hercules from all the other systems
-export wgrib2_ver=3.1.1
-export cdo_ver=2.2.0
diff --git a/versions/run.spack.ver b/versions/run.spack.ver
@@ -1,23 +1,23 @@
-export spack_stack_ver=1.5.1
+export spack_stack_ver=1.6.0
 export spack_env=gsi-addon
 export python_ver=3.10.8
 
 export jasper_ver=2.0.32
 export libpng_ver=1.6.37
-export cdo_ver=2.0.5
+export cdo_ver=2.2.0
 export nco_ver=5.0.6
 
 export hdf5_ver=1.14.0
 export netcdf_c_ver=4.9.2
-export netcdf_fortran_ver=4.6.0
+export netcdf_fortran_ver=4.6.1
 
 export bufr_ver=11.7.0
 export gsi_ncdiag_ver=1.1.2
 export g2tmpl_ver=1.10.2
-export crtm_ver=2.4.0
+export crtm_ver=2.4.0.1
 export wgrib2_ver=2.0.8
 export grib_util_ver=1.3.0
-export prod_util_ver=1.2.2
+export prod_util_ver=2.1.1
 export py_netcdf4_ver=1.5.8
 export py_pyyaml_ver=5.4.1
 export py_jinja2_ver=3.1.2
+2 −2		modulefiles/gfsutils_common.lua
+1 −1		modulefiles/gfsutils_hera.intel.lua
+1 −1		modulefiles/gfsutils_hercules.lua
+1 −1		modulefiles/gfsutils_jet.lua
+1 −1		modulefiles/gfsutils_orion.lua
+1 −1		modulefiles/gfsutils_s4.lua
+6 −6		ci/spack.yaml
+0 −32		modulefiles/gsi_cheyenne.gnu.lua
+0 −32		modulefiles/gsi_cheyenne.intel.lua
+3 −3		modulefiles/gsi_common.lua
+1 −1		modulefiles/gsi_gaea.lua
+3 −3		modulefiles/gsi_hera.gnu.lua
+3 −3		modulefiles/gsi_hera.intel.lua
+3 −3		modulefiles/gsi_hercules.lua
+3 −3		modulefiles/gsi_jet.lua
+3 −3		modulefiles/gsi_orion.lua
+3 −3		modulefiles/gsi_s4.lua
+1 −1		modulefiles/gsi_wcoss2.lua
+0 −6		regression/global_4denvar.sh
+0 −4		regression/hafs_3denvar_hybens.sh
+0 −4		regression/hafs_4denvar_glbens.sh
+0 −1		regression/netcdf_fv3_regional.sh
+0 −21		regression/regression_namelists.sh
+0 −21		regression/regression_namelists_db.sh
+1 −1		src/enkf/enkf.f90
+3 −0		src/enkf/enkf_obs_sensitivity.f90
+7 −0		src/enkf/enkf_obsmod.f90
+16 −0		src/enkf/innovstats.f90
+15 −0		src/enkf/params.f90
+9 −3		src/enkf/readconvobs.f90
+2,230 −0		src/gsi/cads.f90
+9 −8		src/gsi/cplr_get_fv3_regional_ensperts.f90
+16 −2		src/gsi/crtm_interface.f90
+5 −1		src/gsi/gridmod.F90
+1 −0		src/gsi/gsi_files.cmake
+295 −50		src/gsi/gsi_rfv3io_mod.f90
+53 −2		src/gsi/gsimod.F90
+10 −1		src/gsi/hybrid_ensemble_isotropic.F90
+556 −0		src/gsi/mod_fv3_lola.f90
+315 −103		src/gsi/qcmod.f90
+0 −1		src/gsi/read_airs.f90
+179 −35		src/gsi/read_cris.f90
+139 −26		src/gsi/read_iasi.f90
+2 −1		src/gsi/setupaod.f90
+46 −26		src/gsi/setuprad.f90
+0 −169		ush/sub_cheyenne
+0 −18		modulefiles/cheyenne.gnu.lua
+0 −17		modulefiles/cheyenne.intel.lua
+1 −1		modulefiles/common-run.lua
+1 −1		modulefiles/common.lua
+2 −2		modulefiles/hera.gnu-run.lua
+1 −1		modulefiles/hera.gnu.lua
+2 −2		modulefiles/hera.intel-run.lua
+1 −1		modulefiles/hera.intel.lua
+2 −2		modulefiles/jet-run.lua
+2 −2		modulefiles/jet.lua
+2 −2		modulefiles/orion-run.lua
+1 −1		modulefiles/orion.lua
+2 −2		modulefiles/s4-run.lua
+1 −1		modulefiles/s4.lua
+3 −3		modulefiles/ufs_common.lua
+2 −2		modulefiles/ufs_gaea-c5.intel.lua
+1 −1		modulefiles/ufs_hera.gnu.lua
+1 −1		modulefiles/ufs_hera.intel.lua
+1 −1		modulefiles/ufs_hercules.gnu.lua
+1 −1		modulefiles/ufs_hercules.intel.lua
+1 −1		modulefiles/ufs_jet.intel.lua
+1 −1		modulefiles/ufs_orion.intel.lua
+3 −3		ci/spack.yaml
+0 −85		modulefiles/build.cheyenne.intel.lua
+4 −4		modulefiles/build.hera.gnu.lua
+4 −4		modulefiles/build.hera.intel.lua
+4 −4		modulefiles/build.hercules.intel.lua
+4 −4		modulefiles/build.jet.intel.lua
+1 −1		modulefiles/build.noaacloud.intel.lua
+4 −4		modulefiles/build.orion.intel.lua
+4 −4		modulefiles/build.s4.intel.lua
+2 −2		reg_tests/chgres_cube/driver.hera.sh
+1 −1		reg_tests/chgres_cube/driver.jet.sh
+1 −1		reg_tests/chgres_cube/driver.orion.sh