From 3deabab330dc162750c936bb1dc1d9c6841c2695 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 10 Jul 2024 06:17:55 -0600 Subject: [PATCH 1/3] Update .gitmodules and submodule pointer for spack for code review and testing --- .gitmodules | 6 ++++-- spack | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1a6d0b7fb..0c3f3f65e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack - branch = spack-stack-1.6.0 + #url = https://github.com/jcsda/spack + #branch = spack-stack-1.6.0 + url = https://github.com/climbfuji/spack + branch = bugfix/mapl_mvapich_rel160 [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index 338cca020..c84c8bc2d 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 338cca020dd517f394175b35ab8ab6d5e6a08bc0 +Subproject commit c84c8bc2d3e05a0e610ffd3bbeade5993739152f From ae7797de90c6311727ec4d9401c110c327842fe9 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 10 Jul 2024 06:18:26 -0600 Subject: [PATCH 2/3] Back port grib-utils wgrib modulefile bug fix --- configs/common/modules_lmod.yaml | 2 +- configs/common/modules_tcl.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml index ca6377e24..89992e3b7 100644 --- a/configs/common/modules_lmod.yaml +++ b/configs/common/modules_lmod.yaml @@ -190,7 +190,7 @@ modules: 'TOCGRIB': '{prefix}/bin/tocgrib' 'TOCGRIB2': '{prefix}/bin/tocgrib2' 'TOCGRIB2SUPER': '{prefix}/bin/tocgrib2super' - 'WGRIB2': '{prefix}/bin/wgrib2' + 'WGRIB': '{prefix}/bin/wgrib2' landsfcutil: environment: set: diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml index b0ec46b45..90b95304b 100644 --- a/configs/common/modules_tcl.yaml +++ b/configs/common/modules_tcl.yaml @@ -192,7 +192,7 @@ modules: 'TOCGRIB': '{prefix}/bin/tocgrib' 'TOCGRIB2': '{prefix}/bin/tocgrib2' 'TOCGRIB2SUPER': '{prefix}/bin/tocgrib2super' - 'WGRIB2': '{prefix}/bin/wgrib2' + 'WGRIB': '{prefix}/bin/wgrib2' landsfcutil: environment: set: From 0828aa75bc23db375f84b7fedddeb9b8059d334e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 10 Jul 2024 06:52:13 -0600 Subject: [PATCH 3/3] Revert .gitmodules and update submodule pointer for spack --- .gitmodules | 6 ++---- spack | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0c3f3f65e..1a6d0b7fb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "spack"] path = spack - #url = https://github.com/jcsda/spack - #branch = spack-stack-1.6.0 - url = https://github.com/climbfuji/spack - branch = bugfix/mapl_mvapich_rel160 + url = https://github.com/jcsda/spack + branch = spack-stack-1.6.0 [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index c84c8bc2d..f691a0037 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit c84c8bc2d3e05a0e610ffd3bbeade5993739152f +Subproject commit f691a003703d3fc5b222e6d0e062ba1a4f59338a