From 00cf9a347adbe2c123eb69c8c1116cd9fe77c878 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 23 Oct 2024 12:29:18 -0700 Subject: [PATCH 1/5] point to testing submodule --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index a69f3e4f1..5e8db064d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack - branch = spack-stack-dev + url = https://github.com/AlexanderRichert-NOAA/spack + branch = add_sfcio142 [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules From 37dd53a8e69aad5ca24b224c33eccaf2b1633963 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 23 Oct 2024 12:29:33 -0700 Subject: [PATCH 2/5] update pointer to testing submodule --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index b9f2dd225..c48932f00 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit b9f2dd2254cfb1086040f1a100746bd22cb12702 +Subproject commit c48932f0000805a0f98ab075799c166138581a86 From 5343ff081c92c77aa167afe0c9fb142143418fac Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 23 Oct 2024 12:33:16 -0700 Subject: [PATCH 3/5] default sfcio->1.4.2 & sigio->2.3.3 --- configs/common/packages.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 99f17b060..7248b1b61 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -260,11 +260,11 @@ packages: scotch: require: '@7.0.4 +mpi+metis~shared~threads~mpi_thread+noarch' sfcio: - require: '@1.4.1' + require: '@1.4.2' shumlib: require: '@macos_clang_linux_intel_port' sigio: - require: '@2.3.2' + require: '@2.3.3' sp: require: '@2.5.0 precision=4,d,8' udunits: From 83e9ab4ede3faebc46fc34b8e9cbe4fe9e23a88d Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 23 Oct 2024 12:33:50 -0700 Subject: [PATCH 4/5] update pointer to testing submodule --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index c48932f00..43352a469 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit c48932f0000805a0f98ab075799c166138581a86 +Subproject commit 43352a469f76897b75258ffe0d74b8355ec3463d From db56cdec4babc164defd4fbcac57be99e26b29b5 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 23 Oct 2024 15:00:13 -0700 Subject: [PATCH 5/5] revert submodule/pointer --- .gitmodules | 4 ++-- spack | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5e8db064d..a69f3e4f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "spack"] path = spack - url = https://github.com/AlexanderRichert-NOAA/spack - branch = add_sfcio142 + url = https://github.com/jcsda/spack + branch = spack-stack-dev [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index 43352a469..990f0b84b 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 43352a469f76897b75258ffe0d74b8355ec3463d +Subproject commit 990f0b84b7f6096c0542d04784c291666cdc2b7b