Adjust tests.

diff --git a/tests/matrix_free/fe_evaluation_type_traits.cc b/tests/matrix_free/fe_evaluation_type_traits.cc
index 226c13b64c19b47de08e54ba4cc5bb5ad8812837..7a6cb11ceb2227f64a43fb5b90db8dd4a74d9f6c 100644 (file)
--- a/tests/matrix_free/fe_evaluation_type_traits.cc
+++ b/tests/matrix_free/fe_evaluation_type_traits.cc
@@ -98,20 +98,16 @@ main()
   Dummy<double>  dummy;
   Dummy2<double> dummy2;
 
-  deallog << "has_local_element:" << std::endl
-          << "LinearAlgebra::distributed::Vector = "
-          << internal::has_local_element<
-               LinearAlgebra::distributed::Vector<double>>::value
-          << std::endl
-          << "TrilinosWrappers::MPI::Vector = "
-          << internal::has_local_element<TrilinosWrappers::MPI::Vector>::value
-          << std::endl
-          << "Dummy = " << internal::has_local_element<Dummy<double>>::value
-          << std::endl
-          << "Dummy2 = " << internal::has_local_element<Dummy2<double>>::value
-          << std::endl
-          << "Vector = " << internal::has_local_element<Vector<double>>::value
-          << std::endl;
+  deallog
+    << "has_local_element:" << std::endl
+    << "LinearAlgebra::distributed::Vector = "
+    << internal::has_local_element<
+         LinearAlgebra::distributed::Vector<double>> << std::endl
+    << "TrilinosWrappers::MPI::Vector = "
+    << internal::has_local_element<TrilinosWrappers::MPI::Vector> << std::endl
+    << "Dummy = " << internal::has_local_element<Dummy<double>> << std::endl
+    << "Dummy2 = " << internal::has_local_element<Dummy2<double>> << std::endl
+    << "Vector = " << internal::has_local_element<Vector<double>> << std::endl;
 
   // now check internal::vector_access wrapper
   // we expect local_element() to be called
@@ -121,29 +117,26 @@ main()
 
 
   // now check has_partitioners_are_compatible:
-  deallog << "has_partitioners_are_compatible:" << std::endl
-          << "LinearAlgebra::distributed::Vector = "
-          << internal::has_partitioners_are_compatible<
-               LinearAlgebra::distributed::Vector<double>>::value
-          << std::endl
-          << "TrilinosWrappers::MPI::Vector = "
-          << internal::has_partitioners_are_compatible<
-               TrilinosWrappers::MPI::Vector>::value
-          << std::endl
-          << "Vector = "
-          << internal::has_partitioners_are_compatible<Vector<double>>::value
-          << std::endl;
-
-  // check has_begin:
   deallog
-    << "has_begin:" << std::endl
+    << "has_partitioners_are_compatible:" << std::endl
     << "LinearAlgebra::distributed::Vector = "
-    << internal::has_begin<LinearAlgebra::distributed::Vector<double>>::value
-    << std::endl
+    << internal::has_partitioners_are_compatible<
+         LinearAlgebra::distributed::Vector<double>> << std::endl
     << "TrilinosWrappers::MPI::Vector = "
-    << internal::has_begin<TrilinosWrappers::MPI::Vector>::value << std::endl
-    << "Vector = " << internal::has_begin<Vector<double>>::value << std::endl
-    << "Dummy = " << internal::has_begin<Dummy<double>>::value << std::endl;
+    << internal::has_partitioners_are_compatible<
+         TrilinosWrappers::MPI::Vector> << std::endl
+    << "Vector = "
+    << internal::has_partitioners_are_compatible<Vector<double>> << std::endl;
+
+  // check has_begin:
+  deallog << "has_begin:" << std::endl
+          << "LinearAlgebra::distributed::Vector = "
+          << internal::has_begin<
+               LinearAlgebra::distributed::Vector<double>> << std::endl
+          << "TrilinosWrappers::MPI::Vector = "
+          << internal::has_begin<TrilinosWrappers::MPI::Vector> << std::endl
+          << "Vector = " << internal::has_begin<Vector<double>> << std::endl
+          << "Dummy = " << internal::has_begin<Dummy<double>> << std::endl;
   // check is_vectorizable:
   deallog
     << "is_vectorizable:" << std::endl

diff --git a/tests/matrix_free/fe_evaluation_type_traits_02.cc b/tests/matrix_free/fe_evaluation_type_traits_02.cc
index 6f57b2aab2d7d710aa8b3fff16f37460fced707e..dc82f2fc543838a378851478f4214bab88f0fb83 100644 (file)
--- a/tests/matrix_free/fe_evaluation_type_traits_02.cc
+++ b/tests/matrix_free/fe_evaluation_type_traits_02.cc
@@ -105,16 +105,15 @@ main()
   Dummy2<double> dummy2;
 
   deallog << "has_add_local_element:" << std::endl
-          << "Dummy = " << internal::has_add_local_element<Dummy<double>>::value
-          << std::endl
+          << "Dummy = "
+          << internal::has_add_local_element<Dummy<double>> << std::endl
           << "Dummy2 = "
-          << internal::has_add_local_element<Dummy2<double>>::value << std::endl
+          << internal::has_add_local_element<Dummy2<double>> << std::endl
           << "has_set_local_element:" << std::endl
