From 18d6391dadecd03cc72c1701ac1cb6d9b9b96484 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 30 Nov 2017 17:28:12 +0100 Subject: [PATCH] Make sure to not call p::s::Triangulation with a default partitioner in the tests --- tests/matrix_free/matrix_vector_19.cc | 6 +++++- tests/mpi/locally_owned_dofs_per_subdomain.cc | 6 +++++- tests/mpi/locally_owned_subdomain_01.cc | 7 ++++++- tests/physics/step-18-rotation_matrix.cc | 21 +++++++++++-------- tests/physics/step-18.cc | 21 +++++++++++-------- tests/quick_tests/step-metis.cc | 5 ++++- tests/vector_tools/integrate_difference_04.cc | 5 ++++- .../integrate_difference_04_hp.cc | 5 ++++- .../integrate_difference_04_hp_02.cc | 5 ++++- 9 files changed, 56 insertions(+), 25 deletions(-) diff --git a/tests/matrix_free/matrix_vector_19.cc b/tests/matrix_free/matrix_vector_19.cc index 1100f153cb..95c846ff36 100644 --- a/tests/matrix_free/matrix_vector_19.cc +++ b/tests/matrix_free/matrix_vector_19.cc @@ -46,7 +46,11 @@ void test () { typedef double number; - parallel::shared::Triangulation tria (MPI_COMM_WORLD); + parallel::shared::Triangulation + triangulation (MPI_COMM_WORLD, + ::Triangulation::none, + false, + parallel::shared::Triangulation::partition_metis); GridGenerator::hyper_cube (tria); tria.refine_global(1); typename Triangulation::active_cell_iterator diff --git a/tests/mpi/locally_owned_dofs_per_subdomain.cc b/tests/mpi/locally_owned_dofs_per_subdomain.cc index 460119e945..e5bae01d78 100644 --- a/tests/mpi/locally_owned_dofs_per_subdomain.cc +++ b/tests/mpi/locally_owned_dofs_per_subdomain.cc @@ -27,7 +27,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_metis); GridGenerator::hyper_cube(triangulation, -1.0, 1.0); FE_Q fe(1); diff --git a/tests/mpi/locally_owned_subdomain_01.cc b/tests/mpi/locally_owned_subdomain_01.cc index 90ab7e0559..1f9944f2c3 100644 --- a/tests/mpi/locally_owned_subdomain_01.cc +++ b/tests/mpi/locally_owned_subdomain_01.cc @@ -35,7 +35,12 @@ int main (int argc, char *argv[]) MPILogInitAll all; { - parallel::shared::Triangulation<1> tria(MPI_COMM_WORLD); + parallel::shared::Triangulation<1> + tria (MPI_COMM_WORLD, + ::Triangulation::none, + false, + parallel::shared::Triangulation::partition_metis); + deallog << tria.locally_owned_subdomain() << std::endl; } } diff --git a/tests/physics/step-18-rotation_matrix.cc b/tests/physics/step-18-rotation_matrix.cc index 9ee398c44d..c7fef61124 100644 --- a/tests/physics/step-18-rotation_matrix.cc +++ b/tests/physics/step-18-rotation_matrix.cc @@ -281,15 +281,18 @@ namespace Step18 template TopLevel::TopLevel () : - triangulation(MPI_COMM_WORLD), - fe (FE_Q(1), dim), - dof_handler (triangulation), - quadrature_formula (2), - mpi_communicator (MPI_COMM_WORLD), - n_mpi_processes (Utilities::MPI::n_mpi_processes(mpi_communicator)), - this_mpi_process (Utilities::MPI::this_mpi_process(mpi_communicator)), - pcout (std::cout, this_mpi_process == 0), - monitored_vertex_first_dof(0) + triangulation((MPI_COMM_WORLD, + ::Triangulation::none, + false, + parallel::shared::Triangulation::partition_metis), + fe (FE_Q(1), dim), + dof_handler (triangulation), + quadrature_formula (2), + mpi_communicator (MPI_COMM_WORLD), + n_mpi_processes (Utilities::MPI::n_mpi_processes(mpi_communicator)), + this_mpi_process (Utilities::MPI::this_mpi_process(mpi_communicator)), + pcout (std::cout, this_mpi_process == 0), + monitored_vertex_first_dof(0) {} template TopLevel::~TopLevel () diff --git a/tests/physics/step-18.cc b/tests/physics/step-18.cc index ecf494df57..061afa0145 100644 --- a/tests/physics/step-18.cc +++ b/tests/physics/step-18.cc @@ -308,15 +308,18 @@ namespace Step18 template TopLevel::TopLevel () : - triangulation(MPI_COMM_WORLD), - fe (FE_Q(1), dim), - dof_handler (triangulation), - quadrature_formula (2), - mpi_communicator (MPI_COMM_WORLD), - n_mpi_processes (Utilities::MPI::n_mpi_processes(mpi_communicator)), - this_mpi_process (Utilities::MPI::this_mpi_process(mpi_communicator)), - pcout (std::cout, this_mpi_process == 0), - monitored_vertex_first_dof(0) + triangulation((MPI_COMM_WORLD, + ::Triangulation::none, + false, + parallel::shared::Triangulation::partition_metis), + fe (FE_Q(1), dim), + dof_handler (triangulation), + quadrature_formula (2), + mpi_communicator (MPI_COMM_WORLD), + n_mpi_processes (Utilities::MPI::n_mpi_processes(mpi_communicator)), + this_mpi_process (Utilities::MPI::this_mpi_process(mpi_communicator)), + pcout (std::cout, this_mpi_process == 0), + monitored_vertex_first_dof(0) {} template TopLevel::~TopLevel () diff --git a/tests/quick_tests/step-metis.cc b/tests/quick_tests/step-metis.cc index 7bf9cb9e26..990a5f9252 100644 --- a/tests/quick_tests/step-metis.cc +++ b/tests/quick_tests/step-metis.cc @@ -36,7 +36,10 @@ int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - parallel::shared::Triangulation triangulation(MPI_COMM_WORLD); + parallel::shared::Triangulation triangulation(MPI_COMM_WORLD, + ::Triangulation::none, + false, + parallel::shared::Triangulation::partition_metis); FE_Q fe(1); DoFHandler dof_handler (triangulation); diff --git a/tests/vector_tools/integrate_difference_04.cc b/tests/vector_tools/integrate_difference_04.cc index c38ee70b9b..7ec00f1608 100644 --- a/tests/vector_tools/integrate_difference_04.cc +++ b/tests/vector_tools/integrate_difference_04.cc @@ -62,7 +62,10 @@ public: template void test(VectorTools::NormType norm, double value, double exp = 2.0) { - parallel::shared::Triangulation tria(MPI_COMM_WORLD); + parallel::shared::Triangulation tria(MPI_COMM_WORLD, + ::Triangulation::none, + false, + parallel::shared::Triangulation::partition_metis); GridGenerator::hyper_cube(tria); tria.refine_global(3); diff --git a/tests/vector_tools/integrate_difference_04_hp.cc b/tests/vector_tools/integrate_difference_04_hp.cc index e998a1d301..40df9f3c2c 100644 --- a/tests/vector_tools/integrate_difference_04_hp.cc +++ b/tests/vector_tools/integrate_difference_04_hp.cc @@ -67,7 +67,10 @@ public: template void test(VectorTools::NormType norm, double value, double exp = 2.0) { - parallel::shared::Triangulation tria(MPI_COMM_WORLD); + parallel::shared::Triangulation tria(MPI_COMM_WORLD, + ::Triangulation::none, + false, + parallel::shared::Triangulation::partition_metis); GridGenerator::hyper_cube(tria); tria.refine_global(3); diff --git a/tests/vector_tools/integrate_difference_04_hp_02.cc b/tests/vector_tools/integrate_difference_04_hp_02.cc index eb22fbcbf8..392b839a36 100644 --- a/tests/vector_tools/integrate_difference_04_hp_02.cc +++ b/tests/vector_tools/integrate_difference_04_hp_02.cc @@ -71,7 +71,10 @@ public: template void test(VectorTools::NormType norm, double value, double exp = 2.0) { - parallel::shared::Triangulation tria(MPI_COMM_WORLD); + parallel::shared::Triangulation tria(MPI_COMM_WORLD, + ::Triangulation::none, + false, + parallel::shared::Triangulation::partition_metis); GridGenerator::hyper_cube(tria); tria.refine_global(3); -- 2.39.5