Set output array to correct size and only output elements that were actually written to.

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

diff --git a/tests/bits/dof_tools_00a.cc b/tests/bits/dof_tools_00a.cc
index fd748c5909ec230c9baa368705ad380c9e0fa981..633e7a0582d97ea921c5d4eb943de73cc1fced90 100644 (file)
--- a/tests/bits/dof_tools_00a.cc
+++ b/tests/bits/dof_tools_00a.cc
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$ 
 //
-//    Copyright (C) 2003, 2004, 2005 by the deal.II authors
+//    Copyright (C) 2003, 2004, 2005, 2009 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -48,12 +48,12 @@ check_this (const DoFHandler<dim> &dof_handler)
   if (n_components>1)
     {
       std::vector<unsigned int> target_component(n_components,0U);
-
+      dofs_per_component.resize (1);
       DoFTools::count_dofs_per_component (dof_handler,
                                          dofs_per_component,
                                          false,
                                          target_component);
-      for (unsigned int i=0;i<n_components;++i)
+      for (unsigned int i=0;i<std::min(n_components, (unsigned int)dofs_per_component.size());++i)
        deallog << ' ' << dofs_per_component[i];
       deallog << std::endl;
 
@@ -61,25 +61,26 @@ check_this (const DoFHandler<dim> &dof_handler)
                                          dofs_per_component,
                                          true,
                                          target_component);
-      for (unsigned int i=0;i<n_components;++i)
+      for (unsigned int i=0;i<std::min(n_components, (unsigned int)dofs_per_component.size());++i)
        deallog << ' ' << dofs_per_component[i];
       deallog << std::endl;
 
       for (unsigned int i=n_components/2;i<n_components;++i)
        target_component[i] = 1;
+      dofs_per_component.resize (2);
       
       DoFTools::count_dofs_per_component (dof_handler,
                                          dofs_per_component,
                                          false,
                                          target_component);
-      for (unsigned int i=0;i<n_components;++i)
+      for (unsigned int i=0;i<std::min(n_components, (unsigned int)dofs_per_component.size());++i)
        deallog << ' ' << dofs_per_component[i];
       deallog << std::endl;
       DoFTools::count_dofs_per_component (dof_handler,
                                          dofs_per_component,
                                          true,
                                          target_component);
-      for (unsigned int i=0;i<n_components;++i)
+      for (unsigned int i=0;i<std::min(n_components, (unsigned int)dofs_per_component.size());++i)
        deallog << ' ' << dofs_per_component[i];
       deallog << std::endl;
     }

diff --git a/tests/bits/dof_tools_00a/cmp/generic b/tests/bits/dof_tools_00a/cmp/generic
index fa71535ace77787182edf0c3cbf029104197c34b..b782db15bb1b8009ddcb4d498c0462147e23e347 100644 (file)
--- a/tests/bits/dof_tools_00a/cmp/generic
+++ b/tests/bits/dof_tools_00a/cmp/generic
@@ -111,104 +111,104 @@ DEAL::Checking Nedelec1 in 2d:
 DEAL::n_dofs:29
 DEAL:: 29 29
 DEAL:: 29 0
-DEAL:: 58 0
-DEAL:: 29 0
+DEAL:: 58
+DEAL:: 29
 DEAL:: 29 29
 DEAL:: 29 0
 DEAL::Checking Nedelec1 in 3d:
 DEAL::n_dofs:142
 DEAL:: 142 142 142
 DEAL:: 142 0 0
-DEAL:: 426 0 0
-DEAL:: 142 0 0
-DEAL:: 142 284 0
-DEAL:: 142 0 0
+DEAL:: 426
+DEAL:: 142
+DEAL:: 142 284
+DEAL:: 142 0
 DEAL::Checking RaviartThomas0 in 2d:
 DEAL::n_dofs:29
 DEAL:: 29 29
 DEAL:: 29 0
-DEAL:: 58 0
-DEAL:: 29 0
+DEAL:: 58
+DEAL:: 29
 DEAL:: 29 29
 DEAL:: 29 0
 DEAL::Checking RaviartThomas1 in 2d:
 DEAL::n_dofs:98
 DEAL:: 98 98
 DEAL:: 98 0
-DEAL:: 196 0
-DEAL:: 98 0
+DEAL:: 196
+DEAL:: 98
 DEAL:: 98 98
 DEAL:: 98 0
 DEAL::Checking RaviartThomas2 in 2d:
 DEAL::n_dofs:207
 DEAL:: 207 207
 DEAL:: 207 0
-DEAL:: 414 0
-DEAL:: 207 0
+DEAL:: 414
+DEAL:: 207
 DEAL:: 207 207
 DEAL:: 207 0
 DEAL::Checking RaviartThomasNodal0 in 2d:
 DEAL::n_dofs:29
 DEAL:: 29 29
 DEAL:: 29 0
