From 8ad2beed2e324ccd3ac35530bbd7424c8e31d4e4 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Wed, 22 Nov 2017 16:37:46 +0100 Subject: [PATCH] Fix sharedtria/communicate_active_fe_indices --- .../communicate_active_fe_indices_01.cc | 5 +++- ...indices_01.with_metis=true.mpirun=3.output | 16 ++++++------- ...dices_01.with_metis=true.mpirun=3.output.2 | 23 ------------------- ..._indices=off.mpirun=3.output.clang9_sierra | 23 ------------------- .../communicate_active_fe_indices_02.cc | 5 +++- ...indices_02.with_metis=true.mpirun=3.output | 16 ++++++------- ...dices_02.with_metis=true.mpirun=3.output.2 | 23 ------------------- ..._indices=off.mpirun=3.output.clang9_sierra | 23 ------------------- 8 files changed, 24 insertions(+), 110 deletions(-) delete mode 100644 tests/sharedtria/communicate_active_fe_indices_01.with_metis=true.mpirun=3.output.2 delete mode 100644 tests/sharedtria/communicate_active_fe_indices_01.with_metis=true.with_64bit_indices=off.mpirun=3.output.clang9_sierra delete mode 100644 tests/sharedtria/communicate_active_fe_indices_02.with_metis=true.mpirun=3.output.2 delete mode 100644 tests/sharedtria/communicate_active_fe_indices_02.with_metis=true.with_64bit_indices=off.mpirun=3.output.clang9_sierra diff --git a/tests/sharedtria/communicate_active_fe_indices_01.cc b/tests/sharedtria/communicate_active_fe_indices_01.cc index e39435f4e8..72c4fd46a7 100644 --- a/tests/sharedtria/communicate_active_fe_indices_01.cc +++ b/tests/sharedtria/communicate_active_fe_indices_01.cc @@ -40,7 +40,10 @@ template void test() { parallel::shared::Triangulation - triangulation (MPI_COMM_WORLD); + triangulation (MPI_COMM_WORLD, + ::Triangulation::none, + false, + parallel::shared::Triangulation::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 67051f933c..67f7d08468 100644 --- 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 index 67051f933c..0000000000 --- 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 index 67051f933c..0000000000 --- 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 d779fcb79c..c1bfe210fb 100644 --- a/tests/sharedtria/communicate_active_fe_indices_02.cc +++ b/tests/sharedtria/communicate_active_fe_indices_02.cc @@ -38,7 +38,10 @@ template void test() { parallel::shared::Triangulation - triangulation (MPI_COMM_WORLD, dealii::Triangulation::none, true); + triangulation (MPI_COMM_WORLD, + ::Triangulation::none, + true, + parallel::shared::Triangulation::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 67051f933c..67f7d08468 100644 --- 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 index c750ba40bb..0000000000 --- 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 index 52e7c422bd..0000000000 --- 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 - -- 2.39.5