From bc76d62f7325dab7a3f313886ecfa4e663e568bd Mon Sep 17 00:00:00 2001
From: kronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 9 Dec 2009 18:18:12 +0000
Subject: [PATCH] Fix output of tests that produced wrong results with the old
 counting function of DoFs on certain components.

git-svn-id: https://svn.dealii.org/trunk@20221 0785d39b-7218-0410-832d-ea1e28bc413d
---
 tests/bits/count_dofs_per_block_02.cc         |  1 +
 .../bits/count_dofs_per_block_02/cmp/generic  | 10 +++--
 tests/bits/dof_tools_00a.cc                   |  1 -
 tests/bits/dof_tools_00a/cmp/generic          | 44 +++++++++----------
 tests/bits/dof_tools_07/cmp/generic           |  2 +-
 5 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/tests/bits/count_dofs_per_block_02.cc b/tests/bits/count_dofs_per_block_02.cc
index eadcbeb071..2f1793664b 100644
--- a/tests/bits/count_dofs_per_block_02.cc
+++ b/tests/bits/count_dofs_per_block_02.cc
@@ -69,6 +69,7 @@ check ()
   FESystem<dim> fe (FE_RaviartThomas<dim>(0), 1, FE_DGQ<dim>(0), 1);
   DoFHandler<dim> dof_handler (tria);
   dof_handler.distribute_dofs (fe);
