From 10f8ff56a247b760279160e35f47469111c959f9 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Thu, 6 Nov 2014 12:54:00 +0100 Subject: [PATCH] Adjust tests that fail due to vectorized accumulation Commit c7f3054 changed the order of summation in inner products and norms because these operations are now done in vectorized form. The affected tests show spurious changes in the last digit. To improve, the following changes were made: - error_estimator_0?: The output was scaled by l1 norm which is unsafe. These tests should only test error estimation and hence the scaling is done by linfty_norm which will never depend on roundoff. Note that we output up to 7 digits of a float which notoriously runs into roundoff issues. - mesh_3d_12 also outputs 6-7 digits of a float. Changed the accuray of output to 5 digits. - q_dg0_projection was deleted because it FE_Q_DG0 has a singular mass matrix and thus the final solution on the face can be anything. Note e.g. how different the previous solutions for Intel/non-Intel compilers were -> no good test. --- tests/bits/error_estimator_01.cc | 4 +- tests/bits/error_estimator_01.output | 944 +++++++++--------- tests/bits/error_estimator_02.cc | 4 +- tests/bits/error_estimator_02.output | 944 +++++++++--------- tests/codim_one/error_estimator_01.cc | 4 +- tests/codim_one/error_estimator_01.output | 576 +++++------ tests/fe/q_dg0_projection_01.cc | 33 - ...ion_01.compiler=Intel=false.release.output | 143 --- ...tion_01.compiler=Intel=true.release.output | 143 --- tests/fe/q_dg0_projection_01.debug.output | 143 --- tests/grid/mesh_3d_12.cc | 7 +- tests/grid/mesh_3d_12.output | 54 +- 12 files changed, 1269 insertions(+), 1730 deletions(-) delete mode 100644 tests/fe/q_dg0_projection_01.cc delete mode 100644 tests/fe/q_dg0_projection_01.compiler=Intel=false.release.output delete mode 100644 tests/fe/q_dg0_projection_01.compiler=Intel=true.release.output delete mode 100644 tests/fe/q_dg0_projection_01.debug.output diff --git a/tests/bits/error_estimator_01.cc b/tests/bits/error_estimator_01.cc index 96c69bd108..59d2bbb438 100644 --- a/tests/bits/error_estimator_01.cc +++ b/tests/bits/error_estimator_01.cc @@ -153,7 +153,7 @@ check () // number KellyErrorEstimator::estimate (mapping, dof, q_face, neumann_bc, v, error1); - const double scaling_factor = 10000.*error1.size()/error1.l1_norm(); + const double scaling_factor = 500000./error1.linfty_norm(); error1 *= scaling_factor; deallog << "Estimated error indicators:" << std::endl; @@ -170,7 +170,7 @@ check () KellyErrorEstimator::estimate (mapping, dof, q_face, neumann_bc, v, this_error, std::vector(), 0, - multithread_info.n_default_threads, + multithread_info.n_threads(), subdomain); this_error *= scaling_factor; diff --git a/tests/bits/error_estimator_01.output b/tests/bits/error_estimator_01.output index 5c9ee6ea0c..6bc1596929 100644 --- a/tests/bits/error_estimator_01.output +++ b/tests/bits/error_estimator_01.output @@ -1,111 +1,111 @@ DEAL:1d::Estimated error indicators: -DEAL:1d::55.21 -DEAL:1d::67.65 -DEAL:1d::6.61 -DEAL:1d::0.89 -DEAL:1d::9.34 -DEAL:1d::6.64 -DEAL:1d::9.24 -DEAL:1d::36.89 -DEAL:1d::9.28 -DEAL:1d::29.81 -DEAL:1d::1.81 -DEAL:1d::472600.97 -DEAL:1d::4.28 -DEAL:1d::4.61 -DEAL:1d::2.81 -DEAL:1d::2.89 -DEAL:1d::0.43 -DEAL:1d::2.19 -DEAL:1d::0.74 -DEAL:1d::3.29 -DEAL:1d::0.29 -DEAL:1d::0.69 -DEAL:1d::0.68 -DEAL:1d::18.06 -DEAL:1d::0.90 -DEAL:1d::0.87 -DEAL:1d::1.79 -DEAL:1d::0.64 -DEAL:1d::0.97 -DEAL:1d::3.25 -DEAL:1d::2.93 +DEAL:1d::58.41 +DEAL:1d::71.57 +DEAL:1d::6.99 +DEAL:1d::0.94 +DEAL:1d::9.88 +DEAL:1d::7.03 +DEAL:1d::9.78 +DEAL:1d::39.02 +DEAL:1d::9.82 +DEAL:1d::31.53 +DEAL:1d::1.91 +DEAL:1d::500000.00 +DEAL:1d::4.53 +DEAL:1d::4.88 +DEAL:1d::2.97 +DEAL:1d::3.06 +DEAL:1d::0.46 +DEAL:1d::2.31 +DEAL:1d::0.79 +DEAL:1d::3.48 +DEAL:1d::0.30 +DEAL:1d::0.73 +DEAL:1d::0.72 +DEAL:1d::19.11 DEAL:1d::0.95 +DEAL:1d::0.92 +DEAL:1d::1.90 +DEAL:1d::0.67 +DEAL:1d::1.02 +DEAL:1d::3.44 +DEAL:1d::3.10 +DEAL:1d::1.00 DEAL:1d::0.02 -DEAL:1d::0.88 +DEAL:1d::0.93 DEAL:1d::0.03 -DEAL:1d::0.73 +DEAL:1d::0.77 DEAL:1d::0.02 -DEAL:1d::0.14 -DEAL:1d::15.77 -DEAL:1d::0.27 -DEAL:1d::2.10 +DEAL:1d::0.15 +DEAL:1d::16.69 +DEAL:1d::0.28 +DEAL:1d::2.22 DEAL:1d::0.02 DEAL:1d::0.02 -DEAL:1d::0.18 +DEAL:1d::0.19 DEAL:1d::0.05 DEAL:1d::0.05 -DEAL:1d::0.15 -DEAL:1d::0.24 -DEAL:1d::1.57 +DEAL:1d::0.16 +DEAL:1d::0.26 +DEAL:1d::1.66 DEAL:1d::0.01 DEAL:1d::0.00 DEAL:1d::0.01 DEAL:1d::0.01 DEAL:1d::0.01 -DEAL:1d::167089.62 +DEAL:1d::176776.64 DEAL:1d::0.00 -DEAL:1d::0.23 +DEAL:1d::0.24 DEAL:1d::0.01 DEAL:1d::0.01 DEAL:1d::0.01 -DEAL:1d::0.19 +DEAL:1d::0.20 DEAL:1d::0.03 DEAL:1d::0.00 DEAL:1d::0.01 DEAL:1d::Subdomain id=0 -DEAL:1d::0 55.21 +DEAL:1d::0 58.41 DEAL:1d::1 0.00 DEAL:1d::2 0.00 -DEAL:1d::3 0.89 -DEAL:1d::4 9.34 +DEAL:1d::3 0.94 +DEAL:1d::4 9.88 DEAL:1d::5 0.00 DEAL:1d::6 0.00 DEAL:1d::7 0.00 -DEAL:1d::8 9.28 -DEAL:1d::9 29.81 +DEAL:1d::8 9.82 +DEAL:1d::9 31.53 DEAL:1d::10 0.00 DEAL:1d::11 0.00 -DEAL:1d::12 4.28 -DEAL:1d::13 4.61 +DEAL:1d::12 4.53 +DEAL:1d::13 4.88 DEAL:1d::14 0.00 DEAL:1d::15 0.00 -DEAL:1d::16 0.43 +DEAL:1d::16 0.46 DEAL:1d::17 0.00 DEAL:1d::18 0.00 -DEAL:1d::19 3.29 +DEAL:1d::19 3.48 DEAL:1d::20 0.00 DEAL:1d::21 0.00 -DEAL:1d::22 0.68 -DEAL:1d::23 18.06 +DEAL:1d::22 0.72 +DEAL:1d::23 19.11 DEAL:1d::24 0.00 DEAL:1d::25 0.00 -DEAL:1d::26 1.79 -DEAL:1d::27 0.64 -DEAL:1d::28 0.97 -DEAL:1d::29 3.25 -DEAL:1d::30 2.93 -DEAL:1d::31 0.95 +DEAL:1d::26 1.90 +DEAL:1d::27 0.67 +DEAL:1d::28 1.02 +DEAL:1d::29 3.44 +DEAL:1d::30 3.10 +DEAL:1d::31 1.00 DEAL:1d::32 0.02 -DEAL:1d::33 0.88 +DEAL:1d::33 0.93 DEAL:1d::34 0.00 DEAL:1d::35 0.00 DEAL:1d::36 0.02 DEAL:1d::37 0.00 DEAL:1d::38 0.00 DEAL:1d::39 0.00 -DEAL:1d::40 2.10 +DEAL:1d::40 2.22 DEAL:1d::41 0.02 DEAL:1d::42 0.02 DEAL:1d::43 0.00 @@ -119,43 +119,43 @@ DEAL:1d::50 0.00 DEAL:1d::51 0.01 DEAL:1d::52 0.01 DEAL:1d::53 0.01 -DEAL:1d::54 167089.62 +DEAL:1d::54 176776.64 DEAL:1d::55 0.00 -DEAL:1d::56 0.23 +DEAL:1d::56 0.24 DEAL:1d::57 0.01 DEAL:1d::58 0.00 DEAL:1d::59 0.00 -DEAL:1d::60 0.19 +DEAL:1d::60 0.20 DEAL:1d::61 0.03 DEAL:1d::62 0.00 DEAL:1d::63 0.01 DEAL:1d::Subdomain id=1 DEAL:1d::0 0.00 -DEAL:1d::1 67.65 -DEAL:1d::2 6.61 +DEAL:1d::1 71.57 +DEAL:1d::2 6.99 DEAL:1d::3 0.00 DEAL:1d::4 0.00 -DEAL:1d::5 6.64 -DEAL:1d::6 9.24 -DEAL:1d::7 36.89 +DEAL:1d::5 7.03 +DEAL:1d::6 9.78 +DEAL:1d::7 39.02 DEAL:1d::8 0.00 DEAL:1d::9 0.00 -DEAL:1d::10 1.81 -DEAL:1d::11 472600.97 +DEAL:1d::10 1.91 +DEAL:1d::11 500000.00 DEAL:1d::12 0.00 DEAL:1d::13 0.00 -DEAL:1d::14 2.81 -DEAL:1d::15 2.89 +DEAL:1d::14 2.97 +DEAL:1d::15 3.06 DEAL:1d::16 0.00 -DEAL:1d::17 2.19 -DEAL:1d::18 0.74 +DEAL:1d::17 2.31 +DEAL:1d::18 0.79 DEAL:1d::19 0.00 -DEAL:1d::20 0.29 -DEAL:1d::21 0.69 +DEAL:1d::20 0.30 +DEAL:1d::21 0.73 DEAL:1d::22 0.00 DEAL:1d::23 0.00 -DEAL:1d::24 0.90 -DEAL:1d::25 0.87 +DEAL:1d::24 0.95 +DEAL:1d::25 0.92 DEAL:1d::26 0.00 DEAL:1d::27 0.00 DEAL:1d::28 0.00 @@ -165,20 +165,20 @@ DEAL:1d::31 0.00 DEAL:1d::32 0.00 DEAL:1d::33 0.00 DEAL:1d::34 0.03 -DEAL:1d::35 0.73 +DEAL:1d::35 0.77 DEAL:1d::36 0.00 -DEAL:1d::37 0.14 -DEAL:1d::38 15.77 -DEAL:1d::39 0.27 +DEAL:1d::37 0.15 +DEAL:1d::38 16.69 +DEAL:1d::39 0.28 DEAL:1d::40 0.00 DEAL:1d::41 0.00 DEAL:1d::42 0.00 -DEAL:1d::43 0.18 +DEAL:1d::43 0.19 DEAL:1d::44 0.05 DEAL:1d::45 0.05 -DEAL:1d::46 0.15 -DEAL:1d::47 0.24 -DEAL:1d::48 1.57 +DEAL:1d::46 0.16 +DEAL:1d::47 0.26 +DEAL:1d::48 1.66 DEAL:1d::49 0.00 DEAL:1d::50 0.00 DEAL:1d::51 0.00 @@ -196,116 +196,116 @@ DEAL:1d::62 0.00 DEAL:1d::63 0.00 DEAL:1d::OK DEAL:2d::Estimated error indicators: -DEAL:2d::27634.60 -DEAL:2d::27634.60 -DEAL:2d::29.16 -DEAL:2d::80.55 -DEAL:2d::94.47 +DEAL:2d::287221.75 +DEAL:2d::287221.75 +DEAL:2d::303.04 +DEAL:2d::837.22 +DEAL:2d::981.88 +DEAL:2d::892.03 +DEAL:2d::424991.38 +DEAL:2d::499999.97 +DEAL:2d::573.38 +DEAL:2d::499999.97 +DEAL:2d::424991.41 +DEAL:2d::619.94 +DEAL:2d::441.39 +DEAL:2d::424991.38 +DEAL:2d::460.53 +DEAL:2d::499999.97 +DEAL:2d::499999.97 +DEAL:2d::619.94 +DEAL:2d::514.76 +DEAL:2d::517.35 +DEAL:2d::499999.97 +DEAL:2d::441.39 +DEAL:2d::424991.41 +DEAL:2d::364.77 +DEAL:2d::499999.91 +DEAL:2d::424991.41 +DEAL:2d::351.95 +DEAL:2d::287221.75 +DEAL:2d::161951.06 +DEAL:2d::424991.41 +DEAL:2d::528.32 +DEAL:2d::499999.97 +DEAL:2d::619.94 +DEAL:2d::729.65 +DEAL:2d::906.96 +DEAL:2d::906.96 +DEAL:2d::1064.17 +DEAL:2d::287221.75 +DEAL:2d::161951.06 +DEAL:2d::303.04 +DEAL:2d::287221.75 +DEAL:2d::906.96 +DEAL:2d::1064.17 +DEAL:2d::772.96 +DEAL:2d::819.68 +DEAL:2d::287221.75 +DEAL:2d::361.01 +DEAL:2d::161951.06 +DEAL:2d::287221.75 +DEAL:2d::528.32 +DEAL:2d::561.69 +DEAL:2d::424991.41 +DEAL:2d::499999.94 +DEAL:2d::151.94 +DEAL:2d::84.31 +DEAL:2d::145.22 +DEAL:2d::48.68 +DEAL:2d::93.51 +DEAL:2d::93.51 +DEAL:2d::111.31 +DEAL:2d::40955.71 +DEAL:2d::75612.41 +DEAL:2d::75612.41 +DEAL:2d::34.04 +DEAL:2d::157.51 +DEAL:2d::104.24 +DEAL:2d::163.78 +DEAL:2d::108.38 +DEAL:2d::163.78 +DEAL:2d::108.38 +DEAL:2d::155.71 +DEAL:2d::104.24 +DEAL:2d::213.57 +DEAL:2d::155.71 +DEAL:2d::132.15 +DEAL:2d::52.79 +DEAL:2d::59.68 +DEAL:2d::85.11 +DEAL:2d::119.40 +DEAL:2d::152.51 +DEAL:2d::69.29 +DEAL:2d::59.68 +DEAL:2d::104.69 +DEAL:2d::85.11 +DEAL:2d::225910.66 DEAL:2d::85.83 -DEAL:2d::40889.89 -DEAL:2d::48106.73 -DEAL:2d::55.17 -DEAL:2d::48106.73 -DEAL:2d::40889.90 -DEAL:2d::59.65 -DEAL:2d::42.47 -DEAL:2d::40889.89 -DEAL:2d::44.31 -DEAL:2d::48106.73 -DEAL:2d::48106.73 -DEAL:2d::59.65 -DEAL:2d::49.53 -DEAL:2d::49.78 -DEAL:2d::48106.73 -DEAL:2d::42.47 -DEAL:2d::40889.90 -DEAL:2d::35.10 -DEAL:2d::48106.73 -DEAL:2d::40889.90 -DEAL:2d::33.86 -DEAL:2d::27634.60 -DEAL:2d::15581.87 -DEAL:2d::40889.90 -DEAL:2d::50.83 -DEAL:2d::48106.73 -DEAL:2d::59.65 -DEAL:2d::70.20 -DEAL:2d::87.26 -DEAL:2d::87.26 -DEAL:2d::102.39 -DEAL:2d::27634.60 -DEAL:2d::15581.87 -DEAL:2d::29.16 -DEAL:2d::27634.60 -DEAL:2d::87.26 -DEAL:2d::102.39 -DEAL:2d::74.37 -DEAL:2d::78.86 -DEAL:2d::27634.60 -DEAL:2d::34.73 -DEAL:2d::15581.87 -DEAL:2d::27634.60 -DEAL:2d::50.83 -DEAL:2d::54.04 -DEAL:2d::40889.90 -DEAL:2d::48106.73 -DEAL:2d::14.62 -DEAL:2d::8.11 -DEAL:2d::13.97 -DEAL:2d::4.68 -DEAL:2d::9.00 -DEAL:2d::9.00 -DEAL:2d::10.71 -DEAL:2d::3940.49 -DEAL:2d::7274.93 -DEAL:2d::7274.93 -DEAL:2d::3.28 -DEAL:2d::15.15 -DEAL:2d::10.03 -DEAL:2d::15.76 -DEAL:2d::10.43 -DEAL:2d::15.76 -DEAL:2d::10.43 -DEAL:2d::14.98 -DEAL:2d::10.03 -DEAL:2d::20.55 -DEAL:2d::14.98 -DEAL:2d::12.71 -DEAL:2d::5.08 -DEAL:2d::5.74 -DEAL:2d::8.19 -DEAL:2d::11.49 -DEAL:2d::14.67 -DEAL:2d::6.67 -DEAL:2d::5.74 -DEAL:2d::10.07 -DEAL:2d::8.19 -DEAL:2d::21735.65 -DEAL:2d::8.26 -DEAL:2d::19063.32 -DEAL:2d::6.72 -DEAL:2d::10.45 -DEAL:2d::9.25 -DEAL:2d::8.62 -DEAL:2d::7.76 -DEAL:2d::6.20 -DEAL:2d::3.93 -DEAL:2d::15665.22 -DEAL:2d::11677.80 -DEAL:2d::1.20 -DEAL:2d::1.08 -DEAL:2d::1.08 -DEAL:2d::0.96 +DEAL:2d::198135.70 +DEAL:2d::69.87 +DEAL:2d::108.62 +DEAL:2d::96.16 +DEAL:2d::89.60 +DEAL:2d::80.63 +DEAL:2d::64.47 +DEAL:2d::40.88 +DEAL:2d::162817.34 +DEAL:2d::121373.91 +DEAL:2d::12.50 +DEAL:2d::11.21 +DEAL:2d::11.21 +DEAL:2d::9.99 DEAL:2d::Subdomain id=0 -DEAL:2d::0 27634.60 -DEAL:2d::1 27634.60 -DEAL:2d::2 29.16 +DEAL:2d::0 287221.75 +DEAL:2d::1 287221.75 +DEAL:2d::2 303.04 DEAL:2d::3 0.00 DEAL:2d::4 0.00 DEAL:2d::5 0.00 -DEAL:2d::6 40889.89 -DEAL:2d::7 48106.73 -DEAL:2d::8 55.17 +DEAL:2d::6 424991.38 +DEAL:2d::7 499999.97 +DEAL:2d::8 573.38 DEAL:2d::9 0.00 DEAL:2d::10 0.00 DEAL:2d::11 0.00 @@ -326,14 +326,14 @@ DEAL:2d::25 0.00 DEAL:2d::26 0.00 DEAL:2d::27 0.00 DEAL:2d::28 0.00 -DEAL:2d::29 40889.90 -DEAL:2d::30 50.83 -DEAL:2d::31 48106.73 -DEAL:2d::32 59.65 -DEAL:2d::33 70.20 -DEAL:2d::34 87.26 -DEAL:2d::35 87.26 -DEAL:2d::36 102.39 +DEAL:2d::29 424991.41 +DEAL:2d::30 528.32 +DEAL:2d::31 499999.97 +DEAL:2d::32 619.94 +DEAL:2d::33 729.65 +DEAL:2d::34 906.96 +DEAL:2d::35 906.96 +DEAL:2d::36 1064.17 DEAL:2d::37 0.00 DEAL:2d::38 0.00 DEAL:2d::39 0.00 @@ -357,10 +357,10 @@ DEAL:2d::56 0.00 DEAL:2d::57 0.00 DEAL:2d::58 0.00 DEAL:2d::59 0.00 -DEAL:2d::60 3940.49 -DEAL:2d::61 7274.93 -DEAL:2d::62 7274.93 -DEAL:2d::63 3.28 +DEAL:2d::60 40955.71 +DEAL:2d::61 75612.41 +DEAL:2d::62 75612.41 +DEAL:2d::63 34.04 DEAL:2d::64 0.00 DEAL:2d::65 0.00 DEAL:2d::66 0.00 @@ -373,10 +373,10 @@ DEAL:2d::72 0.00 DEAL:2d::73 0.00 DEAL:2d::74 0.00 DEAL:2d::75 0.00 -DEAL:2d::76 5.74 -DEAL:2d::77 8.19 -DEAL:2d::78 11.49 -DEAL:2d::79 14.67 +DEAL:2d::76 59.68 +DEAL:2d::77 85.11 +DEAL:2d::78 119.40 +DEAL:2d::79 152.51 DEAL:2d::80 0.00 DEAL:2d::81 0.00 DEAL:2d::82 0.00 @@ -401,19 +401,19 @@ DEAL:2d::Subdomain id=1 DEAL:2d::0 0.00 DEAL:2d::1 0.00 DEAL:2d::2 0.00 -DEAL:2d::3 80.55 -DEAL:2d::4 94.47 +DEAL:2d::3 837.22 +DEAL:2d::4 981.88 DEAL:2d::5 0.00 DEAL:2d::6 0.00 DEAL:2d::7 0.00 DEAL:2d::8 0.00 -DEAL:2d::9 48106.73 -DEAL:2d::10 40889.90 -DEAL:2d::11 59.65 -DEAL:2d::12 42.47 -DEAL:2d::13 40889.89 -DEAL:2d::14 44.31 -DEAL:2d::15 48106.73 +DEAL:2d::9 499999.97 +DEAL:2d::10 424991.41 +DEAL:2d::11 619.94 +DEAL:2d::12 441.39 +DEAL:2d::13 424991.38 +DEAL:2d::14 460.53 +DEAL:2d::15 499999.97 DEAL:2d::16 0.00 DEAL:2d::17 0.00 DEAL:2d::18 0.00 @@ -435,10 +435,10 @@ DEAL:2d::33 0.00 DEAL:2d::34 0.00 DEAL:2d::35 0.00 DEAL:2d::36 0.00 -DEAL:2d::37 27634.60 -DEAL:2d::38 15581.87 -DEAL:2d::39 29.16 -DEAL:2d::40 27634.60 +DEAL:2d::37 287221.75 +DEAL:2d::38 161951.06 +DEAL:2d::39 303.04 +DEAL:2d::40 287221.75 DEAL:2d::41 0.00 DEAL:2d::42 0.00 DEAL:2d::43 0.00 @@ -451,10 +451,10 @@ DEAL:2d::49 0.00 DEAL:2d::50 0.00 DEAL:2d::51 0.00 DEAL:2d::52 0.00 -DEAL:2d::53 14.62 -DEAL:2d::54 8.11 -DEAL:2d::55 13.97 -DEAL:2d::56 4.68 +DEAL:2d::53 151.94 +DEAL:2d::54 84.31 +DEAL:2d::55 145.22 +DEAL:2d::56 48.68 DEAL:2d::57 0.00 DEAL:2d::58 0.00 DEAL:2d::59 0.00 @@ -462,10 +462,10 @@ DEAL:2d::60 0.00 DEAL:2d::61 0.00 DEAL:2d::62 0.00 DEAL:2d::63 0.00 -DEAL:2d::64 15.15 -DEAL:2d::65 10.03 -DEAL:2d::66 15.76 -DEAL:2d::67 10.43 +DEAL:2d::64 157.51 +DEAL:2d::65 104.24 +DEAL:2d::66 163.78 +DEAL:2d::67 108.38 DEAL:2d::68 0.00 DEAL:2d::69 0.00 DEAL:2d::70 0.00 @@ -478,10 +478,10 @@ DEAL:2d::76 0.00 DEAL:2d::77 0.00 DEAL:2d::78 0.00 DEAL:2d::79 0.00 -DEAL:2d::80 6.67 -DEAL:2d::81 5.74 -DEAL:2d::82 10.07 -DEAL:2d::83 8.19 +DEAL:2d::80 69.29 +DEAL:2d::81 59.68 +DEAL:2d::82 104.69 +DEAL:2d::83 85.11 DEAL:2d::84 0.00 DEAL:2d::85 0.00 DEAL:2d::86 0.00 @@ -515,9 +515,9 @@ DEAL:2d::12 0.00 DEAL:2d::13 0.00 DEAL:2d::14 0.00 DEAL:2d::15 0.00 -DEAL:2d::16 48106.73 -DEAL:2d::17 59.65 -DEAL:2d::18 49.53 +DEAL:2d::16 499999.97 +DEAL:2d::17 619.94 +DEAL:2d::18 514.76 DEAL:2d::19 0.00 DEAL:2d::20 0.00 DEAL:2d::21 0.00 @@ -540,18 +540,18 @@ DEAL:2d::37 0.00 DEAL:2d::38 0.00 DEAL:2d::39 0.00 DEAL:2d::40 0.00 -DEAL:2d::41 87.26 -DEAL:2d::42 102.39 -DEAL:2d::43 74.37 -DEAL:2d::44 78.86 -DEAL:2d::45 27634.60 -DEAL:2d::46 34.73 -DEAL:2d::47 15581.87 -DEAL:2d::48 27634.60 -DEAL:2d::49 50.83 -DEAL:2d::50 54.04 -DEAL:2d::51 40889.90 -DEAL:2d::52 48106.73 +DEAL:2d::41 906.96 +DEAL:2d::42 1064.17 +DEAL:2d::43 772.96 +DEAL:2d::44 819.68 +DEAL:2d::45 287221.75 +DEAL:2d::46 361.01 +DEAL:2d::47 161951.06 +DEAL:2d::48 287221.75 +DEAL:2d::49 528.32 +DEAL:2d::50 561.69 +DEAL:2d::51 424991.41 +DEAL:2d::52 499999.94 DEAL:2d::53 0.00 DEAL:2d::54 0.00 DEAL:2d::55 0.00 @@ -583,10 +583,10 @@ DEAL:2d::80 0.00 DEAL:2d::81 0.00 DEAL:2d::82 0.00 DEAL:2d::83 0.00 -DEAL:2d::84 21735.65 -DEAL:2d::85 8.26 -DEAL:2d::86 19063.32 -DEAL:2d::87 6.72 +DEAL:2d::84 225910.66 +DEAL:2d::85 85.83 +DEAL:2d::86 198135.70 +DEAL:2d::87 69.87 DEAL:2d::88 0.00 DEAL:2d::89 0.00 DEAL:2d::90 0.00 @@ -605,7 +605,7 @@ DEAL:2d::1 0.00 DEAL:2d::2 0.00 DEAL:2d::3 0.00 DEAL:2d::4 0.00 -DEAL:2d::5 85.83 +DEAL:2d::5 892.03 DEAL:2d::6 0.00 DEAL:2d::7 0.00 DEAL:2d::8 0.00 @@ -619,16 +619,16 @@ DEAL:2d::15 0.00 DEAL:2d::16 0.00 DEAL:2d::17 0.00 DEAL:2d::18 0.00 -DEAL:2d::19 49.78 -DEAL:2d::20 48106.73 -DEAL:2d::21 42.47 -DEAL:2d::22 40889.90 -DEAL:2d::23 35.10 -DEAL:2d::24 48106.73 -DEAL:2d::25 40889.90 -DEAL:2d::26 33.86 -DEAL:2d::27 27634.60 -DEAL:2d::28 15581.87 +DEAL:2d::19 517.35 +DEAL:2d::20 499999.97 +DEAL:2d::21 441.39 +DEAL:2d::22 424991.41 +DEAL:2d::23 364.77 +DEAL:2d::24 499999.91 +DEAL:2d::25 424991.41 +DEAL:2d::26 351.95 +DEAL:2d::27 287221.75 +DEAL:2d::28 161951.06 DEAL:2d::29 0.00 DEAL:2d::30 0.00 DEAL:2d::31 0.00 @@ -657,9 +657,9 @@ DEAL:2d::53 0.00 DEAL:2d::54 0.00 DEAL:2d::55 0.00 DEAL:2d::56 0.00 -DEAL:2d::57 9.00 -DEAL:2d::58 9.00 -DEAL:2d::59 10.71 +DEAL:2d::57 93.51 +DEAL:2d::58 93.51 +DEAL:2d::59 111.31 DEAL:2d::60 0.00 DEAL:2d::61 0.00 DEAL:2d::62 0.00 @@ -668,14 +668,14 @@ DEAL:2d::64 0.00 DEAL:2d::65 0.00 DEAL:2d::66 0.00 DEAL:2d::67 0.00 -DEAL:2d::68 15.76 -DEAL:2d::69 10.43 -DEAL:2d::70 14.98 -DEAL:2d::71 10.03 -DEAL:2d::72 20.55 -DEAL:2d::73 14.98 -DEAL:2d::74 12.71 -DEAL:2d::75 5.08 +DEAL:2d::68 163.78 +DEAL:2d::69 108.38 +DEAL:2d::70 155.71 +DEAL:2d::71 104.24 +DEAL:2d::72 213.57 +DEAL:2d::73 155.71 +DEAL:2d::74 132.15 +DEAL:2d::75 52.79 DEAL:2d::76 0.00 DEAL:2d::77 0.00 DEAL:2d::78 0.00 @@ -688,119 +688,119 @@ DEAL:2d::84 0.00 DEAL:2d::85 0.00 DEAL:2d::86 0.00 DEAL:2d::87 0.00 -DEAL:2d::88 10.45 -DEAL:2d::89 9.25 -DEAL:2d::90 8.62 -DEAL:2d::91 7.76 -DEAL:2d::92 6.20 -DEAL:2d::93 3.93 -DEAL:2d::94 15665.22 -DEAL:2d::95 11677.80 -DEAL:2d::96 1.20 -DEAL:2d::97 1.08 -DEAL:2d::98 1.08 -DEAL:2d::99 0.96 +DEAL:2d::88 108.62 +DEAL:2d::89 96.16 +DEAL:2d::90 89.60 +DEAL:2d::91 80.63 +DEAL:2d::92 64.47 +DEAL:2d::93 40.88 +DEAL:2d::94 162817.34 +DEAL:2d::95 121373.91 +DEAL:2d::96 12.50 +DEAL:2d::97 11.21 +DEAL:2d::98 11.21 +DEAL:2d::99 9.99 DEAL:2d::OK DEAL:3d::Estimated error indicators: -DEAL:3d::7953.37 -DEAL:3d::13781.71 -DEAL:3d::20682.11 -DEAL:3d::13781.71 -DEAL:3d::20682.11 -DEAL:3d::331.15 -DEAL:3d::13781.82 -DEAL:3d::7953.41 -DEAL:3d::20681.84 -DEAL:3d::13781.82 -DEAL:3d::20681.73 -DEAL:3d::13781.82 -DEAL:3d::20681.84 -DEAL:3d::13781.78 -DEAL:3d::20682.15 -DEAL:3d::7953.41 -DEAL:3d::13781.71 -DEAL:3d::20682.15 -DEAL:3d::361.20 -DEAL:3d::13781.71 -DEAL:3d::20682.15 -DEAL:3d::13781.82 -DEAL:3d::13781.82 -DEAL:3d::7953.41 -DEAL:3d::341.75 -DEAL:3d::20682.15 -DEAL:3d::20682.04 -DEAL:3d::13781.82 -DEAL:3d::13781.82 -DEAL:3d::20682.04 -DEAL:3d::20682.15 -DEAL:3d::370.94 -DEAL:3d::7953.41 -DEAL:3d::13781.82 -DEAL:3d::13781.82 -DEAL:3d::20682.15 -DEAL:3d::20682.15 -DEAL:3d::13781.82 -DEAL:3d::341.75 -DEAL:3d::20682.15 -DEAL:3d::13781.82 -DEAL:3d::7953.41 -DEAL:3d::20682.15 -DEAL:3d::13781.82 -DEAL:3d::20682.15 -DEAL:3d::370.94 -DEAL:3d::13781.82 -DEAL:3d::20682.04 -DEAL:3d::13781.82 -DEAL:3d::20682.15 -DEAL:3d::7953.41 -DEAL:3d::13781.82 -DEAL:3d::370.94 -DEAL:3d::20682.15 -DEAL:3d::20682.15 -DEAL:3d::13781.82 -DEAL:3d::20682.15 -DEAL:3d::13781.82 -DEAL:3d::13781.82 -DEAL:3d::7953.41 -DEAL:3d::2334.15 -DEAL:3d::4139.65 -DEAL:3d::2746.12 -DEAL:3d::4870.27 -DEAL:3d::4139.65 -DEAL:3d::26.72 -DEAL:3d::4870.27 -DEAL:3d::33.21 -DEAL:3d::6125.28 -DEAL:3d::7206.35 -DEAL:3d::30.93 -DEAL:3d::39.67 -DEAL:3d::7206.35 -DEAL:3d::8478.24 -DEAL:3d::39.67 -DEAL:3d::50.24 -DEAL:3d::40.07 -DEAL:3d::27.70 -DEAL:3d::54.55 -DEAL:3d::40.07 -DEAL:3d::54.55 -DEAL:3d::40.07 -DEAL:3d::71.87 -DEAL:3d::54.55 -DEAL:3d::30.93 -DEAL:3d::39.67 -DEAL:3d::6125.28 -DEAL:3d::7206.35 -DEAL:3d::39.67 -DEAL:3d::50.24 -DEAL:3d::7206.35 -DEAL:3d::8478.24 +DEAL:3d::192276.08 +DEAL:3d::333178.94 +DEAL:3d::499999.03 +DEAL:3d::333178.97 +DEAL:3d::499999.03 +DEAL:3d::8005.58 +DEAL:3d::333181.44 +DEAL:3d::192277.05 +DEAL:3d::499992.50 +DEAL:3d::333181.44 +DEAL:3d::499989.78 +DEAL:3d::333181.44 +DEAL:3d::499992.47 +DEAL:3d::333180.53 +DEAL:3d::500000.00 +DEAL:3d::192277.05 +DEAL:3d::333178.94 +DEAL:3d::499999.97 +DEAL:3d::8732.12 +DEAL:3d::333178.97 +DEAL:3d::500000.00 +DEAL:3d::333181.44 +DEAL:3d::333181.44 +DEAL:3d::192277.05 +DEAL:3d::8261.89 +DEAL:3d::499999.97 +DEAL:3d::499997.28 +DEAL:3d::333181.44 +DEAL:3d::333181.47 +DEAL:3d::499997.28 +DEAL:3d::499999.97 +DEAL:3d::8967.68 +DEAL:3d::192277.05 +DEAL:3d::333181.44 +DEAL:3d::333181.44 +DEAL:3d::499999.97 +DEAL:3d::499999.97 +DEAL:3d::333181.44 +DEAL:3d::8261.89 +DEAL:3d::499999.97 +DEAL:3d::333181.44 +DEAL:3d::192277.05 +DEAL:3d::499999.97 +DEAL:3d::333181.44 +DEAL:3d::499999.97 +DEAL:3d::8967.68 +DEAL:3d::333181.47 +DEAL:3d::499997.28 +DEAL:3d::333181.44 +DEAL:3d::499999.97 +DEAL:3d::192277.05 +DEAL:3d::333181.44 +DEAL:3d::8967.68 +DEAL:3d::499999.97 +DEAL:3d::499999.97 +DEAL:3d::333181.44 +DEAL:3d::499999.97 +DEAL:3d::333181.44 +DEAL:3d::333181.44 +DEAL:3d::192277.05 +DEAL:3d::56429.15 +DEAL:3d::100077.80 +DEAL:3d::66388.59 +DEAL:3d::117741.00 +DEAL:3d::100077.80 +DEAL:3d::646.04 +DEAL:3d::117741.00 +DEAL:3d::802.96 +DEAL:3d::148081.20 +DEAL:3d::174216.77 +DEAL:3d::747.71 +DEAL:3d::959.01 +DEAL:3d::174216.77 +DEAL:3d::204965.12 +DEAL:3d::959.01 +DEAL:3d::1214.67 +DEAL:3d::968.67 +DEAL:3d::669.76 +DEAL:3d::1318.80 +DEAL:3d::968.67 +DEAL:3d::1318.80 +DEAL:3d::968.67 +DEAL:3d::1737.40 +DEAL:3d::1318.80 +DEAL:3d::747.71 +DEAL:3d::959.01 +DEAL:3d::148081.20 +DEAL:3d::174216.77 +DEAL:3d::959.01 +DEAL:3d::1214.67 +DEAL:3d::174216.77 +DEAL:3d::204965.12 DEAL:3d::Subdomain id=0 -DEAL:3d::0 7953.37 -DEAL:3d::1 13781.71 -DEAL:3d::2 20682.11 -DEAL:3d::3 13781.71 -DEAL:3d::4 20682.11 -DEAL:3d::5 331.15 +DEAL:3d::0 192276.08 +DEAL:3d::1 333178.94 +DEAL:3d::2 499999.03 +DEAL:3d::3 333178.97 +DEAL:3d::4 499999.03 +DEAL:3d::5 8005.58 DEAL:3d::6 0.00 DEAL:3d::7 0.00 DEAL:3d::8 0.00 @@ -855,22 +855,22 @@ DEAL:3d::56 0.00 DEAL:3d::57 0.00 DEAL:3d::58 0.00 DEAL:3d::59 0.00 -DEAL:3d::60 2334.15 -DEAL:3d::61 4139.65 -DEAL:3d::62 2746.12 -DEAL:3d::63 4870.27 -DEAL:3d::64 4139.65 -DEAL:3d::65 26.72 -DEAL:3d::66 4870.27 -DEAL:3d::67 33.21 -DEAL:3d::68 6125.28 -DEAL:3d::69 7206.35 -DEAL:3d::70 30.93 -DEAL:3d::71 39.67 -DEAL:3d::72 7206.35 -DEAL:3d::73 8478.24 -DEAL:3d::74 39.67 -DEAL:3d::75 50.24 +DEAL:3d::60 56429.15 +DEAL:3d::61 100077.80 +DEAL:3d::62 66388.59 +DEAL:3d::63 117741.00 +DEAL:3d::64 100077.80 +DEAL:3d::65 646.04 +DEAL:3d::66 117741.00 +DEAL:3d::67 802.96 +DEAL:3d::68 148081.20 +DEAL:3d::69 174216.77 +DEAL:3d::70 747.71 +DEAL:3d::71 959.01 +DEAL:3d::72 174216.77 +DEAL:3d::73 204965.12 +DEAL:3d::74 959.01 +DEAL:3d::75 1214.67 DEAL:3d::76 0.00 DEAL:3d::77 0.00 DEAL:3d::78 0.00 @@ -894,13 +894,13 @@ DEAL:3d::2 0.00 DEAL:3d::3 0.00 DEAL:3d::4 0.00 DEAL:3d::5 0.00 -DEAL:3d::6 13781.82 -DEAL:3d::7 7953.41 -DEAL:3d::8 20681.84 -DEAL:3d::9 13781.82 -DEAL:3d::10 20681.73 -DEAL:3d::11 13781.82 -DEAL:3d::12 20681.84 +DEAL:3d::6 333181.44 +DEAL:3d::7 192277.05 +DEAL:3d::8 499992.50 +DEAL:3d::9 333181.44 +DEAL:3d::10 499989.78 +DEAL:3d::11 333181.44 +DEAL:3d::12 499992.47 DEAL:3d::13 0.00 DEAL:3d::14 0.00 DEAL:3d::15 0.00 @@ -964,14 +964,14 @@ DEAL:3d::72 0.00 DEAL:3d::73 0.00 DEAL:3d::74 0.00 DEAL:3d::75 0.00 -DEAL:3d::76 40.07 -DEAL:3d::77 27.70 -DEAL:3d::78 54.55 -DEAL:3d::79 40.07 -DEAL:3d::80 54.55 -DEAL:3d::81 40.07 -DEAL:3d::82 71.87 -DEAL:3d::83 54.55 +DEAL:3d::76 968.67 +DEAL:3d::77 669.76 +DEAL:3d::78 1318.80 +DEAL:3d::79 968.67 +DEAL:3d::80 1318.80 +DEAL:3d::81 968.67 +DEAL:3d::82 1737.40 +DEAL:3d::83 1318.80 DEAL:3d::84 0.00 DEAL:3d::85 0.00 DEAL:3d::86 0.00 @@ -994,13 +994,13 @@ DEAL:3d::9 0.00 DEAL:3d::10 0.00 DEAL:3d::11 0.00 DEAL:3d::12 0.00 -DEAL:3d::13 13781.78 -DEAL:3d::14 20682.15 -DEAL:3d::15 7953.41 -DEAL:3d::16 13781.71 -DEAL:3d::17 20682.15 -DEAL:3d::18 361.20 -DEAL:3d::19 13781.71 +DEAL:3d::13 333180.53 +DEAL:3d::14 500000.00 +DEAL:3d::15 192277.05 +DEAL:3d::16 333178.94 +DEAL:3d::17 499999.97 +DEAL:3d::18 8732.12 +DEAL:3d::19 333178.97 DEAL:3d::20 0.00 DEAL:3d::21 0.00 DEAL:3d::22 0.00 @@ -1065,14 +1065,14 @@ DEAL:3d::80 0.00 DEAL:3d::81 0.00 DEAL:3d::82 0.00 DEAL:3d::83 0.00 -DEAL:3d::84 30.93 -DEAL:3d::85 39.67 -DEAL:3d::86 6125.28 -DEAL:3d::87 7206.35 -DEAL:3d::88 39.67 -DEAL:3d::89 50.24 -DEAL:3d::90 7206.35 -DEAL:3d::91 8478.24 +DEAL:3d::84 747.71 +DEAL:3d::85 959.01 +DEAL:3d::86 148081.20 +DEAL:3d::87 174216.77 +DEAL:3d::88 959.01 +DEAL:3d::89 1214.67 +DEAL:3d::90 174216.77 +DEAL:3d::91 204965.12 DEAL:3d::Subdomain id=3 DEAL:3d::0 0.00 DEAL:3d::1 0.00 @@ -1094,14 +1094,14 @@ DEAL:3d::16 0.00 DEAL:3d::17 0.00 DEAL:3d::18 0.00 DEAL:3d::19 0.00 -DEAL:3d::20 20682.15 -DEAL:3d::21 13781.82 -DEAL:3d::22 13781.82 -DEAL:3d::23 7953.41 -DEAL:3d::24 341.75 -DEAL:3d::25 20682.15 -DEAL:3d::26 20682.04 -DEAL:3d::27 13781.82 +DEAL:3d::20 500000.00 +DEAL:3d::21 333181.44 +DEAL:3d::22 333181.44 +DEAL:3d::23 192277.05 +DEAL:3d::24 8261.89 +DEAL:3d::25 499999.97 +DEAL:3d::26 499997.28 +DEAL:3d::27 333181.44 DEAL:3d::28 0.00 DEAL:3d::29 0.00 DEAL:3d::30 0.00 @@ -1195,14 +1195,14 @@ DEAL:3d::24 0.00 DEAL:3d::25 0.00 DEAL:3d::26 0.00 DEAL:3d::27 0.00 -DEAL:3d::28 13781.82 -DEAL:3d::29 20682.04 -DEAL:3d::30 20682.15 -DEAL:3d::31 370.94 -DEAL:3d::32 7953.41 -DEAL:3d::33 13781.82 -DEAL:3d::34 13781.82 -DEAL:3d::35 20682.15 +DEAL:3d::28 333181.47 +DEAL:3d::29 499997.28 +DEAL:3d::30 499999.97 +DEAL:3d::31 8967.68 +DEAL:3d::32 192277.05 +DEAL:3d::33 333181.44 +DEAL:3d::34 333181.44 +DEAL:3d::35 499999.97 DEAL:3d::36 0.00 DEAL:3d::37 0.00 DEAL:3d::38 0.00 @@ -1296,14 +1296,14 @@ DEAL:3d::32 0.00 DEAL:3d::33 0.00 DEAL:3d::34 0.00 DEAL:3d::35 0.00 -DEAL:3d::36 20682.15 -DEAL:3d::37 13781.82 -DEAL:3d::38 341.75 -DEAL:3d::39 20682.15 -DEAL:3d::40 13781.82 -DEAL:3d::41 7953.41 -DEAL:3d::42 20682.15 -DEAL:3d::43 13781.82 +DEAL:3d::36 499999.97 +DEAL:3d::37 333181.44 +DEAL:3d::38 8261.89 +DEAL:3d::39 499999.97 +DEAL:3d::40 333181.44 +DEAL:3d::41 192277.05 +DEAL:3d::42 499999.97 +DEAL:3d::43 333181.44 DEAL:3d::44 0.00 DEAL:3d::45 0.00 DEAL:3d::46 0.00 @@ -1397,14 +1397,14 @@ DEAL:3d::40 0.00 DEAL:3d::41 0.00 DEAL:3d::42 0.00 DEAL:3d::43 0.00 -DEAL:3d::44 20682.15 -DEAL:3d::45 370.94 -DEAL:3d::46 13781.82 -DEAL:3d::47 20682.04 -DEAL:3d::48 13781.82 -DEAL:3d::49 20682.15 -DEAL:3d::50 7953.41 -DEAL:3d::51 13781.82 +DEAL:3d::44 499999.97 +DEAL:3d::45 8967.68 +DEAL:3d::46 333181.47 +DEAL:3d::47 499997.28 +DEAL:3d::48 333181.44 +DEAL:3d::49 499999.97 +DEAL:3d::50 192277.05 +DEAL:3d::51 333181.44 DEAL:3d::52 0.00 DEAL:3d::53 0.00 DEAL:3d::54 0.00 @@ -1498,14 +1498,14 @@ DEAL:3d::48 0.00 DEAL:3d::49 0.00 DEAL:3d::50 0.00 DEAL:3d::51 0.00 -DEAL:3d::52 370.94 -DEAL:3d::53 20682.15 -DEAL:3d::54 20682.15 -DEAL:3d::55 13781.82 -DEAL:3d::56 20682.15 -DEAL:3d::57 13781.82 -DEAL:3d::58 13781.82 -DEAL:3d::59 7953.41 +DEAL:3d::52 8967.68 +DEAL:3d::53 499999.97 +DEAL:3d::54 499999.97 +DEAL:3d::55 333181.44 +DEAL:3d::56 499999.97 +DEAL:3d::57 333181.44 +DEAL:3d::58 333181.44 +DEAL:3d::59 192277.05 DEAL:3d::60 0.00 DEAL:3d::61 0.00 DEAL:3d::62 0.00 diff --git a/tests/bits/error_estimator_02.cc b/tests/bits/error_estimator_02.cc index 8c2c2219b4..5e259412c8 100644 --- a/tests/bits/error_estimator_02.cc +++ b/tests/bits/error_estimator_02.cc @@ -153,7 +153,7 @@ check () // number KellyErrorEstimator::estimate (mapping, dof, q_face, neumann_bc, v, error1); - const double scaling_factor = 10000.*error1.size()/error1.l1_norm(); + const double scaling_factor = 500000./error1.linfty_norm(); error1 *= scaling_factor; deallog << "Estimated error indicators:" << std::endl; @@ -170,7 +170,7 @@ check () KellyErrorEstimator::estimate (mapping, dof, q_face, neumann_bc, v, this_error, std::vector(), 0, - multithread_info.n_default_threads, + multithread_info.n_threads(), numbers::invalid_unsigned_int, material); this_error *= scaling_factor; diff --git a/tests/bits/error_estimator_02.output b/tests/bits/error_estimator_02.output index dc924e3829..37ba8c2488 100644 --- a/tests/bits/error_estimator_02.output +++ b/tests/bits/error_estimator_02.output @@ -1,111 +1,111 @@ DEAL:1d::Estimated error indicators: -DEAL:1d::55.21 -DEAL:1d::67.65 -DEAL:1d::6.61 -DEAL:1d::0.89 -DEAL:1d::9.34 -DEAL:1d::6.64 -DEAL:1d::9.24 -DEAL:1d::36.89 -DEAL:1d::9.28 -DEAL:1d::29.81 -DEAL:1d::1.81 -DEAL:1d::472600.97 -DEAL:1d::4.28 -DEAL:1d::4.61 -DEAL:1d::2.81 -DEAL:1d::2.89 -DEAL:1d::0.43 -DEAL:1d::2.19 -DEAL:1d::0.74 -DEAL:1d::3.29 -DEAL:1d::0.29 -DEAL:1d::0.69 -DEAL:1d::0.68 -DEAL:1d::18.06 -DEAL:1d::0.90 -DEAL:1d::0.87 -DEAL:1d::1.79 -DEAL:1d::0.64 -DEAL:1d::0.97 -DEAL:1d::3.25 -DEAL:1d::2.93 +DEAL:1d::58.41 +DEAL:1d::71.57 +DEAL:1d::6.99 +DEAL:1d::0.94 +DEAL:1d::9.88 +DEAL:1d::7.03 +DEAL:1d::9.78 +DEAL:1d::39.02 +DEAL:1d::9.82 +DEAL:1d::31.53 +DEAL:1d::1.91 +DEAL:1d::500000.00 +DEAL:1d::4.53 +DEAL:1d::4.88 +DEAL:1d::2.97 +DEAL:1d::3.06 +DEAL:1d::0.46 +DEAL:1d::2.31 +DEAL:1d::0.79 +DEAL:1d::3.48 +DEAL:1d::0.30 +DEAL:1d::0.73 +DEAL:1d::0.72 +DEAL:1d::19.11 DEAL:1d::0.95 +DEAL:1d::0.92 +DEAL:1d::1.90 +DEAL:1d::0.67 +DEAL:1d::1.02 +DEAL:1d::3.44 +DEAL:1d::3.10 +DEAL:1d::1.00 DEAL:1d::0.02 -DEAL:1d::0.88 +DEAL:1d::0.93 DEAL:1d::0.03 -DEAL:1d::0.73 +DEAL:1d::0.77 DEAL:1d::0.02 -DEAL:1d::0.14 -DEAL:1d::15.77 -DEAL:1d::0.27 -DEAL:1d::2.10 +DEAL:1d::0.15 +DEAL:1d::16.69 +DEAL:1d::0.28 +DEAL:1d::2.22 DEAL:1d::0.02 DEAL:1d::0.02 -DEAL:1d::0.18 +DEAL:1d::0.19 DEAL:1d::0.05 DEAL:1d::0.05 -DEAL:1d::0.15 -DEAL:1d::0.24 -DEAL:1d::1.57 +DEAL:1d::0.16 +DEAL:1d::0.26 +DEAL:1d::1.66 DEAL:1d::0.01 DEAL:1d::0.00 DEAL:1d::0.01 DEAL:1d::0.01 DEAL:1d::0.01 -DEAL:1d::167089.62 +DEAL:1d::176776.64 DEAL:1d::0.00 -DEAL:1d::0.23 +DEAL:1d::0.24 DEAL:1d::0.01 DEAL:1d::0.01 DEAL:1d::0.01 -DEAL:1d::0.19 +DEAL:1d::0.20 DEAL:1d::0.03 DEAL:1d::0.00 DEAL:1d::0.01 DEAL:1d::Material id=0 -DEAL:1d::0 55.21 +DEAL:1d::0 58.41 DEAL:1d::1 0.00 DEAL:1d::2 0.00 -DEAL:1d::3 0.89 -DEAL:1d::4 9.34 +DEAL:1d::3 0.94 +DEAL:1d::4 9.88 DEAL:1d::5 0.00 DEAL:1d::6 0.00 DEAL:1d::7 0.00 -DEAL:1d::8 9.28 -DEAL:1d::9 29.81 +DEAL:1d::8 9.82 +DEAL:1d::9 31.53 DEAL:1d::10 0.00 DEAL:1d::11 0.00 -DEAL:1d::12 4.28 -DEAL:1d::13 4.61 +DEAL:1d::12 4.53 +DEAL:1d::13 4.88 DEAL:1d::14 0.00 DEAL:1d::15 0.00 -DEAL:1d::16 0.43 +DEAL:1d::16 0.46 DEAL:1d::17 0.00 DEAL:1d::18 0.00 -DEAL:1d::19 3.29 +DEAL:1d::19 3.48 DEAL:1d::20 0.00 DEAL:1d::21 0.00 -DEAL:1d::22 0.68 -DEAL:1d::23 18.06 +DEAL:1d::22 0.72 +DEAL:1d::23 19.11 DEAL:1d::24 0.00 DEAL:1d::25 0.00 -DEAL:1d::26 1.79 -DEAL:1d::27 0.64 -DEAL:1d::28 0.97 -DEAL:1d::29 3.25 -DEAL:1d::30 2.93 -DEAL:1d::31 0.95 +DEAL:1d::26 1.90 +DEAL:1d::27 0.67 +DEAL:1d::28 1.02 +DEAL:1d::29 3.44 +DEAL:1d::30 3.10 +DEAL:1d::31 1.00 DEAL:1d::32 0.02 -DEAL:1d::33 0.88 +DEAL:1d::33 0.93 DEAL:1d::34 0.00 DEAL:1d::35 0.00 DEAL:1d::36 0.02 DEAL:1d::37 0.00 DEAL:1d::38 0.00 DEAL:1d::39 0.00 -DEAL:1d::40 2.10 +DEAL:1d::40 2.22 DEAL:1d::41 0.02 DEAL:1d::42 0.02 DEAL:1d::43 0.00 @@ -119,43 +119,43 @@ DEAL:1d::50 0.00 DEAL:1d::51 0.01 DEAL:1d::52 0.01 DEAL:1d::53 0.01 -DEAL:1d::54 167089.62 +DEAL:1d::54 176776.64 DEAL:1d::55 0.00 -DEAL:1d::56 0.23 +DEAL:1d::56 0.24 DEAL:1d::57 0.01 DEAL:1d::58 0.00 DEAL:1d::59 0.00 -DEAL:1d::60 0.19 +DEAL:1d::60 0.20 DEAL:1d::61 0.03 DEAL:1d::62 0.00 DEAL:1d::63 0.01 DEAL:1d::Material id=1 DEAL:1d::0 0.00 -DEAL:1d::1 67.65 -DEAL:1d::2 6.61 +DEAL:1d::1 71.57 +DEAL:1d::2 6.99 DEAL:1d::3 0.00 DEAL:1d::4 0.00 -DEAL:1d::5 6.64 -DEAL:1d::6 9.24 -DEAL:1d::7 36.89 +DEAL:1d::5 7.03 +DEAL:1d::6 9.78 +DEAL:1d::7 39.02 DEAL:1d::8 0.00 DEAL:1d::9 0.00 -DEAL:1d::10 1.81 -DEAL:1d::11 472600.97 +DEAL:1d::10 1.91 +DEAL:1d::11 500000.00 DEAL:1d::12 0.00 DEAL:1d::13 0.00 -DEAL:1d::14 2.81 -DEAL:1d::15 2.89 +DEAL:1d::14 2.97 +DEAL:1d::15 3.06 DEAL:1d::16 0.00 -DEAL:1d::17 2.19 -DEAL:1d::18 0.74 +DEAL:1d::17 2.31 +DEAL:1d::18 0.79 DEAL:1d::19 0.00 -DEAL:1d::20 0.29 -DEAL:1d::21 0.69 +DEAL:1d::20 0.30 +DEAL:1d::21 0.73 DEAL:1d::22 0.00 DEAL:1d::23 0.00 -DEAL:1d::24 0.90 -DEAL:1d::25 0.87 +DEAL:1d::24 0.95 +DEAL:1d::25 0.92 DEAL:1d::26 0.00 DEAL:1d::27 0.00 DEAL:1d::28 0.00 @@ -165,20 +165,20 @@ DEAL:1d::31 0.00 DEAL:1d::32 0.00 DEAL:1d::33 0.00 DEAL:1d::34 0.03 -DEAL:1d::35 0.73 +DEAL:1d::35 0.77 DEAL:1d::36 0.00 -DEAL:1d::37 0.14 -DEAL:1d::38 15.77 -DEAL:1d::39 0.27 +DEAL:1d::37 0.15 +DEAL:1d::38 16.69 +DEAL:1d::39 0.28 DEAL:1d::40 0.00 DEAL:1d::41 0.00 DEAL:1d::42 0.00 -DEAL:1d::43 0.18 +DEAL:1d::43 0.19 DEAL:1d::44 0.05 DEAL:1d::45 0.05 -DEAL:1d::46 0.15 -DEAL:1d::47 0.24 -DEAL:1d::48 1.57 +DEAL:1d::46 0.16 +DEAL:1d::47 0.26 +DEAL:1d::48 1.66 DEAL:1d::49 0.00 DEAL:1d::50 0.00 DEAL:1d::51 0.00 @@ -196,116 +196,116 @@ DEAL:1d::62 0.00 DEAL:1d::63 0.00 DEAL:1d::OK DEAL:2d::Estimated error indicators: -DEAL:2d::27634.60 -DEAL:2d::27634.60 -DEAL:2d::29.16 -DEAL:2d::80.55 -DEAL:2d::94.47 +DEAL:2d::287221.75 +DEAL:2d::287221.75 +DEAL:2d::303.04 +DEAL:2d::837.22 +DEAL:2d::981.88 +DEAL:2d::892.03 +DEAL:2d::424991.38 +DEAL:2d::499999.97 +DEAL:2d::573.38 +DEAL:2d::499999.97 +DEAL:2d::424991.41 +DEAL:2d::619.94 +DEAL:2d::441.39 +DEAL:2d::424991.38 +DEAL:2d::460.53 +DEAL:2d::499999.97 +DEAL:2d::499999.97 +DEAL:2d::619.94 +DEAL:2d::514.76 +DEAL:2d::517.35 +DEAL:2d::499999.97 +DEAL:2d::441.39 +DEAL:2d::424991.41 +DEAL:2d::364.77 +DEAL:2d::499999.91 +DEAL:2d::424991.41 +DEAL:2d::351.95 +DEAL:2d::287221.75 +DEAL:2d::161951.06 +DEAL:2d::424991.41 +DEAL:2d::528.32 +DEAL:2d::499999.97 +DEAL:2d::619.94 +DEAL:2d::729.65 +DEAL:2d::906.96 +DEAL:2d::906.96 +DEAL:2d::1064.17 +DEAL:2d::287221.75 +DEAL:2d::161951.06 +DEAL:2d::303.04 +DEAL:2d::287221.75 +DEAL:2d::906.96 +DEAL:2d::1064.17 +DEAL:2d::772.96 +DEAL:2d::819.68 +DEAL:2d::287221.75 +DEAL:2d::361.01 +DEAL:2d::161951.06 +DEAL:2d::287221.75 +DEAL:2d::528.32 +DEAL:2d::561.69 +DEAL:2d::424991.41 +DEAL:2d::499999.94 +DEAL:2d::151.94 +DEAL:2d::84.31 +DEAL:2d::145.22 +DEAL:2d::48.68 +DEAL:2d::93.51 +DEAL:2d::93.51 +DEAL:2d::111.31 +DEAL:2d::40955.71 +DEAL:2d::75612.41 +DEAL:2d::75612.41 +DEAL:2d::34.04 +DEAL:2d::157.51 +DEAL:2d::104.24 +DEAL:2d::163.78 +DEAL:2d::108.38 +DEAL:2d::163.78 +DEAL:2d::108.38 +DEAL:2d::155.71 +DEAL:2d::104.24 +DEAL:2d::213.57 +DEAL:2d::155.71 +DEAL:2d::132.15 +DEAL:2d::52.79 +DEAL:2d::59.68 +DEAL:2d::85.11 +DEAL:2d::119.40 +DEAL:2d::152.51 +DEAL:2d::69.29 +DEAL:2d::59.68 +DEAL:2d::104.69 +DEAL:2d::85.11 +DEAL:2d::225910.66 DEAL:2d::85.83 -DEAL:2d::40889.89 -DEAL:2d::48106.73 -DEAL:2d::55.17 -DEAL:2d::48106.73 -DEAL:2d::40889.90 -DEAL:2d::59.65 -DEAL:2d::42.47 -DEAL:2d::40889.89 -DEAL:2d::44.31 -DEAL:2d::48106.73 -DEAL:2d::48106.73 -DEAL:2d::59.65 -DEAL:2d::49.53 -DEAL:2d::49.78 -DEAL:2d::48106.73 -DEAL:2d::42.47 -DEAL:2d::40889.90 -DEAL:2d::35.10 -DEAL:2d::48106.73 -DEAL:2d::40889.90 -DEAL:2d::33.86 -DEAL:2d::27634.60 -DEAL:2d::15581.87 -DEAL:2d::40889.90 -DEAL:2d::50.83 -DEAL:2d::48106.73 -DEAL:2d::59.65 -DEAL:2d::70.20 -DEAL:2d::87.26 -DEAL:2d::87.26 -DEAL:2d::102.39 -DEAL:2d::27634.60 -DEAL:2d::15581.87 -DEAL:2d::29.16 -DEAL:2d::27634.60 -DEAL:2d::87.26 -DEAL:2d::102.39 -DEAL:2d::74.37 -DEAL:2d::78.86 -DEAL:2d::27634.60 -DEAL:2d::34.73 -DEAL:2d::15581.87 -DEAL:2d::27634.60 -DEAL:2d::50.83 -DEAL:2d::54.04 -DEAL:2d::40889.90 -DEAL:2d::48106.73 -DEAL:2d::14.62 -DEAL:2d::8.11 -DEAL:2d::13.97 -DEAL:2d::4.68 -DEAL:2d::9.00 -DEAL:2d::9.00 -DEAL:2d::10.71 -DEAL:2d::3940.49 -DEAL:2d::7274.93 -DEAL:2d::7274.93 -DEAL:2d::3.28 -DEAL:2d::15.15 -DEAL:2d::10.03 -DEAL:2d::15.76 -DEAL:2d::10.43 -DEAL:2d::15.76 -DEAL:2d::10.43 -DEAL:2d::14.98 -DEAL:2d::10.03 -DEAL:2d::20.55 -DEAL:2d::14.98 -DEAL:2d::12.71 -DEAL:2d::5.08 -DEAL:2d::5.74 -DEAL:2d::8.19 -DEAL:2d::11.49 -DEAL:2d::14.67 -DEAL:2d::6.67 -DEAL:2d::5.74 -DEAL:2d::10.07 -DEAL:2d::8.19 -DEAL:2d::21735.65 -DEAL:2d::8.26 -DEAL:2d::19063.32 -DEAL:2d::6.72 -DEAL:2d::10.45 -DEAL:2d::9.25 -DEAL:2d::8.62 -DEAL:2d::7.76 -DEAL:2d::6.20 -DEAL:2d::3.93 -DEAL:2d::15665.22 -DEAL:2d::11677.80 -DEAL:2d::1.20 -DEAL:2d::1.08 -DEAL:2d::1.08 -DEAL:2d::0.96 +DEAL:2d::198135.70 +DEAL:2d::69.87 +DEAL:2d::108.62 +DEAL:2d::96.16 +DEAL:2d::89.60 +DEAL:2d::80.63 +DEAL:2d::64.47 +DEAL:2d::40.88 +DEAL:2d::162817.34 +DEAL:2d::121373.91 +DEAL:2d::12.50 +DEAL:2d::11.21 +DEAL:2d::11.21 +DEAL:2d::9.99 DEAL:2d::Material id=0 -DEAL:2d::0 27634.60 -DEAL:2d::1 27634.60 -DEAL:2d::2 29.16 +DEAL:2d::0 287221.75 +DEAL:2d::1 287221.75 +DEAL:2d::2 303.04 DEAL:2d::3 0.00 DEAL:2d::4 0.00 DEAL:2d::5 0.00 -DEAL:2d::6 40889.89 -DEAL:2d::7 48106.73 -DEAL:2d::8 55.17 +DEAL:2d::6 424991.38 +DEAL:2d::7 499999.97 +DEAL:2d::8 573.38 DEAL:2d::9 0.00 DEAL:2d::10 0.00 DEAL:2d::11 0.00 @@ -326,14 +326,14 @@ DEAL:2d::25 0.00 DEAL:2d::26 0.00 DEAL:2d::27 0.00 DEAL:2d::28 0.00 -DEAL:2d::29 40889.90 -DEAL:2d::30 50.83 -DEAL:2d::31 48106.73 -DEAL:2d::32 59.65 -DEAL:2d::33 70.20 -DEAL:2d::34 87.26 -DEAL:2d::35 87.26 -DEAL:2d::36 102.39 +DEAL:2d::29 424991.41 +DEAL:2d::30 528.32 +DEAL:2d::31 499999.97 +DEAL:2d::32 619.94 +DEAL:2d::33 729.65 +DEAL:2d::34 906.96 +DEAL:2d::35 906.96 +DEAL:2d::36 1064.17 DEAL:2d::37 0.00 DEAL:2d::38 0.00 DEAL:2d::39 0.00 @@ -357,10 +357,10 @@ DEAL:2d::56 0.00 DEAL:2d::57 0.00 DEAL:2d::58 0.00 DEAL:2d::59 0.00 -DEAL:2d::60 3940.49 -DEAL:2d::61 7274.93 -DEAL:2d::62 7274.93 -DEAL:2d::63 3.28 +DEAL:2d::60 40955.71 +DEAL:2d::61 75612.41 +DEAL:2d::62 75612.41 +DEAL:2d::63 34.04 DEAL:2d::64 0.00 DEAL:2d::65 0.00 DEAL:2d::66 0.00 @@ -373,10 +373,10 @@ DEAL:2d::72 0.00 DEAL:2d::73 0.00 DEAL:2d::74 0.00 DEAL:2d::75 0.00 -DEAL:2d::76 5.74 -DEAL:2d::77 8.19 -DEAL:2d::78 11.49 -DEAL:2d::79 14.67 +DEAL:2d::76 59.68 +DEAL:2d::77 85.11 +DEAL:2d::78 119.40 +DEAL:2d::79 152.51 DEAL:2d::80 0.00 DEAL:2d::81 0.00 DEAL:2d::82 0.00 @@ -401,19 +401,19 @@ DEAL:2d::Material id=1 DEAL:2d::0 0.00 DEAL:2d::1 0.00 DEAL:2d::2 0.00 -DEAL:2d::3 80.55 -DEAL:2d::4 94.47 +DEAL:2d::3 837.22 +DEAL:2d::4 981.88 DEAL:2d::5 0.00 DEAL:2d::6 0.00 DEAL:2d::7 0.00 DEAL:2d::8 0.00 -DEAL:2d::9 48106.73 -DEAL:2d::10 40889.90 -DEAL:2d::11 59.65 -DEAL:2d::12 42.47 -DEAL:2d::13 40889.89 -DEAL:2d::14 44.31 -DEAL:2d::15 48106.73 +DEAL:2d::9 499999.97 +DEAL:2d::10 424991.41 +DEAL:2d::11 619.94 +DEAL:2d::12 441.39 +DEAL:2d::13 424991.38 +DEAL:2d::14 460.53 +DEAL:2d::15 499999.97 DEAL:2d::16 0.00 DEAL:2d::17 0.00 DEAL:2d::18 0.00 @@ -435,10 +435,10 @@ DEAL:2d::33 0.00 DEAL:2d::34 0.00 DEAL:2d::35 0.00 DEAL:2d::36 0.00 -DEAL:2d::37 27634.60 -DEAL:2d::38 15581.87 -DEAL:2d::39 29.16 -DEAL:2d::40 27634.60 +DEAL:2d::37 287221.75 +DEAL:2d::38 161951.06 +DEAL:2d::39 303.04 +DEAL:2d::40 287221.75 DEAL:2d::41 0.00 DEAL:2d::42 0.00 DEAL:2d::43 0.00 @@ -451,10 +451,10 @@ DEAL:2d::49 0.00 DEAL:2d::50 0.00 DEAL:2d::51 0.00 DEAL:2d::52 0.00 -DEAL:2d::53 14.62 -DEAL:2d::54 8.11 -DEAL:2d::55 13.97 -DEAL:2d::56 4.68 +DEAL:2d::53 151.94 +DEAL:2d::54 84.31 +DEAL:2d::55 145.22 +DEAL:2d::56 48.68 DEAL:2d::57 0.00 DEAL:2d::58 0.00 DEAL:2d::59 0.00 @@ -462,10 +462,10 @@ DEAL:2d::60 0.00 DEAL:2d::61 0.00 DEAL:2d::62 0.00 DEAL:2d::63 0.00 -DEAL:2d::64 15.15 -DEAL:2d::65 10.03 -DEAL:2d::66 15.76 -DEAL:2d::67 10.43 +DEAL:2d::64 157.51 +DEAL:2d::65 104.24 +DEAL:2d::66 163.78 +DEAL:2d::67 108.38 DEAL:2d::68 0.00 DEAL:2d::69 0.00 DEAL:2d::70 0.00 @@ -478,10 +478,10 @@ DEAL:2d::76 0.00 DEAL:2d::77 0.00 DEAL:2d::78 0.00 DEAL:2d::79 0.00 -DEAL:2d::80 6.67 -DEAL:2d::81 5.74 -DEAL:2d::82 10.07 -DEAL:2d::83 8.19 +DEAL:2d::80 69.29 +DEAL:2d::81 59.68 +DEAL:2d::82 104.69 +DEAL:2d::83 85.11 DEAL:2d::84 0.00 DEAL:2d::85 0.00 DEAL:2d::86 0.00 @@ -515,9 +515,9 @@ DEAL:2d::12 0.00 DEAL:2d::13 0.00 DEAL:2d::14 0.00 DEAL:2d::15 0.00 -DEAL:2d::16 48106.73 -DEAL:2d::17 59.65 -DEAL:2d::18 49.53 +DEAL:2d::16 499999.97 +DEAL:2d::17 619.94 +DEAL:2d::18 514.76 DEAL:2d::19 0.00 DEAL:2d::20 0.00 DEAL:2d::21 0.00 @@ -540,18 +540,18 @@ DEAL:2d::37 0.00 DEAL:2d::38 0.00 DEAL:2d::39 0.00 DEAL:2d::40 0.00 -DEAL:2d::41 87.26 -DEAL:2d::42 102.39 -DEAL:2d::43 74.37 -DEAL:2d::44 78.86 -DEAL:2d::45 27634.60 -DEAL:2d::46 34.73 -DEAL:2d::47 15581.87 -DEAL:2d::48 27634.60 -DEAL:2d::49 50.83 -DEAL:2d::50 54.04 -DEAL:2d::51 40889.90 -DEAL:2d::52 48106.73 +DEAL:2d::41 906.96 +DEAL:2d::42 1064.17 +DEAL:2d::43 772.96 +DEAL:2d::44 819.68 +DEAL:2d::45 287221.75 +DEAL:2d::46 361.01 +DEAL:2d::47 161951.06 +DEAL:2d::48 287221.75 +DEAL:2d::49 528.32 +DEAL:2d::50 561.69 +DEAL:2d::51 424991.41 +DEAL:2d::52 499999.94 DEAL:2d::53 0.00 DEAL:2d::54 0.00 DEAL:2d::55 0.00 @@ -583,10 +583,10 @@ DEAL:2d::80 0.00 DEAL:2d::81 0.00 DEAL:2d::82 0.00 DEAL:2d::83 0.00 -DEAL:2d::84 21735.65 -DEAL:2d::85 8.26 -DEAL:2d::86 19063.32 -DEAL:2d::87 6.72 +DEAL:2d::84 225910.66 +DEAL:2d::85 85.83 +DEAL:2d::86 198135.70 +DEAL:2d::87 69.87 DEAL:2d::88 0.00 DEAL:2d::89 0.00 DEAL:2d::90 0.00 @@ -605,7 +605,7 @@ DEAL:2d::1 0.00 DEAL:2d::2 0.00 DEAL:2d::3 0.00 DEAL:2d::4 0.00 -DEAL:2d::5 85.83 +DEAL:2d::5 892.03 DEAL:2d::6 0.00 DEAL:2d::7 0.00 DEAL:2d::8 0.00 @@ -619,16 +619,16 @@ DEAL:2d::15 0.00 DEAL:2d::16 0.00 DEAL:2d::17 0.00 DEAL:2d::18 0.00 -DEAL:2d::19 49.78 -DEAL:2d::20 48106.73 -DEAL:2d::21 42.47 -DEAL:2d::22 40889.90 -DEAL:2d::23 35.10 -DEAL:2d::24 48106.73 -DEAL:2d::25 40889.90 -DEAL:2d::26 33.86 -DEAL:2d::27 27634.60 -DEAL:2d::28 15581.87 +DEAL:2d::19 517.35 +DEAL:2d::20 499999.97 +DEAL:2d::21 441.39 +DEAL:2d::22 424991.41 +DEAL:2d::23 364.77 +DEAL:2d::24 499999.91 +DEAL:2d::25 424991.41 +DEAL:2d::26 351.95 +DEAL:2d::27 287221.75 +DEAL:2d::28 161951.06 DEAL:2d::29 0.00 DEAL:2d::30 0.00 DEAL:2d::31 0.00 @@ -657,9 +657,9 @@ DEAL:2d::53 0.00 DEAL:2d::54 0.00 DEAL:2d::55 0.00 DEAL:2d::56 0.00 -DEAL:2d::57 9.00 -DEAL:2d::58 9.00 -DEAL:2d::59 10.71 +DEAL:2d::57 93.51 +DEAL:2d::58 93.51 +DEAL:2d::59 111.31 DEAL:2d::60 0.00 DEAL:2d::61 0.00 DEAL:2d::62 0.00 @@ -668,14 +668,14 @@ DEAL:2d::64 0.00 DEAL:2d::65 0.00 DEAL:2d::66 0.00 DEAL:2d::67 0.00 -DEAL:2d::68 15.76 -DEAL:2d::69 10.43 -DEAL:2d::70 14.98 -DEAL:2d::71 10.03 -DEAL:2d::72 20.55 -DEAL:2d::73 14.98 -DEAL:2d::74 12.71 -DEAL:2d::75 5.08 +DEAL:2d::68 163.78 +DEAL:2d::69 108.38 +DEAL:2d::70 155.71 +DEAL:2d::71 104.24 +DEAL:2d::72 213.57 +DEAL:2d::73 155.71 +DEAL:2d::74 132.15 +DEAL:2d::75 52.79 DEAL:2d::76 0.00 DEAL:2d::77 0.00 DEAL:2d::78 0.00 @@ -688,119 +688,119 @@ DEAL:2d::84 0.00 DEAL:2d::85 0.00 DEAL:2d::86 0.00 DEAL:2d::87 0.00 -DEAL:2d::88 10.45 -DEAL:2d::89 9.25 -DEAL:2d::90 8.62 -DEAL:2d::91 7.76 -DEAL:2d::92 6.20 -DEAL:2d::93 3.93 -DEAL:2d::94 15665.22 -DEAL:2d::95 11677.80 -DEAL:2d::96 1.20 -DEAL:2d::97 1.08 -DEAL:2d::98 1.08 -DEAL:2d::99 0.96 +DEAL:2d::88 108.62 +DEAL:2d::89 96.16 +DEAL:2d::90 89.60 +DEAL:2d::91 80.63 +DEAL:2d::92 64.47 +DEAL:2d::93 40.88 +DEAL:2d::94 162817.34 +DEAL:2d::95 121373.91 +DEAL:2d::96 12.50 +DEAL:2d::97 11.21 +DEAL:2d::98 11.21 +DEAL:2d::99 9.99 DEAL:2d::OK DEAL:3d::Estimated error indicators: -DEAL:3d::7953.37 -DEAL:3d::13781.71 -DEAL:3d::20682.11 -DEAL:3d::13781.71 -DEAL:3d::20682.11 -DEAL:3d::331.15 -DEAL:3d::13781.82 -DEAL:3d::7953.41 -DEAL:3d::20681.84 -DEAL:3d::13781.82 -DEAL:3d::20681.73 -DEAL:3d::13781.82 -DEAL:3d::20681.84 -DEAL:3d::13781.78 -DEAL:3d::20682.15 -DEAL:3d::7953.41 -DEAL:3d::13781.71 -DEAL:3d::20682.15 -DEAL:3d::361.20 -DEAL:3d::13781.71 -DEAL:3d::20682.15 -DEAL:3d::13781.82 -DEAL:3d::13781.82 -DEAL:3d::7953.41 -DEAL:3d::341.75 -DEAL:3d::20682.15 -DEAL:3d::20682.04 -DEAL:3d::13781.82 -DEAL:3d::13781.82 -DEAL:3d::20682.04 -DEAL:3d::20682.15 -DEAL:3d::370.94 -DEAL:3d::7953.41 -DEAL:3d::13781.82 -DEAL:3d::13781.82 -DEAL:3d::20682.15 -DEAL:3d::20682.15 -DEAL:3d::13781.82 -DEAL:3d::341.75 -DEAL:3d::20682.15 -DEAL:3d::13781.82 -DEAL:3d::7953.41 -DEAL:3d::20682.15 -DEAL:3d::13781.82 -DEAL:3d::20682.15 -DEAL:3d::370.94 -DEAL:3d::13781.82 -DEAL:3d::20682.04 -DEAL:3d::13781.82 -DEAL:3d::20682.15 -DEAL:3d::7953.41 -DEAL:3d::13781.82 -DEAL:3d::370.94 -DEAL:3d::20682.15 -DEAL:3d::20682.15 -DEAL:3d::13781.82 -DEAL:3d::20682.15 -DEAL:3d::13781.82 -DEAL:3d::13781.82 -DEAL:3d::7953.41 -DEAL:3d::2334.15 -DEAL:3d::4139.65 -DEAL:3d::2746.12 -DEAL:3d::4870.27 -DEAL:3d::4139.65 -DEAL:3d::26.72 -DEAL:3d::4870.27 -DEAL:3d::33.21 -DEAL:3d::6125.28 -DEAL:3d::7206.35 -DEAL:3d::30.93 -DEAL:3d::39.67 -DEAL:3d::7206.35 -DEAL:3d::8478.24 -DEAL:3d::39.67 -DEAL:3d::50.24 -DEAL:3d::40.07 -DEAL:3d::27.70 -DEAL:3d::54.55 -DEAL:3d::40.07 -DEAL:3d::54.55 -DEAL:3d::40.07 -DEAL:3d::71.87 -DEAL:3d::54.55 -DEAL:3d::30.93 -DEAL:3d::39.67 -DEAL:3d::6125.28 -DEAL:3d::7206.35 -DEAL:3d::39.67 -DEAL:3d::50.24 -DEAL:3d::7206.35 -DEAL:3d::8478.24 +DEAL:3d::192276.08 +DEAL:3d::333178.94 +DEAL:3d::499999.03 +DEAL:3d::333178.97 +DEAL:3d::499999.03 +DEAL:3d::8005.58 +DEAL:3d::333181.44 +DEAL:3d::192277.05 +DEAL:3d::499992.50 +DEAL:3d::333181.44 +DEAL:3d::499989.78 +DEAL:3d::333181.44 +DEAL:3d::499992.47 +DEAL:3d::333180.53 +DEAL:3d::500000.00 +DEAL:3d::192277.05 +DEAL:3d::333178.94 +DEAL:3d::499999.97 +DEAL:3d::8732.12 +DEAL:3d::333178.97 +DEAL:3d::500000.00 +DEAL:3d::333181.44 +DEAL:3d::333181.44 +DEAL:3d::192277.05 +DEAL:3d::8261.89 +DEAL:3d::499999.97 +DEAL:3d::499997.28 +DEAL:3d::333181.44 +DEAL:3d::333181.47 +DEAL:3d::499997.28 +DEAL:3d::499999.97 +DEAL:3d::8967.68 +DEAL:3d::192277.05 +DEAL:3d::333181.44 +DEAL:3d::333181.44 +DEAL:3d::499999.97 +DEAL:3d::499999.97 +DEAL:3d::333181.44 +DEAL:3d::8261.89 +DEAL:3d::499999.97 +DEAL:3d::333181.44 +DEAL:3d::192277.05 +DEAL:3d::499999.97 +DEAL:3d::333181.44 +DEAL:3d::499999.97 +DEAL:3d::8967.68 +DEAL:3d::333181.47 +DEAL:3d::499997.28 +DEAL:3d::333181.44 +DEAL:3d::499999.97 +DEAL:3d::192277.05 +DEAL:3d::333181.44 +DEAL:3d::8967.68 +DEAL:3d::499999.97 +DEAL:3d::499999.97 +DEAL:3d::333181.44 +DEAL:3d::499999.97 +DEAL:3d::333181.44 +DEAL:3d::333181.44 +DEAL:3d::192277.05 +DEAL:3d::56429.15 +DEAL:3d::100077.80 +DEAL:3d::66388.59 +DEAL:3d::117741.00 +DEAL:3d::100077.80 +DEAL:3d::646.04 +DEAL:3d::117741.00 +DEAL:3d::802.96 +DEAL:3d::148081.20 +DEAL:3d::174216.77 +DEAL:3d::747.71 +DEAL:3d::959.01 +DEAL:3d::174216.77 +DEAL:3d::204965.12 +DEAL:3d::959.01 +DEAL:3d::1214.67 +DEAL:3d::968.67 +DEAL:3d::669.76 +DEAL:3d::1318.80 +DEAL:3d::968.67 +DEAL:3d::1318.80 +DEAL:3d::968.67 +DEAL:3d::1737.40 +DEAL:3d::1318.80 +DEAL:3d::747.71 +DEAL:3d::959.01 +DEAL:3d::148081.20 +DEAL:3d::174216.77 +DEAL:3d::959.01 +DEAL:3d::1214.67 +DEAL:3d::174216.77 +DEAL:3d::204965.12 DEAL:3d::Material id=0 -DEAL:3d::0 7953.37 -DEAL:3d::1 13781.71 -DEAL:3d::2 20682.11 -DEAL:3d::3 13781.71 -DEAL:3d::4 20682.11 -DEAL:3d::5 331.15 +DEAL:3d::0 192276.08 +DEAL:3d::1 333178.94 +DEAL:3d::2 499999.03 +DEAL:3d::3 333178.97 +DEAL:3d::4 499999.03 +DEAL:3d::5 8005.58 DEAL:3d::6 0.00 DEAL:3d::7 0.00 DEAL:3d::8 0.00 @@ -855,22 +855,22 @@ DEAL:3d::56 0.00 DEAL:3d::57 0.00 DEAL:3d::58 0.00 DEAL:3d::59 0.00 -DEAL:3d::60 2334.15 -DEAL:3d::61 4139.65 -DEAL:3d::62 2746.12 -DEAL:3d::63 4870.27 -DEAL:3d::64 4139.65 -DEAL:3d::65 26.72 -DEAL:3d::66 4870.27 -DEAL:3d::67 33.21 -DEAL:3d::68 6125.28 -DEAL:3d::69 7206.35 -DEAL:3d::70 30.93 -DEAL:3d::71 39.67 -DEAL:3d::72 7206.35 -DEAL:3d::73 8478.24 -DEAL:3d::74 39.67 -DEAL:3d::75 50.24 +DEAL:3d::60 56429.15 +DEAL:3d::61 100077.80 +DEAL:3d::62 66388.59 +DEAL:3d::63 117741.00 +DEAL:3d::64 100077.80 +DEAL:3d::65 646.04 +DEAL:3d::66 117741.00 +DEAL:3d::67 802.96 +DEAL:3d::68 148081.20 +DEAL:3d::69 174216.77 +DEAL:3d::70 747.71 +DEAL:3d::71 959.01 +DEAL:3d::72 174216.77 +DEAL:3d::73 204965.12 +DEAL:3d::74 959.01 +DEAL:3d::75 1214.67 DEAL:3d::76 0.00 DEAL:3d::77 0.00 DEAL:3d::78 0.00 @@ -894,13 +894,13 @@ DEAL:3d::2 0.00 DEAL:3d::3 0.00 DEAL:3d::4 0.00 DEAL:3d::5 0.00 -DEAL:3d::6 13781.82 -DEAL:3d::7 7953.41 -DEAL:3d::8 20681.84 -DEAL:3d::9 13781.82 -DEAL:3d::10 20681.73 -DEAL:3d::11 13781.82 -DEAL:3d::12 20681.84 +DEAL:3d::6 333181.44 +DEAL:3d::7 192277.05 +DEAL:3d::8 499992.50 +DEAL:3d::9 333181.44 +DEAL:3d::10 499989.78 +DEAL:3d::11 333181.44 +DEAL:3d::12 499992.47 DEAL:3d::13 0.00 DEAL:3d::14 0.00 DEAL:3d::15 0.00 @@ -964,14 +964,14 @@ DEAL:3d::72 0.00 DEAL:3d::73 0.00 DEAL:3d::74 0.00 DEAL:3d::75 0.00 -DEAL:3d::76 40.07 -DEAL:3d::77 27.70 -DEAL:3d::78 54.55 -DEAL:3d::79 40.07 -DEAL:3d::80 54.55 -DEAL:3d::81 40.07 -DEAL:3d::82 71.87 -DEAL:3d::83 54.55 +DEAL:3d::76 968.67 +DEAL:3d::77 669.76 +DEAL:3d::78 1318.80 +DEAL:3d::79 968.67 +DEAL:3d::80 1318.80 +DEAL:3d::81 968.67 +DEAL:3d::82 1737.40 +DEAL:3d::83 1318.80 DEAL:3d::84 0.00 DEAL:3d::85 0.00 DEAL:3d::86 0.00 @@ -994,13 +994,13 @@ DEAL:3d::9 0.00 DEAL:3d::10 0.00 DEAL:3d::11 0.00 DEAL:3d::12 0.00 -DEAL:3d::13 13781.78 -DEAL:3d::14 20682.15 -DEAL:3d::15 7953.41 -DEAL:3d::16 13781.71 -DEAL:3d::17 20682.15 -DEAL:3d::18 361.20 -DEAL:3d::19 13781.71 +DEAL:3d::13 333180.53 +DEAL:3d::14 500000.00 +DEAL:3d::15 192277.05 +DEAL:3d::16 333178.94 +DEAL:3d::17 499999.97 +DEAL:3d::18 8732.12 +DEAL:3d::19 333178.97 DEAL:3d::20 0.00 DEAL:3d::21 0.00 DEAL:3d::22 0.00 @@ -1065,14 +1065,14 @@ DEAL:3d::80 0.00 DEAL:3d::81 0.00 DEAL:3d::82 0.00 DEAL:3d::83 0.00 -DEAL:3d::84 30.93 -DEAL:3d::85 39.67 -DEAL:3d::86 6125.28 -DEAL:3d::87 7206.35 -DEAL:3d::88 39.67 -DEAL:3d::89 50.24 -DEAL:3d::90 7206.35 -DEAL:3d::91 8478.24 +DEAL:3d::84 747.71 +DEAL:3d::85 959.01 +DEAL:3d::86 148081.20 +DEAL:3d::87 174216.77 +DEAL:3d::88 959.01 +DEAL:3d::89 1214.67 +DEAL:3d::90 174216.77 +DEAL:3d::91 204965.12 DEAL:3d::Material id=3 DEAL:3d::0 0.00 DEAL:3d::1 0.00 @@ -1094,14 +1094,14 @@ DEAL:3d::16 0.00 DEAL:3d::17 0.00 DEAL:3d::18 0.00 DEAL:3d::19 0.00 -DEAL:3d::20 20682.15 -DEAL:3d::21 13781.82 -DEAL:3d::22 13781.82 -DEAL:3d::23 7953.41 -DEAL:3d::24 341.75 -DEAL:3d::25 20682.15 -DEAL:3d::26 20682.04 -DEAL:3d::27 13781.82 +DEAL:3d::20 500000.00 +DEAL:3d::21 333181.44 +DEAL:3d::22 333181.44 +DEAL:3d::23 192277.05 +DEAL:3d::24 8261.89 +DEAL:3d::25 499999.97 +DEAL:3d::26 499997.28 +DEAL:3d::27 333181.44 DEAL:3d::28 0.00 DEAL:3d::29 0.00 DEAL:3d::30 0.00 @@ -1195,14 +1195,14 @@ DEAL:3d::24 0.00 DEAL:3d::25 0.00 DEAL:3d::26 0.00 DEAL:3d::27 0.00 -DEAL:3d::28 13781.82 -DEAL:3d::29 20682.04 -DEAL:3d::30 20682.15 -DEAL:3d::31 370.94 -DEAL:3d::32 7953.41 -DEAL:3d::33 13781.82 -DEAL:3d::34 13781.82 -DEAL:3d::35 20682.15 +DEAL:3d::28 333181.47 +DEAL:3d::29 499997.28 +DEAL:3d::30 499999.97 +DEAL:3d::31 8967.68 +DEAL:3d::32 192277.05 +DEAL:3d::33 333181.44 +DEAL:3d::34 333181.44 +DEAL:3d::35 499999.97 DEAL:3d::36 0.00 DEAL:3d::37 0.00 DEAL:3d::38 0.00 @@ -1296,14 +1296,14 @@ DEAL:3d::32 0.00 DEAL:3d::33 0.00 DEAL:3d::34 0.00 DEAL:3d::35 0.00 -DEAL:3d::36 20682.15 -DEAL:3d::37 13781.82 -DEAL:3d::38 341.75 -DEAL:3d::39 20682.15 -DEAL:3d::40 13781.82 -DEAL:3d::41 7953.41 -DEAL:3d::42 20682.15 -DEAL:3d::43 13781.82 +DEAL:3d::36 499999.97 +DEAL:3d::37 333181.44 +DEAL:3d::38 8261.89 +DEAL:3d::39 499999.97 +DEAL:3d::40 333181.44 +DEAL:3d::41 192277.05 +DEAL:3d::42 499999.97 +DEAL:3d::43 333181.44 DEAL:3d::44 0.00 DEAL:3d::45 0.00 DEAL:3d::46 0.00 @@ -1397,14 +1397,14 @@ DEAL:3d::40 0.00 DEAL:3d::41 0.00 DEAL:3d::42 0.00 DEAL:3d::43 0.00 -DEAL:3d::44 20682.15 -DEAL:3d::45 370.94 -DEAL:3d::46 13781.82 -DEAL:3d::47 20682.04 -DEAL:3d::48 13781.82 -DEAL:3d::49 20682.15 -DEAL:3d::50 7953.41 -DEAL:3d::51 13781.82 +DEAL:3d::44 499999.97 +DEAL:3d::45 8967.68 +DEAL:3d::46 333181.47 +DEAL:3d::47 499997.28 +DEAL:3d::48 333181.44 +DEAL:3d::49 499999.97 +DEAL:3d::50 192277.05 +DEAL:3d::51 333181.44 DEAL:3d::52 0.00 DEAL:3d::53 0.00 DEAL:3d::54 0.00 @@ -1498,14 +1498,14 @@ DEAL:3d::48 0.00 DEAL:3d::49 0.00 DEAL:3d::50 0.00 DEAL:3d::51 0.00 -DEAL:3d::52 370.94 -DEAL:3d::53 20682.15 -DEAL:3d::54 20682.15 -DEAL:3d::55 13781.82 -DEAL:3d::56 20682.15 -DEAL:3d::57 13781.82 -DEAL:3d::58 13781.82 -DEAL:3d::59 7953.41 +DEAL:3d::52 8967.68 +DEAL:3d::53 499999.97 +DEAL:3d::54 499999.97 +DEAL:3d::55 333181.44 +DEAL:3d::56 499999.97 +DEAL:3d::57 333181.44 +DEAL:3d::58 333181.44 +DEAL:3d::59 192277.05 DEAL:3d::60 0.00 DEAL:3d::61 0.00 DEAL:3d::62 0.00 diff --git a/tests/codim_one/error_estimator_01.cc b/tests/codim_one/error_estimator_01.cc index e56d61e216..73d706e08d 100644 --- a/tests/codim_one/error_estimator_01.cc +++ b/tests/codim_one/error_estimator_01.cc @@ -151,7 +151,7 @@ check () // number KellyErrorEstimator::estimate (mapping, dof, q_face, neumann_bc, v, error1); - const double scaling_factor = 10000.*error1.size()/error1.l1_norm(); + const double scaling_factor = 500000./error1.linfty_norm(); error1 *= scaling_factor; deallog << "Estimated error indicators:" << std::endl; @@ -168,7 +168,7 @@ check () KellyErrorEstimator::estimate (mapping, dof, q_face, neumann_bc, v, this_error, std::vector(), 0, - multithread_info.n_default_threads, + multithread_info.n_threads(), subdomain); this_error *= scaling_factor; diff --git a/tests/codim_one/error_estimator_01.output b/tests/codim_one/error_estimator_01.output index 6a9bf3b202..e26cf16514 100644 --- a/tests/codim_one/error_estimator_01.output +++ b/tests/codim_one/error_estimator_01.output @@ -1,111 +1,111 @@ DEAL:1d::Estimated error indicators: -DEAL:1d::55.21 -DEAL:1d::67.65 -DEAL:1d::6.61 -DEAL:1d::0.89 -DEAL:1d::9.34 -DEAL:1d::6.64 -DEAL:1d::9.24 -DEAL:1d::36.89 -DEAL:1d::9.28 -DEAL:1d::29.81 -DEAL:1d::1.81 -DEAL:1d::472600.97 -DEAL:1d::4.28 -DEAL:1d::4.61 -DEAL:1d::2.81 -DEAL:1d::2.89 -DEAL:1d::0.43 -DEAL:1d::2.19 -DEAL:1d::0.74 -DEAL:1d::3.29 -DEAL:1d::0.29 -DEAL:1d::0.69 -DEAL:1d::0.68 -DEAL:1d::18.06 -DEAL:1d::0.90 -DEAL:1d::0.87 -DEAL:1d::1.79 -DEAL:1d::0.64 -DEAL:1d::0.97 -DEAL:1d::3.25 -DEAL:1d::2.93 +DEAL:1d::58.41 +DEAL:1d::71.57 +DEAL:1d::6.99 +DEAL:1d::0.94 +DEAL:1d::9.88 +DEAL:1d::7.03 +DEAL:1d::9.78 +DEAL:1d::39.02 +DEAL:1d::9.82 +DEAL:1d::31.53 +DEAL:1d::1.91 +DEAL:1d::500000.00 +DEAL:1d::4.53 +DEAL:1d::4.88 +DEAL:1d::2.97 +DEAL:1d::3.06 +DEAL:1d::0.46 +DEAL:1d::2.31 +DEAL:1d::0.79 +DEAL:1d::3.48 +DEAL:1d::0.30 +DEAL:1d::0.73 +DEAL:1d::0.72 +DEAL:1d::19.11 DEAL:1d::0.95 +DEAL:1d::0.92 +DEAL:1d::1.90 +DEAL:1d::0.67 +DEAL:1d::1.02 +DEAL:1d::3.44 +DEAL:1d::3.10 +DEAL:1d::1.00 DEAL:1d::0.02 -DEAL:1d::0.88 +DEAL:1d::0.93 DEAL:1d::0.03 -DEAL:1d::0.73 +DEAL:1d::0.77 DEAL:1d::0.02 -DEAL:1d::0.14 -DEAL:1d::15.77 -DEAL:1d::0.27 -DEAL:1d::2.10 +DEAL:1d::0.15 +DEAL:1d::16.69 +DEAL:1d::0.28 +DEAL:1d::2.22 DEAL:1d::0.02 DEAL:1d::0.02 -DEAL:1d::0.18 +DEAL:1d::0.19 DEAL:1d::0.05 DEAL:1d::0.05 -DEAL:1d::0.15 -DEAL:1d::0.24 -DEAL:1d::1.57 +DEAL:1d::0.16 +DEAL:1d::0.26 +DEAL:1d::1.66 DEAL:1d::0.01 DEAL:1d::0.00 DEAL:1d::0.01 DEAL:1d::0.01 DEAL:1d::0.01 -DEAL:1d::167089.62 +DEAL:1d::176776.64 DEAL:1d::0.00 -DEAL:1d::0.23 +DEAL:1d::0.24 DEAL:1d::0.01 DEAL:1d::0.01 DEAL:1d::0.01 -DEAL:1d::0.19 +DEAL:1d::0.20 DEAL:1d::0.03 DEAL:1d::0.00 DEAL:1d::0.01 DEAL:1d::Subdomain id=0 -DEAL:1d::0 55.21 +DEAL:1d::0 58.41 DEAL:1d::1 0.00 DEAL:1d::2 0.00 -DEAL:1d::3 0.89 -DEAL:1d::4 9.34 +DEAL:1d::3 0.94 +DEAL:1d::4 9.88 DEAL:1d::5 0.00 DEAL:1d::6 0.00 DEAL:1d::7 0.00 -DEAL:1d::8 9.28 -DEAL:1d::9 29.81 +DEAL:1d::8 9.82 +DEAL:1d::9 31.53 DEAL:1d::10 0.00 DEAL:1d::11 0.00 -DEAL:1d::12 4.28 -DEAL:1d::13 4.61 +DEAL:1d::12 4.53 +DEAL:1d::13 4.88 DEAL:1d::14 0.00 DEAL:1d::15 0.00 -DEAL:1d::16 0.43 +DEAL:1d::16 0.46 DEAL:1d::17 0.00 DEAL:1d::18 0.00 -DEAL:1d::19 3.29 +DEAL:1d::19 3.48 DEAL:1d::20 0.00 DEAL:1d::21 0.00 -DEAL:1d::22 0.68 -DEAL:1d::23 18.06 +DEAL:1d::22 0.72 +DEAL:1d::23 19.11 DEAL:1d::24 0.00 DEAL:1d::25 0.00 -DEAL:1d::26 1.79 -DEAL:1d::27 0.64 -DEAL:1d::28 0.97 -DEAL:1d::29 3.25 -DEAL:1d::30 2.93 -DEAL:1d::31 0.95 +DEAL:1d::26 1.90 +DEAL:1d::27 0.67 +DEAL:1d::28 1.02 +DEAL:1d::29 3.44 +DEAL:1d::30 3.10 +DEAL:1d::31 1.00 DEAL:1d::32 0.02 -DEAL:1d::33 0.88 +DEAL:1d::33 0.93 DEAL:1d::34 0.00 DEAL:1d::35 0.00 DEAL:1d::36 0.02 DEAL:1d::37 0.00 DEAL:1d::38 0.00 DEAL:1d::39 0.00 -DEAL:1d::40 2.10 +DEAL:1d::40 2.22 DEAL:1d::41 0.02 DEAL:1d::42 0.02 DEAL:1d::43 0.00 @@ -119,43 +119,43 @@ DEAL:1d::50 0.00 DEAL:1d::51 0.01 DEAL:1d::52 0.01 DEAL:1d::53 0.01 -DEAL:1d::54 167089.62 +DEAL:1d::54 176776.64 DEAL:1d::55 0.00 -DEAL:1d::56 0.23 +DEAL:1d::56 0.24 DEAL:1d::57 0.01 DEAL:1d::58 0.00 DEAL:1d::59 0.00 -DEAL:1d::60 0.19 +DEAL:1d::60 0.20 DEAL:1d::61 0.03 DEAL:1d::62 0.00 DEAL:1d::63 0.01 DEAL:1d::Subdomain id=1 DEAL:1d::0 0.00 -DEAL:1d::1 67.65 -DEAL:1d::2 6.61 +DEAL:1d::1 71.57 +DEAL:1d::2 6.99 DEAL:1d::3 0.00 DEAL:1d::4 0.00 -DEAL:1d::5 6.64 -DEAL:1d::6 9.24 -DEAL:1d::7 36.89 +DEAL:1d::5 7.03 +DEAL:1d::6 9.78 +DEAL:1d::7 39.02 DEAL:1d::8 0.00 DEAL:1d::9 0.00 -DEAL:1d::10 1.81 -DEAL:1d::11 472600.97 +DEAL:1d::10 1.91 +DEAL:1d::11 500000.00 DEAL:1d::12 0.00 DEAL:1d::13 0.00 -DEAL:1d::14 2.81 -DEAL:1d::15 2.89 +DEAL:1d::14 2.97 +DEAL:1d::15 3.06 DEAL:1d::16 0.00 -DEAL:1d::17 2.19 -DEAL:1d::18 0.74 +DEAL:1d::17 2.31 +DEAL:1d::18 0.79 DEAL:1d::19 0.00 -DEAL:1d::20 0.29 -DEAL:1d::21 0.69 +DEAL:1d::20 0.30 +DEAL:1d::21 0.73 DEAL:1d::22 0.00 DEAL:1d::23 0.00 -DEAL:1d::24 0.90 -DEAL:1d::25 0.87 +DEAL:1d::24 0.95 +DEAL:1d::25 0.92 DEAL:1d::26 0.00 DEAL:1d::27 0.00 DEAL:1d::28 0.00 @@ -165,20 +165,20 @@ DEAL:1d::31 0.00 DEAL:1d::32 0.00 DEAL:1d::33 0.00 DEAL:1d::34 0.03 -DEAL:1d::35 0.73 +DEAL:1d::35 0.77 DEAL:1d::36 0.00 -DEAL:1d::37 0.14 -DEAL:1d::38 15.77 -DEAL:1d::39 0.27 +DEAL:1d::37 0.15 +DEAL:1d::38 16.69 +DEAL:1d::39 0.28 DEAL:1d::40 0.00 DEAL:1d::41 0.00 DEAL:1d::42 0.00 -DEAL:1d::43 0.18 +DEAL:1d::43 0.19 DEAL:1d::44 0.05 DEAL:1d::45 0.05 -DEAL:1d::46 0.15 -DEAL:1d::47 0.24 -DEAL:1d::48 1.57 +DEAL:1d::46 0.16 +DEAL:1d::47 0.26 +DEAL:1d::48 1.66 DEAL:1d::49 0.00 DEAL:1d::50 0.00 DEAL:1d::51 0.00 @@ -326,116 +326,116 @@ DEAL:1d::62 0.00 DEAL:1d::63 0.00 DEAL:1d::OK DEAL:2d::Estimated error indicators: -DEAL:2d::27634.60 -DEAL:2d::27634.60 -DEAL:2d::29.16 -DEAL:2d::80.55 -DEAL:2d::94.47 +DEAL:2d::287221.75 +DEAL:2d::287221.75 +DEAL:2d::303.04 +DEAL:2d::837.22 +DEAL:2d::981.88 +DEAL:2d::892.03 +DEAL:2d::424991.38 +DEAL:2d::499999.97 +DEAL:2d::573.38 +DEAL:2d::499999.97 +DEAL:2d::424991.41 +DEAL:2d::619.94 +DEAL:2d::441.39 +DEAL:2d::424991.38 +DEAL:2d::460.53 +DEAL:2d::499999.97 +DEAL:2d::499999.97 +DEAL:2d::619.94 +DEAL:2d::514.76 +DEAL:2d::517.35 +DEAL:2d::499999.97 +DEAL:2d::441.39 +DEAL:2d::424991.41 +DEAL:2d::364.77 +DEAL:2d::499999.91 +DEAL:2d::424991.41 +DEAL:2d::351.95 +DEAL:2d::287221.75 +DEAL:2d::161951.06 +DEAL:2d::424991.41 +DEAL:2d::528.32 +DEAL:2d::499999.97 +DEAL:2d::619.94 +DEAL:2d::729.65 +DEAL:2d::906.96 +DEAL:2d::906.96 +DEAL:2d::1064.17 +DEAL:2d::287221.75 +DEAL:2d::161951.06 +DEAL:2d::303.04 +DEAL:2d::287221.75 +DEAL:2d::906.96 +DEAL:2d::1064.17 +DEAL:2d::772.96 +DEAL:2d::819.68 +DEAL:2d::287221.75 +DEAL:2d::361.01 +DEAL:2d::161951.06 +DEAL:2d::287221.75 +DEAL:2d::528.32 +DEAL:2d::561.69 +DEAL:2d::424991.41 +DEAL:2d::499999.94 +DEAL:2d::151.94 +DEAL:2d::84.31 +DEAL:2d::145.22 +DEAL:2d::48.68 +DEAL:2d::93.51 +DEAL:2d::93.51 +DEAL:2d::111.31 +DEAL:2d::40955.71 +DEAL:2d::75612.41 +DEAL:2d::75612.41 +DEAL:2d::34.04 +DEAL:2d::157.51 +DEAL:2d::104.24 +DEAL:2d::163.78 +DEAL:2d::108.38 +DEAL:2d::163.78 +DEAL:2d::108.38 +DEAL:2d::155.71 +DEAL:2d::104.24 +DEAL:2d::213.57 +DEAL:2d::155.71 +DEAL:2d::132.15 +DEAL:2d::52.79 +DEAL:2d::59.68 +DEAL:2d::85.11 +DEAL:2d::119.40 +DEAL:2d::152.51 +DEAL:2d::69.29 +DEAL:2d::59.68 +DEAL:2d::104.69 +DEAL:2d::85.11 +DEAL:2d::225910.66 DEAL:2d::85.83 -DEAL:2d::40889.89 -DEAL:2d::48106.73 -DEAL:2d::55.17 -DEAL:2d::48106.73 -DEAL:2d::40889.90 -DEAL:2d::59.65 -DEAL:2d::42.47 -DEAL:2d::40889.89 -DEAL:2d::44.31 -DEAL:2d::48106.73 -DEAL:2d::48106.73 -DEAL:2d::59.65 -DEAL:2d::49.53 -DEAL:2d::49.78 -DEAL:2d::48106.73 -DEAL:2d::42.47 -DEAL:2d::40889.90 -DEAL:2d::35.10 -DEAL:2d::48106.73 -DEAL:2d::40889.90 -DEAL:2d::33.86 -DEAL:2d::27634.60 -DEAL:2d::15581.87 -DEAL:2d::40889.90 -DEAL:2d::50.83 -DEAL:2d::48106.73 -DEAL:2d::59.65 -DEAL:2d::70.20 -DEAL:2d::87.26 -DEAL:2d::87.26 -DEAL:2d::102.39 -DEAL:2d::27634.60 -DEAL:2d::15581.87 -DEAL:2d::29.16 -DEAL:2d::27634.60 -DEAL:2d::87.26 -DEAL:2d::102.39 -DEAL:2d::74.37 -DEAL:2d::78.86 -DEAL:2d::27634.60 -DEAL:2d::34.73 -DEAL:2d::15581.87 -DEAL:2d::27634.60 -DEAL:2d::50.83 -DEAL:2d::54.04 -DEAL:2d::40889.90 -DEAL:2d::48106.73 -DEAL:2d::14.62 -DEAL:2d::8.11 -DEAL:2d::13.97 -DEAL:2d::4.68 -DEAL:2d::9.00 -DEAL:2d::9.00 -DEAL:2d::10.71 -DEAL:2d::3940.49 -DEAL:2d::7274.93 -DEAL:2d::7274.93 -DEAL:2d::3.28 -DEAL:2d::15.15 -DEAL:2d::10.03 -DEAL:2d::15.76 -DEAL:2d::10.43 -DEAL:2d::15.76 -DEAL:2d::10.43 -DEAL:2d::14.98 -DEAL:2d::10.03 -DEAL:2d::20.55 -DEAL:2d::14.98 -DEAL:2d::12.71 -DEAL:2d::5.08 -DEAL:2d::5.74 -DEAL:2d::8.19 -DEAL:2d::11.49 -DEAL:2d::14.67 -DEAL:2d::6.67 -DEAL:2d::5.74 -DEAL:2d::10.07 -DEAL:2d::8.19 -DEAL:2d::21735.65 -DEAL:2d::8.26 -DEAL:2d::19063.32 -DEAL:2d::6.72 -DEAL:2d::10.45 -DEAL:2d::9.25 -DEAL:2d::8.62 -DEAL:2d::7.76 -DEAL:2d::6.20 -DEAL:2d::3.93 -DEAL:2d::15665.22 -DEAL:2d::11677.80 -DEAL:2d::1.20 -DEAL:2d::1.08 -DEAL:2d::1.08 -DEAL:2d::0.96 +DEAL:2d::198135.70 +DEAL:2d::69.87 +DEAL:2d::108.62 +DEAL:2d::96.16 +DEAL:2d::89.60 +DEAL:2d::80.63 +DEAL:2d::64.47 +DEAL:2d::40.88 +DEAL:2d::162817.34 +DEAL:2d::121373.91 +DEAL:2d::12.50 +DEAL:2d::11.21 +DEAL:2d::11.21 +DEAL:2d::9.99 DEAL:2d::Subdomain id=0 -DEAL:2d::0 27634.60 -DEAL:2d::1 27634.60 -DEAL:2d::2 29.16 +DEAL:2d::0 287221.75 +DEAL:2d::1 287221.75 +DEAL:2d::2 303.04 DEAL:2d::3 0.00 DEAL:2d::4 0.00 DEAL:2d::5 0.00 -DEAL:2d::6 40889.89 -DEAL:2d::7 48106.73 -DEAL:2d::8 55.17 +DEAL:2d::6 424991.38 +DEAL:2d::7 499999.97 +DEAL:2d::8 573.38 DEAL:2d::9 0.00 DEAL:2d::10 0.00 DEAL:2d::11 0.00 @@ -456,14 +456,14 @@ DEAL:2d::25 0.00 DEAL:2d::26 0.00 DEAL:2d::27 0.00 DEAL:2d::28 0.00 -DEAL:2d::29 40889.90 -DEAL:2d::30 50.83 -DEAL:2d::31 48106.73 -DEAL:2d::32 59.65 -DEAL:2d::33 70.20 -DEAL:2d::34 87.26 -DEAL:2d::35 87.26 -DEAL:2d::36 102.39 +DEAL:2d::29 424991.41 +DEAL:2d::30 528.32 +DEAL:2d::31 499999.97 +DEAL:2d::32 619.94 +DEAL:2d::33 729.65 +DEAL:2d::34 906.96 +DEAL:2d::35 906.96 +DEAL:2d::36 1064.17 DEAL:2d::37 0.00 DEAL:2d::38 0.00 DEAL:2d::39 0.00 @@ -487,10 +487,10 @@ DEAL:2d::56 0.00 DEAL:2d::57 0.00 DEAL:2d::58 0.00 DEAL:2d::59 0.00 -DEAL:2d::60 3940.49 -DEAL:2d::61 7274.93 -DEAL:2d::62 7274.93 -DEAL:2d::63 3.28 +DEAL:2d::60 40955.71 +DEAL:2d::61 75612.41 +DEAL:2d::62 75612.41 +DEAL:2d::63 34.04 DEAL:2d::64 0.00 DEAL:2d::65 0.00 DEAL:2d::66 0.00 @@ -503,10 +503,10 @@ DEAL:2d::72 0.00 DEAL:2d::73 0.00 DEAL:2d::74 0.00 DEAL:2d::75 0.00 -DEAL:2d::76 5.74 -DEAL:2d::77 8.19 -DEAL:2d::78 11.49 -DEAL:2d::79 14.67 +DEAL:2d::76 59.68 +DEAL:2d::77 85.11 +DEAL:2d::78 119.40 +DEAL:2d::79 152.51 DEAL:2d::80 0.00 DEAL:2d::81 0.00 DEAL:2d::82 0.00 @@ -531,19 +531,19 @@ DEAL:2d::Subdomain id=1 DEAL:2d::0 0.00 DEAL:2d::1 0.00 DEAL:2d::2 0.00 -DEAL:2d::3 80.55 -DEAL:2d::4 94.47 +DEAL:2d::3 837.22 +DEAL:2d::4 981.88 DEAL:2d::5 0.00 DEAL:2d::6 0.00 DEAL:2d::7 0.00 DEAL:2d::8 0.00 -DEAL:2d::9 48106.73 -DEAL:2d::10 40889.90 -DEAL:2d::11 59.65 -DEAL:2d::12 42.47 -DEAL:2d::13 40889.89 -DEAL:2d::14 44.31 -DEAL:2d::15 48106.73 +DEAL:2d::9 499999.97 +DEAL:2d::10 424991.41 +DEAL:2d::11 619.94 +DEAL:2d::12 441.39 +DEAL:2d::13 424991.38 +DEAL:2d::14 460.53 +DEAL:2d::15 499999.97 DEAL:2d::16 0.00 DEAL:2d::17 0.00 DEAL:2d::18 0.00 @@ -565,10 +565,10 @@ DEAL:2d::33 0.00 DEAL:2d::34 0.00 DEAL:2d::35 0.00 DEAL:2d::36 0.00 -DEAL:2d::37 27634.60 -DEAL:2d::38 15581.87 -DEAL:2d::39 29.16 -DEAL:2d::40 27634.60 +DEAL:2d::37 287221.75 +DEAL:2d::38 161951.06 +DEAL:2d::39 303.04 +DEAL:2d::40 287221.75 DEAL:2d::41 0.00 DEAL:2d::42 0.00 DEAL:2d::43 0.00 @@ -581,10 +581,10 @@ DEAL:2d::49 0.00 DEAL:2d::50 0.00 DEAL:2d::51 0.00 DEAL:2d::52 0.00 -DEAL:2d::53 14.62 -DEAL:2d::54 8.11 -DEAL:2d::55 13.97 -DEAL:2d::56 4.68 +DEAL:2d::53 151.94 +DEAL:2d::54 84.31 +DEAL:2d::55 145.22 +DEAL:2d::56 48.68 DEAL:2d::57 0.00 DEAL:2d::58 0.00 DEAL:2d::59 0.00 @@ -592,10 +592,10 @@ DEAL:2d::60 0.00 DEAL:2d::61 0.00 DEAL:2d::62 0.00 DEAL:2d::63 0.00 -DEAL:2d::64 15.15 -DEAL:2d::65 10.03 -DEAL:2d::66 15.76 -DEAL:2d::67 10.43 +DEAL:2d::64 157.51 +DEAL:2d::65 104.24 +DEAL:2d::66 163.78 +DEAL:2d::67 108.38 DEAL:2d::68 0.00 DEAL:2d::69 0.00 DEAL:2d::70 0.00 @@ -608,10 +608,10 @@ DEAL:2d::76 0.00 DEAL:2d::77 0.00 DEAL:2d::78 0.00 DEAL:2d::79 0.00 -DEAL:2d::80 6.67 -DEAL:2d::81 5.74 -DEAL:2d::82 10.07 -DEAL:2d::83 8.19 +DEAL:2d::80 69.29 +DEAL:2d::81 59.68 +DEAL:2d::82 104.69 +DEAL:2d::83 85.11 DEAL:2d::84 0.00 DEAL:2d::85 0.00 DEAL:2d::86 0.00 @@ -645,9 +645,9 @@ DEAL:2d::12 0.00 DEAL:2d::13 0.00 DEAL:2d::14 0.00 DEAL:2d::15 0.00 -DEAL:2d::16 48106.73 -DEAL:2d::17 59.65 -DEAL:2d::18 49.53 +DEAL:2d::16 499999.97 +DEAL:2d::17 619.94 +DEAL:2d::18 514.76 DEAL:2d::19 0.00 DEAL:2d::20 0.00 DEAL:2d::21 0.00 @@ -670,18 +670,18 @@ DEAL:2d::37 0.00 DEAL:2d::38 0.00 DEAL:2d::39 0.00 DEAL:2d::40 0.00 -DEAL:2d::41 87.26 -DEAL:2d::42 102.39 -DEAL:2d::43 74.37 -DEAL:2d::44 78.86 -DEAL:2d::45 27634.60 -DEAL:2d::46 34.73 -DEAL:2d::47 15581.87 -DEAL:2d::48 27634.60 -DEAL:2d::49 50.83 -DEAL:2d::50 54.04 -DEAL:2d::51 40889.90 -DEAL:2d::52 48106.73 +DEAL:2d::41 906.96 +DEAL:2d::42 1064.17 +DEAL:2d::43 772.96 +DEAL:2d::44 819.68 +DEAL:2d::45 287221.75 +DEAL:2d::46 361.01 +DEAL:2d::47 161951.06 +DEAL:2d::48 287221.75 +DEAL:2d::49 528.32 +DEAL:2d::50 561.69 +DEAL:2d::51 424991.41 +DEAL:2d::52 499999.94 DEAL:2d::53 0.00 DEAL:2d::54 0.00 DEAL:2d::55 0.00 @@ -713,10 +713,10 @@ DEAL:2d::80 0.00 DEAL:2d::81 0.00 DEAL:2d::82 0.00 DEAL:2d::83 0.00 -DEAL:2d::84 21735.65 -DEAL:2d::85 8.26 -DEAL:2d::86 19063.32 -DEAL:2d::87 6.72 +DEAL:2d::84 225910.66 +DEAL:2d::85 85.83 +DEAL:2d::86 198135.70 +DEAL:2d::87 69.87 DEAL:2d::88 0.00 DEAL:2d::89 0.00 DEAL:2d::90 0.00 @@ -735,7 +735,7 @@ DEAL:2d::1 0.00 DEAL:2d::2 0.00 DEAL:2d::3 0.00 DEAL:2d::4 0.00 -DEAL:2d::5 85.83 +DEAL:2d::5 892.03 DEAL:2d::6 0.00 DEAL:2d::7 0.00 DEAL:2d::8 0.00 @@ -749,16 +749,16 @@ DEAL:2d::15 0.00 DEAL:2d::16 0.00 DEAL:2d::17 0.00 DEAL:2d::18 0.00 -DEAL:2d::19 49.78 -DEAL:2d::20 48106.73 -DEAL:2d::21 42.47 -DEAL:2d::22 40889.90 -DEAL:2d::23 35.10 -DEAL:2d::24 48106.73 -DEAL:2d::25 40889.90 -DEAL:2d::26 33.86 -DEAL:2d::27 27634.60 -DEAL:2d::28 15581.87 +DEAL:2d::19 517.35 +DEAL:2d::20 499999.97 +DEAL:2d::21 441.39 +DEAL:2d::22 424991.41 +DEAL:2d::23 364.77 +DEAL:2d::24 499999.91 +DEAL:2d::25 424991.41 +DEAL:2d::26 351.95 +DEAL:2d::27 287221.75 +DEAL:2d::28 161951.06 DEAL:2d::29 0.00 DEAL:2d::30 0.00 DEAL:2d::31 0.00 @@ -787,9 +787,9 @@ DEAL:2d::53 0.00 DEAL:2d::54 0.00 DEAL:2d::55 0.00 DEAL:2d::56 0.00 -DEAL:2d::57 9.00 -DEAL:2d::58 9.00 -DEAL:2d::59 10.71 +DEAL:2d::57 93.51 +DEAL:2d::58 93.51 +DEAL:2d::59 111.31 DEAL:2d::60 0.00 DEAL:2d::61 0.00 DEAL:2d::62 0.00 @@ -798,14 +798,14 @@ DEAL:2d::64 0.00 DEAL:2d::65 0.00 DEAL:2d::66 0.00 DEAL:2d::67 0.00 -DEAL:2d::68 15.76 -DEAL:2d::69 10.43 -DEAL:2d::70 14.98 -DEAL:2d::71 10.03 -DEAL:2d::72 20.55 -DEAL:2d::73 14.98 -DEAL:2d::74 12.71 -DEAL:2d::75 5.08 +DEAL:2d::68 163.78 +DEAL:2d::69 108.38 +DEAL:2d::70 155.71 +DEAL:2d::71 104.24 +DEAL:2d::72 213.57 +DEAL:2d::73 155.71 +DEAL:2d::74 132.15 +DEAL:2d::75 52.79 DEAL:2d::76 0.00 DEAL:2d::77 0.00 DEAL:2d::78 0.00 @@ -818,18 +818,18 @@ DEAL:2d::84 0.00 DEAL:2d::85 0.00 DEAL:2d::86 0.00 DEAL:2d::87 0.00 -DEAL:2d::88 10.45 -DEAL:2d::89 9.25 -DEAL:2d::90 8.62 -DEAL:2d::91 7.76 -DEAL:2d::92 6.20 -DEAL:2d::93 3.93 -DEAL:2d::94 15665.22 -DEAL:2d::95 11677.80 -DEAL:2d::96 1.20 -DEAL:2d::97 1.08 -DEAL:2d::98 1.08 -DEAL:2d::99 0.96 +DEAL:2d::88 108.62 +DEAL:2d::89 96.16 +DEAL:2d::90 89.60 +DEAL:2d::91 80.63 +DEAL:2d::92 64.47 +DEAL:2d::93 40.88 +DEAL:2d::94 162817.34 +DEAL:2d::95 121373.91 +DEAL:2d::96 12.50 +DEAL:2d::97 11.21 +DEAL:2d::98 11.21 +DEAL:2d::99 9.99 DEAL:2d::Subdomain id=4 DEAL:2d::0 0.00 DEAL:2d::1 0.00 diff --git a/tests/fe/q_dg0_projection_01.cc b/tests/fe/q_dg0_projection_01.cc deleted file mode 100644 index 380c399118..0000000000 --- a/tests/fe/q_dg0_projection_01.cc +++ /dev/null @@ -1,33 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2003 - 2013 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - - -/* - * Project the function [1,1] onto a deformed grid and see whether the - * FESystem elements can represent it exactly. This shouldn't be a surprise, - * but it is nice to compare with the RT and ABF elements - */ - - - -char logname[] = "output"; -#include "deformed_projection.h" - - -void test () -{ - FESystem<2> fe (FE_Q_DG0<2>(3), 2); - check (fe); -} diff --git a/tests/fe/q_dg0_projection_01.compiler=Intel=false.release.output b/tests/fe/q_dg0_projection_01.compiler=Intel=false.release.output deleted file mode 100644 index 028d8b85cf..0000000000 --- a/tests/fe/q_dg0_projection_01.compiler=Intel=false.release.output +++ /dev/null @@ -1,143 +0,0 @@ - -DEAL::Dofs/cell 34Dofs/face 8 -DEAL::Dofs total 34 -DEAL::MM created -DEAL::RHS created -DEAL:cg::Starting value 0.52 -DEAL:cg::Convergence step 14 value 0 -# This file was generated by the deal.II library. - - -# -# For a description of the GNUPLOT format see the GNUPLOT manual. -# -# -0.00 0.00 1.00 1.00 -0.25 0.00 1.00 1.00 -0.50 0.00 1.00 1.00 -0.75 0.00 1.00 1.00 -1.00 0.00 1.00 1.00 - -0.15 0.12 1.00 1.00 -0.36 0.12 1.00 1.00 -0.57 0.12 1.00 1.00 -0.79 0.12 1.00 1.00 -1.00 0.12 1.00 1.00 - -0.30 0.25 1.00 1.00 -0.47 0.25 1.00 1.00 -0.65 0.25 1.00 1.00 -0.82 0.25 1.00 1.00 -1.00 0.25 1.00 1.00 - -0.45 0.38 1.00 1.00 -0.59 0.38 1.00 1.00 -0.73 0.38 1.00 1.00 -0.86 0.38 1.00 1.00 -1.00 0.38 1.00 1.00 - -0.60 0.50 1.00 1.00 -0.70 0.50 1.00 1.00 -0.80 0.50 1.00 1.00 -0.90 0.50 1.00 1.00 -1.00 0.50 1.00 1.00 - - -DEAL::1.26 -DEAL::1.26 -DEAL::1.26 -DEAL::1.26 -DEAL::Dofs total 34 -DEAL::MM created -DEAL::RHS created -DEAL:cg::Starting value 0.33 -DEAL:cg::Convergence step 22 value 0 -# This file was generated by the deal.II library. - - -# -# For a description of the GNUPLOT format see the GNUPLOT manual. -# -# -0.60 0.50 1.00 1.00 -0.70 0.50 1.00 1.00 -0.80 0.50 1.00 1.00 -0.90 0.50 1.00 1.00 -1.00 0.50 1.00 1.00 - -0.57 0.62 1.00 1.00 -0.68 0.62 1.00 1.00 -0.79 0.62 1.00 1.00 -0.89 0.62 1.00 1.00 -1.00 0.62 1.00 1.00 - -0.55 0.75 1.00 1.00 -0.66 0.75 1.00 1.00 -0.78 0.75 1.00 1.00 -0.89 0.75 1.00 1.00 -1.00 0.75 1.00 1.00 - -0.53 0.88 1.00 1.00 -0.64 0.88 1.00 1.00 -0.76 0.88 1.00 1.00 -0.88 0.88 1.00 1.00 -1.00 0.88 1.00 1.00 - -0.50 1.00 1.00 1.00 -0.62 1.00 1.00 1.00 -0.75 1.00 1.00 1.00 -0.88 1.00 1.00 1.00 -1.00 1.00 1.00 1.00 - - -DEAL::-0.18 -DEAL::-0.18 -DEAL::-0.18 -DEAL::-0.18 -DEAL::Dofs total 34 -DEAL::MM created -DEAL::RHS created -DEAL:cg::Starting value 0.63 -DEAL:cg::Convergence step 23 value 0 -# This file was generated by the deal.II library. - - -# -# For a description of the GNUPLOT format see the GNUPLOT manual. -# -# -0.00 0.00 1.00 1.00 -0.15 0.12 1.00 1.00 -0.30 0.25 1.00 1.00 -0.45 0.38 1.00 1.00 -0.60 0.50 1.00 1.00 - -0.00 0.25 1.00 1.00 -0.14 0.34 1.00 1.00 -0.29 0.44 1.00 1.00 -0.43 0.53 1.00 1.00 -0.57 0.62 1.00 1.00 - -0.00 0.50 1.00 1.00 -0.14 0.56 1.00 1.00 -0.28 0.62 1.00 1.00 -0.41 0.69 1.00 1.00 -0.55 0.75 1.00 1.00 - -0.00 0.75 1.00 1.00 -0.13 0.78 1.00 1.00 -0.26 0.81 1.00 1.00 -0.39 0.84 1.00 1.00 -0.53 0.88 1.00 1.00 - -0.00 1.00 1.00 1.00 -0.12 1.00 1.00 1.00 -0.25 1.00 1.00 1.00 -0.38 1.00 1.00 1.00 -0.50 1.00 1.00 1.00 - - -DEAL::0.11 -DEAL::0.11 -DEAL::0.11 -DEAL::0.11 diff --git a/tests/fe/q_dg0_projection_01.compiler=Intel=true.release.output b/tests/fe/q_dg0_projection_01.compiler=Intel=true.release.output deleted file mode 100644 index d38d3534e4..0000000000 --- a/tests/fe/q_dg0_projection_01.compiler=Intel=true.release.output +++ /dev/null @@ -1,143 +0,0 @@ - -DEAL::Dofs/cell 34Dofs/face 8 -DEAL::Dofs total 34 -DEAL::MM created -DEAL::RHS created -DEAL:cg::Starting value 0.52 -DEAL:cg::Convergence step 24 value 0 -# This file was generated by the deal.II library. - - -# -# For a description of the GNUPLOT format see the GNUPLOT manual. -# -# -0.00 0.00 1.00 1.00 -0.25 0.00 1.00 1.00 -0.50 0.00 1.00 1.00 -0.75 0.00 1.00 1.00 -1.00 0.00 1.00 1.00 - -0.15 0.12 1.00 1.00 -0.36 0.12 1.00 1.00 -0.57 0.12 1.00 1.00 -0.79 0.12 1.00 1.00 -1.00 0.12 1.00 1.00 - -0.30 0.25 1.00 1.00 -0.47 0.25 1.00 1.00 -0.65 0.25 1.00 1.00 -0.82 0.25 1.00 1.00 -1.00 0.25 1.00 1.00 - -0.45 0.38 1.00 1.00 -0.59 0.38 1.00 1.00 -0.73 0.38 1.00 1.00 -0.86 0.38 1.00 1.00 -1.00 0.38 1.00 1.00 - -0.60 0.50 1.00 1.00 -0.70 0.50 1.00 1.00 -0.80 0.50 1.00 1.00 -0.90 0.50 1.00 1.00 -1.00 0.50 1.00 1.00 - - -DEAL::1.58 -DEAL::-1.83 -DEAL::1.58 -DEAL::-1.83 -DEAL::Dofs total 34 -DEAL::MM created -DEAL::RHS created -DEAL:cg::Starting value 0.33 -DEAL:cg::Convergence step 22 value 0 -# This file was generated by the deal.II library. - - -# -# For a description of the GNUPLOT format see the GNUPLOT manual. -# -# -0.60 0.50 1.00 1.00 -0.70 0.50 1.00 1.00 -0.80 0.50 1.00 1.00 -0.90 0.50 1.00 1.00 -1.00 0.50 1.00 1.00 - -0.57 0.62 1.00 1.00 -0.68 0.62 1.00 1.00 -0.79 0.62 1.00 1.00 -0.89 0.62 1.00 1.00 -1.00 0.62 1.00 1.00 - -0.55 0.75 1.00 1.00 -0.66 0.75 1.00 1.00 -0.78 0.75 1.00 1.00 -0.89 0.75 1.00 1.00 -1.00 0.75 1.00 1.00 - -0.53 0.88 1.00 1.00 -0.64 0.88 1.00 1.00 -0.76 0.88 1.00 1.00 -0.88 0.88 1.00 1.00 -1.00 0.88 1.00 1.00 - -0.50 1.00 1.00 1.00 -0.62 1.00 1.00 1.00 -0.75 1.00 1.00 1.00 -0.88 1.00 1.00 1.00 -1.00 1.00 1.00 1.00 - - -DEAL::-0.01 -DEAL::-0.34 -DEAL::-0.01 -DEAL::-0.34 -DEAL::Dofs total 34 -DEAL::MM created -DEAL::RHS created -DEAL:cg::Starting value 0.63 -DEAL:cg::Convergence step 39 value 0 -# This file was generated by the deal.II library. - - -# -# For a description of the GNUPLOT format see the GNUPLOT manual. -# -# -0.00 0.00 1.00 1.00 -0.15 0.12 1.00 1.00 -0.30 0.25 1.00 1.00 -0.45 0.38 1.00 1.00 -0.60 0.50 1.00 1.00 - -0.00 0.25 1.00 1.00 -0.14 0.34 1.00 1.00 -0.29 0.44 1.00 1.00 -0.43 0.53 1.00 1.00 -0.57 0.62 1.00 1.00 - -0.00 0.50 1.00 1.00 -0.14 0.56 1.00 1.00 -0.28 0.62 1.00 1.00 -0.41 0.69 1.00 1.00 -0.55 0.75 1.00 1.00 - -0.00 0.75 1.00 1.00 -0.13 0.78 1.00 1.00 -0.26 0.81 1.00 1.00 -0.39 0.84 1.00 1.00 -0.53 0.88 1.00 1.00 - -0.00 1.00 1.00 1.00 -0.12 1.00 1.00 1.00 -0.25 1.00 1.00 1.00 -0.38 1.00 1.00 1.00 -0.50 1.00 1.00 1.00 - - -DEAL::-0.36 -DEAL::0.61 -DEAL::-0.36 -DEAL::0.61 diff --git a/tests/fe/q_dg0_projection_01.debug.output b/tests/fe/q_dg0_projection_01.debug.output deleted file mode 100644 index 028d8b85cf..0000000000 --- a/tests/fe/q_dg0_projection_01.debug.output +++ /dev/null @@ -1,143 +0,0 @@ - -DEAL::Dofs/cell 34Dofs/face 8 -DEAL::Dofs total 34 -DEAL::MM created -DEAL::RHS created -DEAL:cg::Starting value 0.52 -DEAL:cg::Convergence step 14 value 0 -# This file was generated by the deal.II library. - - -# -# For a description of the GNUPLOT format see the GNUPLOT manual. -# -# -0.00 0.00 1.00 1.00 -0.25 0.00 1.00 1.00 -0.50 0.00 1.00 1.00 -0.75 0.00 1.00 1.00 -1.00 0.00 1.00 1.00 - -0.15 0.12 1.00 1.00 -0.36 0.12 1.00 1.00 -0.57 0.12 1.00 1.00 -0.79 0.12 1.00 1.00 -1.00 0.12 1.00 1.00 - -0.30 0.25 1.00 1.00 -0.47 0.25 1.00 1.00 -0.65 0.25 1.00 1.00 -0.82 0.25 1.00 1.00 -1.00 0.25 1.00 1.00 - -0.45 0.38 1.00 1.00 -0.59 0.38 1.00 1.00 -0.73 0.38 1.00 1.00 -0.86 0.38 1.00 1.00 -1.00 0.38 1.00 1.00 - -0.60 0.50 1.00 1.00 -0.70 0.50 1.00 1.00 -0.80 0.50 1.00 1.00 -0.90 0.50 1.00 1.00 -1.00 0.50 1.00 1.00 - - -DEAL::1.26 -DEAL::1.26 -DEAL::1.26 -DEAL::1.26 -DEAL::Dofs total 34 -DEAL::MM created -DEAL::RHS created -DEAL:cg::Starting value 0.33 -DEAL:cg::Convergence step 22 value 0 -# This file was generated by the deal.II library. - - -# -# For a description of the GNUPLOT format see the GNUPLOT manual. -# -# -0.60 0.50 1.00 1.00 -0.70 0.50 1.00 1.00 -0.80 0.50 1.00 1.00 -0.90 0.50 1.00 1.00 -1.00 0.50 1.00 1.00 - -0.57 0.62 1.00 1.00 -0.68 0.62 1.00 1.00 -0.79 0.62 1.00 1.00 -0.89 0.62 1.00 1.00 -1.00 0.62 1.00 1.00 - -0.55 0.75 1.00 1.00 -0.66 0.75 1.00 1.00 -0.78 0.75 1.00 1.00 -0.89 0.75 1.00 1.00 -1.00 0.75 1.00 1.00 - -0.53 0.88 1.00 1.00 -0.64 0.88 1.00 1.00 -0.76 0.88 1.00 1.00 -0.88 0.88 1.00 1.00 -1.00 0.88 1.00 1.00 - -0.50 1.00 1.00 1.00 -0.62 1.00 1.00 1.00 -0.75 1.00 1.00 1.00 -0.88 1.00 1.00 1.00 -1.00 1.00 1.00 1.00 - - -DEAL::-0.18 -DEAL::-0.18 -DEAL::-0.18 -DEAL::-0.18 -DEAL::Dofs total 34 -DEAL::MM created -DEAL::RHS created -DEAL:cg::Starting value 0.63 -DEAL:cg::Convergence step 23 value 0 -# This file was generated by the deal.II library. - - -# -# For a description of the GNUPLOT format see the GNUPLOT manual. -# -# -0.00 0.00 1.00 1.00 -0.15 0.12 1.00 1.00 -0.30 0.25 1.00 1.00 -0.45 0.38 1.00 1.00 -0.60 0.50 1.00 1.00 - -0.00 0.25 1.00 1.00 -0.14 0.34 1.00 1.00 -0.29 0.44 1.00 1.00 -0.43 0.53 1.00 1.00 -0.57 0.62 1.00 1.00 - -0.00 0.50 1.00 1.00 -0.14 0.56 1.00 1.00 -0.28 0.62 1.00 1.00 -0.41 0.69 1.00 1.00 -0.55 0.75 1.00 1.00 - -0.00 0.75 1.00 1.00 -0.13 0.78 1.00 1.00 -0.26 0.81 1.00 1.00 -0.39 0.84 1.00 1.00 -0.53 0.88 1.00 1.00 - -0.00 1.00 1.00 1.00 -0.12 1.00 1.00 1.00 -0.25 1.00 1.00 1.00 -0.38 1.00 1.00 1.00 -0.50 1.00 1.00 1.00 - - -DEAL::0.11 -DEAL::0.11 -DEAL::0.11 -DEAL::0.11 diff --git a/tests/grid/mesh_3d_12.cc b/tests/grid/mesh_3d_12.cc index 291a54db6e..d500d2f2a4 100644 --- a/tests/grid/mesh_3d_12.cc +++ b/tests/grid/mesh_3d_12.cc @@ -62,9 +62,9 @@ void check_this (Triangulation<3> &tria) u, e); - deallog << " " << e.l1_norm() << std::endl; - deallog << " " << e.l2_norm() << std::endl; - deallog << " " << e.linfty_norm() << std::endl; + deallog << " " << static_cast(e.l1_norm()) << std::endl; + deallog << " " << static_cast(e.l2_norm()) << std::endl; + deallog << " " << static_cast(e.linfty_norm()) << std::endl; } @@ -91,6 +91,7 @@ int main () deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); + deallog << std::setprecision(5); { Triangulation<3> coarse_grid; diff --git a/tests/grid/mesh_3d_12.output b/tests/grid/mesh_3d_12.output index ff1ff073dd..b786d4f494 100644 --- a/tests/grid/mesh_3d_12.output +++ b/tests/grid/mesh_3d_12.output @@ -1,37 +1,37 @@ DEAL::Initial check -DEAL:: 1.93150 -DEAL:: 0.678289 -DEAL:: 0.402964 +DEAL:: 1.9315 +DEAL:: 0.67829 +DEAL:: 0.40296 DEAL::Check 0 -DEAL:: 3.77915 -DEAL:: 0.572837 -DEAL:: 0.179270 +DEAL:: 3.7791 +DEAL:: 0.57284 +DEAL:: 0.17927 DEAL::Check 1 -DEAL:: 5.86911 -DEAL:: 0.329660 -DEAL:: 0.0411273 +DEAL:: 5.8691 +DEAL:: 0.32966 +DEAL:: 0.041127 DEAL::Initial check -DEAL:: 2.52567 -DEAL:: 0.838836 -DEAL:: 0.402964 +DEAL:: 2.5257 +DEAL:: 0.83884 +DEAL:: 0.40296 DEAL::Check 0 -DEAL:: 5.28305 -DEAL:: 0.758350 -DEAL:: 0.179270 +DEAL:: 5.2830 +DEAL:: 0.75835 +DEAL:: 0.17927 DEAL::Check 1 -DEAL:: 8.26356 -DEAL:: 0.440081 -DEAL:: 0.0411273 +DEAL:: 8.2636 +DEAL:: 0.44008 +DEAL:: 0.041127 DEAL::Initial check -DEAL:: 6.63199 -DEAL:: 2.18605 -DEAL:: 0.971172 +DEAL:: 6.6320 +DEAL:: 2.1861 +DEAL:: 0.97117 DEAL::Check 0 -DEAL:: 7.24766 -DEAL:: 0.921457 -DEAL:: 0.184524 +DEAL:: 7.2477 +DEAL:: 0.92146 +DEAL:: 0.18452 DEAL::Check 1 -DEAL:: 9.04235 -DEAL:: 0.421062 -DEAL:: 0.0400020 +DEAL:: 9.0424 +DEAL:: 0.42106 +DEAL:: 0.040002 -- 2.39.5