From c633f87ef3146f9cf1ca1abcb116b85fca3862ed Mon Sep 17 00:00:00 2001 From: Niklas Fehn Date: Tue, 25 Jul 2017 13:33:36 +0200 Subject: [PATCH] Improvement of initialization of Chebyshev smoother. Make initial guess robust with respect to number of processors by operating on the global index. --- include/deal.II/lac/precondition.h | 9 +- ...st=true.with_trilinos=true.mpirun=3.output | 106 +++++++++--------- ...st=true.with_trilinos=true.mpirun=7.output | 104 ++++++++--------- ...st=true.with_trilinos=true.mpirun=3.output | 40 +++---- ...st=true.with_trilinos=true.mpirun=7.output | 38 +++---- 5 files changed, 151 insertions(+), 146 deletions(-) diff --git a/include/deal.II/lac/precondition.h b/include/deal.II/lac/precondition.h index e41602a9d1..1d1d504091 100644 --- a/include/deal.II/lac/precondition.h +++ b/include/deal.II/lac/precondition.h @@ -1931,9 +1931,14 @@ namespace internal // 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 + // a period of 11. + // Make initial guess robust with respect to number of processors + // by operating on the global index. + types::global_dof_index first_local_range = 0; + if (!vector.locally_owned_elements().is_empty()) + first_local_range = vector.locally_owned_elements().nth_index_in_set(0); for (unsigned int i=0; i(1) DEAL:2d::Number of degrees of freedom: 81 DEAL:2d:cg::Starting value 9.000 -DEAL:2d:cg:cg::Starting value 0.009297 +DEAL:2d:cg:cg::Starting value 0.008804 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 6.865e-06 +DEAL:2d:cg:cg::Starting value 1.035e-05 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 7.160e-08 +DEAL:2d:cg:cg::Starting value 9.380e-08 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg::Convergence step 3 value 4.624e-07 +DEAL:2d:cg::Convergence step 3 value 4.632e-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.02741 +DEAL:2d:cg:cg::Starting value 0.02904 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 5.357e-06 +DEAL:2d:cg:cg::Starting value 5.542e-06 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 1.614e-09 +DEAL:2d:cg:cg::Starting value 3.318e-09 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg::Convergence step 3 value 3.874e-07 +DEAL:2d:cg::Convergence step 3 value 4.000e-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.09872 +DEAL:2d:cg:cg::Starting value 0.1041 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 3.026e-06 +DEAL:2d:cg:cg::Starting value 3.041e-06 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 1.139e-07 +DEAL:2d:cg:cg::Starting value 1.133e-07 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 1.716e-10 +DEAL:2d:cg:cg::Starting value 1.824e-10 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg::Convergence step 4 value 1.475e-08 +DEAL:2d:cg::Convergence step 4 value 1.222e-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.7288 +DEAL:2d:cg:cg::Starting value 0.4928 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 0.0001125 +DEAL:2d:cg:cg::Starting value 7.433e-05 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 5.547e-07 +DEAL:2d:cg:cg::Starting value 4.269e-07 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 1.651e-09 +DEAL:2d:cg:cg::Starting value 1.107e-09 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg::Convergence step 4 value 1.217e-08 +DEAL:2d:cg::Convergence step 4 value 1.339e-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 2.750 +DEAL:2d:cg:cg::Starting value 1.857 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 0.0001016 +DEAL:2d:cg:cg::Starting value 6.915e-05 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 1.332e-06 +DEAL:2d:cg:cg::Starting value 9.008e-07 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 3.295e-09 +DEAL:2d:cg:cg::Starting value 2.272e-09 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg::Convergence step 4 value 1.552e-08 +DEAL:2d:cg::Convergence step 4 value 1.555e-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 10.87 +DEAL:2d:cg:cg::Starting value 7.324 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 0.0005755 +DEAL:2d:cg:cg::Starting value 0.0003835 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 8.458e-07 +DEAL:2d:cg:cg::Starting value 5.631e-07 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 1.274e-08 +DEAL:2d:cg:cg::Starting value 8.812e-09 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg::Convergence step 4 value 3.067e-08 +DEAL:2d:cg::Convergence step 4 value 3.108e-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.1418 +DEAL:3d:cg:cg::Starting value 0.1411 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 7.294e-05 +DEAL:3d:cg:cg::Starting value 7.053e-05 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 4.688e-09 +DEAL:3d:cg:cg::Starting value 4.822e-09 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg::Convergence step 3 value 9.196e-09 +DEAL:3d:cg::Convergence step 3 value 9.057e-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.03518 +DEAL:3d:cg:cg::Starting value 0.03502 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 0.0002887 +DEAL:3d:cg:cg::Starting value 0.0002864 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 1.492e-07 +DEAL:3d:cg:cg::Starting value 1.471e-07 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg::Convergence step 3 value 1.324e-06 +DEAL:3d:cg::Convergence step 3 value 1.321e-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.06164 +DEAL:3d:cg:cg::Starting value 0.06187 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 6.844e-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 7.352e-07 +DEAL:3d:cg:cg::Starting value 8.132e-07 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 1.067e-09 +DEAL:3d:cg:cg::Starting value 1.153e-09 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg::Convergence step 4 value 6.582e-08 +DEAL:3d:cg::Convergence step 4 value 6.546e-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.136 +DEAL:3d:cg:cg::Starting value 1.198 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg:cg::Starting value 0.0001381 +DEAL:3d:cg:cg::Starting value 0.0001874 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg:cg::Starting value 7.483e-08 +DEAL:3d:cg:cg::Starting value 8.519e-08 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg::Convergence step 3 value 4.444e-08 +DEAL:3d:cg::Convergence step 3 value 4.352e-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.333 +DEAL:3d:cg:cg::Starting value 6.688 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg:cg::Starting value 0.0005547 +DEAL:3d:cg:cg::Starting value 0.0005904 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg:cg::Starting value 2.051e-06 +DEAL:3d:cg:cg::Starting value 2.187e-06 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg::Convergence step 3 value 2.121e-06 +DEAL:3d:cg::Convergence step 3 value 2.196e-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 46.10 +DEAL:3d:cg:cg::Starting value 49.17 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg:cg::Starting value 0.006090 +DEAL:3d:cg:cg::Starting value 0.006462 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg:cg::Starting value 8.064e-06 +DEAL:3d:cg:cg::Starting value 8.640e-06 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg::Convergence step 3 value 9.434e-06 +DEAL:3d:cg::Convergence step 3 value 9.302e-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 330df78db9..cd85abb368 100644 --- 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.009339 +DEAL:2d:cg:cg::Starting value 0.008804 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 6.557e-06 +DEAL:2d:cg:cg::Starting value 1.035e-05 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 6.976e-08 +DEAL:2d:cg:cg::Starting value 9.380e-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.632e-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.02740 +DEAL:2d:cg:cg::Starting value 0.02904 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 5.355e-06 +DEAL:2d:cg:cg::Starting value 5.542e-06 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 1.596e-09 +DEAL:2d:cg:cg::Starting value 3.318e-09 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg::Convergence step 3 value 3.872e-07 +DEAL:2d:cg::Convergence step 3 value 4.000e-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.09908 +DEAL:2d:cg:cg::Starting value 0.1041 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 2.974e-06 +DEAL:2d:cg:cg::Starting value 3.041e-06 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 1.212e-07 +DEAL:2d:cg:cg::Starting value 1.133e-07 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 1.678e-10 +DEAL:2d:cg:cg::Starting value 1.824e-10 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg::Convergence step 4 value 1.837e-08 +DEAL:2d:cg::Convergence step 4 value 1.222e-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.7166 +DEAL:2d:cg:cg::Starting value 0.4928 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 0.0001109 +DEAL:2d:cg:cg::Starting value 7.433e-05 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 5.827e-07 +DEAL:2d:cg:cg::Starting value 4.269e-07 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 1.608e-09 +DEAL:2d:cg:cg::Starting value 1.107e-09 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg::Convergence step 4 value 1.277e-08 +DEAL:2d:cg::Convergence step 4 value 1.339e-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 2.695 +DEAL:2d:cg:cg::Starting value 1.857 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 9.568e-05 +DEAL:2d:cg:cg::Starting value 6.915e-05 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 1.282e-06 +DEAL:2d:cg:cg::Starting value 9.008e-07 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 3.283e-09 +DEAL:2d:cg:cg::Starting value 2.272e-09 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg::Convergence step 4 value 1.559e-08 +DEAL:2d:cg::Convergence step 4 value 1.555e-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 10.65 +DEAL:2d:cg:cg::Starting value 7.324 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 0.0005552 +DEAL:2d:cg:cg::Starting value 0.0003835 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 8.195e-07 +DEAL:2d:cg:cg::Starting value 5.631e-07 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg:cg::Starting value 1.269e-08 +DEAL:2d:cg:cg::Starting value 8.812e-09 DEAL:2d:cg:cg::Convergence step 2 value 0 -DEAL:2d:cg::Convergence step 4 value 3.101e-08 +DEAL:2d:cg::Convergence step 4 value 3.108e-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.1413 +DEAL:3d:cg:cg::Starting value 0.1411 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 7.120e-05 +DEAL:3d:cg:cg::Starting value 7.053e-05 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 4.784e-09 +DEAL:3d:cg:cg::Starting value 4.822e-09 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg::Convergence step 3 value 9.096e-09 +DEAL:3d:cg::Convergence step 3 value 9.057e-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.03518 +DEAL:3d:cg:cg::Starting value 0.03502 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 0.0002883 +DEAL:3d:cg:cg::Starting value 0.0002864 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 1.489e-07 +DEAL:3d:cg:cg::Starting value 1.471e-07 DEAL:3d:cg:cg::Convergence step 1 value 0 DEAL:3d:cg::Convergence step 3 value 1.321e-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.06170 +DEAL:3d:cg:cg::Starting value 0.06187 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 6.304e-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 5.815e-07 +DEAL:3d:cg:cg::Starting value 8.132e-07 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 8.967e-10 +DEAL:3d:cg:cg::Starting value 1.153e-09 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg::Convergence step 4 value 6.469e-08 +DEAL:3d:cg::Convergence step 4 value 6.546e-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.126 +DEAL:3d:cg:cg::Starting value 1.198 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg:cg::Starting value 0.0001398 +DEAL:3d:cg:cg::Starting value 0.0001874 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg:cg::Starting value 2.278e-08 +DEAL:3d:cg:cg::Starting value 8.519e-08 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg::Convergence step 3 value 5.638e-08 +DEAL:3d:cg::Convergence step 3 value 4.352e-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.331 +DEAL:3d:cg:cg::Starting value 6.688 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg:cg::Starting value 0.0005469 +DEAL:3d:cg:cg::Starting value 0.0005904 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg:cg::Starting value 2.015e-06 +DEAL:3d:cg:cg::Starting value 2.187e-06 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg::Convergence step 3 value 2.003e-06 +DEAL:3d:cg::Convergence step 3 value 2.196e-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.14 +DEAL:3d:cg:cg::Starting value 49.17 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg:cg::Starting value 0.006202 +DEAL:3d:cg:cg::Starting value 0.006462 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg:cg::Starting value 8.144e-06 +DEAL:3d:cg:cg::Starting value 8.640e-06 DEAL:3d:cg:cg::Convergence step 2 value 0 -DEAL:3d:cg::Convergence step 3 value 9.599e-06 +DEAL:3d:cg::Convergence step 3 value 9.302e-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 e2e5f50ae7..7b27e1ef59 100644 --- 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 @@ -5,65 +5,65 @@ DEAL:2d:cg::Starting value 9.000 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.525e-08 +DEAL:2d:cg::Convergence step 3 value 3.515e-08 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::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 2.883e-08 +DEAL:2d:cg::Convergence step 3 value 2.831e-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.7112 +DEAL:2d:cg:cg::Starting value 0.4815 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 0.0001324 +DEAL:2d:cg:cg::Starting value 9.432e-05 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 2.886e-07 +DEAL:2d:cg:cg::Starting value 2.174e-07 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg::Convergence step 3 value 4.342e-07 +DEAL:2d:cg::Convergence step 3 value 3.366e-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 2.690 +DEAL:2d:cg:cg::Starting value 1.818 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 0.0002067 +DEAL:2d:cg:cg::Starting value 0.0001408 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 4.530e-08 +DEAL:2d:cg:cg::Starting value 3.548e-08 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg::Convergence step 3 value 7.932e-07 +DEAL:2d:cg::Convergence step 3 value 8.040e-07 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.765e-10 +DEAL:3d:cg::Convergence step 3 value 9.624e-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.305e-07 +DEAL:3d:cg::Convergence step 3 value 1.308e-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.088 +DEAL:3d:cg:cg::Starting value 1.147 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 3.828e-05 +DEAL:3d:cg:cg::Starting value 4.360e-05 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 1.155e-07 +DEAL:3d:cg:cg::Starting value 1.203e-07 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg::Convergence step 3 value 2.674e-08 +DEAL:3d:cg::Convergence step 3 value 2.611e-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.089 +DEAL:3d:cg:cg::Starting value 6.424 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 0.0005714 +DEAL:3d:cg:cg::Starting value 0.0006099 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 1.861e-06 +DEAL:3d:cg:cg::Starting value 1.980e-06 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg::Convergence step 3 value 1.215e-06 +DEAL:3d:cg::Convergence step 3 value 1.197e-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 9006446a86..7b27e1ef59 100644 --- 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 @@ -5,41 +5,41 @@ DEAL:2d:cg::Starting value 9.000 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.519e-08 +DEAL:2d:cg::Convergence step 3 value 3.515e-08 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::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 2.884e-08 +DEAL:2d:cg::Convergence step 3 value 2.831e-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.6993 +DEAL:2d:cg:cg::Starting value 0.4815 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 0.0001337 +DEAL:2d:cg:cg::Starting value 9.432e-05 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 2.994e-07 +DEAL:2d:cg:cg::Starting value 2.174e-07 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg::Convergence step 3 value 3.919e-07 +DEAL:2d:cg::Convergence step 3 value 3.366e-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 2.636 +DEAL:2d:cg:cg::Starting value 1.818 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 0.0001975 +DEAL:2d:cg:cg::Starting value 0.0001408 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg:cg::Starting value 4.406e-08 +DEAL:2d:cg:cg::Starting value 3.548e-08 DEAL:2d:cg:cg::Convergence step 1 value 0 -DEAL:2d:cg::Convergence step 3 value 8.342e-07 +DEAL:2d:cg::Convergence step 3 value 8.040e-07 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.666e-10 +DEAL:3d:cg::Convergence step 3 value 9.624e-10 DEAL:3d::Testing FE_Q<3>(1) DEAL:3d::Number of degrees of freedom: 729 DEAL:3d:cg::Starting value 27.00 @@ -50,20 +50,20 @@ DEAL:3d:cg::Convergence step 3 value 1.308e-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.076 +DEAL:3d:cg:cg::Starting value 1.147 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 3.521e-05 +DEAL:3d:cg:cg::Starting value 4.360e-05 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 1.182e-07 +DEAL:3d:cg:cg::Starting value 1.203e-07 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg::Convergence step 3 value 3.247e-08 +DEAL:3d:cg::Convergence step 3 value 2.611e-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.088 +DEAL:3d:cg:cg::Starting value 6.424 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 0.0005598 +DEAL:3d:cg:cg::Starting value 0.0006099 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg:cg::Starting value 1.843e-06 +DEAL:3d:cg:cg::Starting value 1.980e-06 DEAL:3d:cg:cg::Convergence step 1 value 0 -DEAL:3d:cg::Convergence step 3 value 1.246e-06 +DEAL:3d:cg::Convergence step 3 value 1.197e-06 -- 2.39.5