+  deallog << "Number of DoFs: " << dof_handler.n_dofs() << std::endl;
 
 				   // no grouping
   {
diff --git a/tests/bits/count_dofs_per_block_02/cmp/generic b/tests/bits/count_dofs_per_block_02/cmp/generic
index 32daed286f..070d3b0354 100644
--- a/tests/bits/count_dofs_per_block_02/cmp/generic
+++ b/tests/bits/count_dofs_per_block_02/cmp/generic
@@ -1,13 +1,15 @@
 
+DEAL::Number of DoFs: 39
 DEAL::3 29 29 10
 DEAL::2 29 10
-DEAL::2 58 10
 DEAL::2 29 10
-DEAL::5 10 0 0 0 58
+DEAL::2 29 10
+DEAL::5 10 0 0 0 29
 DEAL::5 10 0 0 0 29
+DEAL::Number of DoFs: 119
 DEAL::4 97 97 97 22
 DEAL::2 97 22
-DEAL::2 291 22
 DEAL::2 97 22
-DEAL::7 22 0 0 0 0 0 291
+DEAL::2 97 22
+DEAL::7 22 0 0 0 0 0 97
 DEAL::7 22 0 0 0 0 0 97
diff --git a/tests/bits/dof_tools_00a.cc b/tests/bits/dof_tools_00a.cc
index 633e7a0582..3fddcbf8f9 100644
--- a/tests/bits/dof_tools_00a.cc
+++ b/tests/bits/dof_tools_00a.cc
@@ -13,7 +13,6 @@
 
 #include "../tests.h"
 #include "dof_tools_common.cc"
-#include <lac/block_sparsity_pattern.h>
 
 // check
 //   DoFTools::
diff --git a/tests/bits/dof_tools_00a/cmp/generic b/tests/bits/dof_tools_00a/cmp/generic
index b782db15bb..f72f1cbfb1 100644
--- a/tests/bits/dof_tools_00a/cmp/generic
+++ b/tests/bits/dof_tools_00a/cmp/generic
@@ -111,7 +111,7 @@ DEAL::Checking Nedelec1 in 2d:
 DEAL::n_dofs:29
 DEAL:: 29 29
 DEAL:: 29 0
-DEAL:: 58
+DEAL:: 29
 DEAL:: 29
 DEAL:: 29 29
 DEAL:: 29 0
@@ -119,15 +119,15 @@ DEAL::Checking Nedelec1 in 3d:
 DEAL::n_dofs:142
 DEAL:: 142 142 142
 DEAL:: 142 0 0
-DEAL:: 426
 DEAL:: 142
-DEAL:: 142 284
+DEAL:: 142
+DEAL:: 142 142
 DEAL:: 142 0
 DEAL::Checking RaviartThomas0 in 2d:
 DEAL::n_dofs:29
 DEAL:: 29 29
 DEAL:: 29 0
-DEAL:: 58
+DEAL:: 29
 DEAL:: 29
 DEAL:: 29 29
 DEAL:: 29 0
@@ -135,7 +135,7 @@ DEAL::Checking RaviartThomas1 in 2d:
 DEAL::n_dofs:98
 DEAL:: 98 98
 DEAL:: 98 0
-DEAL:: 196
+DEAL:: 98
 DEAL:: 98
 DEAL:: 98 98
 DEAL:: 98 0
@@ -143,7 +143,7 @@ DEAL::Checking RaviartThomas2 in 2d:
 DEAL::n_dofs:207
 DEAL:: 207 207
 DEAL:: 207 0
-DEAL:: 414
+DEAL:: 207
 DEAL:: 207
 DEAL:: 207 207
 DEAL:: 207 0
@@ -151,7 +151,7 @@ DEAL::Checking RaviartThomasNodal0 in 2d:
 DEAL::n_dofs:29
 DEAL:: 29 29
 DEAL:: 29 0
-DEAL:: 58
+DEAL:: 29
 DEAL:: 29
 DEAL:: 29 29
 DEAL:: 29 0
@@ -159,7 +159,7 @@ DEAL::Checking RaviartThomasNodal1 in 2d:
 DEAL::n_dofs:98
 DEAL:: 98 98
 DEAL:: 98 0
-DEAL:: 196
+DEAL:: 98
 DEAL:: 98
 DEAL:: 98 98
 DEAL:: 98 0
@@ -167,7 +167,7 @@ DEAL::Checking RaviartThomasNodal2 in 2d:
 DEAL::n_dofs:207
 DEAL:: 207 207
 DEAL:: 207 0
-DEAL:: 414
+DEAL:: 207
 DEAL:: 207
 DEAL:: 207 207
 DEAL:: 207 0
@@ -175,25 +175,25 @@ DEAL::Checking RaviartThomasNodal0 in 3d:
 DEAL::n_dofs:97
 DEAL:: 97 97 97
 DEAL:: 97 0 0
-DEAL:: 291
 DEAL:: 97
-DEAL:: 97 194
+DEAL:: 97
+DEAL:: 97 97
 DEAL:: 97 0
 DEAL::Checking RaviartThomasNodal1 in 3d:
 DEAL::n_dofs:652
 DEAL:: 652 652 652
 DEAL:: 652 0 0
-DEAL:: 1956
 DEAL:: 652
-DEAL:: 652 1304
+DEAL:: 652
+DEAL:: 652 652
 DEAL:: 652 0
 DEAL::Checking RaviartThomasNodal2 in 3d:
 DEAL::n_dofs:2061
 DEAL:: 2061 2061 2061
 DEAL:: 2061 0 0
-DEAL:: 6183
 DEAL:: 2061
-DEAL:: 2061 4122
+DEAL:: 2061
+DEAL:: 2061 2061
 DEAL:: 2061 0
 DEAL::Checking FE_Q<1>(1)3 in 1d:
 DEAL::n_dofs:15
@@ -379,15 +379,15 @@ DEAL::Checking FE_DGQ<2>(3)1FE_Nedelec<2>(1)2 in 2d:
 DEAL::n_dofs:218
 DEAL:: 160 29 29 29 29
 DEAL:: 160 29 0 29 0
-DEAL:: 276
 DEAL:: 218
-DEAL:: 189 87
+DEAL:: 218
+DEAL:: 189 218
 DEAL:: 189 29
 DEAL::Checking FE_Nedelec<2>(1)1FESystem<2>(FE_DGQ<2>(1),2)1FESystem<2>(FE_Q<2>(2),1, FE_Nedelec<2>(1),2)2 in 2d:
 DEAL::n_dofs:339
-DEAL:: 29 29 40 40 115 58 58 58 58 115 58 58 58 58
-DEAL:: 29 0 40 40 115 0 0 0 0 115 0 0 0 0
-DEAL:: 832
+DEAL:: 29 29 40 40 57 29 29 29 29 57 29 29 29 29
+DEAL:: 29 0 40 40 57 29 0 29 0 57 29 0 29 0
+DEAL:: 339
 DEAL:: 339
-DEAL:: 369 463
-DEAL:: 224 115
+DEAL:: 195 144
+DEAL:: 195 144
diff --git a/tests/bits/dof_tools_07/cmp/generic b/tests/bits/dof_tools_07/cmp/generic
index 925576cf6f..42f243f6e5 100644
--- a/tests/bits/dof_tools_07/cmp/generic
+++ b/tests/bits/dof_tools_07/cmp/generic
@@ -126,4 +126,4 @@ DEAL::160 10 10 10 57 10 57 10
 DEAL::Checking FE_DGQ<2>(3)1FE_Nedelec<2>(1)2 in 2d:
 DEAL::160 29 29 29 29 
 DEAL::Checking FE_Nedelec<2>(1)1FESystem<2>(FE_DGQ<2>(1),2)1FESystem<2>(FE_Q<2>(2),1, FE_Nedelec<2>(1),2)2 in 2d:
-DEAL::29 29 40 40 115 58 58 58 58 115 58 58 58 58 
+DEAL::29 29 40 40 57 29 29 29 29 57 29 29 29 29 
-- 
2.39.5