-DEAL:: 58 0
-DEAL:: 29 0
+DEAL:: 58
+DEAL:: 29
 DEAL:: 29 29
 DEAL:: 29 0
 DEAL::Checking RaviartThomasNodal1 in 2d:
 DEAL::n_dofs:98
 DEAL:: 98 98
 DEAL:: 98 0
-DEAL:: 196 0
-DEAL:: 98 0
+DEAL:: 196
+DEAL:: 98
 DEAL:: 98 98
 DEAL:: 98 0
 DEAL::Checking RaviartThomasNodal2 in 2d:
 DEAL::n_dofs:207
 DEAL:: 207 207
 DEAL:: 207 0
-DEAL:: 414 0
-DEAL:: 207 0
+DEAL:: 414
+DEAL:: 207
 DEAL:: 207 207
 DEAL:: 207 0
 DEAL::Checking RaviartThomasNodal0 in 3d:
 DEAL::n_dofs:97
 DEAL:: 97 97 97
 DEAL:: 97 0 0
-DEAL:: 291 0 0
-DEAL:: 97 0 0
-DEAL:: 97 194 0
-DEAL:: 97 0 0
+DEAL:: 291
+DEAL:: 97
+DEAL:: 97 194
+DEAL:: 97 0
 DEAL::Checking RaviartThomasNodal1 in 3d:
 DEAL::n_dofs:652
 DEAL:: 652 652 652
 DEAL:: 652 0 0
-DEAL:: 1956 0 0
-DEAL:: 652 0 0
-DEAL:: 652 1304 0
-DEAL:: 652 0 0
+DEAL:: 1956
+DEAL:: 652
+DEAL:: 652 1304
+DEAL:: 652 0
 DEAL::Checking RaviartThomasNodal2 in 3d:
 DEAL::n_dofs:2061
 DEAL:: 2061 2061 2061
 DEAL:: 2061 0 0
-DEAL:: 6183 0 0
-DEAL:: 2061 0 0
-DEAL:: 2061 4122 0
-DEAL:: 2061 0 0
+DEAL:: 6183
+DEAL:: 2061
+DEAL:: 2061 4122
+DEAL:: 2061 0
 DEAL::Checking FE_Q<1>(1)3 in 1d:
 DEAL::n_dofs:15
 DEAL:: 5 5 5
 DEAL:: 5 5 5
-DEAL:: 15 0 0
-DEAL:: 15 0 0
-DEAL:: 5 10 0
-DEAL:: 5 10 0
+DEAL:: 15
+DEAL:: 15
+DEAL:: 5 10
+DEAL:: 5 10
 DEAL::Checking FE_DGQ<1>(2)2 in 1d:
 DEAL::n_dofs:24
 DEAL:: 12 12
 DEAL:: 12 12
-DEAL:: 24 0
-DEAL:: 24 0
+DEAL:: 24
+DEAL:: 24
 DEAL:: 12 12
 DEAL:: 12 12
 DEAL::Checking FE_DGP<1>(3)1 in 1d:
@@ -219,16 +219,16 @@ DEAL::Checking FE_Q<2>(1)3 in 2d:
 DEAL::n_dofs:54
 DEAL:: 18 18 18
 DEAL:: 18 18 18
-DEAL:: 54 0 0
-DEAL:: 54 0 0
-DEAL:: 18 36 0
-DEAL:: 18 36 0
+DEAL:: 54
+DEAL:: 54
+DEAL:: 18 36
+DEAL:: 18 36
 DEAL::Checking FE_DGQ<2>(2)2 in 2d:
 DEAL::n_dofs:180
 DEAL:: 90 90
 DEAL:: 90 90
-DEAL:: 180 0
-DEAL:: 180 0
+DEAL:: 180
+DEAL:: 180
 DEAL:: 90 90
 DEAL:: 90 90
 DEAL::Checking FE_DGP<2>(3)1 in 2d:
@@ -239,16 +239,16 @@ DEAL::Checking FE_Q<3>(1)3 in 3d:
 DEAL::n_dofs:180
 DEAL:: 60 60 60
 DEAL:: 60 60 60
-DEAL:: 180 0 0
-DEAL:: 180 0 0
-DEAL:: 60 120 0
-DEAL:: 60 120 0
+DEAL:: 180
+DEAL:: 180
+DEAL:: 60 120
+DEAL:: 60 120
 DEAL::Checking FE_DGQ<3>(2)2 in 3d:
 DEAL::n_dofs:1188
 DEAL:: 594 594
 DEAL:: 594 594
-DEAL:: 1188 0
-DEAL:: 1188 0
+DEAL:: 1188
+DEAL:: 1188
 DEAL:: 594 594
 DEAL:: 594 594
 DEAL::Checking FE_DGP<3>(3)1 in 3d:
