From 13cbe62e988932cebb93163742c3a6bebcc5b85b Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 21 Jul 2023 09:09:11 -0400 Subject: [PATCH] Use MPILogInitAll in particles/generators_* tests --- tests/particles/generators_09.cc | 2 +- ...erators_09.with_p4est=true.mpirun=3.output | 55 ++++++++++++------- tests/particles/generators_11.cc | 2 +- ...erators_11.with_p4est=true.mpirun=3.output | 55 ++++++++++++------- tests/particles/generators_12.cc | 2 +- ...erators_12.with_p4est=true.mpirun=3.output | 55 ++++++++++++------- 6 files changed, 105 insertions(+), 66 deletions(-) diff --git a/tests/particles/generators_09.cc b/tests/particles/generators_09.cc index d76fc2640c..d15c9906b1 100644 --- a/tests/particles/generators_09.cc +++ b/tests/particles/generators_09.cc @@ -94,7 +94,7 @@ main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - initlog(); + MPILogInitAll mpi_log; { deallog.push("2d/2d"); diff --git a/tests/particles/generators_09.with_p4est=true.mpirun=3.output b/tests/particles/generators_09.with_p4est=true.mpirun=3.output index 4255ff9bdc..3f7c22e25b 100644 --- a/tests/particles/generators_09.with_p4est=true.mpirun=3.output +++ b/tests/particles/generators_09.with_p4est=true.mpirun=3.output @@ -1,22 +1,35 @@ -DEAL:2d/2d::OK -DEAL:2d/3d::OK -DEAL:3d/3d::OK -DEAL:2d/2d::OK -DEAL:2d/3d::OK -DEAL:3d/3d::OK -EAL:2d/3d::Locally owned active cells: 0 -DEAL:2d/3d::Global particles: 1 -DEAL:2d/3d::OK -DEAL:3d/3d::Locally owned active cells: 0 -DEAL:3d/3d::Global particles: 1 -DEAL:3d/3d::OK -DEAL:2d/2d::Locally owned active cells: 0 -DEAL:2d/2d::Global particles: 1 -DEAL:2d/2d::OK -DEAL:2d/3d::Locally owned active cells: 0 -DEAL:2d/3d::Global particles: 1 -DEAL:2d/3d::OK -DEAL:3d/3d::Locally owned active cells: 0 -DEAL:3d/3d::Global particles: 1 -DEAL:3d/3d::OK +DEAL:0:2d/2d::Locally owned active cells: 0 +DEAL:0:2d/2d::Global particles: 1 +DEAL:0:2d/2d::OK +DEAL:0:2d/3d::Locally owned active cells: 0 +DEAL:0:2d/3d::Global particles: 1 +DEAL:0:2d/3d::OK +DEAL:0:3d/3d::Locally owned active cells: 0 +DEAL:0:3d/3d::Global particles: 1 +DEAL:0:3d/3d::OK +DEAL:0:2d/2d::Locally owned active cells: 0 +DEAL:0:2d/2d::Global particles: 1 +DEAL:0:2d/2d::OK +DEAL:0:2d/3d::Locally owned active cells: 0 +DEAL:0:2d/3d::Global particles: 1 +DEAL:0:2d/3d::OK +DEAL:0:3d/3d::Locally owned active cells: 0 +DEAL:0:3d/3d::Global particles: 1 +DEAL:0:3d/3d::OK + +DEAL:1:2d/2d::OK +DEAL:1:2d/3d::OK +DEAL:1:3d/3d::OK +DEAL:1:2d/2d::OK +DEAL:1:2d/3d::OK +DEAL:1:3d/3d::OK + + +DEAL:2:2d/2d::OK +DEAL:2:2d/3d::OK +DEAL:2:3d/3d::OK +DEAL:2:2d/2d::OK +DEAL:2:2d/3d::OK +DEAL:2:3d/3d::OK + diff --git a/tests/particles/generators_11.cc b/tests/particles/generators_11.cc index f522196ab6..880b4e21e9 100644 --- a/tests/particles/generators_11.cc +++ b/tests/particles/generators_11.cc @@ -94,7 +94,7 @@ main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - initlog(); + MPILogInitAll mpi_log; { deallog.push("2d/2d"); diff --git a/tests/particles/generators_11.with_p4est=true.mpirun=3.output b/tests/particles/generators_11.with_p4est=true.mpirun=3.output index d296d53b50..efea5af35b 100644 --- a/tests/particles/generators_11.with_p4est=true.mpirun=3.output +++ b/tests/particles/generators_11.with_p4est=true.mpirun=3.output @@ -1,22 +1,35 @@ -DEAL:2d/2d::OK -DEAL:2d/3d::OK -DEAL:3d/3d::OK -DEAL:2d/2d::OK -DEAL:2d/3d::OK -DEAL:3d/3d::OK -EAL:2d/3d::Locally owned active cells: 0 -DEAL:2d/3d::Global particles: 3 -DEAL:2d/3d::OK -DEAL:3d/3d::Locally owned active cells: 0 -DEAL:3d/3d::Global particles: 3 -DEAL:3d/3d::OK -DEAL:2d/2d::Locally owned active cells: 0 -DEAL:2d/2d::Global particles: 3 -DEAL:2d/2d::OK -DEAL:2d/3d::Locally owned active cells: 0 -DEAL:2d/3d::Global particles: 3 -DEAL:2d/3d::OK -DEAL:3d/3d::Locally owned active cells: 0 -DEAL:3d/3d::Global particles: 3 -DEAL:3d/3d::OK +DEAL:0:2d/2d::Locally owned active cells: 0 +DEAL:0:2d/2d::Global particles: 3 +DEAL:0:2d/2d::OK +DEAL:0:2d/3d::Locally owned active cells: 0 +DEAL:0:2d/3d::Global particles: 3 +DEAL:0:2d/3d::OK +DEAL:0:3d/3d::Locally owned active cells: 0 +DEAL:0:3d/3d::Global particles: 3 +DEAL:0:3d/3d::OK +DEAL:0:2d/2d::Locally owned active cells: 0 +DEAL:0:2d/2d::Global particles: 3 +DEAL:0:2d/2d::OK +DEAL:0:2d/3d::Locally owned active cells: 0 +DEAL:0:2d/3d::Global particles: 3 +DEAL:0:2d/3d::OK +DEAL:0:3d/3d::Locally owned active cells: 0 +DEAL:0:3d/3d::Global particles: 3 +DEAL:0:3d/3d::OK + +DEAL:1:2d/2d::OK +DEAL:1:2d/3d::OK +DEAL:1:3d/3d::OK +DEAL:1:2d/2d::OK +DEAL:1:2d/3d::OK +DEAL:1:3d/3d::OK + + +DEAL:2:2d/2d::OK +DEAL:2:2d/3d::OK +DEAL:2:3d/3d::OK +DEAL:2:2d/2d::OK +DEAL:2:2d/3d::OK +DEAL:2:3d/3d::OK + diff --git a/tests/particles/generators_12.cc b/tests/particles/generators_12.cc index a8fa1de273..6cb46e92bc 100644 --- a/tests/particles/generators_12.cc +++ b/tests/particles/generators_12.cc @@ -94,7 +94,7 @@ main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - initlog(); + MPILogInitAll mpi_log; { deallog.push("2d/2d"); diff --git a/tests/particles/generators_12.with_p4est=true.mpirun=3.output b/tests/particles/generators_12.with_p4est=true.mpirun=3.output index 23de02c622..72a25ad56b 100644 --- a/tests/particles/generators_12.with_p4est=true.mpirun=3.output +++ b/tests/particles/generators_12.with_p4est=true.mpirun=3.output @@ -1,22 +1,35 @@ -DEAL:2d/2d::OK -DEAL:2d/3d::OK -DEAL:3d/3d::OK -DEAL:2d/2d::OK -DEAL:2d/3d::OK -DEAL:3d/3d::OK -EAL:2d/3d::Locally owned active cells: 0 -DEAL:2d/3d::Global particles: 4 -DEAL:2d/3d::OK -DEAL:3d/3d::Locally owned active cells: 0 -DEAL:3d/3d::Global particles: 4 -DEAL:3d/3d::OK -DEAL:2d/2d::Locally owned active cells: 0 -DEAL:2d/2d::Global particles: 4 -DEAL:2d/2d::OK -DEAL:2d/3d::Locally owned active cells: 0 -DEAL:2d/3d::Global particles: 4 -DEAL:2d/3d::OK -DEAL:3d/3d::Locally owned active cells: 0 -DEAL:3d/3d::Global particles: 4 -DEAL:3d/3d::OK +DEAL:0:2d/2d::Locally owned active cells: 0 +DEAL:0:2d/2d::Global particles: 4 +DEAL:0:2d/2d::OK +DEAL:0:2d/3d::Locally owned active cells: 0 +DEAL:0:2d/3d::Global particles: 4 +DEAL:0:2d/3d::OK +DEAL:0:3d/3d::Locally owned active cells: 0 +DEAL:0:3d/3d::Global particles: 4 +DEAL:0:3d/3d::OK +DEAL:0:2d/2d::Locally owned active cells: 0 +DEAL:0:2d/2d::Global particles: 4 +DEAL:0:2d/2d::OK +DEAL:0:2d/3d::Locally owned active cells: 0 +DEAL:0:2d/3d::Global particles: 4 +DEAL:0:2d/3d::OK +DEAL:0:3d/3d::Locally owned active cells: 0 +DEAL:0:3d/3d::Global particles: 4 +DEAL:0:3d/3d::OK + +DEAL:1:2d/2d::OK +DEAL:1:2d/3d::OK +DEAL:1:3d/3d::OK +DEAL:1:2d/2d::OK +DEAL:1:2d/3d::OK +DEAL:1:3d/3d::OK + + +DEAL:2:2d/2d::OK +DEAL:2:2d/3d::OK +DEAL:2:3d/3d::OK +DEAL:2:2d/2d::OK +DEAL:2:2d/3d::OK +DEAL:2:3d/3d::OK + -- 2.39.5