From a365ed7d7e3d8d2a49fa240832ef2351999f4e03 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Mon, 25 Jun 2018 18:21:29 +0200 Subject: [PATCH] Simplify test failing for older gcc --- tests/trilinos/sparse_matrix_add_03.cc | 10 +++++----- tests/trilinos/sparse_matrix_copy_from_02.cc | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/trilinos/sparse_matrix_add_03.cc b/tests/trilinos/sparse_matrix_add_03.cc index e46b6ec315..ff5463c55f 100644 --- a/tests/trilinos/sparse_matrix_add_03.cc +++ b/tests/trilinos/sparse_matrix_add_03.cc @@ -34,10 +34,10 @@ void test() { - const auto MyPID{Utilities::MPI::this_mpi_process(MPI_COMM_WORLD)}; - const auto NumProc{Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD)}; + const unsigned int MyPID = Utilities::MPI::this_mpi_process(MPI_COMM_WORLD); + const unsigned int NumProc = Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD); - if (!MyPID) + if (MyPID == 0) deallog << "NumProc=" << NumProc << std::endl; // create non-contiguous index set for NumProc > 1 @@ -89,14 +89,14 @@ test() { const auto &el = M1.el(i, i); - if (!MyPID) + if (MyPID == 0) deallog << "i = " << i << " , j = " << i << " , el = " << el << std::endl; AssertThrow(el == dealii::numbers::PI, dealii::ExcInternalError()); } - if (!MyPID) + if (MyPID == 0) deallog << "OK" << std::endl; } diff --git a/tests/trilinos/sparse_matrix_copy_from_02.cc b/tests/trilinos/sparse_matrix_copy_from_02.cc index 3dbbb5214a..f389224f02 100644 --- a/tests/trilinos/sparse_matrix_copy_from_02.cc +++ b/tests/trilinos/sparse_matrix_copy_from_02.cc @@ -34,10 +34,10 @@ void test() { - const auto MyPID{Utilities::MPI::this_mpi_process(MPI_COMM_WORLD)}; - const auto NumProc{Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD)}; + const unsigned int MyPID = Utilities::MPI::this_mpi_process(MPI_COMM_WORLD); + const unsigned int NumProc = Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD); - if (!MyPID) + if (MyPID == 0) deallog << "NumProc=" << NumProc << std::endl; // create non-contiguous index set for NumProc > 1 @@ -89,14 +89,14 @@ test() { const auto &el = M1.el(i, i); - if (!MyPID) + if (MyPID == 0) deallog << "i = " << i << " , j = " << i << " , el = " << el << std::endl; AssertThrow(el == dealii::numbers::PI, dealii::ExcInternalError()); } - if (!MyPID) + if (MyPID == 0) deallog << "OK" << std::endl; } -- 2.39.5