changed modules. Only Kokkos is a submodule, all other repos are clon…

…ed when necessary

.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

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

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}"
 )

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}"
 )

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}