Better initial guess for Chebyshev vector

diff --git a/include/deal.II/lac/precondition.h b/include/deal.II/lac/precondition.h
index ce5ac91966bc787bd2f2ba5050b968ad2f6744b3..544eceb6497bc8c028a35947da591adcc85c5667 100644 (file)
--- a/include/deal.II/lac/precondition.h
+++ b/include/deal.II/lac/precondition.h
@@ -1937,6 +1937,37 @@ namespace internal
         }
     }
 
+    template <typename VectorType>
+    void set_initial_guess(VectorType &vector)
+    {
+      vector = 1./std::sqrt(static_cast<double>(vector.size()));
+      if (vector.locally_owned_elements().is_element(0))
+        vector(0) = 0.;
+    }
+
+    template <typename Number>
+    void set_initial_guess(::dealii::Vector<Number> &vector)
+    {
+      // Choose a high-frequency mode consisting of numbers between 0 and 1
+      // that is cheap to compute (cheaper than random numbers) but avoids
+      // obviously re-occurring numbers in multi-component systems by choosing
+      // a period of 11
+      for (unsigned int i=0; i<vector.size(); ++i)
+        vector(i) = i%11;
+    }
+
+    template <typename Number>
+    void set_initial_guess(::dealii::LinearAlgebra::distributed::Vector<Number> &vector)
+    {
+      // Choose a high-frequency mode consisting of numbers between 0 and 1
+      // that is cheap to compute (cheaper than random numbers) but avoids
+      // obviously re-occurring numbers in multi-component systems by choosing
+      // a period of 11
+      const unsigned int size = vector.local_size();
+      for (unsigned int i=0; i<vector.local_size(); ++i)
+        vector.local_element(i) = i%11;
+    }
+
     struct EigenvalueTracker
     {
     public:
@@ -2041,7 +2072,7 @@ PreconditionChebyshev<MatrixType,VectorType,PreconditionerType>::estimate_eigenv
   Assert(data.preconditioner.get() != NULL, ExcNotInitialized());
 
   update1.reinit(src);
-  update2 = src;
+  update2.reinit(src, true);
 
   // calculate largest eigenvalue using a hand-tuned CG iteration on the
   // matrix weighted by its diagonal. we start with a vector that consists of
@@ -2065,9 +2096,7 @@ PreconditionChebyshev<MatrixType,VectorType,PreconditionerType>::estimate_eigenv
 
       // set an initial guess which is close to the constant vector but where
       // one entry is different to trigger high frequencies
-      update2 = 1.;
-      if (update2.locally_owned_elements().is_element(0))
-        update2(0) = 0.;
+      internal::PreconditionChebyshev::set_initial_guess(update2);
 
       try
         {

diff --git a/tests/lac/precondition_chebyshev_03.cc b/tests/lac/precondition_chebyshev_03.cc
index 8fed9b46cba268a2e9740c35fb2b7b8b478c05c1..0f2f531b7337b57f13435039efc7258450ba5f85 100644 (file)
--- a/tests/lac/precondition_chebyshev_03.cc
+++ b/tests/lac/precondition_chebyshev_03.cc
@@ -36,7 +36,7 @@ int main()
 {
   std::ofstream logfile("output");
   deallog << std::fixed;
-  deallog << std::setprecision(2);
+  deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.threshold_double(1.e-10);
 

diff --git a/tests/lac/precondition_chebyshev_03.with_lapack=true.output b/tests/lac/precondition_chebyshev_03.with_lapack=true.output
index 96cdf4ba967d7c1c06af5001e0f8528145c4e21c..46085e7f683639caf1b69614db98cdca9373fe05 100644 (file)
--- a/tests/lac/precondition_chebyshev_03.with_lapack=true.output
+++ b/tests/lac/precondition_chebyshev_03.with_lapack=true.output
@@ -1,13 +1,13 @@
 
 DEAL::Size 4 Unknowns 9
-DEAL::Residual step i=0:   ilu=0.33, cheby=0.08
-DEAL::Residual step i=1:   ilu=0.36, cheby=0.08
-DEAL::Residual step i=2:   ilu=0.17, cheby=0.05
+DEAL::Residual step i=0:   ilu=0.3321, cheby=0.0826
+DEAL::Residual step i=1:   ilu=0.3592, cheby=0.0825
+DEAL::Residual step i=2:   ilu=0.1717, cheby=0.0523
 DEAL::Size 8 Unknowns 49
-DEAL::Residual step i=0:   ilu=1.94, cheby=0.14
-DEAL::Residual step i=1:   ilu=2.15, cheby=0.15
-DEAL::Residual step i=2:   ilu=1.76, cheby=0.15
+DEAL::Residual step i=0:   ilu=1.9436, cheby=0.1554
+DEAL::Residual step i=1:   ilu=2.1487, cheby=0.1587
+DEAL::Residual step i=2:   ilu=1.7563, cheby=0.1575
 DEAL::Size 16 Unknowns 225
-DEAL::Residual step i=0:   ilu=6.15, cheby=0.38
-DEAL::Residual step i=1:   ilu=6.25, cheby=0.40
-DEAL::Residual step i=2:   ilu=5.65, cheby=0.37
+DEAL::Residual step i=0:   ilu=6.1463, cheby=0.3718
+DEAL::Residual step i=1:   ilu=6.2524, cheby=0.3873
+DEAL::Residual step i=2:   ilu=5.6540, cheby=0.3595

diff --git a/tests/matrix_free/parallel_multigrid.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=3.output b/tests/matrix_free/parallel_multigrid.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=3.output
index 81a324f2c70db8cea1f59052f2bce373cd067d0a..7619fd7a63a769192af01247724f7847a24b020a 100644 (file)
--- a/tests/matrix_free/parallel_multigrid.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=3.output
+++ b/tests/matrix_free/parallel_multigrid.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=3.output
@@ -2,130 +2,130 @@
 DEAL:2d::Testing FE_Q<2>(1)
 DEAL:2d::Number of degrees of freedom: 81
 DEAL:2d:cg::Starting value 9.000
-DEAL:2d:cg:cg::Starting value 0.009350
+DEAL:2d:cg:cg::Starting value 0.009192
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 6.469e-06
+DEAL:2d:cg:cg::Starting value 7.683e-06
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 6.921e-08
+DEAL:2d:cg:cg::Starting value 7.681e-08
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg::Convergence step 3 value 4.626e-07
+DEAL:2d:cg::Convergence step 3 value 4.627e-07
 DEAL:2d::Testing FE_Q<2>(1)
 DEAL:2d::Number of degrees of freedom: 289
 DEAL:2d:cg::Starting value 17.00
-DEAL:2d:cg:cg::Starting value 0.02703
+DEAL:2d:cg:cg::Starting value 0.02924
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 5.170e-06
+DEAL:2d:cg:cg::Starting value 5.528e-06
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 8.499e-10
+DEAL:2d:cg:cg::Starting value 3.143e-09
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg::Convergence step 3 value 3.600e-07
+DEAL:2d:cg::Convergence step 3 value 3.949e-07
 DEAL:2d::Testing FE_Q<2>(1)
 DEAL:2d::Number of degrees of freedom: 1089
 DEAL:2d:cg::Starting value 33.00
-DEAL:2d:cg:cg::Starting value 0.09751
+DEAL:2d:cg:cg::Starting value 0.1049
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 2.794e-06
+DEAL:2d:cg:cg::Starting value 3.095e-06
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 1.111e-07
+DEAL:2d:cg:cg::Starting value 1.204e-07
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 1.758e-10
+DEAL:2d:cg:cg::Starting value 1.752e-10
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg::Convergence step 4 value 1.484e-08
+DEAL:2d:cg::Convergence step 4 value 1.436e-08
 DEAL:2d::Testing FE_Q<2>(2)
 DEAL:2d::Number of degrees of freedom: 289
 DEAL:2d:cg::Starting value 17.00
-DEAL:2d:cg:cg::Starting value 0.5165
+DEAL:2d:cg:cg::Starting value 0.7350
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 7.798e-05
+DEAL:2d:cg:cg::Starting value 0.0001136
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 4.794e-07
+DEAL:2d:cg:cg::Starting value 6.839e-07
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 1.177e-09
+DEAL:2d:cg:cg::Starting value 1.680e-09
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg::Convergence step 4 value 1.404e-08
+DEAL:2d:cg::Convergence step 4 value 1.403e-08
 DEAL:2d::Testing FE_Q<2>(2)
 DEAL:2d::Number of degrees of freedom: 1089
 DEAL:2d:cg::Starting value 33.00
-DEAL:2d:cg:cg::Starting value 1.948
+DEAL:2d:cg:cg::Starting value 2.771
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 7.876e-05
+DEAL:2d:cg:cg::Starting value 0.0001123
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 9.527e-07
+DEAL:2d:cg:cg::Starting value 1.360e-06
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 1.973e-09
+DEAL:2d:cg:cg::Starting value 2.849e-09
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg::Convergence step 4 value 1.627e-08
+DEAL:2d:cg::Convergence step 4 value 1.621e-08
 DEAL:2d::Testing FE_Q<2>(2)
 DEAL:2d::Number of degrees of freedom: 4225
 DEAL:2d:cg::Starting value 65.00
-DEAL:2d:cg:cg::Starting value 7.684
+DEAL:2d:cg:cg::Starting value 10.93
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 0.0004225
+DEAL:2d:cg:cg::Starting value 0.0006025
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 5.550e-07
+DEAL:2d:cg:cg::Starting value 7.933e-07
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 8.109e-09
+DEAL:2d:cg:cg::Starting value 1.160e-08
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg::Convergence step 4 value 3.009e-08
+DEAL:2d:cg::Convergence step 4 value 3.006e-08
 DEAL:3d::Testing FE_Q<3>(1)
 DEAL:3d::Number of degrees of freedom: 125
 DEAL:3d:cg::Starting value 11.18
-DEAL:3d:cg:cg::Starting value 0.1410
+DEAL:3d:cg:cg::Starting value 0.1413
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 6.992e-05
+DEAL:3d:cg:cg::Starting value 7.091e-05
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 4.858e-09
+DEAL:3d:cg:cg::Starting value 4.800e-09
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg::Convergence step 3 value 9.022e-09
+DEAL:3d:cg::Convergence step 3 value 9.079e-09
 DEAL:3d::Testing FE_Q<3>(1)
 DEAL:3d::Number of degrees of freedom: 729
 DEAL:3d:cg::Starting value 27.00
-DEAL:3d:cg:cg::Starting value 0.03500
+DEAL:3d:cg:cg::Starting value 0.03499
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 0.0002870
+DEAL:3d:cg:cg::Starting value 0.0002863
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 1.473e-07
+DEAL:3d:cg:cg::Starting value 1.469e-07
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg::Convergence step 3 value 1.327e-06
+DEAL:3d:cg::Convergence step 3 value 1.323e-06
 DEAL:3d::Testing FE_Q<3>(1)
 DEAL:3d::Number of degrees of freedom: 4913
 DEAL:3d:cg::Starting value 70.09
-DEAL:3d:cg:cg::Starting value 0.06187
+DEAL:3d:cg:cg::Starting value 0.06182
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 7.842e-05
+DEAL:3d:cg:cg::Starting value 7.408e-05
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 1.062e-06
+DEAL:3d:cg:cg::Starting value 9.192e-07
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 1.441e-09
+DEAL:3d:cg:cg::Starting value 1.274e-09
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg::Convergence step 4 value 6.374e-08
+DEAL:3d:cg::Convergence step 4 value 6.463e-08
 DEAL:3d::Testing FE_Q<3>(2)
 DEAL:3d::Number of degrees of freedom: 729
 DEAL:3d:cg::Starting value 27.00
-DEAL:3d:cg:cg::Starting value 1.155
+DEAL:3d:cg:cg::Starting value 1.154
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg:cg::Starting value 0.0001365
+DEAL:3d:cg:cg::Starting value 0.0001372
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg:cg::Starting value 1.471e-07
+DEAL:3d:cg:cg::Starting value 1.430e-07
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg::Convergence step 3 value 5.041e-08
+DEAL:3d:cg::Convergence step 3 value 4.895e-08
 DEAL:3d::Testing FE_Q<3>(2)
 DEAL:3d::Number of degrees of freedom: 4913
 DEAL:3d:cg::Starting value 70.09
-DEAL:3d:cg:cg::Starting value 6.474
+DEAL:3d:cg:cg::Starting value 6.457
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg:cg::Starting value 0.0005841
+DEAL:3d:cg:cg::Starting value 0.0005811
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg:cg::Starting value 2.219e-06
+DEAL:3d:cg:cg::Starting value 2.200e-06
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg::Convergence step 3 value 2.560e-06
+DEAL:3d:cg::Convergence step 3 value 2.510e-06
 DEAL:3d::Testing FE_Q<3>(2)
 DEAL:3d::Number of degrees of freedom: 35937
 DEAL:3d:cg::Starting value 189.6
-DEAL:3d:cg:cg::Starting value 47.62
+DEAL:3d:cg:cg::Starting value 47.58
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg:cg::Starting value 0.006356
+DEAL:3d:cg:cg::Starting value 0.006336
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg:cg::Starting value 8.271e-06
+DEAL:3d:cg:cg::Starting value 8.287e-06
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg::Convergence step 3 value 1.007e-05
+DEAL:3d:cg::Convergence step 3 value 9.888e-06

diff --git a/tests/matrix_free/parallel_multigrid.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=7.output b/tests/matrix_free/parallel_multigrid.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=7.output
index 81a324f2c70db8cea1f59052f2bce373cd067d0a..9c8c57c54b2ca6c0b848d943a96268fd40f6d846 100644 (file)
--- a/tests/matrix_free/parallel_multigrid.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=7.output
+++ b/tests/matrix_free/parallel_multigrid.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=7.output
@@ -2,130 +2,130 @@
 DEAL:2d::Testing FE_Q<2>(1)
 DEAL:2d::Number of degrees of freedom: 81
 DEAL:2d:cg::Starting value 9.000
-DEAL:2d:cg:cg::Starting value 0.009350
+DEAL:2d:cg:cg::Starting value 0.009346
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 6.469e-06
+DEAL:2d:cg:cg::Starting value 6.496e-06
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 6.921e-08
+DEAL:2d:cg:cg::Starting value 6.938e-08
 DEAL:2d:cg:cg::Convergence step 1 value 0
 DEAL:2d:cg::Convergence step 3 value 4.626e-07
 DEAL:2d::Testing FE_Q<2>(1)
 DEAL:2d::Number of degrees of freedom: 289
 DEAL:2d:cg::Starting value 17.00
-DEAL:2d:cg:cg::Starting value 0.02703
+DEAL:2d:cg:cg::Starting value 0.02705
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 5.170e-06
+DEAL:2d:cg:cg::Starting value 5.317e-06
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 8.499e-10
+DEAL:2d:cg:cg::Starting value 1.194e-09
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg::Convergence step 3 value 3.600e-07
+DEAL:2d:cg::Convergence step 3 value 3.838e-07
 DEAL:2d::Testing FE_Q<2>(1)
 DEAL:2d::Number of degrees of freedom: 1089
 DEAL:2d:cg::Starting value 33.00
-DEAL:2d:cg:cg::Starting value 0.09751
+DEAL:2d:cg:cg::Starting value 0.09791
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 2.794e-06
+DEAL:2d:cg:cg::Starting value 2.929e-06
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 1.111e-07
+DEAL:2d:cg:cg::Starting value 1.185e-07
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 1.758e-10
+DEAL:2d:cg:cg::Starting value 1.692e-10
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg::Convergence step 4 value 1.484e-08
+DEAL:2d:cg::Convergence step 4 value 1.780e-08
 DEAL:2d::Testing FE_Q<2>(2)
 DEAL:2d::Number of degrees of freedom: 289
 DEAL:2d:cg::Starting value 17.00
-DEAL:2d:cg:cg::Starting value 0.5165
+DEAL:2d:cg:cg::Starting value 0.7249
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 7.798e-05
+DEAL:2d:cg:cg::Starting value 0.0001120
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 4.794e-07
+DEAL:2d:cg:cg::Starting value 6.729e-07
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 1.177e-09
+DEAL:2d:cg:cg::Starting value 1.656e-09
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg::Convergence step 4 value 1.404e-08
+DEAL:2d:cg::Convergence step 4 value 1.401e-08
 DEAL:2d::Testing FE_Q<2>(2)
 DEAL:2d::Number of degrees of freedom: 1089
 DEAL:2d:cg::Starting value 33.00
-DEAL:2d:cg:cg::Starting value 1.948
+DEAL:2d:cg:cg::Starting value 2.734
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 7.876e-05
+DEAL:2d:cg:cg::Starting value 0.0001108
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 9.527e-07
+DEAL:2d:cg:cg::Starting value 1.342e-06
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 1.973e-09
+DEAL:2d:cg:cg::Starting value 2.808e-09
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg::Convergence step 4 value 1.627e-08
+DEAL:2d:cg::Convergence step 4 value 1.621e-08
 DEAL:2d::Testing FE_Q<2>(2)
 DEAL:2d::Number of degrees of freedom: 4225
 DEAL:2d:cg::Starting value 65.00
-DEAL:2d:cg:cg::Starting value 7.684
+DEAL:2d:cg:cg::Starting value 10.78
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 0.0004225
+DEAL:2d:cg:cg::Starting value 0.0005940
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 5.550e-07
+DEAL:2d:cg:cg::Starting value 7.817e-07
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg:cg::Starting value 8.109e-09
+DEAL:2d:cg:cg::Starting value 1.143e-08
 DEAL:2d:cg:cg::Convergence step 2 value 0
-DEAL:2d:cg::Convergence step 4 value 3.009e-08
+DEAL:2d:cg::Convergence step 4 value 3.006e-08
 DEAL:3d::Testing FE_Q<3>(1)
 DEAL:3d::Number of degrees of freedom: 125
 DEAL:3d:cg::Starting value 11.18
-DEAL:3d:cg:cg::Starting value 0.1410
+DEAL:3d:cg:cg::Starting value 0.1412
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 6.992e-05
+DEAL:3d:cg:cg::Starting value 7.069e-05
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 4.858e-09
+DEAL:3d:cg:cg::Starting value 4.813e-09
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg::Convergence step 3 value 9.022e-09
+DEAL:3d:cg::Convergence step 3 value 9.066e-09
 DEAL:3d::Testing FE_Q<3>(1)
 DEAL:3d::Number of degrees of freedom: 729
 DEAL:3d:cg::Starting value 27.00
-DEAL:3d:cg:cg::Starting value 0.03500
+DEAL:3d:cg:cg::Starting value 0.03502
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 0.0002870
+DEAL:3d:cg:cg::Starting value 0.0002871
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 1.473e-07
+DEAL:3d:cg:cg::Starting value 1.475e-07
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg::Convergence step 3 value 1.327e-06
+DEAL:3d:cg::Convergence step 3 value 1.325e-06
 DEAL:3d::Testing FE_Q<3>(1)
 DEAL:3d::Number of degrees of freedom: 4913
 DEAL:3d:cg::Starting value 70.09
-DEAL:3d:cg:cg::Starting value 0.06187
+DEAL:3d:cg:cg::Starting value 0.06183
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 7.842e-05
+DEAL:3d:cg:cg::Starting value 7.450e-05
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 1.062e-06
+DEAL:3d:cg:cg::Starting value 9.333e-07
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 1.441e-09
+DEAL:3d:cg:cg::Starting value 1.291e-09
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg::Convergence step 4 value 6.374e-08
+DEAL:3d:cg::Convergence step 4 value 6.450e-08
 DEAL:3d::Testing FE_Q<3>(2)
 DEAL:3d::Number of degrees of freedom: 729
 DEAL:3d:cg::Starting value 27.00
-DEAL:3d:cg:cg::Starting value 1.155
+DEAL:3d:cg:cg::Starting value 1.154
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg:cg::Starting value 0.0001365
+DEAL:3d:cg:cg::Starting value 0.0001378
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg:cg::Starting value 1.471e-07
+DEAL:3d:cg:cg::Starting value 1.421e-07
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg::Convergence step 3 value 5.041e-08
+DEAL:3d:cg::Convergence step 3 value 4.863e-08
 DEAL:3d::Testing FE_Q<3>(2)
 DEAL:3d::Number of degrees of freedom: 4913
 DEAL:3d:cg::Starting value 70.09
-DEAL:3d:cg:cg::Starting value 6.474
+DEAL:3d:cg:cg::Starting value 6.449
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg:cg::Starting value 0.0005841
+DEAL:3d:cg:cg::Starting value 0.0005799
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg:cg::Starting value 2.219e-06
+DEAL:3d:cg:cg::Starting value 2.195e-06
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg::Convergence step 3 value 2.560e-06
+DEAL:3d:cg::Convergence step 3 value 2.497e-06
 DEAL:3d::Testing FE_Q<3>(2)
 DEAL:3d::Number of degrees of freedom: 35937
 DEAL:3d:cg::Starting value 189.6
-DEAL:3d:cg:cg::Starting value 47.62
+DEAL:3d:cg:cg::Starting value 47.58
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg:cg::Starting value 0.006356
+DEAL:3d:cg:cg::Starting value 0.006336
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg:cg::Starting value 8.271e-06
+DEAL:3d:cg:cg::Starting value 8.282e-06
 DEAL:3d:cg:cg::Convergence step 2 value 0
-DEAL:3d:cg::Convergence step 3 value 1.007e-05
+DEAL:3d:cg::Convergence step 3 value 9.898e-06

diff --git a/tests/matrix_free/parallel_multigrid_02.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=3.output b/tests/matrix_free/parallel_multigrid_02.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=3.output
index f4dd586dfe5a0864c495215a3da435ab846b48b6..447f1032c908948493924f92b7d2b15bb8b5f00f 100644 (file)
--- a/tests/matrix_free/parallel_multigrid_02.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=3.output
+++ b/tests/matrix_free/parallel_multigrid_02.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=3.output
@@ -12,92 +12,92 @@ DEAL:2d:cg::Starting value 17.00
 DEAL:2d:cg:cg::Convergence step 0 value 0
 DEAL:2d:cg:cg::Convergence step 0 value 0
 DEAL:2d:cg:cg::Convergence step 0 value 0
-DEAL:2d:cg::Convergence step 3 value 3.003e-08
+DEAL:2d:cg::Convergence step 3 value 2.852e-08
 DEAL:2d::Testing FE_Q<2>(1)
 DEAL:2d::Number of degrees of freedom: 1089
 DEAL:2d:cg::Starting value 33.00
 DEAL:2d:cg:cg::Convergence step 0 value 0
 DEAL:2d:cg:cg::Convergence step 0 value 0
 DEAL:2d:cg:cg::Convergence step 0 value 0
-DEAL:2d:cg::Convergence step 3 value 1.234e-06
+DEAL:2d:cg::Convergence step 3 value 1.188e-06
 DEAL:2d::Testing FE_Q<2>(2)
 DEAL:2d::Number of degrees of freedom: 289
 DEAL:2d:cg::Starting value 17.00
-DEAL:2d:cg:cg::Starting value 0.5046
+DEAL:2d:cg:cg::Starting value 0.7172
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 0.0001009
+DEAL:2d:cg:cg::Starting value 0.0001433
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 2.390e-07
+DEAL:2d:cg:cg::Starting value 3.394e-07
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg::Convergence step 3 value 2.836e-07
+DEAL:2d:cg::Convergence step 3 value 2.855e-07
 DEAL:2d::Testing FE_Q<2>(2)
 DEAL:2d::Number of degrees of freedom: 1089
 DEAL:2d:cg::Starting value 33.00
-DEAL:2d:cg:cg::Starting value 1.907
+DEAL:2d:cg:cg::Starting value 2.710
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 0.0001557
+DEAL:2d:cg:cg::Starting value 0.0002209
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 2.528e-08
+DEAL:2d:cg:cg::Starting value 3.547e-08
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg::Convergence step 3 value 7.105e-07
+DEAL:2d:cg::Convergence step 3 value 7.112e-07
 DEAL:2d::Testing FE_Q<2>(2)
 DEAL:2d::Number of degrees of freedom: 4225
 DEAL:2d:cg::Starting value 65.00
-DEAL:2d:cg:cg::Starting value 7.521
+DEAL:2d:cg:cg::Starting value 10.69
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 0.0004595
+DEAL:2d:cg:cg::Starting value 0.0006523
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 4.621e-07
+DEAL:2d:cg:cg::Starting value 6.562e-07
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg::Convergence step 3 value 1.709e-06
+DEAL:2d:cg::Convergence step 3 value 1.706e-06
 DEAL:3d::Testing FE_Q<3>(1)
 DEAL:3d::Number of degrees of freedom: 125
 DEAL:3d:cg::Starting value 11.18
 DEAL:3d:cg:cg::Convergence step 0 value 0
 DEAL:3d:cg:cg::Convergence step 0 value 0
 DEAL:3d:cg:cg::Convergence step 0 value 0
-DEAL:3d:cg::Convergence step 3 value 9.585e-10
+DEAL:3d:cg::Convergence step 3 value 9.648e-10
 DEAL:3d::Testing FE_Q<3>(1)
 DEAL:3d::Number of degrees of freedom: 729
 DEAL:3d:cg::Starting value 27.00
 DEAL:3d:cg:cg::Convergence step 0 value 0
 DEAL:3d:cg:cg::Convergence step 0 value 0
 DEAL:3d:cg:cg::Convergence step 0 value 0
-DEAL:3d:cg::Convergence step 3 value 1.302e-07
+DEAL:3d:cg::Convergence step 3 value 1.307e-07
 DEAL:3d::Testing FE_Q<3>(1)
 DEAL:3d::Number of degrees of freedom: 4913
 DEAL:3d:cg::Starting value 70.09
 DEAL:3d:cg:cg::Convergence step 0 value 0
 DEAL:3d:cg:cg::Convergence step 0 value 0
 DEAL:3d:cg:cg::Convergence step 0 value 0
-DEAL:3d:cg::Convergence step 3 value 1.260e-07
+DEAL:3d:cg::Convergence step 3 value 1.389e-07
 DEAL:3d::Testing FE_Q<3>(2)
 DEAL:3d::Number of degrees of freedom: 729
 DEAL:3d:cg::Starting value 27.00
-DEAL:3d:cg:cg::Starting value 1.111
+DEAL:3d:cg:cg::Starting value 1.110
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 4.641e-05
+DEAL:3d:cg:cg::Starting value 4.566e-05
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 1.161e-07
+DEAL:3d:cg:cg::Starting value 1.159e-07
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg::Convergence step 3 value 2.867e-08
+DEAL:3d:cg::Convergence step 3 value 2.775e-08
 DEAL:3d::Testing FE_Q<3>(2)
 DEAL:3d::Number of degrees of freedom: 4913
 DEAL:3d:cg::Starting value 70.09
-DEAL:3d:cg:cg::Starting value 6.226
+DEAL:3d:cg:cg::Starting value 6.209
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 0.0006131
+DEAL:3d:cg:cg::Starting value 0.0006089
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 1.964e-06
+DEAL:3d:cg:cg::Starting value 1.952e-06
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg::Convergence step 3 value 1.131e-06
+DEAL:3d:cg::Convergence step 3 value 1.139e-06
 DEAL:3d::Testing FE_Q<3>(2)
 DEAL:3d::Number of degrees of freedom: 35937
 DEAL:3d:cg::Starting value 189.6
-DEAL:3d:cg:cg::Starting value 45.82
+DEAL:3d:cg:cg::Starting value 45.77
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 0.006222
+DEAL:3d:cg:cg::Starting value 0.006203
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 8.361e-06
+DEAL:3d:cg:cg::Starting value 8.376e-06
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg::Convergence step 3 value 5.576e-06
+DEAL:3d:cg::Convergence step 3 value 5.606e-06

diff --git a/tests/matrix_free/parallel_multigrid_02.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=7.output b/tests/matrix_free/parallel_multigrid_02.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=7.output
index f4dd586dfe5a0864c495215a3da435ab846b48b6..60497e07ed2e17377b38ef834b2de543217579f4 100644 (file)
--- a/tests/matrix_free/parallel_multigrid_02.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=7.output
+++ b/tests/matrix_free/parallel_multigrid_02.with_mpi=true.with_p4est=true.with_trilinos=true.mpirun=7.output
@@ -12,92 +12,92 @@ DEAL:2d:cg::Starting value 17.00
 DEAL:2d:cg:cg::Convergence step 0 value 0
 DEAL:2d:cg:cg::Convergence step 0 value 0
 DEAL:2d:cg:cg::Convergence step 0 value 0
-DEAL:2d:cg::Convergence step 3 value 3.003e-08
+DEAL:2d:cg::Convergence step 3 value 2.901e-08
 DEAL:2d::Testing FE_Q<2>(1)
 DEAL:2d::Number of degrees of freedom: 1089
 DEAL:2d:cg::Starting value 33.00
 DEAL:2d:cg:cg::Convergence step 0 value 0
 DEAL:2d:cg:cg::Convergence step 0 value 0
 DEAL:2d:cg:cg::Convergence step 0 value 0
-DEAL:2d:cg::Convergence step 3 value 1.234e-06
+DEAL:2d:cg::Convergence step 3 value 1.591e-06
 DEAL:2d::Testing FE_Q<2>(2)
 DEAL:2d::Number of degrees of freedom: 289
 DEAL:2d:cg::Starting value 17.00
-DEAL:2d:cg:cg::Starting value 0.5046
+DEAL:2d:cg:cg::Starting value 0.7073
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 0.0001009
+DEAL:2d:cg:cg::Starting value 0.0001412
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 2.390e-07
+DEAL:2d:cg:cg::Starting value 3.343e-07
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg::Convergence step 3 value 2.836e-07
+DEAL:2d:cg::Convergence step 3 value 2.869e-07
 DEAL:2d::Testing FE_Q<2>(2)
 DEAL:2d::Number of degrees of freedom: 1089
 DEAL:2d:cg::Starting value 33.00
-DEAL:2d:cg:cg::Starting value 1.907
+DEAL:2d:cg:cg::Starting value 2.673
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 0.0001557
+DEAL:2d:cg:cg::Starting value 0.0002179
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 2.528e-08
+DEAL:2d:cg:cg::Starting value 3.494e-08
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg::Convergence step 3 value 7.105e-07
+DEAL:2d:cg::Convergence step 3 value 7.111e-07
 DEAL:2d::Testing FE_Q<2>(2)
 DEAL:2d::Number of degrees of freedom: 4225
 DEAL:2d:cg::Starting value 65.00
-DEAL:2d:cg:cg::Starting value 7.521
+DEAL:2d:cg:cg::Starting value 10.54
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 0.0004595
+DEAL:2d:cg:cg::Starting value 0.0006433
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg:cg::Starting value 4.621e-07
+DEAL:2d:cg:cg::Starting value 6.472e-07
 DEAL:2d:cg:cg::Convergence step 1 value 0
-DEAL:2d:cg::Convergence step 3 value 1.709e-06
+DEAL:2d:cg::Convergence step 3 value 1.706e-06
 DEAL:3d::Testing FE_Q<3>(1)
 DEAL:3d::Number of degrees of freedom: 125
 DEAL:3d:cg::Starting value 11.18
 DEAL:3d:cg:cg::Convergence step 0 value 0
 DEAL:3d:cg:cg::Convergence step 0 value 0
 DEAL:3d:cg:cg::Convergence step 0 value 0
-DEAL:3d:cg::Convergence step 3 value 9.585e-10
+DEAL:3d:cg::Convergence step 3 value 9.634e-10
 DEAL:3d::Testing FE_Q<3>(1)
 DEAL:3d::Number of degrees of freedom: 729
 DEAL:3d:cg::Starting value 27.00
 DEAL:3d:cg:cg::Convergence step 0 value 0
 DEAL:3d:cg:cg::Convergence step 0 value 0
 DEAL:3d:cg:cg::Convergence step 0 value 0
-DEAL:3d:cg::Convergence step 3 value 1.302e-07
+DEAL:3d:cg::Convergence step 3 value 1.304e-07
 DEAL:3d::Testing FE_Q<3>(1)
 DEAL:3d::Number of degrees of freedom: 4913
 DEAL:3d:cg::Starting value 70.09
 DEAL:3d:cg:cg::Convergence step 0 value 0
 DEAL:3d:cg:cg::Convergence step 0 value 0
 DEAL:3d:cg:cg::Convergence step 0 value 0
-DEAL:3d:cg::Convergence step 3 value 1.260e-07
+DEAL:3d:cg::Convergence step 3 value 1.365e-07
 DEAL:3d::Testing FE_Q<3>(2)
 DEAL:3d::Number of degrees of freedom: 729
 DEAL:3d:cg::Starting value 27.00
-DEAL:3d:cg:cg::Starting value 1.111
+DEAL:3d:cg:cg::Starting value 1.110
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 4.641e-05
+DEAL:3d:cg:cg::Starting value 4.552e-05
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 1.161e-07
+DEAL:3d:cg:cg::Starting value 1.159e-07
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg::Convergence step 3 value 2.867e-08
+DEAL:3d:cg::Convergence step 3 value 2.755e-08
 DEAL:3d::Testing FE_Q<3>(2)
 DEAL:3d::Number of degrees of freedom: 4913
 DEAL:3d:cg::Starting value 70.09
-DEAL:3d:cg:cg::Starting value 6.226
+DEAL:3d:cg:cg::Starting value 6.201
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 0.0006131
+DEAL:3d:cg:cg::Starting value 0.0006074
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 1.964e-06
+DEAL:3d:cg:cg::Starting value 1.949e-06
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg::Convergence step 3 value 1.131e-06
+DEAL:3d:cg::Convergence step 3 value 1.141e-06
 DEAL:3d::Testing FE_Q<3>(2)
 DEAL:3d::Number of degrees of freedom: 35937
 DEAL:3d:cg::Starting value 189.6
-DEAL:3d:cg:cg::Starting value 45.82
+DEAL:3d:cg:cg::Starting value 45.78
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 0.006222
+DEAL:3d:cg:cg::Starting value 0.006202
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg:cg::Starting value 8.361e-06
+DEAL:3d:cg:cg::Starting value 8.370e-06
 DEAL:3d:cg:cg::Convergence step 1 value 0
-DEAL:3d:cg::Convergence step 3 value 5.576e-06
+DEAL:3d:cg::Convergence step 3 value 5.604e-06