From 2a361bec5504a80d38d296ad5e72a0a977229372 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Sun, 3 Dec 2017 11:27:39 +0100 Subject: [PATCH] Fix shared::Triangulation tests --- tests/mpi/blockwise_parallel_01.cc | 6 +++--- tests/mpi/blockwise_parallel_01.mpirun=2.output | 2 ++ tests/mpi/locally_owned_dofs_per_subdomain.cc | 2 +- .../mpi/locally_owned_dofs_per_subdomain.mpirun=2.output | 8 ++++---- tests/mpi/locally_owned_dofs_per_subdomain_hp.cc | 6 +++++- .../locally_owned_dofs_per_subdomain_hp.mpirun=2.output | 8 ++++---- tests/physics/step-18-rotation_matrix.cc | 2 +- tests/physics/step-18.cc | 2 +- 8 files changed, 21 insertions(+), 15 deletions(-) diff --git a/tests/mpi/blockwise_parallel_01.cc b/tests/mpi/blockwise_parallel_01.cc index 07fb23d2fd..cde2742457 100644 --- a/tests/mpi/blockwise_parallel_01.cc +++ b/tests/mpi/blockwise_parallel_01.cc @@ -56,9 +56,9 @@ void test() locally_owned_dofs_per_block[1] = locally_owned_dofs_per_subdomain[this_mpi_process].get_view(dofs_per_block, dh.n_dofs()); - if (locally_owned_dofs_per_block[0] != locally_owned_dofs_per_block[1])) - ExcMessage("Locally owned dofs differ across blocks.")); - } + if (locally_owned_dofs_per_block[0] != locally_owned_dofs_per_block[1]) + AssertThrow(false, ExcMessage("Locally owned dofs differ across blocks.")); + } if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) deallog << "OK for " << dim << "d" << std::endl; diff --git a/tests/mpi/blockwise_parallel_01.mpirun=2.output b/tests/mpi/blockwise_parallel_01.mpirun=2.output index 5637e3faa0..76b868c7e1 100644 --- a/tests/mpi/blockwise_parallel_01.mpirun=2.output +++ b/tests/mpi/blockwise_parallel_01.mpirun=2.output @@ -1,3 +1,5 @@ + DEAL:0::OK for 2d DEAL:0::OK for 3d + diff --git a/tests/mpi/locally_owned_dofs_per_subdomain.cc b/tests/mpi/locally_owned_dofs_per_subdomain.cc index e5bae01d78..a1d87e9c0e 100644 --- a/tests/mpi/locally_owned_dofs_per_subdomain.cc +++ b/tests/mpi/locally_owned_dofs_per_subdomain.cc @@ -31,7 +31,7 @@ void test () triangulation (MPI_COMM_WORLD, ::Triangulation::none, false, - parallel::shared::Triangulation::partition_metis); + parallel::shared::Triangulation::partition_zorder); GridGenerator::hyper_cube(triangulation, -1.0, 1.0); FE_Q fe(1); diff --git a/tests/mpi/locally_owned_dofs_per_subdomain.mpirun=2.output b/tests/mpi/locally_owned_dofs_per_subdomain.mpirun=2.output index 481ba49a0d..3c757e8d85 100644 --- a/tests/mpi/locally_owned_dofs_per_subdomain.mpirun=2.output +++ b/tests/mpi/locally_owned_dofs_per_subdomain.mpirun=2.output @@ -2,18 +2,18 @@ DEAL:0::dim=2 DEAL:0::rank=0 DEAL:0:: n_dofs=4 -DEAL:0:: n_locally_owned_dofs=4 +DEAL:0:: n_locally_owned_dofs=0 DEAL:0::dim=3 DEAL:0::rank=0 DEAL:0:: n_dofs=8 -DEAL:0:: n_locally_owned_dofs=8 +DEAL:0:: n_locally_owned_dofs=0 DEAL:1::dim=2 DEAL:1::rank=1 DEAL:1:: n_dofs=4 -DEAL:1:: n_locally_owned_dofs=0 +DEAL:1:: n_locally_owned_dofs=4 DEAL:1::dim=3 DEAL:1::rank=1 DEAL:1:: n_dofs=8 -DEAL:1:: n_locally_owned_dofs=0 +DEAL:1:: n_locally_owned_dofs=8 diff --git a/tests/mpi/locally_owned_dofs_per_subdomain_hp.cc b/tests/mpi/locally_owned_dofs_per_subdomain_hp.cc index 68a072828a..fb1b20efd2 100644 --- a/tests/mpi/locally_owned_dofs_per_subdomain_hp.cc +++ b/tests/mpi/locally_owned_dofs_per_subdomain_hp.cc @@ -30,7 +30,11 @@ template void test () { - parallel::shared::Triangulation triangulation(MPI_COMM_WORLD); + parallel::shared::Triangulation + triangulation (MPI_COMM_WORLD, + ::Triangulation::none, + false, + parallel::shared::Triangulation::partition_zorder); GridGenerator::hyper_cube(triangulation, -1.0, 1.0); hp::FECollection fe; diff --git a/tests/mpi/locally_owned_dofs_per_subdomain_hp.mpirun=2.output b/tests/mpi/locally_owned_dofs_per_subdomain_hp.mpirun=2.output index 481ba49a0d..3c757e8d85 100644 --- a/tests/mpi/locally_owned_dofs_per_subdomain_hp.mpirun=2.output +++ b/tests/mpi/locally_owned_dofs_per_subdomain_hp.mpirun=2.output @@ -2,18 +2,18 @@ DEAL:0::dim=2 DEAL:0::rank=0 DEAL:0:: n_dofs=4 -DEAL:0:: n_locally_owned_dofs=4 +DEAL:0:: n_locally_owned_dofs=0 DEAL:0::dim=3 DEAL:0::rank=0 DEAL:0:: n_dofs=8 -DEAL:0:: n_locally_owned_dofs=8 +DEAL:0:: n_locally_owned_dofs=0 DEAL:1::dim=2 DEAL:1::rank=1 DEAL:1:: n_dofs=4 -DEAL:1:: n_locally_owned_dofs=0 +DEAL:1:: n_locally_owned_dofs=4 DEAL:1::dim=3 DEAL:1::rank=1 DEAL:1:: n_dofs=8 -DEAL:1:: n_locally_owned_dofs=0 +DEAL:1:: n_locally_owned_dofs=8 diff --git a/tests/physics/step-18-rotation_matrix.cc b/tests/physics/step-18-rotation_matrix.cc index e7fd5e81fa..389aa31b80 100644 --- a/tests/physics/step-18-rotation_matrix.cc +++ b/tests/physics/step-18-rotation_matrix.cc @@ -284,7 +284,7 @@ namespace Step18 triangulation(MPI_COMM_WORLD, ::Triangulation::none, false, - parallel::shared::Triangulation::partition_metis), + parallel::shared::Triangulation::partition_zorder), fe (FE_Q(1), dim), dof_handler (triangulation), quadrature_formula (2), diff --git a/tests/physics/step-18.cc b/tests/physics/step-18.cc index 9419b37055..f13052e4ac 100644 --- a/tests/physics/step-18.cc +++ b/tests/physics/step-18.cc @@ -311,7 +311,7 @@ namespace Step18 triangulation(MPI_COMM_WORLD, ::Triangulation::none, false, - parallel::shared::Triangulation::partition_metis), + parallel::shared::Triangulation::partition_zorder), fe (FE_Q(1), dim), dof_handler (triangulation), quadrature_formula (2), -- 2.39.5