From 6a0d5e91179132b94756eb231dac93f626a2158f Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 25 Sep 2017 17:39:04 -0600 Subject: [PATCH] Provide output from all processors. --- tests/mpi/hp_unify_dof_indices_01.cc | 31 ++++++------------ .../hp_unify_dof_indices_01.mpirun=1.output | 20 ++++++------ .../hp_unify_dof_indices_01.mpirun=2.output | 32 +++++++++++++------ 3 files changed, 42 insertions(+), 41 deletions(-) diff --git a/tests/mpi/hp_unify_dof_indices_01.cc b/tests/mpi/hp_unify_dof_indices_01.cc index c1b402d650..e4703588b2 100644 --- a/tests/mpi/hp_unify_dof_indices_01.cc +++ b/tests/mpi/hp_unify_dof_indices_01.cc @@ -56,8 +56,8 @@ void test() Assert (triangulation.n_global_active_cells() == 2, ExcInternalError()); Assert (triangulation.n_active_cells() == 2, - ExcInternalError()); - + ExcInternalError()); + hp::FECollection fe; fe.push_back (FE_Q(2)); fe.push_back (FE_Q(2)); @@ -81,31 +81,20 @@ void test() for (auto i : dof_indices) deallog << i << ' '; deallog << std::endl; - } + } } int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); + MPILogInitAll log; - unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); - if (myid == 0) - { - initlog(); - - deallog.push("2d"); - test<2>(); - deallog.pop(); - - deallog.push("3d"); - test<3>(); - deallog.pop(); - } - else - { - test<2>(); - test<3>(); - } + deallog.push("2d"); + test<2>(); + deallog.pop(); + deallog.push("3d"); + test<3>(); + deallog.pop(); } diff --git a/tests/mpi/hp_unify_dof_indices_01.mpirun=1.output b/tests/mpi/hp_unify_dof_indices_01.mpirun=1.output index 8de3c8fa4a..5a2705a6c2 100644 --- a/tests/mpi/hp_unify_dof_indices_01.mpirun=1.output +++ b/tests/mpi/hp_unify_dof_indices_01.mpirun=1.output @@ -1,11 +1,11 @@ -DEAL:2d::Processor: 0 -DEAL:2d:: Cell: 0.0 -DEAL:2d:: 0 1 2 3 4 5 6 7 8 -DEAL:2d:: Cell: 0.1 -DEAL:2d:: 1 9 3 10 5 11 12 13 14 -DEAL:3d::Processor: 0 -DEAL:3d:: Cell: 0.0 -DEAL:3d:: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 -DEAL:3d:: Cell: 0.1 -DEAL:3d:: 1 27 3 28 5 29 7 30 9 31 32 33 13 34 35 36 17 37 19 38 21 39 40 41 42 43 44 +DEAL:0:2d::Processor: 0 +DEAL:0:2d:: Cell: 0.0 +DEAL:0:2d:: 0 1 2 3 4 5 6 7 8 +DEAL:0:2d:: Cell: 0.1 +DEAL:0:2d:: 1 9 3 10 5 11 12 13 14 +DEAL:0:3d::Processor: 0 +DEAL:0:3d:: Cell: 0.0 +DEAL:0:3d:: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 +DEAL:0:3d:: Cell: 0.1 +DEAL:0:3d:: 1 27 3 28 5 29 7 30 9 31 32 33 13 34 35 36 17 37 19 38 21 39 40 41 42 43 44 diff --git a/tests/mpi/hp_unify_dof_indices_01.mpirun=2.output b/tests/mpi/hp_unify_dof_indices_01.mpirun=2.output index 621d745f8a..23c890083e 100644 --- a/tests/mpi/hp_unify_dof_indices_01.mpirun=2.output +++ b/tests/mpi/hp_unify_dof_indices_01.mpirun=2.output @@ -1,11 +1,23 @@ -DEAL:2d::Processor: 0 -DEAL:2d:: Cell: 0.0 -DEAL:2d:: 0 1 2 3 4 5 6 7 8 -DEAL:2d:: Cell: 0.1 -DEAL:2d:: 9 10 11 12 13 14 15 16 17 -DEAL:3d::Processor: 0 -DEAL:3d:: Cell: 0.0 -DEAL:3d:: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 -DEAL:3d:: Cell: 0.1 -DEAL:3d:: 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 +DEAL:0:2d::Processor: 0 +DEAL:0:2d:: Cell: 0.0 +DEAL:0:2d:: 0 1 2 3 4 5 6 7 8 +DEAL:0:2d:: Cell: 0.1 +DEAL:0:2d:: 9 10 11 12 13 14 15 16 17 +DEAL:0:3d::Processor: 0 +DEAL:0:3d:: Cell: 0.0 +DEAL:0:3d:: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 +DEAL:0:3d:: Cell: 0.1 +DEAL:0:3d:: 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 + +DEAL:1:2d::Processor: 1 +DEAL:1:2d:: Cell: 0.0 +DEAL:1:2d:: 0 1 2 3 4 5 6 7 8 +DEAL:1:2d:: Cell: 0.1 +DEAL:1:2d:: 9 10 11 12 13 14 15 16 17 +DEAL:1:3d::Processor: 1 +DEAL:1:3d:: Cell: 0.0 +DEAL:1:3d:: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 +DEAL:1:3d:: Cell: 0.1 +DEAL:1:3d:: 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 + -- 2.39.5