From: Daniel Arndt Date: Tue, 25 Jan 2022 22:05:41 +0000 (-0500) Subject: Fix matrix_free/matrix_free_type_traits test X-Git-Tag: v9.4.0-rc1~563^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c7e91af47add029b2df28aa3976e120f9d4d699;p=dealii.git 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 4ea0771d0b..7851052aa5 100644 --- 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>::value << std::endl; - deallog << "is_serial_or_dummy:" << std::endl - << "LinearAlgebra::distributed::Vector = " - << internal::is_serial_or_dummy< - LinearAlgebra::distributed::Vector>::value - << std::endl - << "TrilinosWrappers::MPI::Vector = " - << internal::is_serial_or_dummy::value - << std::endl - << "Vector = " << internal::is_serial_or_dummy>::value - << std::endl - << "unsigned int = " - << internal::is_serial_or_dummy::value << 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; // 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 0382073a93..48817cec28 100644 --- 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