diff --git a/modulefiles/module_gwci.hercules.lua b/modulefiles/module_gwci.hercules.lua index 0a70a960ec..179bbef114 100644 --- 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.6.0/envs/gsi-addon-dev/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/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 index 9803214712..565197fbe4 100644 --- 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.6.0/envs/gsi-addon-dev/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/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.hercules.lua b/modulefiles/module_gwsetup.hercules.lua index 32111aed18..795b295b30 100644 --- a/modulefiles/module_gwsetup.hercules.lua +++ b/modulefiles/module_gwsetup.hercules.lua @@ -5,7 +5,7 @@ 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.6.0/envs/gsi-addon-dev/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/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.11.6" diff --git a/modulefiles/module_gwsetup.orion.lua b/modulefiles/module_gwsetup.orion.lua index bd2845c846..96ed50f7f0 100644 --- a/modulefiles/module_gwsetup.orion.lua +++ b/modulefiles/module_gwsetup.orion.lua @@ -7,7 +7,7 @@ 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.6.0/envs/gsi-addon-dev/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/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.11.6" diff --git a/modulefiles/module_gwsetup.s4.lua b/modulefiles/module_gwsetup.s4.lua index 602a7f53ec..77a647006f 100644 --- a/modulefiles/module_gwsetup.s4.lua +++ b/modulefiles/module_gwsetup.s4.lua @@ -5,7 +5,7 @@ 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.6.0/envs/gsi-addon-dev/install/modulefiles/Core") +prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/gsi-addon-env/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.11.6" diff --git a/sorc/gfs_utils.fd b/sorc/gfs_utils.fd index df7678e6c9..eb8769c92c 160000 --- a/sorc/gfs_utils.fd +++ b/sorc/gfs_utils.fd @@ -1 +1 @@ -Subproject commit df7678e6c93658618dda6113e291e772b4dd53ef +Subproject commit eb8769c92c1bf27ac0aa32ea48bd192ecefbdd63 diff --git a/sorc/gsi_enkf.fd b/sorc/gsi_enkf.fd index 7f3969a475..339bf16c63 160000 --- a/sorc/gsi_enkf.fd +++ b/sorc/gsi_enkf.fd @@ -1 +1 @@ -Subproject commit 7f3969a475e782c7a0fa6ed91369e97b51ae4dcb +Subproject commit 339bf16c6344500b44deccc338273ad233d5212b diff --git a/sorc/gsi_monitor.fd b/sorc/gsi_monitor.fd index 1adce02c9c..05ac88562a 160000 --- a/sorc/gsi_monitor.fd +++ b/sorc/gsi_monitor.fd @@ -1 +1 @@ -Subproject commit 1adce02c9c128cf9d1b22bde80aaef9dc6bb02a3 +Subproject commit 05ac88562a1a3acbfcf11870263498bc06fc5169 diff --git a/sorc/gsi_utils.fd b/sorc/gsi_utils.fd index 81d106d5f1..5a506f14bf 160000 --- a/sorc/gsi_utils.fd +++ b/sorc/gsi_utils.fd @@ -1 +1 @@ -Subproject commit 81d106d5f17358c8ee6ff547e05107d1ff225bd3 +Subproject commit 5a506f14bfd19c37a31a50dac1891e45b3ddc7ec diff --git a/versions/build.hera.ver b/versions/build.hera.ver index ff85b1a801..66ec8e4c6c 100644 --- a/versions/build.hera.ver +++ b/versions/build.hera.ver @@ -1,3 +1,4 @@ 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" diff --git a/versions/build.hercules.ver b/versions/build.hercules.ver index 5513466631..40c6aeb054 100644 --- a/versions/build.hercules.ver +++ b/versions/build.hercules.ver @@ -1,3 +1,4 @@ export stack_intel_ver=2021.9.0 export stack_impi_ver=2021.9.0 +export spack_env=gsi-addon-env source "${HOMEgfs:-}/versions/build.spack.ver" diff --git a/versions/build.jet.ver b/versions/build.jet.ver index ff85b1a801..66ec8e4c6c 100644 --- a/versions/build.jet.ver +++ b/versions/build.jet.ver @@ -1,3 +1,4 @@ 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" diff --git a/versions/build.orion.ver b/versions/build.orion.ver index ff85b1a801..33f271e93b 100644 --- a/versions/build.orion.ver +++ b/versions/build.orion.ver @@ -1,3 +1,4 @@ export stack_intel_ver=2021.5.0 export stack_impi_ver=2021.5.1 +export spack_env=gsi-addon-env source "${HOMEgfs:-}/versions/build.spack.ver" diff --git a/versions/build.s4.ver b/versions/build.s4.ver index a0aae51d87..a75cb612f8 100644 --- a/versions/build.s4.ver +++ b/versions/build.s4.ver @@ -1,3 +1,4 @@ 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" diff --git a/versions/build.spack.ver b/versions/build.spack.ver index 39b6cdadd6..808f85dd16 100644 --- a/versions/build.spack.ver +++ b/versions/build.spack.ver @@ -1,5 +1,4 @@ export spack_stack_ver=1.6.0 -export spack_env=gsi-addon-dev export cmake_ver=3.23.1 diff --git a/versions/run.hera.ver b/versions/run.hera.ver index 9ac8ae2ec3..0895659307 100644 --- a/versions/run.hera.ver +++ b/versions/run.hera.ver @@ -1,5 +1,6 @@ export stack_intel_ver=2021.5.0 export stack_impi_ver=2021.5.1 +export spack_env=gsi-addon-dev export hpss_ver=hpss export ncl_ver=6.6.2 diff --git a/versions/run.hercules.ver b/versions/run.hercules.ver index f692854931..e9d2c40ec2 100644 --- a/versions/run.hercules.ver +++ b/versions/run.hercules.ver @@ -1,6 +1,7 @@ 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 export ncl_ver=6.6.2 export perl_ver=5.36.0 diff --git a/versions/run.jet.ver b/versions/run.jet.ver index 18a82cab4f..5192188364 100644 --- a/versions/run.jet.ver +++ b/versions/run.jet.ver @@ -1,5 +1,6 @@ export stack_intel_ver=2021.5.0 export stack_impi_ver=2021.5.1 +export spack_env=gsi-addon-dev export hpss_ver= export ncl_ver=6.6.2 diff --git a/versions/run.orion.ver b/versions/run.orion.ver index 7671bc028d..835ac99d34 100644 --- a/versions/run.orion.ver +++ b/versions/run.orion.ver @@ -1,5 +1,6 @@ export stack_intel_ver=2022.0.2 export stack_impi_ver=2021.5.1 +export spack_env=gsi-addon-env export ncl_ver=6.6.2 export gempak_ver=7.5.1 diff --git a/versions/run.s4.ver b/versions/run.s4.ver index 56817ef439..27a53db299 100644 --- a/versions/run.s4.ver +++ b/versions/run.s4.ver @@ -1,5 +1,6 @@ export stack_intel_ver=2021.5.0 export stack_impi_ver=2021.5.0 +export spack_env=gsi-addon-env export ncl_ver=6.4.0-precompiled diff --git a/versions/run.spack.ver b/versions/run.spack.ver index 86d250023a..5b245ef873 100644 --- a/versions/run.spack.ver +++ b/versions/run.spack.ver @@ -1,5 +1,4 @@ export spack_stack_ver=1.6.0 -export spack_env=gsi-addon-dev export python_ver=3.11.6 export jasper_ver=2.0.32