From aad2b1a8fbccb082f3205964e341b4a29b7419e5 Mon Sep 17 00:00:00 2001 From: Marc Fehling Date: Tue, 6 Jul 2021 22:25:58 -0600 Subject: [PATCH] tests: shared tria: use partition_zoltan instead of partition_auto if output prepared with zoltan. --- tests/grid/grid_tools_cache_04.cc | 6 +++++- ...rue.with_trilinos_with_zoltan=true.mpirun=1.output} | 0 ...rue.with_trilinos_with_zoltan=true.mpirun=4.output} | 0 .../remote_point_evaluation_01.cc | 10 ++++++++-- ...rue.with_trilinos_with_zoltan=true.mpirun=1.output} | 0 ...rue.with_trilinos_with_zoltan=true.mpirun=4.output} | 0 .../remote_point_evaluation_02.cc | 10 ++++++++-- ...rue.with_trilinos_with_zoltan=true.mpirun=1.output} | 0 ...rue.with_trilinos_with_zoltan=true.mpirun=5.output} | 0 tests/sharedtria/limit_p_level_difference_04.cc | 8 +++++--- ...rue.with_trilinos_with_zoltan=true.mpirun=1.output} | 0 ...rue.with_trilinos_with_zoltan=true.mpirun=4.output} | 0 12 files changed, 26 insertions(+), 8 deletions(-) rename tests/grid/{grid_tools_cache_04.with_mpi=true.with_p4est=true.mpirun=1.output => grid_tools_cache_04.with_mpi=true.with_p4est=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output} (100%) rename tests/grid/{grid_tools_cache_04.with_mpi=true.with_p4est=true.mpirun=4.output => grid_tools_cache_04.with_mpi=true.with_p4est=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output} (100%) rename tests/remote_point_evaluation/{remote_point_evaluation_01.mpirun=1.output => remote_point_evaluation_01.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output} (100%) rename tests/remote_point_evaluation/{remote_point_evaluation_01.mpirun=4.output => remote_point_evaluation_01.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output} (100%) rename tests/remote_point_evaluation/{remote_point_evaluation_02.mpirun=1.output => remote_point_evaluation_02.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output} (100%) rename tests/remote_point_evaluation/{remote_point_evaluation_02.mpirun=5.output => remote_point_evaluation_02.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=5.output} (100%) rename tests/sharedtria/{limit_p_level_difference_04.with_mpi=true.mpirun=1.output => limit_p_level_difference_04.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output} (100%) rename tests/sharedtria/{limit_p_level_difference_04.with_mpi=true.mpirun=4.output => limit_p_level_difference_04.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output} (100%) diff --git a/tests/grid/grid_tools_cache_04.cc b/tests/grid/grid_tools_cache_04.cc index 7de31a4518..afcf22e584 100644 --- a/tests/grid/grid_tools_cache_04.cc +++ b/tests/grid/grid_tools_cache_04.cc @@ -44,7 +44,11 @@ test(unsigned int n_points) deallog << "Testing for dim = " << dim << std::endl; // Creating a grid in the square [0,1]x[0,1] - parallel::shared::Triangulation tria(MPI_COMM_WORLD); + parallel::shared::Triangulation tria( + MPI_COMM_WORLD, + Triangulation::none, + false, + parallel::shared::Triangulation::Settings::partition_zoltan); GridGenerator::hyper_cube(tria); tria.refine_global(std::max(8 - dim, 3)); diff --git a/tests/grid/grid_tools_cache_04.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/grid/grid_tools_cache_04.with_mpi=true.with_p4est=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output similarity index 100% rename from tests/grid/grid_tools_cache_04.with_mpi=true.with_p4est=true.mpirun=1.output rename to tests/grid/grid_tools_cache_04.with_mpi=true.with_p4est=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output diff --git a/tests/grid/grid_tools_cache_04.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/grid/grid_tools_cache_04.with_mpi=true.with_p4est=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output similarity index 100% rename from tests/grid/grid_tools_cache_04.with_mpi=true.with_p4est=true.mpirun=4.output rename to tests/grid/grid_tools_cache_04.with_mpi=true.with_p4est=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output diff --git a/tests/remote_point_evaluation/remote_point_evaluation_01.cc b/tests/remote_point_evaluation/remote_point_evaluation_01.cc index 62355fee90..528f16322d 100644 --- a/tests/remote_point_evaluation/remote_point_evaluation_01.cc +++ b/tests/remote_point_evaluation/remote_point_evaluation_01.cc @@ -410,7 +410,10 @@ test() const unsigned int n_refinements = 5; parallel::shared::Triangulation tria( - MPI_COMM_WORLD, Triangulation::none, true); + MPI_COMM_WORLD, + Triangulation::none, + true, + parallel::shared::Triangulation::Settings::partition_zoltan); #if false GridGenerator::hyper_sphere(tria, Point(), 0.5); #else @@ -460,7 +463,10 @@ test() const unsigned int background_fe_degree = 2; parallel::shared::Triangulation background_tria( - MPI_COMM_WORLD, Triangulation::none, true); + MPI_COMM_WORLD, + Triangulation::none, + true, + parallel::shared::Triangulation::Settings::partition_zoltan); #if false GridGenerator::hyper_cube(background_tria, -1.0, +1.0); #else diff --git a/tests/remote_point_evaluation/remote_point_evaluation_01.mpirun=1.output b/tests/remote_point_evaluation/remote_point_evaluation_01.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output similarity index 100% rename from tests/remote_point_evaluation/remote_point_evaluation_01.mpirun=1.output rename to tests/remote_point_evaluation/remote_point_evaluation_01.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output diff --git a/tests/remote_point_evaluation/remote_point_evaluation_01.mpirun=4.output b/tests/remote_point_evaluation/remote_point_evaluation_01.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output similarity index 100% rename from tests/remote_point_evaluation/remote_point_evaluation_01.mpirun=4.output rename to tests/remote_point_evaluation/remote_point_evaluation_01.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output diff --git a/tests/remote_point_evaluation/remote_point_evaluation_02.cc b/tests/remote_point_evaluation/remote_point_evaluation_02.cc index 2918d4a943..50f4049cad 100644 --- a/tests/remote_point_evaluation/remote_point_evaluation_02.cc +++ b/tests/remote_point_evaluation/remote_point_evaluation_02.cc @@ -340,7 +340,10 @@ test() const unsigned int n_refinements = 5; parallel::shared::Triangulation tria( - MPI_COMM_WORLD, Triangulation::none, true); + MPI_COMM_WORLD, + Triangulation::none, + true, + parallel::shared::Triangulation::Settings::partition_zoltan); #if false GridGenerator::hyper_sphere(tria, Point(), 0.5); #else @@ -377,7 +380,10 @@ test() const unsigned int background_fe_degree = 2; parallel::shared::Triangulation background_tria( - MPI_COMM_WORLD, Triangulation::none, true); + MPI_COMM_WORLD, + Triangulation::none, + true, + parallel::shared::Triangulation::Settings::partition_zoltan); #if false GridGenerator::hyper_cube(background_tria, -1.0, +1.0); #else diff --git a/tests/remote_point_evaluation/remote_point_evaluation_02.mpirun=1.output b/tests/remote_point_evaluation/remote_point_evaluation_02.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output similarity index 100% rename from tests/remote_point_evaluation/remote_point_evaluation_02.mpirun=1.output rename to tests/remote_point_evaluation/remote_point_evaluation_02.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output diff --git a/tests/remote_point_evaluation/remote_point_evaluation_02.mpirun=5.output b/tests/remote_point_evaluation/remote_point_evaluation_02.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=5.output similarity index 100% rename from tests/remote_point_evaluation/remote_point_evaluation_02.mpirun=5.output rename to tests/remote_point_evaluation/remote_point_evaluation_02.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=5.output diff --git a/tests/sharedtria/limit_p_level_difference_04.cc b/tests/sharedtria/limit_p_level_difference_04.cc index 019d2bf087..e94dddeca7 100644 --- a/tests/sharedtria/limit_p_level_difference_04.cc +++ b/tests/sharedtria/limit_p_level_difference_04.cc @@ -62,9 +62,11 @@ test(const unsigned int max_difference, const bool allow_artificial_cells) // after prepare_coarsening_and_refinement(), the p-levels should propagate // through the central cells as if they were already coarsened - parallel::shared::Triangulation tria(MPI_COMM_WORLD, - Triangulation::none, - allow_artificial_cells); + parallel::shared::Triangulation tria( + MPI_COMM_WORLD, + Triangulation::none, + allow_artificial_cells, + parallel::shared::Triangulation::Settings::partition_zoltan); TestGrids::hyper_line(tria, 3); // refine the central cell diff --git a/tests/sharedtria/limit_p_level_difference_04.with_mpi=true.mpirun=1.output b/tests/sharedtria/limit_p_level_difference_04.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output similarity index 100% rename from tests/sharedtria/limit_p_level_difference_04.with_mpi=true.mpirun=1.output rename to tests/sharedtria/limit_p_level_difference_04.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=1.output diff --git a/tests/sharedtria/limit_p_level_difference_04.with_mpi=true.mpirun=4.output b/tests/sharedtria/limit_p_level_difference_04.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output similarity index 100% rename from tests/sharedtria/limit_p_level_difference_04.with_mpi=true.mpirun=4.output rename to tests/sharedtria/limit_p_level_difference_04.with_mpi=true.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=4.output -- 2.39.5