From: Wolfgang Bangerth Date: Tue, 1 Feb 2022 19:09:31 +0000 (-0700) Subject: Adjust tests. X-Git-Tag: v9.4.0-rc1~538^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4363e4ee4e34c3b521abc6f9e6fa4df01172027e;p=dealii.git Adjust tests. --- diff --git a/tests/matrix_free/fe_evaluation_type_traits.cc b/tests/matrix_free/fe_evaluation_type_traits.cc index 226c13b64c..7a6cb11ceb 100644 --- a/tests/matrix_free/fe_evaluation_type_traits.cc +++ b/tests/matrix_free/fe_evaluation_type_traits.cc @@ -98,20 +98,16 @@ main() Dummy dummy; Dummy2 dummy2; - deallog << "has_local_element:" << std::endl - << "LinearAlgebra::distributed::Vector = " - << internal::has_local_element< - LinearAlgebra::distributed::Vector>::value - << std::endl - << "TrilinosWrappers::MPI::Vector = " - << internal::has_local_element::value - << std::endl - << "Dummy = " << internal::has_local_element>::value - << std::endl - << "Dummy2 = " << internal::has_local_element>::value - << std::endl - << "Vector = " << internal::has_local_element>::value - << std::endl; + deallog + << "has_local_element:" << std::endl + << "LinearAlgebra::distributed::Vector = " + << internal::has_local_element< + LinearAlgebra::distributed::Vector> << std::endl + << "TrilinosWrappers::MPI::Vector = " + << internal::has_local_element << std::endl + << "Dummy = " << internal::has_local_element> << std::endl + << "Dummy2 = " << internal::has_local_element> << std::endl + << "Vector = " << internal::has_local_element> << 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>::value - << std::endl - << "TrilinosWrappers::MPI::Vector = " - << internal::has_partitioners_are_compatible< - TrilinosWrappers::MPI::Vector>::value - << std::endl - << "Vector = " - << internal::has_partitioners_are_compatible>::value - << std::endl; - - // check has_begin: deallog - << "has_begin:" << std::endl + << "has_partitioners_are_compatible:" << std::endl << "LinearAlgebra::distributed::Vector = " - << internal::has_begin>::value - << std::endl + << internal::has_partitioners_are_compatible< + LinearAlgebra::distributed::Vector> << std::endl << "TrilinosWrappers::MPI::Vector = " - << internal::has_begin::value << std::endl - << "Vector = " << internal::has_begin>::value << std::endl - << "Dummy = " << internal::has_begin>::value << std::endl; + << internal::has_partitioners_are_compatible< + TrilinosWrappers::MPI::Vector> << std::endl + << "Vector = " + << internal::has_partitioners_are_compatible> << std::endl; + + // check has_begin: + deallog << "has_begin:" << std::endl + << "LinearAlgebra::distributed::Vector = " + << internal::has_begin< + LinearAlgebra::distributed::Vector> << std::endl + << "TrilinosWrappers::MPI::Vector = " + << internal::has_begin << std::endl + << "Vector = " << internal::has_begin> << std::endl + << "Dummy = " << internal::has_begin> << 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 6f57b2aab2..dc82f2fc54 100644 --- 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 dummy2; deallog << "has_add_local_element:" << std::endl - << "Dummy = " << internal::has_add_local_element>::value - << std::endl + << "Dummy = " + << internal::has_add_local_element> << std::endl << "Dummy2 = " - << internal::has_add_local_element>::value << std::endl + << internal::has_add_local_element> << std::endl << "has_set_local_element:" << std::endl - << "Dummy = " << internal::has_set_local_element>::value - << std::endl + << "Dummy = " + << internal::has_set_local_element> << std::endl << "Dummy2 = " - << internal::has_set_local_element>::value - << std::endl; + << internal::has_set_local_element> << 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 7851052aa5..35ba6b2429 100644 --- 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>::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>::value - << std::endl; - - deallog << "has_compress_start:" << std::endl - << "LinearAlgebra::distributed::Vector = " - << internal::has_compress_start< - LinearAlgebra::distributed::Vector>::value - << std::endl - << "TrilinosWrappers::MPI::Vector = " - << internal::has_compress_start::value - << std::endl - << "Vector = " << internal::has_compress_start>::value - << std::endl; + deallog + << "has_update_ghost_values_start:" << std::endl + << "LinearAlgebra::distributed::Vector = " + << internal::has_update_ghost_values_start< + LinearAlgebra::distributed::Vector> << std::endl + << "TrilinosWrappers::MPI::Vector = " + << internal::has_update_ghost_values_start< + TrilinosWrappers::MPI::Vector> << std::endl + << "Vector = " + << internal::has_update_ghost_values_start> << 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>::value - << std::endl + << internal::has_compress_start< + LinearAlgebra::distributed::Vector> << std::endl << "TrilinosWrappers::MPI::Vector = " - << internal::has_exchange_on_subset::value - << std::endl - << "Vector = " << internal::has_exchange_on_subset>::value - << std::endl; + << internal::has_compress_start << std::endl + << "Vector = " << internal::has_compress_start> << std::endl; + + deallog << "has_exchange_on_subset:" << std::endl + << "LinearAlgebra::distributed::Vector = " + << internal::has_exchange_on_subset< + LinearAlgebra::distributed::Vector> << std::endl + << "TrilinosWrappers::MPI::Vector = " + << internal::has_exchange_on_subset< + TrilinosWrappers::MPI::Vector> << std::endl + << "Vector = " + << internal::has_exchange_on_subset> << std::endl; deallog << "has_communication_block_size:" << std::endl << "LinearAlgebra::distributed::Vector = " << internal::has_communication_block_size< - LinearAlgebra::distributed::Vector>::value - << std::endl + LinearAlgebra::distributed::Vector> << std::endl << "LinearAlgebra::distributed::BlockVector = " << internal::has_communication_block_size< - LinearAlgebra::distributed::BlockVector>::value - << std::endl; + LinearAlgebra::distributed::BlockVector> << std::endl; - deallog - << "is_not_parallel_vector:" << std::endl - << "LinearAlgebra::distributed::Vector = " - << internal::is_not_parallel_vector< - LinearAlgebra::distributed::Vector>::value - << std::endl - << "TrilinosWrappers::MPI::Vector = " - << internal::is_not_parallel_vector::value - << std::endl - << "Vector = " << internal::is_not_parallel_vector>::value - << std::endl - << "unsigned int = " - << internal::is_not_parallel_vector::value << std::endl; + deallog << "is_not_parallel_vector:" << std::endl + << "LinearAlgebra::distributed::Vector = " + << internal::is_not_parallel_vector< + LinearAlgebra::distributed::Vector> << std::endl + << "TrilinosWrappers::MPI::Vector = " + << internal::is_not_parallel_vector< + TrilinosWrappers::MPI::Vector> << std::endl + << "Vector = " + << internal::is_not_parallel_vector> << std::endl + << "unsigned int = " + << internal::is_not_parallel_vector << std::endl; // check that MatrixFree::cell_loop can run for non-vector types MatrixFree<2> matrix_free;