tests: shared tria: use partition_zoltan instead of partition_auto if output prepared...

diff --git a/tests/grid/grid_tools_cache_04.cc b/tests/grid/grid_tools_cache_04.cc
index 7de31a4518df93d96df24fa9d34995b98434140e..afcf22e584d0504286e0bbbcbd2ac124e4f37558 100644 (file)
--- 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<dim> tria(MPI_COMM_WORLD);
+  parallel::shared::Triangulation<dim> tria(
+    MPI_COMM_WORLD,
+    Triangulation<dim>::none,
+    false,
+    parallel::shared::Triangulation<dim>::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 62355fee90462d86ea0798862d0bcded3c505e12..528f16322dbc9015a83b497962a9fd8f8cdb5fda 100644 (file)
--- 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<dim, spacedim> tria(
-    MPI_COMM_WORLD, Triangulation<dim, spacedim>::none, true);
+    MPI_COMM_WORLD,
+    Triangulation<dim, spacedim>::none,
+    true,
+    parallel::shared::Triangulation<dim, spacedim>::Settings::partition_zoltan);
 #if false
   GridGenerator::hyper_sphere(tria, Point<spacedim>(), 0.5);
 #else
@@ -460,7 +463,10 @@ test()
   const unsigned int background_fe_degree = 2;
 
   parallel::shared::Triangulation<spacedim> background_tria(
-    MPI_COMM_WORLD, Triangulation<spacedim>::none, true);
+    MPI_COMM_WORLD,
+    Triangulation<spacedim>::none,
+    true,
+    parallel::shared::Triangulation<spacedim>::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 2918d4a943020320346c13e3f46092f4589bbe21..50f4049cad8b5868172159bd0d9e934b46a5b928 100644 (file)
--- 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<dim, spacedim> tria(
-    MPI_COMM_WORLD, Triangulation<dim, spacedim>::none, true);
+    MPI_COMM_WORLD,
+    Triangulation<dim, spacedim>::none,
+    true,
+    parallel::shared::Triangulation<dim, spacedim>::Settings::partition_zoltan);
 #if false
   GridGenerator::hyper_sphere(tria, Point<spacedim>(), 0.5);
 #else
@@ -377,7 +380,10 @@ test()
   const unsigned int background_fe_degree = 2;
 
   parallel::shared::Triangulation<spacedim> background_tria(
-    MPI_COMM_WORLD, Triangulation<spacedim>::none, true);
+    MPI_COMM_WORLD,
+    Triangulation<spacedim>::none,
+    true,
+    parallel::shared::Triangulation<spacedim>::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 019d2bf0874589c5c3c76164d1cadb0fc15faf7b..e94dddeca731a364e2ffd6bda8d780e88f0fd24a 100644 (file)
--- 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<dim> tria(MPI_COMM_WORLD,
-                                            Triangulation<dim>::none,
-                                            allow_artificial_cells);
+  parallel::shared::Triangulation<dim> tria(
+    MPI_COMM_WORLD,
+    Triangulation<dim>::none,
+    allow_artificial_cells,
+    parallel::shared::Triangulation<dim>::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