From 7a43975760ce2414514674a1aac5f0f13a372341 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@icloud.com>
Date: Mon, 20 May 2024 20:54:34 -0600
Subject: [PATCH] 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 71dcae90b..a69f3e4f1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,7 @@
 [submodule "spack"]
   path = spack
-  #url = https://github.com/jcsda/spack
-  #branch = spack-stack-dev
-  url = https://github.com/climbfuji/spack
-  branch = feature/merge_spack_develop_into_spack_stack_dev_20240509
+  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 e3a929305..a11d824ab 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit e3a929305c1febd70c48c081fd51d225a9aabcf2
+Subproject commit a11d824ab096688c6225a2d2780ce381734f1549