Do not output iteration numbers. They are too sensitive

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

diff --git a/tests/bits/step-51.cc b/tests/bits/step-51.cc
index ed203d6d76aaaa69ee42b9db73a2517ddea5d37d..56922f1ffe03270c159e6d949e0598d29ab8c65a 100644 (file)
--- a/tests/bits/step-51.cc
+++ b/tests/bits/step-51.cc
@@ -333,10 +333,6 @@ namespace Step51
     dof_handler.distribute_dofs(fe);
     dof_handler_u_post.distribute_dofs(fe_u_post);
 
-    deallog << "   Number of degrees of freedom: "
-            << dof_handler.n_dofs()
-            << std::endl;
-
     solution.reinit (dof_handler.n_dofs());
     system_rhs.reinit (dof_handler.n_dofs());
 
@@ -763,10 +759,15 @@ namespace Step51
   void HDG<dim>::solve ()
   {
     SolverControl solver_control (system_matrix.m()*10,
-                                  1e-11*system_rhs.l2_norm());
+                                  1e-12*system_rhs.l2_norm());
+    // do not output iteration numbers to log file because these are too
+    // sensitive
+    std::ostringstream stream;
+    deallog.attach(stream);
     SolverBicgstab<> solver (solver_control, false);
     solver.solve (system_matrix, solution, system_rhs,
                   PreconditionIdentity());
+    deallog.attach(logfile);
 
     system_matrix.clear();
 
