From f7ba50c73b121ed8baebeb212f17930998edd5dc Mon Sep 17 00:00:00 2001 From: kronbichler Date: Tue, 28 May 2013 15:57:13 +0000 Subject: [PATCH] Adjust test case for new scheme for constraints. git-svn-id: https://svn.dealii.org/trunk@29660 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/mpi/p4est_2d_constraintmatrix_01.cc | 2 +- .../ncpu_10/cmp/generic | 24 ++++++++++ .../ncpu_4/cmp/generic | 16 +++++++ tests/mpi/p4est_2d_constraintmatrix_02.cc | 2 +- .../ncpu_10/cmp/generic | 16 ++++++- .../ncpu_4/cmp/generic | 44 +++++++++++++++++-- 6 files changed, 96 insertions(+), 8 deletions(-) diff --git a/tests/mpi/p4est_2d_constraintmatrix_01.cc b/tests/mpi/p4est_2d_constraintmatrix_01.cc index 943cc41925..7349fdfeb2 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_01.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_01.cc @@ -58,7 +58,7 @@ void test() dofh.distribute_dofs (fe); IndexSet dof_set; - DoFTools::extract_locally_active_dofs (dofh, dof_set); + DoFTools::extract_locally_relevant_dofs (dofh, dof_set); ConstraintMatrix cm; DoFTools::make_hanging_node_constraints (dofh, cm); diff --git a/tests/mpi/p4est_2d_constraintmatrix_01/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_constraintmatrix_01/ncpu_10/cmp/generic index 48ad8a8ba4..b1188f5c0d 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_01/ncpu_10/cmp/generic +++ b/tests/mpi/p4est_2d_constraintmatrix_01/ncpu_10/cmp/generic @@ -30,11 +30,35 @@ DEAL:0:2d::hyper_cube **** **** proc 7 + 5 4: 0.5 + 5 8: 0.5 + 7 6: 0.5 + 7 8: 0.5 **** + 5 4: 0.5 + 5 8: 0.5 + 7 6: 0.5 + 7 8: 0.5 **** proc 8 + 5 4: 0.5 + 5 8: 0.5 + 7 6: 0.5 + 7 8: 0.5 **** + 5 4: 0.5 + 5 8: 0.5 + 7 6: 0.5 + 7 8: 0.5 **** proc 9 + 5 4: 0.5 + 5 8: 0.5 + 7 6: 0.5 + 7 8: 0.5 **** + 5 4: 0.5 + 5 8: 0.5 + 7 6: 0.5 + 7 8: 0.5 diff --git a/tests/mpi/p4est_2d_constraintmatrix_01/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_constraintmatrix_01/ncpu_4/cmp/generic index b52b8b28fc..9a760a1fd3 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_01/ncpu_4/cmp/generic +++ b/tests/mpi/p4est_2d_constraintmatrix_01/ncpu_4/cmp/generic @@ -15,8 +15,24 @@ DEAL:0:2d::hyper_cube 7 8: 0.5 **** proc 2 + 5 4: 0.5 + 5 8: 0.5 + 7 6: 0.5 + 7 8: 0.5 **** + 5 4: 0.5 + 5 8: 0.5 + 7 6: 0.5 + 7 8: 0.5 **** proc 3 + 5 4: 0.5 + 5 8: 0.5 + 7 6: 0.5 + 7 8: 0.5 **** + 5 4: 0.5 + 5 8: 0.5 + 7 6: 0.5 + 7 8: 0.5 diff --git a/tests/mpi/p4est_2d_constraintmatrix_02.cc b/tests/mpi/p4est_2d_constraintmatrix_02.cc index 5df85c6213..b9f25663f1 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_02.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_02.cc @@ -60,7 +60,7 @@ void test() dofh.distribute_dofs (fe); IndexSet dof_set; - DoFTools::extract_locally_active_dofs (dofh, dof_set); + DoFTools::extract_locally_relevant_dofs (dofh, dof_set); ConstraintMatrix cm; DoFTools::make_hanging_node_constraints (dofh, cm); diff --git a/tests/mpi/p4est_2d_constraintmatrix_02/ncpu_10/cmp/generic b/tests/mpi/p4est_2d_constraintmatrix_02/ncpu_10/cmp/generic index a14a133457..5597566abd 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_02/ncpu_10/cmp/generic +++ b/tests/mpi/p4est_2d_constraintmatrix_02/ncpu_10/cmp/generic @@ -8,13 +8,25 @@ DEAL:0:2d::ok DEAL:0:2d::step 2 DEAL:0:2d:: 7 6: 0.5 7 8: 0.5 + 13 8: 0.5 + 13 14: 0.5 **** DEAL:0:2d:: 7 6: 0.5 7 8: 0.5 + 13 8: 0.5 + 13 14: 0.5 ok DEAL:0:2d::step 3 -DEAL:0:2d::**** -DEAL:0:2d::ok +DEAL:0:2d:: 17 8: 0.5 + 17 20: 0.5 + 13 8: 0.5 + 13 14: 0.5 +**** +DEAL:0:2d:: 17 8: 0.5 + 17 20: 0.5 + 13 8: 0.5 + 13 14: 0.5 +ok DEAL:0:2d::step 4 DEAL:0:2d::**** DEAL:0:2d::ok diff --git a/tests/mpi/p4est_2d_constraintmatrix_02/ncpu_4/cmp/generic b/tests/mpi/p4est_2d_constraintmatrix_02/ncpu_4/cmp/generic index fc2ecefbb4..340d63049d 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_02/ncpu_4/cmp/generic +++ b/tests/mpi/p4est_2d_constraintmatrix_02/ncpu_4/cmp/generic @@ -8,13 +8,25 @@ DEAL:0:2d::ok DEAL:0:2d::step 2 DEAL:0:2d:: 7 6: 0.5 7 8: 0.5 + 13 8: 0.5 + 13 14: 0.5 **** DEAL:0:2d:: 7 6: 0.5 7 8: 0.5 + 13 8: 0.5 + 13 14: 0.5 ok DEAL:0:2d::step 3 -DEAL:0:2d::**** -DEAL:0:2d::ok +DEAL:0:2d:: 19 8: 0.5 + 19 15: 0.5 + 13 8: 0.5 + 13 14: 0.5 +**** +DEAL:0:2d:: 19 8: 0.5 + 19 15: 0.5 + 13 8: 0.5 + 13 14: 0.5 +ok DEAL:0:2d::step 4 DEAL:0:2d::**** DEAL:0:2d::ok @@ -32,17 +44,25 @@ ok DEAL:0:2d::step 6 DEAL:0:2d:: 7 6: 0.5 7 8: 0.5 + 17 8: 0.5 + 17 11: 0.5 **** DEAL:0:2d:: 7 6: 0.5 7 8: 0.5 + 17 8: 0.5 + 17 11: 0.5 ok DEAL:0:2d::step 7 -DEAL:0:2d:: 13 8: 0.5 +DEAL:0:2d:: 17 8: 0.5 + 17 20: 0.5 + 13 8: 0.5 13 14: 0.5 12 11: 0.5 12 14: 0.5 **** -DEAL:0:2d:: 13 8: 0.5 +DEAL:0:2d:: 17 8: 0.5 + 17 20: 0.5 + 13 8: 0.5 13 14: 0.5 12 11: 0.5 12 14: 0.5 @@ -50,28 +70,44 @@ ok DEAL:0:2d::step 8 DEAL:0:2d:: 12 11: 0.5 12 14: 0.5 + 22 14: 0.5 + 22 24: 0.5 **** DEAL:0:2d:: 12 11: 0.5 12 14: 0.5 + 22 14: 0.5 + 22 24: 0.5 ok DEAL:0:2d::step 9 DEAL:0:2d:: 12 11: 0.5 12 14: 0.5 + 22 14: 0.5 + 22 24: 0.5 **** DEAL:0:2d:: 12 11: 0.5 12 14: 0.5 + 22 14: 0.5 + 22 24: 0.5 ok DEAL:0:2d::step 10 DEAL:0:2d:: 12 11: 0.5 12 14: 0.5 + 22 14: 0.5 + 22 24: 0.5 **** DEAL:0:2d:: 12 11: 0.5 12 14: 0.5 + 22 14: 0.5 + 22 24: 0.5 ok DEAL:0:2d::step 11 DEAL:0:2d:: 12 11: 0.5 12 14: 0.5 + 22 14: 0.5 + 22 24: 0.5 **** DEAL:0:2d:: 12 11: 0.5 12 14: 0.5 + 22 14: 0.5 + 22 24: 0.5 ok -- 2.39.5