From 16c2a723c504b835fab06de3091d993707d5fa07 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 12 Jan 2024 21:13:04 -0700 Subject: [PATCH 1/2] Update .gitmodules and submodule pointer for spack for code review and testing --- .gitmodules | 10 ++++++---- spack | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index b1f475b64..41fc4927a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,11 @@ [submodule "spack"] path = spack - #url = https://github.com/spack/spack - #branch = develop - url = https://github.com/jcsda/spack - branch = jcsda_emc_spack_stack + ##url = https://github.com/spack/spack + ##branch = develop + #url = https://github.com/jcsda/spack + #branch = jcsda_emc_spack_stack + url = https://github.com/climbfuji/spack + branch = feature/add_fftw_lapack_jedi_neptune_env_passive [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index cc9780cd0..f66402082 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit cc9780cd0e4f0a44137af65862d7a5d876d03fc8 +Subproject commit f6640208299fc15b4b9b3f17ceac95f72ff7fbb5 From 7ef1cf1afa811ffd64a6fca6172981737a4d6dd5 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 16 Jan 2024 11:56:40 -0700 Subject: [PATCH 2/2] Revert .gitmodules and update submodule pointer for spack --- .gitmodules | 10 ++++------ spack | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 41fc4927a..b1f475b64 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,9 @@ [submodule "spack"] path = spack - ##url = https://github.com/spack/spack - ##branch = develop - #url = https://github.com/jcsda/spack - #branch = jcsda_emc_spack_stack - url = https://github.com/climbfuji/spack - branch = feature/add_fftw_lapack_jedi_neptune_env_passive + #url = https://github.com/spack/spack + #branch = develop + url = https://github.com/jcsda/spack + branch = jcsda_emc_spack_stack [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index ac4b440ea..5cfbf8f8c 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit ac4b440ea5a58ba400ba1964fd4c6aa64c9551c6 +Subproject commit 5cfbf8f8ceca6e9bfa0cdf3dd938aad98aef40e1