From 859f66870a62da1c904c992e2c42d8e83409d9b6 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 19 Dec 2023 16:17:53 -0700 Subject: [PATCH 1/3] 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 17f5bc5fc..9f4516e45 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 = release/1.6.0 + ##url = https://github.com/spack/spack + ##branch = develop + #url = https://github.com/jcsda/spack + #branch = release/1.6.0 + url = https://github.com/climbfuji/spack + branch = feature/rel160_crtm_release [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index 67633edb8..d71fff9b1 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 67633edb8b36aa88ef488ba175ada8978192d562 +Subproject commit d71fff9b13cd0667e1c5a8d535e583dc0b31f1d1 From 0216729645aba10b8142fee525a2a0068744e9df Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 19 Dec 2023 17:05:30 -0700 Subject: [PATCH 2/3] Generate module for qhull --- configs/common/modules_lmod.yaml | 1 - configs/common/modules_tcl.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml index d8b853121..7d9957bfc 100644 --- a/configs/common/modules_lmod.yaml +++ b/configs/common/modules_lmod.yaml @@ -71,7 +71,6 @@ modules: - openssl - perl - pkgconf - - qhull - qt - randrproto - readline diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml index 9a8affb11..afe12a2be 100644 --- a/configs/common/modules_tcl.yaml +++ b/configs/common/modules_tcl.yaml @@ -73,7 +73,6 @@ modules: - openssl - perl - pkgconf - - qhull - qt - randrproto - readline From 397410c0f7c696f9b56a1f9d4bb75d864e4748ef Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 20 Dec 2023 10:54:09 -0700 Subject: [PATCH 3/3] 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 9f4516e45..17f5bc5fc 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 = release/1.6.0 - url = https://github.com/climbfuji/spack - branch = feature/rel160_crtm_release + #url = https://github.com/spack/spack + #branch = develop + url = https://github.com/jcsda/spack + branch = release/1.6.0 [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index d71fff9b1..4c6dcd2a0 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit d71fff9b13cd0667e1c5a8d535e583dc0b31f1d1 +Subproject commit 4c6dcd2a01927d06ccc1005d8403811d0eccdc30