Adjust test case for new scheme for constraints.

git-svn-id: https://svn.dealii.org/trunk@29660 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/mpi/p4est_2d_constraintmatrix_01.cc b/tests/mpi/p4est_2d_constraintmatrix_01.cc
index 943cc4192529eaa8e9a8530301023a3224b38c7c..7349fdfeb2834047eb27cb80e38f03fb77469994 100644 (file)
--- 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 48ad8a8ba4276042411e7dd2ee6b0a3d4102b152..b1188f5c0df611ab89465bba4881694dd4fc91ad 100644 (file)
--- 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 b52b8b28fce2cbaefeb389c4d42969a858c0ec20..9a760a1fd33c2a526e3d175a1c99345ca2d36a0b 100644 (file)
--- 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 5df85c62137509d7b8d7e0e5b23559736bdc2e7b..b9f25663f109f019e0436ca7bbb71f96e28699ff 100644 (file)
--- 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 a14a1334576b10c45a44299b388c3bf404b8290e..5597566abd4a31c5ecfa59bfd88cb9c683f36dd0 100644 (file)
--- 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 fc2ecefbb47c824bca4bec1214e97164db1b27cd..340d63049db7fa7da65cfd238d3abe5d5fca84b5 100644 (file)
--- 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