take over r31966 and r31968

git-svn-id: https://svn.dealii.org/branches/releases/Branch-8-1@31969 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/deal.II/assemble_matrix_parallel_01.cc b/tests/deal.II/assemble_matrix_parallel_01.cc
index 4cd2b1769799ab717098a030151d5fe309226290..6d842edf1bd971c79857662257ad898916895f41 100644 (file)
--- a/tests/deal.II/assemble_matrix_parallel_01.cc
+++ b/tests/deal.II/assemble_matrix_parallel_01.cc
@@ -416,9 +416,10 @@ void LaplaceProblem<dim>::run ()
     {
       if (cycle == 0)
         {
-          GridGenerator::hyper_shell(triangulation,
+          GridGenerator::hyper_cube(triangulation, 0, 1/* ,
                                      Point<dim>(),
-                                     0.5, 1., (dim==3) ? 96 : 12, false);
+                                     0.5, 1., (dim==3) ? 96 : 12, false*/);
+          triangulation.refine_global(2);
         }
 
       setup_system ();

diff --git a/tests/deal.II/inhomogeneous_constraints_block.cc b/tests/deal.II/inhomogeneous_constraints_block.cc
index de0b45163cad3f57e6cbc40a1ca1eb1064b326c5..5ae14449f6c0f15f1a4eac90a2f97e7e63391595 100644 (file)
--- a/tests/deal.II/inhomogeneous_constraints_block.cc
+++ b/tests/deal.II/inhomogeneous_constraints_block.cc
@@ -325,10 +325,6 @@ void AdvectionProblem<dim>::assemble_reference ()
                                       reference_matrix,
                                       test_rhs,
                                       reference_rhs);
-
-  deallog << "  Reference matrix nonzeros: " << reference_matrix.n_nonzero_elements()
-          << ", actually: " << reference_matrix.n_actually_nonzero_elements (1e-10)
-          << std::endl;
 }
 
 
@@ -401,9 +397,6 @@ void AdvectionProblem<dim>::assemble_test_1 ()
     }
 
   test_all_constraints.condense (test_matrix, test_rhs);
-  deallog << "  Test matrix 1 nonzeros: " << test_matrix.n_nonzero_elements()
-          << ", actually: " << test_matrix.n_actually_nonzero_elements (1e-10)
-          << std::endl;
 
   test_equality();
 }
@@ -476,9 +469,6 @@ void AdvectionProblem<dim>::assemble_test_2 ()
                                                        test_matrix,
                                                        test_rhs);
     }
-  deallog << "  Test matrix 2 nonzeros: " << test_matrix.n_nonzero_elements()
-          << ", actually: " << test_matrix.n_actually_nonzero_elements (1e-10)
-          << std::endl;
   test_equality();
 }
 

diff --git a/tests/deal.II/inhomogeneous_constraints_block.output b/tests/deal.II/inhomogeneous_constraints_block.output
index 3af785ade2679afaa5a723fa909579ffd0789f8d..a69afcbe4ea32437b89b55685921b267c5cb5c4b 100644 (file)
--- a/tests/deal.II/inhomogeneous_constraints_block.output
+++ b/tests/deal.II/inhomogeneous_constraints_block.output
@@ -4,11 +4,8 @@ DEAL::
 DEAL::  Number of active cells:       28
 DEAL::  Number of degrees of freedom: 298
 DEAL::  Number of constraints       : 48
-DEAL::  Reference matrix nonzeros: 9084, actually: 1744
-DEAL::  Test matrix 1 nonzeros: 9084, actually: 1748
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 9084, actually: 1748
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
 DEAL::
@@ -16,10 +13,7 @@ DEAL::
 DEAL::  Number of active cells:       64
 DEAL::  Number of degrees of freedom: 1602
 DEAL::  Number of constraints       : 288
-DEAL::  Reference matrix nonzeros: 165476, actually: 19180
-DEAL::  Test matrix 1 nonzeros: 165476, actually: 19256
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 165476, actually: 19170
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0