@@ -259,135 +259,135 @@ DEAL::Checking FE_Q<1>(1)3FE_DGQ<1>(2)2 in 1d:
 DEAL::n_dofs:39
 DEAL:: 5 5 5 12 12
 DEAL:: 5 5 5 12 12
-DEAL:: 39 0 0 0 0
-DEAL:: 39 0 0 0 0
-DEAL:: 10 29 0 0 0
-DEAL:: 10 29 0 0 0
+DEAL:: 39
+DEAL:: 39
+DEAL:: 10 29
+DEAL:: 10 29
 DEAL::Checking FE_DGQ<1>(2)2FE_DGP<1>(3)1 in 1d:
 DEAL::n_dofs:40
 DEAL:: 12 12 16
 DEAL:: 12 12 16
-DEAL:: 40 0 0
-DEAL:: 40 0 0
-DEAL:: 12 28 0
-DEAL:: 12 28 0
+DEAL:: 40
+DEAL:: 40
+DEAL:: 12 28
+DEAL:: 12 28
 DEAL::Checking FE_DGP<1>(3)1FE_DGQ<1>(2)2 in 1d:
 DEAL::n_dofs:40
 DEAL:: 16 12 12
 DEAL:: 16 12 12
-DEAL:: 40 0 0
-DEAL:: 40 0 0
-DEAL:: 16 24 0
-DEAL:: 16 24 0
+DEAL:: 40
+DEAL:: 40
+DEAL:: 16 24
+DEAL:: 16 24
 DEAL::Checking FE_Q<2>(1)3FE_DGQ<2>(2)2 in 2d:
 DEAL::n_dofs:234
 DEAL:: 18 18 18 90 90
 DEAL:: 18 18 18 90 90
-DEAL:: 234 0 0 0 0
-DEAL:: 234 0 0 0 0
-DEAL:: 36 198 0 0 0
-DEAL:: 36 198 0 0 0
+DEAL:: 234
+DEAL:: 234
+DEAL:: 36 198
+DEAL:: 36 198
 DEAL::Checking FE_DGQ<2>(2)2FE_DGP<2>(3)1 in 2d:
 DEAL::n_dofs:280
 DEAL:: 90 90 100
 DEAL:: 90 90 100
-DEAL:: 280 0 0
-DEAL:: 280 0 0
-DEAL:: 90 190 0
-DEAL:: 90 190 0
+DEAL:: 280
+DEAL:: 280
+DEAL:: 90 190
+DEAL:: 90 190
 DEAL::Checking FE_DGP<2>(3)1FE_DGQ<2>(2)2 in 2d:
 DEAL::n_dofs:280
 DEAL:: 100 90 90
 DEAL:: 100 90 90
-DEAL:: 280 0 0
-DEAL:: 280 0 0
-DEAL:: 100 180 0
-DEAL:: 100 180 0
+DEAL:: 280
+DEAL:: 280
+DEAL:: 100 180
+DEAL:: 100 180
 DEAL::Checking FE_Q<1>(1)3FE_DGP<1>(3)1FE_Q<1>(1)3 in 1d:
 DEAL::n_dofs:46
 DEAL:: 5 5 5 16 5 5 5
 DEAL:: 5 5 5 16 5 5 5
-DEAL:: 46 0 0 0 0 0 0
-DEAL:: 46 0 0 0 0 0 0
-DEAL:: 15 31 0 0 0 0 0
-DEAL:: 15 31 0 0 0 0 0
+DEAL:: 46
+DEAL:: 46
+DEAL:: 15 31
+DEAL:: 15 31
 DEAL::Checking FE_DGQ<1>(2)2FE_DGQ<1>(2)2FE_Q<1>(3)3 in 1d:
 DEAL::n_dofs:87
 DEAL:: 12 12 12 12 13 13 13
 DEAL:: 12 12 12 12 13 13 13
-DEAL:: 87 0 0 0 0 0 0
-DEAL:: 87 0 0 0 0 0 0
-DEAL:: 36 51 0 0 0 0 0
-DEAL:: 36 51 0 0 0 0 0
+DEAL:: 87
+DEAL:: 87
+DEAL:: 36 51
+DEAL:: 36 51
 DEAL::Checking FE_DGP<1>(3)1FE_DGP<1>(3)1FE_Q<1>(2)3 in 1d:
 DEAL::n_dofs:59
 DEAL:: 16 16 9 9 9
 DEAL:: 16 16 9 9 9
