diff --git a/cmake/std/atdm/common/toss3/environment_new.sh b/cmake/std/atdm/common/toss3/environment_new.sh
index 7577f41c60fc..e0cbd02ab66c 100755
--- a/cmake/std/atdm/common/toss3/environment_new.sh
+++ b/cmake/std/atdm/common/toss3/environment_new.sh
@@ -9,7 +9,7 @@
echo "Using $ATDM_CONFIG_SYSTEM_NAME toss3 compiler stack $ATDM_CONFIG_COMPILER to build $ATDM_CONFIG_BUILD_TYPE code with Kokkos node type $ATDM_CONFIG_NODE_TYPE"
export ATDM_CONFIG_ENABLE_SPARC_SETTINGS=ON
-export ATDM_CONFIG_USE_NINJA=ON
+export ATDM_CONFIG_USE_NINJA=OFF
export ATDM_CONFIG_BUILD_COUNT=8
# export ATDM_CONFIG_CMAKE_JOB_POOL_LINK=2
# NOTE: Above, currently setting CMAKE_JOB_POOL_LINK results in a build
diff --git a/cmake/std/atdm/common/toss3/environment_tlcc2.sh b/cmake/std/atdm/common/toss3/environment_tlcc2.sh
index 702b638c7c78..484ffa80c7f3 100755
--- a/cmake/std/atdm/common/toss3/environment_tlcc2.sh
+++ b/cmake/std/atdm/common/toss3/environment_tlcc2.sh
@@ -12,7 +12,7 @@ fi
echo "Using toss3 compiler stack $ATDM_CONFIG_COMPILER to build $ATDM_CONFIG_BUILD_TYPE code with Kokkos node type $ATDM_CONFIG_NODE_TYPE"
-export ATDM_CONFIG_USE_NINJA=ON
+export ATDM_CONFIG_USE_NINJA=OFF
export ATDM_CONFIG_BUILD_COUNT=8
# export ATDM_CONFIG_CMAKE_JOB_POOL_LINK=2
# NOTE: Above, currently setting CMAKE_JOB_POOL_LINK results in a build
diff --git a/packages/muelu/test/maxwell/Belos.xml b/packages/muelu/test/maxwell/Belos.xml
new file mode 100644
index 000000000000..54bfc3273e69
--- /dev/null
+++ b/packages/muelu/test/maxwell/Belos.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/muelu/test/maxwell/CMakeLists.txt b/packages/muelu/test/maxwell/CMakeLists.txt
index 51f83e006ad2..9f10108ecd1f 100644
--- a/packages/muelu/test/maxwell/CMakeLists.txt
+++ b/packages/muelu/test/maxwell/CMakeLists.txt
@@ -2,6 +2,7 @@
ASSERT_DEFINED(
${PACKAGE_NAME}_ENABLE_Amesos2
${PACKAGE_NAME}_ENABLE_Belos
+ ${PACKAGE_NAME}_ENABLE_ML
)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
@@ -29,7 +30,7 @@ IF (${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Amesos2)
NUM_MPI_PROCS 4
)
- IF (${PACKAGE_NAME}_ENABLE_ML AND ${PACKAGE_NAME}_ENABLE_EPETRA)
+ IF (${PACKAGE_NAME}_ENABLE_ML AND ${PACKAGE_NAME}_ENABLE_Epetra)
TRIBITS_ADD_TEST(
Maxwell3D
NAME "Maxwell3D-Tpetra-ML-list"
@@ -59,7 +60,7 @@ IF (${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Amesos2)
NUM_MPI_PROCS 4
)
- IF (${PACKAGE_NAME}_ENABLE_ML AND ${PACKAGE_NAME}_HAVE_EPETRA_SOLVER_STACK AND (NOT Xpetra_INT_LONG_LONG))
+ IF (${PACKAGE_NAME}_ENABLE_ML)
TRIBITS_ADD_TEST(
Maxwell3D
NAME "Maxwell3D-ML"
@@ -72,7 +73,7 @@ IF (${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Amesos2)
TRIBITS_COPY_FILES_TO_BINARY_DIR(Maxwell_cp
- SOURCE_FILES M0.mat M1.mat S.mat D0.mat coords.mat Maxwell.xml Maxwell_ML.xml Maxwell_ML_MueLu.xml Maxwell_ML1.xml
+ SOURCE_FILES M0.mat M1.mat S.mat D0.mat coords.mat Belos.xml Maxwell.xml Maxwell_ML.xml Maxwell_ML_MueLu.xml Maxwell_ML1.xml
)
IF(HAVE_MUELU_COMPLEX)
diff --git a/packages/muelu/test/maxwell/Maxwell3D.cpp b/packages/muelu/test/maxwell/Maxwell3D.cpp
index 788ac12f26d1..a0f8ef018afc 100644
--- a/packages/muelu/test/maxwell/Maxwell3D.cpp
+++ b/packages/muelu/test/maxwell/Maxwell3D.cpp
@@ -44,6 +44,7 @@
//
// @HEADER
#include
+#include