diff --git a/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc b/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc
index e188023a33230c167a771ab1ed59a35b29ed21e8..93bb66b4a65502046d13de590e111361a2a83273 100644 (file)
--- a/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc
+++ b/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc
@@ -289,10 +289,6 @@ void AdvectionProblem<dim>::assemble_reference ()
                                       reference_matrix,
                                       test_rhs,
                                       reference_rhs);
-
-  deallog << "  Reference matrix nonzeros: " << reference_matrix.n_nonzero_elements()
-          << ", actually: " << reference_matrix.n_actually_nonzero_elements (1e-12)
-          << std::endl;
 }
 
 
@@ -360,9 +356,6 @@ void AdvectionProblem<dim>::assemble_test_1 ()
     }
 
   test_all_constraints.condense (test_matrix, test_rhs);
-  deallog << "  Test matrix 1 nonzeros: " << test_matrix.n_nonzero_elements()
-          << ", actually: " << test_matrix.n_actually_nonzero_elements (1e-12)
-          << std::endl;
 
   test_equality();
 }
@@ -430,9 +423,6 @@ void AdvectionProblem<dim>::assemble_test_2 ()
                                                        test_matrix,
                                                        test_rhs);
     }
-  deallog << "  Test matrix 2 nonzeros: " << test_matrix.n_nonzero_elements()
-          << ", actually: " << test_matrix.n_actually_nonzero_elements (1e-12)
-          << std::endl;
   test_equality();
 }
 

diff --git a/tests/deal.II/inhomogeneous_constraints_nonsymmetric.output b/tests/deal.II/inhomogeneous_constraints_nonsymmetric.output
index 405114df8486a90ea7bc7cbbfa50072294274a36..a63fdb51a8f6a7634e53ca377e64806b4d7b4563 100644 (file)
--- a/tests/deal.II/inhomogeneous_constraints_nonsymmetric.output
+++ b/tests/deal.II/inhomogeneous_constraints_nonsymmetric.output
@@ -4,11 +4,8 @@ DEAL::
 DEAL::  Number of active cells:       32
 DEAL::  Number of degrees of freedom: 159
 DEAL::  Number of constraints       : 30
-DEAL::  Reference matrix nonzeros: 2499, actually: 1441
-DEAL::  Test matrix 1 nonzeros: 2499, actually: 1442
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 2499, actually: 1440
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
 DEAL::
@@ -16,10 +13,7 @@ DEAL::
 DEAL::  Number of active cells:       42
 DEAL::  Number of degrees of freedom: 529
 DEAL::  Number of constraints       : 234
-DEAL::  Reference matrix nonzeros: 30555, actually: 11223
-DEAL::  Test matrix 1 nonzeros: 30555, actually: 11228
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 30555, actually: 11194
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0