-DEAL:: 59 0 0 0 0
-DEAL:: 59 0 0 0 0
-DEAL:: 32 27 0 0 0
-DEAL:: 32 27 0 0 0
+DEAL:: 59
+DEAL:: 59
+DEAL:: 32 27
+DEAL:: 32 27
 DEAL::Checking FE_Q<2>(1)3FE_DGP<2>(3)1FE_Q<2>(1)3 in 2d:
 DEAL::n_dofs:208
 DEAL:: 18 18 18 100 18 18 18
 DEAL:: 18 18 18 100 18 18 18
-DEAL:: 208 0 0 0 0 0 0
-DEAL:: 208 0 0 0 0 0 0
-DEAL:: 54 154 0 0 0 0 0
-DEAL:: 54 154 0 0 0 0 0
+DEAL:: 208
+DEAL:: 208
+DEAL:: 54 154
+DEAL:: 54 154
 DEAL::Checking FE_DGQ<2>(2)2FE_DGQ<2>(2)2FE_Q<2>(3)3 in 2d:
 DEAL::n_dofs:708
 DEAL:: 90 90 90 90 116 116 116
 DEAL:: 90 90 90 90 116 116 116
-DEAL:: 708 0 0 0 0 0 0
-DEAL:: 708 0 0 0 0 0 0
-DEAL:: 270 438 0 0 0 0 0
-DEAL:: 270 438 0 0 0 0 0
+DEAL:: 708
+DEAL:: 708
+DEAL:: 270 438
+DEAL:: 270 438
 DEAL::Checking FE_DGP<2>(3)1FE_DGP<2>(3)1FE_Q<2>(2)3 in 2d:
 DEAL::n_dofs:371
 DEAL:: 100 100 57 57 57
 DEAL:: 100 100 57 57 57
-DEAL:: 371 0 0 0 0
-DEAL:: 371 0 0 0 0
-DEAL:: 200 171 0 0 0
-DEAL:: 200 171 0 0 0
+DEAL:: 371
+DEAL:: 371
+DEAL:: 200 171
+DEAL:: 200 171
 DEAL::Checking FE_DGQ<3>(1)3FE_DGP<3>(3)1FE_Q<3>(1)3 in 3d:
 DEAL::n_dofs:1148
 DEAL:: 176 176 176 440 60 60 60
 DEAL:: 176 176 176 440 60 60 60
-DEAL:: 1148 0 0 0 0 0 0
-DEAL:: 1148 0 0 0 0 0 0
-DEAL:: 528 620 0 0 0 0 0
-DEAL:: 528 620 0 0 0 0 0
+DEAL:: 1148
+DEAL:: 1148
+DEAL:: 528 620
+DEAL:: 528 620
 DEAL::Checking (FESystem<2>(FE_Q<2>(1),3))3FE_DGQ<2>(0)1FE_Q<2>(1)3 in 2d:
 DEAL::n_dofs:226
 DEAL:: 18 18 18 18 18 18 18 18 18 10 18 18 18
 DEAL:: 18 18 18 18 18 18 18 18 18 10 18 18 18
-DEAL:: 226 0 0 0 0 0 0 0 0 0 0 0 0
-DEAL:: 226 0 0 0 0 0 0 0 0 0 0 0 0
-DEAL:: 108 118 0 0 0 0 0 0 0 0 0 0 0
-DEAL:: 108 118 0 0 0 0 0 0 0 0 0 0 0
+DEAL:: 226
+DEAL:: 226
+DEAL:: 108 118
+DEAL:: 108 118
 DEAL::Checking FE_DGQ<2>(3)1FESystem<2>(FE_DGQ<2>(0),3)1FESystem<2>(FE_Q<2>(2),1, FE_DGQ<2>(0),1)2 in 2d:
 DEAL::n_dofs:324
 DEAL:: 160 10 10 10 57 10 57 10
 DEAL:: 160 10 10 10 57 10 57 10
-DEAL:: 324 0 0 0 0 0 0 0
-DEAL:: 324 0 0 0 0 0 0 0
-DEAL:: 190 134 0 0 0 0 0 0
-DEAL:: 190 134 0 0 0 0 0 0
+DEAL:: 324
+DEAL:: 324
+DEAL:: 190 134
+DEAL:: 190 134
 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 0 0 0 0
-DEAL:: 218 0 0 0 0
-DEAL:: 189 87 0 0 0
-DEAL:: 189 29 0 0 0
+DEAL:: 276
+DEAL:: 218
+DEAL:: 189 87
+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 0 0 0 0 0 0 0 0 0 0 0 0 0
-DEAL:: 339 0 0 0 0 0 0 0 0 0 0 0 0 0
-DEAL:: 369 463 0 0 0 0 0 0 0 0 0 0 0 0
-DEAL:: 224 115 0 0 0 0 0 0 0 0 0 0 0 0
+DEAL:: 832
+DEAL:: 339
+DEAL:: 369 463
+DEAL:: 224 115