From 4cebc64f1c186715c172fee8f80bef8e17255df5 Mon Sep 17 00:00:00 2001 From: Biju Date: Fri, 30 Aug 2024 14:15:59 +0000 Subject: [PATCH 1/5] Changes related to /lfs5 migration on Jet --- FV3 | 2 +- modulefiles/ufs_jet.intel.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FV3 b/FV3 index 88a34197f1..ae5eb94306 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 88a34197f1eea1132f782f139efeacac40f46e27 +Subproject commit ae5eb943063eb1413f494cf15002f7aa001668a9 diff --git a/modulefiles/ufs_jet.intel.lua b/modulefiles/ufs_jet.intel.lua index b29373eec1..7ab777e54c 100644 --- a/modulefiles/ufs_jet.intel.lua +++ b/modulefiles/ufs_jet.intel.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Jet/Intel ]]) -prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core") +prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" load(pathJoin("stack-intel", stack_intel_ver)) From e4e4ad202937b7a792fa0a2ce754075cad5b4050 Mon Sep 17 00:00:00 2001 From: Biju Date: Mon, 9 Sep 2024 18:51:24 +0000 Subject: [PATCH 2/5] Updating new impi version, impi/2024.2.1 on Jet --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index ae5eb94306..a0c9760fc9 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit ae5eb943063eb1413f494cf15002f7aa001668a9 +Subproject commit a0c9760fc954f8006880ed7126d76898d002faeb From 26c01973d1e70c12a802041bb24b4e9c7c3f96d0 Mon Sep 17 00:00:00 2001 From: Biju Date: Mon, 9 Sep 2024 19:36:48 +0000 Subject: [PATCH 3/5] Updating new impi version, impi/2024.2.1 on Jet --- modulefiles/ufs_jet.intel.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modulefiles/ufs_jet.intel.lua b/modulefiles/ufs_jet.intel.lua index 7ab777e54c..cbcac0359e 100644 --- a/modulefiles/ufs_jet.intel.lua +++ b/modulefiles/ufs_jet.intel.lua @@ -10,6 +10,9 @@ load(pathJoin("stack-intel", stack_intel_ver)) stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1" load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) +impi_ver=os.getenv("impi_ver") or "2024.2.1" +load(pathJoin("impi", impi_ver)) + stack_python_ver=os.getenv("stack_python_ver") or "3.10.13" load(pathJoin("stack-python", stack_python_ver)) From 787c916019251020ad22e880f971fb5e48e0ac30 Mon Sep 17 00:00:00 2001 From: Biju Date: Thu, 17 Oct 2024 19:53:31 +0000 Subject: [PATCH 4/5] Reverting to old impi version(2022.1.2) on Jet --- FV3 | 2 +- modulefiles/ufs_jet.intel.lua | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/FV3 b/FV3 index a0c9760fc9..299d0a20e5 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit a0c9760fc954f8006880ed7126d76898d002faeb +Subproject commit 299d0a20e5520266f9832a90ba3de229f0858825 diff --git a/modulefiles/ufs_jet.intel.lua b/modulefiles/ufs_jet.intel.lua index cbcac0359e..7ab777e54c 100644 --- a/modulefiles/ufs_jet.intel.lua +++ b/modulefiles/ufs_jet.intel.lua @@ -10,9 +10,6 @@ load(pathJoin("stack-intel", stack_intel_ver)) stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1" load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) -impi_ver=os.getenv("impi_ver") or "2024.2.1" -load(pathJoin("impi", impi_ver)) - stack_python_ver=os.getenv("stack_python_ver") or "3.10.13" load(pathJoin("stack-python", stack_python_ver)) From 7bcb0afa717333bd433236cd288c235b00d9a8e1 Mon Sep 17 00:00:00 2001 From: Bin Liu Date: Fri, 1 Nov 2024 16:53:18 +0000 Subject: [PATCH 5/5] Update submodule FV3 and .gitmodules. --- .gitmodules | 4 ++-- FV3 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 59c030ab57..9938bb7e02 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,11 @@ [submodule "FV3"] path = FV3 url = https://github.com/hafs-community/fv3atm - branch = feature/hafs.v2.0.1 + branch = support/HAFS [submodule "WW3"] path = WW3 url = https://github.com/hafs-community/WW3 - branch = feature/hafs.v2.0.1 + branch = support/HAFS [submodule "stochastic_physics"] path = stochastic_physics url = https://github.com/NOAA-PSL/stochastic_physics diff --git a/FV3 b/FV3 index 299d0a20e5..5296fb7f5b 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 299d0a20e5520266f9832a90ba3de229f0858825 +Subproject commit 5296fb7f5b3b3e77ca73afa6c9c9606f876a01e6