Fix matrix_free/matrix_free_type_traits test

diff --git a/tests/matrix_free/matrix_free_type_traits.cc b/tests/matrix_free/matrix_free_type_traits.cc
index 4ea0771d0bd2dcc9c986961074b625a0d46aefaf..7851052aa52559f36a080726a664c7398cab0f43 100644 (file)
--- a/tests/matrix_free/matrix_free_type_traits.cc
+++ b/tests/matrix_free/matrix_free_type_traits.cc
@@ -77,18 +77,19 @@ main()
                LinearAlgebra::distributed::BlockVector<double>>::value
           << std::endl;
 
-  deallog << "is_serial_or_dummy:" << std::endl
-          << "LinearAlgebra::distributed::Vector = "
-          << internal::is_serial_or_dummy<
-               LinearAlgebra::distributed::Vector<double>>::value
-          << std::endl
-          << "TrilinosWrappers::MPI::Vector = "
-          << internal::is_serial_or_dummy<TrilinosWrappers::MPI::Vector>::value
-          << std::endl
-          << "Vector = " << internal::is_serial_or_dummy<Vector<double>>::value
-          << std::endl
-          << "unsigned int = "
-          << internal::is_serial_or_dummy<unsigned int>::value << std::endl;
+  deallog
+    << "is_not_parallel_vector:" << std::endl
+    << "LinearAlgebra::distributed::Vector = "
+    << internal::is_not_parallel_vector<
+         LinearAlgebra::distributed::Vector<double>>::value
+    << std::endl
+    << "TrilinosWrappers::MPI::Vector = "
+    << internal::is_not_parallel_vector<TrilinosWrappers::MPI::Vector>::value
+    << std::endl
+    << "Vector = " << internal::is_not_parallel_vector<Vector<double>>::value
+    << std::endl
+    << "unsigned int = "
+    << internal::is_not_parallel_vector<unsigned int>::value << std::endl;
 
   // check that MatrixFree::cell_loop can run for non-vector types
   MatrixFree<2> matrix_free;

diff --git a/tests/matrix_free/matrix_free_type_traits.with_trilinos=true.output b/tests/matrix_free/matrix_free_type_traits.with_trilinos=true.output
index 0382073a9358497954c4131895a5d42aa887f6ef..48817cec28aea7fba5ab696dce0cea66f6f67fd2 100644 (file)
--- a/tests/matrix_free/matrix_free_type_traits.with_trilinos=true.output
+++ b/tests/matrix_free/matrix_free_type_traits.with_trilinos=true.output
@@ -14,7 +14,7 @@ DEAL::Vector = 0
 DEAL::has_communication_block_size:
 DEAL::LinearAlgebra::distributed::Vector = 0
 DEAL::LinearAlgebra::distributed::BlockVector = 1
-DEAL::is_serial_or_dummy:
+DEAL::is_not_parallel_vector:
 DEAL::LinearAlgebra::distributed::Vector = 0
 DEAL::TrilinosWrappers::MPI::Vector = 0
 DEAL::Vector = 1