-          << "Dummy = " << internal::has_set_local_element<Dummy<double>>::value
-          << std::endl
+          << "Dummy = "
+          << internal::has_set_local_element<Dummy<double>> << std::endl
           << "Dummy2 = "
-          << internal::has_set_local_element<Dummy2<double>>::value
-          << std::endl;
+          << internal::has_set_local_element<Dummy2<double>> << std::endl;
 
   // now check internal::vector_access_[set|add] wrappers
   deallog << "internal::vector_access_set:" << std::endl;

diff --git a/tests/matrix_free/matrix_free_type_traits.cc b/tests/matrix_free/matrix_free_type_traits.cc
index 7851052aa52559f36a080726a664c7398cab0f43..35ba6b242976f861e44674cc4d7e4e2b25797901 100644 (file)
--- a/tests/matrix_free/matrix_free_type_traits.cc
+++ b/tests/matrix_free/matrix_free_type_traits.cc
@@ -30,66 +30,56 @@ main()
 {
   initlog();
 
-  deallog << "has_update_ghost_values_start:" << std::endl
-          << "LinearAlgebra::distributed::Vector = "
-          << internal::has_update_ghost_values_start<
-               LinearAlgebra::distributed::Vector<double>>::value
-          << std::endl
-          << "TrilinosWrappers::MPI::Vector = "
-          << internal::has_update_ghost_values_start<
-               TrilinosWrappers::MPI::Vector>::value
-          << std::endl
-          << "Vector = "
-          << internal::has_update_ghost_values_start<Vector<double>>::value
-          << std::endl;
-
-  deallog << "has_compress_start:" << std::endl
-          << "LinearAlgebra::distributed::Vector = "
-          << internal::has_compress_start<
-               LinearAlgebra::distributed::Vector<double>>::value
-          << std::endl
-          << "TrilinosWrappers::MPI::Vector = "
-          << internal::has_compress_start<TrilinosWrappers::MPI::Vector>::value
-          << std::endl
-          << "Vector = " << internal::has_compress_start<Vector<double>>::value
-          << std::endl;
+  deallog
+    << "has_update_ghost_values_start:" << std::endl
+    << "LinearAlgebra::distributed::Vector = "
+    << internal::has_update_ghost_values_start<
+         LinearAlgebra::distributed::Vector<double>> << std::endl
+    << "TrilinosWrappers::MPI::Vector = "
+    << internal::has_update_ghost_values_start<
+         TrilinosWrappers::MPI::Vector> << std::endl
+    << "Vector = "
+    << internal::has_update_ghost_values_start<Vector<double>> << std::endl;
 
   deallog
-    << "has_exchange_on_subset:" << std::endl
+    << "has_compress_start:" << std::endl
     << "LinearAlgebra::distributed::Vector = "
-    << internal::has_exchange_on_subset<
-         LinearAlgebra::distributed::Vector<double>>::value
-    << std::endl
+    << internal::has_compress_start<
+         LinearAlgebra::distributed::Vector<double>> << std::endl
     << "TrilinosWrappers::MPI::Vector = "
-    << internal::has_exchange_on_subset<TrilinosWrappers::MPI::Vector>::value
-    << std::endl
-    << "Vector = " << internal::has_exchange_on_subset<Vector<double>>::value
-    << std::endl;
+    << internal::has_compress_start<TrilinosWrappers::MPI::Vector> << std::endl
+    << "Vector = " << internal::has_compress_start<Vector<double>> << std::endl;
+
+  deallog << "has_exchange_on_subset:" << std::endl
+          << "LinearAlgebra::distributed::Vector = "
+          << internal::has_exchange_on_subset<
+               LinearAlgebra::distributed::Vector<double>> << std::endl
+          << "TrilinosWrappers::MPI::Vector = "
+          << internal::has_exchange_on_subset<
+               TrilinosWrappers::MPI::Vector> << std::endl
+          << "Vector = "
+          << internal::has_exchange_on_subset<Vector<double>> << std::endl;
 
 
   deallog << "has_communication_block_size:" << std::endl
           << "LinearAlgebra::distributed::Vector = "
           << internal::has_communication_block_size<
-               LinearAlgebra::distributed::Vector<double>>::value
-          << std::endl
+               LinearAlgebra::distributed::Vector<double>> << std::endl
           << "LinearAlgebra::distributed::BlockVector = "
           << internal::has_communication_block_size<
-               LinearAlgebra::distributed::BlockVector<double>>::value
-          << std::endl;
+               LinearAlgebra::distributed::BlockVector<double>> << 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;
+  deallog << "is_not_parallel_vector:" << std::endl
+          << "LinearAlgebra::distributed::Vector = "
+          << internal::is_not_parallel_vector<
+               LinearAlgebra::distributed::Vector<double>> << std::endl
+          << "TrilinosWrappers::MPI::Vector = "
+          << internal::is_not_parallel_vector<
+               TrilinosWrappers::MPI::Vector> << std::endl
+          << "Vector = "
+          << internal::is_not_parallel_vector<Vector<double>> << std::endl
+          << "unsigned int = "
+          << internal::is_not_parallel_vector<unsigned int> << std::endl;
 
   // check that MatrixFree::cell_loop can run for non-vector types
   MatrixFree<2> matrix_free;