From 5b6d5e03f4076dd2d4b10665dc58355fa5f820f5 Mon Sep 17 00:00:00 2001
From: Daniel Dunning <39738037+djdunning@users.noreply.github.com>
Date: Wed, 1 Nov 2023 15:02:17 -0600
Subject: [PATCH] changed modules. Only Kokkos is a submodule, all other repos
 are cloned when necessary

---
 .gitmodules                     | 6 ------
 examples/phaseFieldMPI/heffte   | 2 +-
 scripts/build-matar.sh          | 2 +-
 scripts/cmake_build_examples.sh | 6 ++++++
 scripts/cmake_build_test.sh     | 6 ++++++
 scripts/setup-env.sh            | 2 --
 test/googletest                 | 2 +-
 7 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index adc2ba9d..411bfedb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
 [submodule "kokkos"]
 	path = src/Kokkos/kokkos
 	url = https://github.com/kokkos/kokkos
-[submodule "googletest"]
-	path = test/googletest
-	url = https://github.com/google/googletest.git
-[submodule "heffte"]
-	path = examples/phaseFieldMPI/heffte
-	url = https://bitbucket.org/icl/heffte.git
diff --git a/examples/phaseFieldMPI/heffte b/examples/phaseFieldMPI/heffte
index 08b2a9bb..40ad9c09 160000
--- a/examples/phaseFieldMPI/heffte
+++ b/examples/phaseFieldMPI/heffte
@@ -1 +1 @@
-Subproject commit 08b2a9bb9e0643549d578da1f70c1b4ec40345e7
+Subproject commit 40ad9c094987819d6325e6286243430a31141b51
diff --git a/scripts/build-matar.sh b/scripts/build-matar.sh
index e710a547..df8ee129 100755
--- a/scripts/build-matar.sh
+++ b/scripts/build-matar.sh
@@ -72,7 +72,7 @@ for arg in "$@"; do
         --execution=*)
             option="${arg#*=}"
             if [[ " ${valid_execution[*]} " == *" $option "* ]]; then
-                solver="$option"
+                execution="$option"
             else
                 echo "Error: Invalid --execution specified."
                 show_help
diff --git a/scripts/cmake_build_examples.sh b/scripts/cmake_build_examples.sh
index 57286fa0..63d5893a 100644
--- a/scripts/cmake_build_examples.sh
+++ b/scripts/cmake_build_examples.sh
@@ -2,6 +2,12 @@
 
 kokkos_build_type="${1}"
 
+if [ ! -d "${EXAMPLE_SOURCE_DIR}/phaseFieldMPI/heffte" ]
+then
+  echo "Missing heffte for examples, downloading...."
+  git clone https://bitbucket.org/icl/heffte.git ${EXAMPLE_SOURCE_DIR}/phaseFieldMPI/heffte
+fi
+
 cmake_options=(
     -D CMAKE_PREFIX_PATH="${MATAR_INSTALL_DIR};${KOKKOS_INSTALL_DIR}"
 )
diff --git a/scripts/cmake_build_test.sh b/scripts/cmake_build_test.sh
index df55bb40..509ae6a6 100644
--- a/scripts/cmake_build_test.sh
+++ b/scripts/cmake_build_test.sh
@@ -2,6 +2,12 @@
 
 kokkos_build_type="${1}"
 
+if [ ! -d "${TEST_SOURCE_DIR}/phaseFieldMPI/heffte" ]
+then
+  echo "Missing googletest for testing, downloading...."
+  git clone https://github.com/google/googletest.git ${TEST_SOURCE_DIR}/googletest
+fi
+
 cmake_options=(
     -D CMAKE_PREFIX_PATH="${MATAR_INSTALL_DIR};${KOKKOS_INSTALL_DIR}"
 )
diff --git a/scripts/setup-env.sh b/scripts/setup-env.sh
index cdedf32a..eb86898d 100644
--- a/scripts/setup-env.sh
+++ b/scripts/setup-env.sh
@@ -17,11 +17,9 @@ export libdir=${topdir}/lib
 export builddir=${basedir}/${my_build}
 export installdir=${basedir}/install
 
-export EXAMPLE_BASE_DIR=${basedir}
 export EXAMPLE_SOURCE_DIR=${basedir}/examples
 export EXAMPLE_BUILD_DIR=${builddir}
 
-export TEST_BASE_DIR=${basedir}
 export TEST_SOURCE_DIR=${basedir}/test
 export TEST_BUILD_DIR=${builddir}
 
diff --git a/test/googletest b/test/googletest
index 519beb0e..b10fad38 160000
--- a/test/googletest
+++ b/test/googletest
@@ -1 +1 @@
-Subproject commit 519beb0e52c842729b4b53731d27c0e0c32ab4a2
+Subproject commit b10fad38c4026a29ea6561ab15fc4818170d1c10