diff --git a/tests/hp/vectors_rhs_02.cc b/tests/hp/vectors_rhs_02.cc
index 2f5d15b73e763e1c465290f86ced068fe83ade7f..eaf07c2bdad525ef4f72dde2b7b06bd76a91fa5a 100644 (file)
--- a/tests/hp/vectors_rhs_02.cc
+++ b/tests/hp/vectors_rhs_02.cc
@@ -117,9 +117,9 @@ check ()
 int main ()
 {
   std::ofstream logfile ("output");
-  logfile.precision (4);
+  logfile.precision (6);
   logfile.setf(std::ios::fixed);
-  deallog << std::setprecision(4) << std::fixed;
+  deallog << std::setprecision(6) << std::fixed;
   deallog.attach(logfile);
   deallog.depth_console (0);
 

diff --git a/tests/hp/vectors_rhs_02.output b/tests/hp/vectors_rhs_02.output
index f24acba175c57313f0d8d7a7be0326b2eb1c146d..ec071ddc233a5d6e2b5a0a26ca0c29a9edc10940 100644 (file)
--- a/tests/hp/vectors_rhs_02.output
+++ b/tests/hp/vectors_rhs_02.output
@@ -1,125 +1,125 @@
 
-DEAL:2d::0.1320
-DEAL:2d::0.5092
-DEAL:2d::0.0813
-DEAL:2d::0.1021
-DEAL:2d::-0.0499
-DEAL:2d::0.0777
-DEAL:2d::0.0666
-DEAL:2d::0.0681
-DEAL:2d::0.1498
-DEAL:2d::0.0474
-DEAL:2d::0.1202
-DEAL:2d::0.1509
-DEAL:2d::-0.3395
-DEAL:2d::0.5281
-DEAL:2d::0.0496
-DEAL:2d::0.1553
-DEAL:2d::-0.0071
-DEAL:2d::-0.0089
-DEAL:2d::0.5092
-DEAL:2d::0.0082
-DEAL:2d::0.1498
-DEAL:2d::0.0126
-DEAL:2d::0.0251
-DEAL:2d::0.0082
-DEAL:2d::0.0251
-DEAL:2d::0.0126
-DEAL:2d::-0.0474
-DEAL:2d::0.0496
-DEAL:2d::-0.0681
-DEAL:2d::0.5281
-DEAL:2d::0.0071
-DEAL:2d::0.0089
-DEAL:2d::0.1697
-DEAL:2d::-0.1202
-DEAL:2d::-0.1509
-DEAL:2d::0.1553
-DEAL:2d::0.0499
-DEAL:2d::-0.0813
-DEAL:2d::-0.1021
-DEAL:2d::0.2641
-DEAL:2d::0.0777
-DEAL:2d::-0.1449
-DEAL:2d::-0.1820
-DEAL:2d::0.1209
-DEAL:2d::0.1829
-DEAL:2d::0.1029
-DEAL:2d::0.1662
-DEAL:2d::0.0737
-DEAL:2d::0.0574
-DEAL:2d::0.0928
-DEAL:2d::0.0724
-DEAL:2d::0.1095
-DEAL:2d::0.0650
-DEAL:2d::0.0441
-DEAL:2d::0.0363
-DEAL:3d::0.4167
-DEAL:3d::0.5833
-DEAL:3d::1.1667
-DEAL:3d::1.6667
-DEAL:3d::1.7500
-DEAL:3d::2.5000
-DEAL:3d::0.5833
-DEAL:3d::0.8333
-DEAL:3d::0.8333
-DEAL:3d::1.1667
-DEAL:3d::1.7500
-DEAL:3d::2.5000
-DEAL:3d::0.5833
-DEAL:3d::1.1667
-DEAL:3d::1.7500
-DEAL:3d::2.5000
-DEAL:3d::0.5833
-DEAL:3d::0.8333
-DEAL:3d::1.1667
-DEAL:3d::1.6667
-DEAL:3d::1.2500
-DEAL:3d::1.7500
-DEAL:3d::0.5833
-DEAL:3d::1.1667
-DEAL:3d::1.6667
-DEAL:3d::1.7500
-DEAL:3d::0.5833
-DEAL:3d::0.8333
-DEAL:3d::1.1667
-DEAL:3d::1.7500
-DEAL:3d::0.5833
-DEAL:3d::1.1667
-DEAL:3d::1.7500
-DEAL:3d::0.4687
-DEAL:3d::0.7292
-DEAL:3d::0.9375
-DEAL:3d::1.4583
-DEAL:3d::1.4063
-DEAL:3d::2.1875
-DEAL:3d::0.3021
-DEAL:3d::0.6875
-DEAL:3d::0.9583
-DEAL:3d::1.0312
-DEAL:3d::1.4375
-DEAL:3d::0.3438
-DEAL:3d::0.4792
-DEAL:3d::0.6042
-DEAL:3d::1.0312
-DEAL:3d::1.4375
-DEAL:3d::0.1771
-DEAL:3d::0.3542
-DEAL:3d::0.6562
-DEAL:3d::0.6875
-DEAL:3d::0.3438
-DEAL:3d::0.4792
-DEAL:3d::0.6875
-DEAL:3d::0.9583
-DEAL:3d::0.9062
-DEAL:3d::0.1771
-DEAL:3d::0.4375
-DEAL:3d::0.4583
-DEAL:3d::0.5312
-DEAL:3d::0.2187
-DEAL:3d::0.2292
-DEAL:3d::0.3542
-DEAL:3d::0.5312
-DEAL:3d::0.0521
-DEAL:3d::0.1042
-DEAL:3d::0.1562
+DEAL:2d::0.132027
+DEAL:2d::0.509248
+DEAL:2d::0.081280
+DEAL:2d::0.102076
+DEAL:2d::-0.049921
+DEAL:2d::0.077654
+DEAL:2d::0.066556
+DEAL:2d::0.068128
+DEAL:2d::0.149762
+DEAL:2d::0.047411
+DEAL:2d::0.120153
+DEAL:2d::0.150896
+DEAL:2d::-0.339499
+DEAL:2d::0.528109
+DEAL:2d::0.049602
+DEAL:2d::0.155308
+DEAL:2d::-0.007068
+DEAL:2d::-0.008876
+DEAL:2d::0.509248
+DEAL:2d::0.008167
+DEAL:2d::0.149762
+DEAL:2d::0.012563
+DEAL:2d::0.025126
+DEAL:2d::0.008167
+DEAL:2d::0.025126
+DEAL:2d::0.012563
+DEAL:2d::-0.047411
+DEAL:2d::0.049602
+DEAL:2d::-0.068128
+DEAL:2d::0.528109
+DEAL:2d::0.007068
+DEAL:2d::0.008876
+DEAL:2d::0.169749
+DEAL:2d::-0.120153
+DEAL:2d::-0.150896
+DEAL:2d::0.155308
+DEAL:2d::0.049921
+DEAL:2d::-0.081280
+DEAL:2d::-0.102076
+DEAL:2d::0.264055
+DEAL:2d::0.077654
+DEAL:2d::-0.144890
+DEAL:2d::-0.181962
+DEAL:2d::0.120947
+DEAL:2d::0.182896
+DEAL:2d::0.102853
+DEAL:2d::0.166239
+DEAL:2d::0.073748
+DEAL:2d::0.057412
+DEAL:2d::0.092794
+DEAL:2d::0.072379
+DEAL:2d::0.109451
+DEAL:2d::0.065009
+DEAL:2d::0.044133
+DEAL:2d::0.036288
+DEAL:3d::0.416667
+DEAL:3d::0.583333
+DEAL:3d::1.166667
+DEAL:3d::1.666667
+DEAL:3d::1.750000
+DEAL:3d::2.500000
+DEAL:3d::0.583333
+DEAL:3d::0.833333
+DEAL:3d::0.833333
+DEAL:3d::1.166667
+DEAL:3d::1.750000
+DEAL:3d::2.500000
+DEAL:3d::0.583333
+DEAL:3d::1.166667
+DEAL:3d::1.750000
+DEAL:3d::2.500000
+DEAL:3d::0.583333
+DEAL:3d::0.833333
+DEAL:3d::1.166667
+DEAL:3d::1.666667
+DEAL:3d::1.250000
+DEAL:3d::1.750000
+DEAL:3d::0.583333
+DEAL:3d::1.166667
+DEAL:3d::1.666667
+DEAL:3d::1.750000
+DEAL:3d::0.583333
+DEAL:3d::0.833333
+DEAL:3d::1.166667
+DEAL:3d::1.750000
+DEAL:3d::0.583333
+DEAL:3d::1.166667
+DEAL:3d::1.750000
+DEAL:3d::0.468750
+DEAL:3d::0.729167
+DEAL:3d::0.937500
+DEAL:3d::1.458333
+DEAL:3d::1.406250
+DEAL:3d::2.187500
+DEAL:3d::0.302083
+DEAL:3d::0.687500
+DEAL:3d::0.958333
+DEAL:3d::1.031250
+DEAL:3d::1.437500
+DEAL:3d::0.343750
+DEAL:3d::0.479167
+DEAL:3d::0.604167
+DEAL:3d::1.031250
+DEAL:3d::1.437500
+DEAL:3d::0.177083
+DEAL:3d::0.354167
+DEAL:3d::0.656250
+DEAL:3d::0.687500
+DEAL:3d::0.343750
+DEAL:3d::0.479167
+DEAL:3d::0.687500
+DEAL:3d::0.958333
+DEAL:3d::0.906250
+DEAL:3d::0.177083
+DEAL:3d::0.437500
+DEAL:3d::0.458333
+DEAL:3d::0.531250
+DEAL:3d::0.218750
+DEAL:3d::0.229167
+DEAL:3d::0.354167
+DEAL:3d::0.531250
+DEAL:3d::0.052083
+DEAL:3d::0.104167
+DEAL:3d::0.156250

diff --git a/tests/umfpack/umfpack_04.cc b/tests/umfpack/umfpack_04.cc
index 349d62d4ac06863f8a2d7df17ab8289516564d7d..dccf7fcbc3a58f70fc1c3797fac07bdc00e00bbc 100644 (file)
--- a/tests/umfpack/umfpack_04.cc
+++ b/tests/umfpack/umfpack_04.cc
@@ -174,7 +174,7 @@ void test ()
   ub = b;
   ubb = bb;
 
-  SolverControl control (1000, 1e-12);
+  SolverControl control (1000, 1e-13);
 
   SolverCG<BlockVector<double> > bcg(control, SolverCG<BlockVector<double> >::AdditionalData());
   bcg.solve(Bb, bx, bb, PreconditionIdentity());

diff --git a/tests/umfpack/umfpack_04.compiler=Intel=no.release.output b/tests/umfpack/umfpack_04.compiler=Intel=no.release.output
index 06991c36faefe3433a27c7627fcff7c6b97b0d5d..8a04a69361b8a72327912bf776e444ad25b979b0 100644 (file)
--- a/tests/umfpack/umfpack_04.compiler=Intel=no.release.output
+++ b/tests/umfpack/umfpack_04.compiler=Intel=no.release.output
@@ -2,9 +2,9 @@
 DEAL::1d
 DEAL::Number of dofs = 97
 DEAL:cg::Starting value 0.215517
-DEAL:cg::Convergence step 112 value 0
+DEAL:cg::Convergence step 113 value 0
 DEAL:cg::Starting value 0.215517
-DEAL:cg::Convergence step 112 value 0
+DEAL:cg::Convergence step 113 value 0
 DEAL::Sparse Factorization
 DEAL::absolute norms = 6.45748 6.45748
 DEAL::relative norm distance = 0
@@ -14,9 +14,9 @@ DEAL::relative norm distance = 0
 DEAL::2d
 DEAL::Number of dofs = 994
 DEAL:cg::Starting value 0.595296
-DEAL:cg::Convergence step 58 value 0
+DEAL:cg::Convergence step 61 value 0
 DEAL:cg::Starting value 0.595296
-DEAL:cg::Convergence step 58 value 0
+DEAL:cg::Convergence step 61 value 0
 DEAL::Sparse Factorization
 DEAL::absolute norms = 10.0596 10.0596
 DEAL::relative norm distance = 0
@@ -26,9 +26,9 @@ DEAL::relative norm distance = 0
 DEAL::3d
 DEAL::Number of dofs = 669
 DEAL:cg::Starting value 3.12141
-DEAL:cg::Convergence step 24 value 0
+DEAL:cg::Convergence step 25 value 0
 DEAL:cg::Starting value 3.12141
-DEAL:cg::Convergence step 24 value 0
+DEAL:cg::Convergence step 25 value 0
 DEAL::Sparse Factorization
 DEAL::absolute norms = 13.7931 13.7931
 DEAL::relative norm distance = 0

diff --git a/tests/umfpack/umfpack_04.compiler=Intel=yes.release.output b/tests/umfpack/umfpack_04.compiler=Intel=yes.release.output
index 4135273bdae43306b6ac9a1c4a985ca4107a4e33..221e282041927431a188d6a7a5b7ec8ca14e9826 100644 (file)
--- a/tests/umfpack/umfpack_04.compiler=Intel=yes.release.output
+++ b/tests/umfpack/umfpack_04.compiler=Intel=yes.release.output
@@ -2,9 +2,9 @@
 DEAL::1d
 DEAL::Number of dofs = 97
 DEAL:cg::Starting value 0.215517
-DEAL:cg::Convergence step 111 value 0
+DEAL:cg::Convergence step 112 value 0
 DEAL:cg::Starting value 0.215517
-DEAL:cg::Convergence step 111 value 0
+DEAL:cg::Convergence step 112 value 0
 DEAL::Sparse Factorization
 DEAL::absolute norms = 6.45748 6.45748
 DEAL::relative norm distance = 0
@@ -14,9 +14,9 @@ DEAL::relative norm distance = 0
 DEAL::2d
 DEAL::Number of dofs = 994
 DEAL:cg::Starting value 0.595296
-DEAL:cg::Convergence step 58 value 0
+DEAL:cg::Convergence step 61 value 0
 DEAL:cg::Starting value 0.595296
-DEAL:cg::Convergence step 58 value 0
+DEAL:cg::Convergence step 61 value 0
 DEAL::Sparse Factorization
 DEAL::absolute norms = 10.0596 10.0596
 DEAL::relative norm distance = 0
@@ -26,9 +26,9 @@ DEAL::relative norm distance = 0
 DEAL::3d
 DEAL::Number of dofs = 669
 DEAL:cg::Starting value 3.12141
-DEAL:cg::Convergence step 24 value 0
+DEAL:cg::Convergence step 25 value 0
 DEAL:cg::Starting value 3.12141
-DEAL:cg::Convergence step 24 value 0
+DEAL:cg::Convergence step 25 value 0
 DEAL::Sparse Factorization
 DEAL::absolute norms = 13.7931 13.7931
 DEAL::relative norm distance = 0

diff --git a/tests/umfpack/umfpack_04.debug.output b/tests/umfpack/umfpack_04.debug.output
index 06991c36faefe3433a27c7627fcff7c6b97b0d5d..8a04a69361b8a72327912bf776e444ad25b979b0 100644 (file)
--- a/tests/umfpack/umfpack_04.debug.output
+++ b/tests/umfpack/umfpack_04.debug.output
@@ -2,9 +2,9 @@
 DEAL::1d
 DEAL::Number of dofs = 97
 DEAL:cg::Starting value 0.215517
-DEAL:cg::Convergence step 112 value 0
+DEAL:cg::Convergence step 113 value 0
 DEAL:cg::Starting value 0.215517
-DEAL:cg::Convergence step 112 value 0
+DEAL:cg::Convergence step 113 value 0
 DEAL::Sparse Factorization
 DEAL::absolute norms = 6.45748 6.45748
 DEAL::relative norm distance = 0
@@ -14,9 +14,9 @@ DEAL::relative norm distance = 0
 DEAL::2d
 DEAL::Number of dofs = 994
 DEAL:cg::Starting value 0.595296
-DEAL:cg::Convergence step 58 value 0
+DEAL:cg::Convergence step 61 value 0
 DEAL:cg::Starting value 0.595296
-DEAL:cg::Convergence step 58 value 0
+DEAL:cg::Convergence step 61 value 0
 DEAL::Sparse Factorization
 DEAL::absolute norms = 10.0596 10.0596
 DEAL::relative norm distance = 0
@@ -26,9 +26,9 @@ DEAL::relative norm distance = 0
 DEAL::3d
 DEAL::Number of dofs = 669
 DEAL:cg::Starting value 3.12141
-DEAL:cg::Convergence step 24 value 0
+DEAL:cg::Convergence step 25 value 0
 DEAL:cg::Starting value 3.12141
-DEAL:cg::Convergence step 24 value 0
+DEAL:cg::Convergence step 25 value 0
 DEAL::Sparse Factorization
 DEAL::absolute norms = 13.7931 13.7931
 DEAL::relative norm distance = 0