@@ -941,8 +942,6 @@ namespace Step51
   {
     for (unsigned int cycle=0; cycle<14-4*dim; ++cycle)
       {
-        deallog << "Cycle " << cycle << ':' << std::endl;
-
         refine_grid (cycle);
         setup_system ();
         assemble_system (false);

diff --git a/tests/bits/step-51.output b/tests/bits/step-51.output
index 768c5da026e129f2f468a9b8445fa181a217942d..53e7a504c966652eeb58ad869a68157c7c7fd735 100644 (file)
--- a/tests/bits/step-51.output
+++ b/tests/bits/step-51.output
@@ -1,44 +1,14 @@
 
-DEAL::Cycle 0:
-DEAL::   Number of degrees of freedom: 9
-DEAL:Bicgstab::Starting value 8.19443
-DEAL:Bicgstab::Convergence step 8 value 0
-DEAL::Cycle 1:
-DEAL::   Number of degrees of freedom: 13
-DEAL:Bicgstab::Starting value 13.9539
-DEAL:Bicgstab::Convergence step 12 value 0
-DEAL::Cycle 2:
-DEAL::   Number of degrees of freedom: 17
-DEAL:Bicgstab::Starting value 13.0731
-DEAL:Bicgstab::Convergence step 16 value 0
-DEAL::Cycle 3:
-DEAL::   Number of degrees of freedom: 25
-DEAL:Bicgstab::Starting value 12.1492
-DEAL:Bicgstab::Convergence step 24 value 0
-DEAL::Cycle 4:
-DEAL::   Number of degrees of freedom: 33
-DEAL:Bicgstab::Starting value 11.0492
-DEAL:Bicgstab::Convergence step 34 value 0
-DEAL::Cycle 5:
-DEAL::   Number of degrees of freedom: 49
-DEAL:Bicgstab::Starting value 9.35310
-DEAL:Bicgstab::Convergence step 51 value 0
-DEAL::Cycle 6:
-DEAL::   Number of degrees of freedom: 65
-DEAL:Bicgstab::Starting value 8.20475
-DEAL:Bicgstab::Convergence step 74 value 0
-DEAL::Cycle 7:
-DEAL::   Number of degrees of freedom: 97
-DEAL:Bicgstab::Starting value 6.76136
-DEAL:Bicgstab::Convergence step 104 value 0
-DEAL::Cycle 8:
-DEAL::   Number of degrees of freedom: 129
-DEAL:Bicgstab::Starting value 5.87456
-DEAL:Bicgstab::Convergence step 137 value 0
-DEAL::Cycle 9:
-DEAL::   Number of degrees of freedom: 193
-DEAL:Bicgstab::Starting value 4.80772
-DEAL:Bicgstab::Convergence step 213 value 0
+
+
+
+
+
+
+
+
+
+
 cells dofs     val L2        grad L2      val L2-post   
 8     9    4.080e-01 -    1.722e+00 -    3.362e-01 -    
 12    13   1.659e-01 2.22 8.766e-01 1.67 2.151e-02 6.78 
@@ -50,46 +20,16 @@ cells dofs     val L2        grad L2      val L2-post
 96    97   2.440e-03 1.98 1.253e-02 2.01 5.281e-05 3.01 
 128   129  1.377e-03 1.99 7.035e-03 2.01 2.224e-05 3.01 
 192   193  6.141e-04 1.99 3.119e-03 2.01 6.573e-06 3.01 
-DEAL::Cycle 0:
-DEAL::   Number of degrees of freedom: 9
-DEAL:Bicgstab::Starting value 7.96477
-DEAL:Bicgstab::Convergence step 8 value 0
-DEAL::Cycle 1:
-DEAL::   Number of degrees of freedom: 13
-DEAL:Bicgstab::Starting value 13.4076
-DEAL:Bicgstab::Convergence step 12 value 0
-DEAL::Cycle 2:
-DEAL::   Number of degrees of freedom: 17
-DEAL:Bicgstab::Starting value 12.9549
-DEAL:Bicgstab::Convergence step 16 value 0
-DEAL::Cycle 3:
-DEAL::   Number of degrees of freedom: 25
-DEAL:Bicgstab::Starting value 12.1266
-DEAL:Bicgstab::Convergence step 24 value 0
-DEAL::Cycle 4:
-DEAL::   Number of degrees of freedom: 33
-DEAL:Bicgstab::Starting value 11.0426
-DEAL:Bicgstab::Convergence step 34 value 0
-DEAL::Cycle 5:
-DEAL::   Number of degrees of freedom: 49
-DEAL:Bicgstab::Starting value 9.35200
-DEAL:Bicgstab::Convergence step 50 value 0
-DEAL::Cycle 6:
-DEAL::   Number of degrees of freedom: 65
-DEAL:Bicgstab::Starting value 8.20444
-DEAL:Bicgstab::Convergence step 73 value 0
-DEAL::Cycle 7:
-DEAL::   Number of degrees of freedom: 97
-DEAL:Bicgstab::Starting value 6.76131
-DEAL:Bicgstab::Convergence step 105 value 0
-DEAL::Cycle 8:
-DEAL::   Number of degrees of freedom: 129
-DEAL:Bicgstab::Starting value 5.87455
-DEAL:Bicgstab::Convergence step 143 value 0
-DEAL::Cycle 9:
-DEAL::   Number of degrees of freedom: 193
-DEAL:Bicgstab::Starting value 4.80772
-DEAL:Bicgstab::Convergence step 225 value 0
+
+
+
+
+
+
+
+
+
+
 cells dofs     val L2        grad L2      val L2-post   
 8     9    2.141e-02 -    1.398e-01 -    3.487e-03 -    
 12    13   6.701e-03 2.87 3.811e-02 3.21 4.976e-04 4.80 
@@ -98,33 +38,15 @@ cells dofs     val L2        grad L2      val L2-post
 32    33   1.126e-04 3.94 6.373e-04 3.99 3.412e-06 5.01 
 48    49   2.256e-05 3.97 1.259e-04 4.00 4.472e-07 5.01 
 64    65   7.179e-06 3.98 3.980e-05 4.00 1.057e-07 5.01 
-96    97   1.425e-06 3.99 7.848e-06 4.00 1.388e-08 5.01 
-128   129  4.519e-07 3.99 2.481e-06 4.00 3.302e-09 4.99 
-192   193  8.946e-08 3.99 4.894e-07 4.00 7.398e-10 3.69 
-DEAL::Cycle 0:
-DEAL::   Number of degrees of freedom: 80
-DEAL:Bicgstab::Starting value 12.2150
-DEAL:Bicgstab::Convergence step 37 value 0
-DEAL::Cycle 1:
-DEAL::   Number of degrees of freedom: 168
-DEAL:Bicgstab::Starting value 8.50278
-DEAL:Bicgstab::Convergence step 48 value 0
-DEAL::Cycle 2:
-DEAL::   Number of degrees of freedom: 288
-DEAL:Bicgstab::Starting value 10.5333
-DEAL:Bicgstab::Convergence step 62 value 1.01190e-10
-DEAL::Cycle 3:
-DEAL::   Number of degrees of freedom: 624
-DEAL:Bicgstab::Starting value 8.10478
-DEAL:Bicgstab::Convergence step 98 value 0
-DEAL::Cycle 4:
-DEAL::   Number of degrees of freedom: 1088
-DEAL:Bicgstab::Starting value 6.61947
-DEAL:Bicgstab::Convergence step 120 value 0
-DEAL::Cycle 5:
-DEAL::   Number of degrees of freedom: 2400
-DEAL:Bicgstab::Starting value 4.75284
-DEAL:Bicgstab::Convergence step 181 value 0
+96    97   1.425e-06 3.99 7.848e-06 4.00 1.386e-08 5.01 
+128   129  4.519e-07 3.99 2.481e-06 4.00 3.284e-09 5.01 
+192   193  8.946e-08 3.99 4.894e-07 4.00 4.323e-10 5.00 
+
+
+
+
+
+
 cells dofs     val L2        grad L2      val L2-post   
 16    80   1.066e+01 -    1.571e+01 -    1.055e+01 -    
 36    168  3.727e+00 2.59 7.998e+00 1.67 3.660e+00 2.61 
@@ -132,30 +54,12 @@ cells dofs     val L2        grad L2      val L2-post
 144   624  2.730e-01 2.68 1.867e+00 2.02 6.110e-02 4.92 
 256   1088 1.493e-01 2.10 1.046e+00 2.01 2.878e-02 2.62 
 576   2400 6.965e-02 1.88 4.847e-01 1.90 9.202e-03 2.81 
-DEAL::Cycle 0:
-DEAL::   Number of degrees of freedom: 120
-DEAL:Bicgstab::Starting value 10.6959
-DEAL:Bicgstab::Convergence step 43 value 0
-DEAL::Cycle 1:
-DEAL::   Number of degrees of freedom: 252
-DEAL:Bicgstab::Starting value 13.2620
-DEAL:Bicgstab::Convergence step 58 value 0
-DEAL::Cycle 2:
-DEAL::   Number of degrees of freedom: 432
-DEAL:Bicgstab::Starting value 11.2567
-DEAL:Bicgstab::Convergence step 74 value 0
-DEAL::Cycle 3:
-DEAL::   Number of degrees of freedom: 936
-DEAL:Bicgstab::Starting value 9.46542
-DEAL:Bicgstab::Convergence step 105 value 0
-DEAL::Cycle 4:
-DEAL::   Number of degrees of freedom: 1632
-DEAL:Bicgstab::Starting value 7.48176
-DEAL:Bicgstab::Convergence step 138 value 0
-DEAL::Cycle 5:
-DEAL::   Number of degrees of freedom: 3600
-DEAL:Bicgstab::Starting value 5.13012
-DEAL:Bicgstab::Convergence step 189 value 0
+
+
+
+
+
+
 cells dofs     val L2        grad L2       val L2-post   
 16    120  7.645e-01 -    5.413e+00 -    2.667e-01 -     
 36    252  4.745e-01 1.18 2.375e+00 2.03 3.501e-01 -0.67 

diff --git a/tests/bits/step-51p.cc b/tests/bits/step-51p.cc
index fae43af7b6239f8c782bbd7086482322543c47dd..f4a6a383ba801de7196f1183389fe469d9bea15f 100644 (file)
--- a/tests/bits/step-51p.cc
+++ b/tests/bits/step-51p.cc
@@ -333,10 +333,6 @@ namespace Step51
     dof_handler.distribute_dofs(fe);
     dof_handler_u_post.distribute_dofs(fe_u_post);
 
-    deallog << "   Number of degrees of freedom: "
-            << dof_handler.n_dofs()
-            << std::endl;
-
     solution.reinit (dof_handler.n_dofs());
     system_rhs.reinit (dof_handler.n_dofs());
 
@@ -763,10 +759,13 @@ namespace Step51
   void HDG<dim>::solve ()
   {
     SolverControl solver_control (system_matrix.m()*10,
-                                  1e-11*system_rhs.l2_norm());
+                                  1e-12*system_rhs.l2_norm());
+    std::ostringstream stream;
+    deallog.attach(stream);
     SolverBicgstab<> solver (solver_control, false);
     solver.solve (system_matrix, solution, system_rhs,
                   PreconditionIdentity());
+    deallog.attach(logfile);
 
     system_matrix.clear();
 
@@ -941,8 +940,6 @@ namespace Step51
   {
     for (unsigned int cycle=0; cycle<14-4*dim; ++cycle)
       {
-        deallog << "Cycle " << cycle << ':' << std::endl;
-
         refine_grid (cycle);
         setup_system ();
         assemble_system (false);

diff --git a/tests/bits/step-51p.output b/tests/bits/step-51p.output
index a0f2912453d3c699732d5ed14428b480bb23bdd6..d009da0c963fa81768c1448101cbcfc1cbfc31db 100644 (file)
--- a/tests/bits/step-51p.output
+++ b/tests/bits/step-51p.output
@@ -1,44 +1,14 @@
 
-DEAL::Cycle 0:
-DEAL::   Number of degrees of freedom: 9
-DEAL:Bicgstab::Starting value 8.19443
-DEAL:Bicgstab::Convergence step 8 value 0
-DEAL::Cycle 1:
-DEAL::   Number of degrees of freedom: 13
-DEAL:Bicgstab::Starting value 13.9539
-DEAL:Bicgstab::Convergence step 12 value 0
-DEAL::Cycle 2:
-DEAL::   Number of degrees of freedom: 17
-DEAL:Bicgstab::Starting value 13.0731
-DEAL:Bicgstab::Convergence step 16 value 0
-DEAL::Cycle 3:
-DEAL::   Number of degrees of freedom: 25
-DEAL:Bicgstab::Starting value 12.1492
-DEAL:Bicgstab::Convergence step 24 value 1.07658e-10
-DEAL::Cycle 4:
-DEAL::   Number of degrees of freedom: 33
-DEAL:Bicgstab::Starting value 11.0492
-DEAL:Bicgstab::Convergence step 34 value 0
-DEAL::Cycle 5:
-DEAL::   Number of degrees of freedom: 49
-DEAL:Bicgstab::Starting value 9.35310
-DEAL:Bicgstab::Convergence step 51 value 0
-DEAL::Cycle 6:
-DEAL::   Number of degrees of freedom: 65
-DEAL:Bicgstab::Starting value 8.20475
-DEAL:Bicgstab::Convergence step 75 value 0
-DEAL::Cycle 7:
-DEAL::   Number of degrees of freedom: 97
-DEAL:Bicgstab::Starting value 6.76136
-DEAL:Bicgstab::Convergence step 104 value 0
-DEAL::Cycle 8:
-DEAL::   Number of degrees of freedom: 129
-DEAL:Bicgstab::Starting value 5.87456
-DEAL:Bicgstab::Convergence step 142 value 0
-DEAL::Cycle 9:
-DEAL::   Number of degrees of freedom: 193
-DEAL:Bicgstab::Starting value 4.80772
-DEAL:Bicgstab::Convergence step 211 value 0
+
+
+
+
+
+
+
+
+
+
 cells dofs     val L2        grad L2      val L2-post   
 8     9    4.080e-01 -    1.722e+00 -    3.362e-01 -    
 12    13   1.659e-01 2.22 8.766e-01 1.67 2.151e-02 6.78 
@@ -50,46 +20,16 @@ cells dofs     val L2        grad L2      val L2-post
 96    97   2.440e-03 1.98 1.253e-02 2.01 5.281e-05 3.01 
 128   129  1.377e-03 1.99 7.035e-03 2.01 2.224e-05 3.01 
 192   193  6.141e-04 1.99 3.119e-03 2.01 6.573e-06 3.01 
-DEAL::Cycle 0:
-DEAL::   Number of degrees of freedom: 9
-DEAL:Bicgstab::Starting value 7.96477
-DEAL:Bicgstab::Convergence step 8 value 0
-DEAL::Cycle 1:
-DEAL::   Number of degrees of freedom: 13
-DEAL:Bicgstab::Starting value 13.4076
-DEAL:Bicgstab::Convergence step 12 value 0
-DEAL::Cycle 2:
-DEAL::   Number of degrees of freedom: 17
-DEAL:Bicgstab::Starting value 12.9549
-DEAL:Bicgstab::Convergence step 16 value 0
-DEAL::Cycle 3:
-DEAL::   Number of degrees of freedom: 25
-DEAL:Bicgstab::Starting value 12.1266
-DEAL:Bicgstab::Convergence step 25 value 0
-DEAL::Cycle 4:
-DEAL::   Number of degrees of freedom: 33
-DEAL:Bicgstab::Starting value 11.0426
-DEAL:Bicgstab::Convergence step 33 value 0
-DEAL::Cycle 5:
-DEAL::   Number of degrees of freedom: 49
-DEAL:Bicgstab::Starting value 9.35200
-DEAL:Bicgstab::Convergence step 49 value 0
-DEAL::Cycle 6:
-DEAL::   Number of degrees of freedom: 65
-DEAL:Bicgstab::Starting value 8.20444
-DEAL:Bicgstab::Convergence step 71 value 0
-DEAL::Cycle 7:
-DEAL::   Number of degrees of freedom: 97
-DEAL:Bicgstab::Starting value 6.76131
-DEAL:Bicgstab::Convergence step 111 value 0
-DEAL::Cycle 8:
-DEAL::   Number of degrees of freedom: 129
-DEAL:Bicgstab::Starting value 5.87455
-DEAL:Bicgstab::Convergence step 144 value 0
-DEAL::Cycle 9:
-DEAL::   Number of degrees of freedom: 193
-DEAL:Bicgstab::Starting value 4.80772
-DEAL:Bicgstab::Convergence step 206 value 0
+
+
+
+
+
+
+
+
+
+
 cells dofs     val L2        grad L2      val L2-post   
 8     9    2.141e-02 -    1.398e-01 -    3.487e-03 -    
 12    13   6.701e-03 2.87 3.811e-02 3.21 4.976e-04 4.80 
@@ -98,33 +38,15 @@ cells dofs     val L2        grad L2      val L2-post
 32    33   1.126e-04 3.94 6.373e-04 3.99 3.412e-06 5.01 
 48    49   2.256e-05 3.97 1.259e-04 4.00 4.472e-07 5.01 
 64    65   7.179e-06 3.98 3.980e-05 4.00 1.057e-07 5.01 
-96    97   1.425e-06 3.99 7.848e-06 4.00 1.388e-08 5.01 
-128   129  4.519e-07 3.99 2.481e-06 4.00 3.400e-09 4.89 
-192   193  8.946e-08 3.99 4.894e-07 4.00 1.008e-09 3.00 
-DEAL::Cycle 0:
-DEAL::   Number of degrees of freedom: 80
-DEAL:Bicgstab::Starting value 17.6593
-DEAL:Bicgstab::Convergence step 31 value 1.30726e-10
-DEAL::Cycle 1:
-DEAL::   Number of degrees of freedom: 168
-DEAL:Bicgstab::Starting value 11.4720
-DEAL:Bicgstab::Convergence step 44 value 0
-DEAL::Cycle 2:
-DEAL::   Number of degrees of freedom: 288
-DEAL:Bicgstab::Starting value 16.7917
-DEAL:Bicgstab::Convergence step 63 value 1.47629e-10
-DEAL::Cycle 3:
-DEAL::   Number of degrees of freedom: 624
-DEAL:Bicgstab::Starting value 12.5049
-DEAL:Bicgstab::Convergence step 90 value 0
-DEAL::Cycle 4:
-DEAL::   Number of degrees of freedom: 1088
-DEAL:Bicgstab::Starting value 9.93628
-DEAL:Bicgstab::Convergence step 120 value 0
-DEAL::Cycle 5:
-DEAL::   Number of degrees of freedom: 2400
-DEAL:Bicgstab::Starting value 6.94024
-DEAL:Bicgstab::Convergence step 177 value 0
+96    97   1.425e-06 3.99 7.848e-06 4.00 1.386e-08 5.01 
+128   129  4.519e-07 3.99 2.481e-06 4.00 3.285e-09 5.01 
+192   193  8.946e-08 3.99 4.894e-07 4.00 4.527e-10 4.89 
+
+
+
+
+
+
 cells dofs     val L2        grad L2      val L2-post   
 16    80   1.043e+01 -    1.616e+01 -    1.034e+01 -    
 36    168  3.699e+00 2.56 8.081e+00 1.71 3.637e+00 2.58 
@@ -132,30 +54,12 @@ cells dofs     val L2        grad L2      val L2-post
 144   624  2.947e-01 2.47 2.255e+00 1.80 6.403e-02 4.88 
 256   1088 1.638e-01 2.04 1.343e+00 1.80 2.937e-02 2.71 
 576   2400 7.616e-02 1.89 6.522e-01 1.78 9.203e-03 2.86 
-DEAL::Cycle 0:
-DEAL::   Number of degrees of freedom: 120
-DEAL:Bicgstab::Starting value 19.9021
-DEAL:Bicgstab::Convergence step 39 value 1.15234e-10
-DEAL::Cycle 1:
-DEAL::   Number of degrees of freedom: 252
-DEAL:Bicgstab::Starting value 15.8809
-DEAL:Bicgstab::Convergence step 56 value 0
-DEAL::Cycle 2:
-DEAL::   Number of degrees of freedom: 432
-DEAL:Bicgstab::Starting value 16.3149
-DEAL:Bicgstab::Convergence step 71 value 0
-DEAL::Cycle 3:
-DEAL::   Number of degrees of freedom: 936
-DEAL:Bicgstab::Starting value 12.6721
-DEAL:Bicgstab::Convergence step 109 value 1.21847e-10
-DEAL::Cycle 4:
-DEAL::   Number of degrees of freedom: 1632
-DEAL:Bicgstab::Starting value 10.0470
-DEAL:Bicgstab::Convergence step 144 value 0
-DEAL::Cycle 5:
-DEAL::   Number of degrees of freedom: 3600
-DEAL:Bicgstab::Starting value 6.97340
-DEAL:Bicgstab::Convergence step 198 value 0
+
+
+
+
+
+
 cells dofs     val L2        grad L2      val L2-post   
 16    120  8.296e-01 -    6.543e+00 -    4.572e-01 -    
 36    252  5.045e-01 1.23 3.062e+00 1.87 3.570e-01 0.61