Fix sharedtria/communicate_active_fe_indices

diff --git a/tests/sharedtria/communicate_active_fe_indices_01.cc b/tests/sharedtria/communicate_active_fe_indices_01.cc
index e39435f4e8603c689661acde7416f7fee1d4183a..72c4fd46a710387cb9202b9fb4ef6c8c2979bc5b 100644 (file)
--- a/tests/sharedtria/communicate_active_fe_indices_01.cc
+++ b/tests/sharedtria/communicate_active_fe_indices_01.cc
@@ -40,7 +40,10 @@ template <int dim>
 void test()
 {
   parallel::shared::Triangulation<dim>
-  triangulation (MPI_COMM_WORLD);
+  triangulation (MPI_COMM_WORLD,
+                 ::Triangulation<dim>::none,
+                 false,
+                 parallel::shared::Triangulation<dim>::partition_zorder);
 
   GridGenerator::hyper_cube(triangulation);
   triangulation.refine_global (3);

diff --git a/tests/sharedtria/communicate_active_fe_indices_01.with_metis=true.mpirun=3.output b/tests/sharedtria/communicate_active_fe_indices_01.with_metis=true.mpirun=3.output
index 67051f933cd0245313411d5bf915a08b88f9dcec..67f7d08468c5d65a780635c0a6e3b1b483b5921f 100644 (file)
--- a/tests/sharedtria/communicate_active_fe_indices_01.with_metis=true.mpirun=3.output
+++ b/tests/sharedtria/communicate_active_fe_indices_01.with_metis=true.mpirun=3.output
@@ -1,23 +1,23 @@
 
 DEAL:0:1d::n_dofs: 9
-DEAL:0:1d::n_locally_owned_dofs: 4
+DEAL:0:1d::n_locally_owned_dofs: 3
 DEAL:0:2d::n_dofs: 81
-DEAL:0:2d::n_locally_owned_dofs: 32
+DEAL:0:2d::n_locally_owned_dofs: 26
 DEAL:0:3d::n_dofs: 729
-DEAL:0:3d::n_locally_owned_dofs: 304
+DEAL:0:3d::n_locally_owned_dofs: 227
 
 DEAL:1:1d::n_dofs: 9
 DEAL:1:1d::n_locally_owned_dofs: 4
 DEAL:1:2d::n_dofs: 81
-DEAL:1:2d::n_locally_owned_dofs: 27
+DEAL:1:2d::n_locally_owned_dofs: 32
 DEAL:1:3d::n_dofs: 729
-DEAL:1:3d::n_locally_owned_dofs: 246
+DEAL:1:3d::n_locally_owned_dofs: 252
 
 
 DEAL:2:1d::n_dofs: 9
-DEAL:2:1d::n_locally_owned_dofs: 1
+DEAL:2:1d::n_locally_owned_dofs: 2
 DEAL:2:2d::n_dofs: 81
-DEAL:2:2d::n_locally_owned_dofs: 22
+DEAL:2:2d::n_locally_owned_dofs: 23
 DEAL:2:3d::n_dofs: 729
-DEAL:2:3d::n_locally_owned_dofs: 179
+DEAL:2:3d::n_locally_owned_dofs: 250
 

diff --git a/tests/sharedtria/communicate_active_fe_indices_01.with_metis=true.mpirun=3.output.2 b/tests/sharedtria/communicate_active_fe_indices_01.with_metis=true.mpirun=3.output.2
deleted file mode 100644 (file)
index 67051f9..0000000
--- a/tests/sharedtria/communicate_active_fe_indices_01.with_metis=true.mpirun=3.output.2
+++ /dev/null
@@ -1,23 +0,0 @@
-
-DEAL:0:1d::n_dofs: 9
-DEAL:0:1d::n_locally_owned_dofs: 4
-DEAL:0:2d::n_dofs: 81
-DEAL:0:2d::n_locally_owned_dofs: 32
-DEAL:0:3d::n_dofs: 729
-DEAL:0:3d::n_locally_owned_dofs: 304
-
-DEAL:1:1d::n_dofs: 9
-DEAL:1:1d::n_locally_owned_dofs: 4
-DEAL:1:2d::n_dofs: 81
-DEAL:1:2d::n_locally_owned_dofs: 27
-DEAL:1:3d::n_dofs: 729
-DEAL:1:3d::n_locally_owned_dofs: 246
-
-
-DEAL:2:1d::n_dofs: 9
-DEAL:2:1d::n_locally_owned_dofs: 1
-DEAL:2:2d::n_dofs: 81
-DEAL:2:2d::n_locally_owned_dofs: 22
-DEAL:2:3d::n_dofs: 729
-DEAL:2:3d::n_locally_owned_dofs: 179
-

diff --git a/tests/sharedtria/communicate_active_fe_indices_01.with_metis=true.with_64bit_indices=off.mpirun=3.output.clang9_sierra b/tests/sharedtria/communicate_active_fe_indices_01.with_metis=true.with_64bit_indices=off.mpirun=3.output.clang9_sierra
deleted file mode 100644 (file)
index 67051f9..0000000
--- a/tests/sharedtria/communicate_active_fe_indices_01.with_metis=true.with_64bit_indices=off.mpirun=3.output.clang9_sierra
+++ /dev/null
@@ -1,23 +0,0 @@
-
-DEAL:0:1d::n_dofs: 9
-DEAL:0:1d::n_locally_owned_dofs: 4
-DEAL:0:2d::n_dofs: 81
-DEAL:0:2d::n_locally_owned_dofs: 32
-DEAL:0:3d::n_dofs: 729
-DEAL:0:3d::n_locally_owned_dofs: 304
-
-DEAL:1:1d::n_dofs: 9
-DEAL:1:1d::n_locally_owned_dofs: 4
-DEAL:1:2d::n_dofs: 81
-DEAL:1:2d::n_locally_owned_dofs: 27
-DEAL:1:3d::n_dofs: 729
-DEAL:1:3d::n_locally_owned_dofs: 246
-
-
-DEAL:2:1d::n_dofs: 9
-DEAL:2:1d::n_locally_owned_dofs: 1
-DEAL:2:2d::n_dofs: 81
-DEAL:2:2d::n_locally_owned_dofs: 22
-DEAL:2:3d::n_dofs: 729
-DEAL:2:3d::n_locally_owned_dofs: 179
-

diff --git a/tests/sharedtria/communicate_active_fe_indices_02.cc b/tests/sharedtria/communicate_active_fe_indices_02.cc
index d779fcb79c8bbbe8be0ee747d9f1f44d1e8d6f77..c1bfe210fb350279fda74d97c70259245eed35da 100644 (file)
--- a/tests/sharedtria/communicate_active_fe_indices_02.cc
+++ b/tests/sharedtria/communicate_active_fe_indices_02.cc
@@ -38,7 +38,10 @@ template <int dim>
 void test()
 {
   parallel::shared::Triangulation<dim>
-  triangulation (MPI_COMM_WORLD, dealii::Triangulation<dim>::none, true);
+  triangulation (MPI_COMM_WORLD,
+                 ::Triangulation<dim>::none,
+                 true,
+                 parallel::shared::Triangulation<dim>::partition_zorder);
 
   GridGenerator::hyper_cube(triangulation);
   triangulation.refine_global (3);

diff --git a/tests/sharedtria/communicate_active_fe_indices_02.with_metis=true.mpirun=3.output b/tests/sharedtria/communicate_active_fe_indices_02.with_metis=true.mpirun=3.output
index 67051f933cd0245313411d5bf915a08b88f9dcec..67f7d08468c5d65a780635c0a6e3b1b483b5921f 100644 (file)
--- a/tests/sharedtria/communicate_active_fe_indices_02.with_metis=true.mpirun=3.output
+++ b/tests/sharedtria/communicate_active_fe_indices_02.with_metis=true.mpirun=3.output
@@ -1,23 +1,23 @@
 
 DEAL:0:1d::n_dofs: 9
-DEAL:0:1d::n_locally_owned_dofs: 4
+DEAL:0:1d::n_locally_owned_dofs: 3
 DEAL:0:2d::n_dofs: 81
-DEAL:0:2d::n_locally_owned_dofs: 32
+DEAL:0:2d::n_locally_owned_dofs: 26
 DEAL:0:3d::n_dofs: 729
-DEAL:0:3d::n_locally_owned_dofs: 304
+DEAL:0:3d::n_locally_owned_dofs: 227
 
 DEAL:1:1d::n_dofs: 9
 DEAL:1:1d::n_locally_owned_dofs: 4
 DEAL:1:2d::n_dofs: 81
-DEAL:1:2d::n_locally_owned_dofs: 27
+DEAL:1:2d::n_locally_owned_dofs: 32
 DEAL:1:3d::n_dofs: 729
-DEAL:1:3d::n_locally_owned_dofs: 246
+DEAL:1:3d::n_locally_owned_dofs: 252
 
 
 DEAL:2:1d::n_dofs: 9
-DEAL:2:1d::n_locally_owned_dofs: 1
+DEAL:2:1d::n_locally_owned_dofs: 2
 DEAL:2:2d::n_dofs: 81
-DEAL:2:2d::n_locally_owned_dofs: 22
+DEAL:2:2d::n_locally_owned_dofs: 23
 DEAL:2:3d::n_dofs: 729
-DEAL:2:3d::n_locally_owned_dofs: 179
+DEAL:2:3d::n_locally_owned_dofs: 250
 

diff --git a/tests/sharedtria/communicate_active_fe_indices_02.with_metis=true.mpirun=3.output.2 b/tests/sharedtria/communicate_active_fe_indices_02.with_metis=true.mpirun=3.output.2
deleted file mode 100644 (file)
index c750ba4..0000000
--- a/tests/sharedtria/communicate_active_fe_indices_02.with_metis=true.mpirun=3.output.2
+++ /dev/null
@@ -1,23 +0,0 @@
-
-DEAL:0:1d::n_dofs: 9
-DEAL:0:1d::n_locally_owned_dofs: 4
-DEAL:0:2d::n_dofs: 81
-DEAL:0:2d::n_locally_owned_dofs: 28
-DEAL:0:3d::n_dofs: 729
-DEAL:0:3d::n_locally_owned_dofs: 244
-
-DEAL:1:1d::n_dofs: 9
-DEAL:1:1d::n_locally_owned_dofs: 3
-DEAL:1:2d::n_dofs: 81
-DEAL:1:2d::n_locally_owned_dofs: 26
-DEAL:1:3d::n_dofs: 729
-DEAL:1:3d::n_locally_owned_dofs: 240
-
-
-DEAL:2:1d::n_dofs: 9
-DEAL:2:1d::n_locally_owned_dofs: 2
-DEAL:2:2d::n_dofs: 81
-DEAL:2:2d::n_locally_owned_dofs: 27
-DEAL:2:3d::n_dofs: 729
-DEAL:2:3d::n_locally_owned_dofs: 245
-

diff --git a/tests/sharedtria/communicate_active_fe_indices_02.with_metis=true.with_64bit_indices=off.mpirun=3.output.clang9_sierra b/tests/sharedtria/communicate_active_fe_indices_02.with_metis=true.with_64bit_indices=off.mpirun=3.output.clang9_sierra
deleted file mode 100644 (file)
index 52e7c42..0000000
--- a/tests/sharedtria/communicate_active_fe_indices_02.with_metis=true.with_64bit_indices=off.mpirun=3.output.clang9_sierra
+++ /dev/null
@@ -1,23 +0,0 @@
-
-DEAL:0:1d::n_dofs: 9
-DEAL:0:1d::n_locally_owned_dofs: 3
-DEAL:0:2d::n_dofs: 81
-DEAL:0:2d::n_locally_owned_dofs: 27
-DEAL:0:3d::n_dofs: 729
-DEAL:0:3d::n_locally_owned_dofs: 255
-
-DEAL:1:1d::n_dofs: 9
-DEAL:1:1d::n_locally_owned_dofs: 4
-DEAL:1:2d::n_dofs: 81
-DEAL:1:2d::n_locally_owned_dofs: 28
-DEAL:1:3d::n_dofs: 729
-DEAL:1:3d::n_locally_owned_dofs: 238
-
-
-DEAL:2:1d::n_dofs: 9
-DEAL:2:1d::n_locally_owned_dofs: 2
-DEAL:2:2d::n_dofs: 81
-DEAL:2:2d::n_locally_owned_dofs: 26
-DEAL:2:3d::n_dofs: 729
-DEAL:2:3d::n_locally_owned_dofs: 236
-