From 53e52f4305585b3f4fd9048d6fbf005010392d0e Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Tue, 29 Aug 2017 17:40:18 +0200 Subject: [PATCH] Relax fe/*projection_01 tests --- tests/fe/abf_projection_01.cc | 3 +- tests/fe/abf_projection_01.output | 189 ++++++++++++------------ tests/fe/deformed_projection.h | 9 +- tests/fe/fe_sys_projection_01.cc | 3 +- tests/fe/fe_sys_projection_01.output | 9 +- tests/fe/q_bubbles_projection_01.cc | 3 +- tests/fe/q_bubbles_projection_01.output | 189 ++++++++++++------------ tests/fe/q_iso_q1_projection_01.cc | 3 +- tests/fe/q_iso_q1_projection_01.output | 189 ++++++++++++------------ tests/fe/rt_projection_01.cc | 3 +- tests/fe/rt_projection_01.output | 189 ++++++++++++------------ 11 files changed, 391 insertions(+), 398 deletions(-) diff --git a/tests/fe/abf_projection_01.cc b/tests/fe/abf_projection_01.cc index e80407ec65..e570e0e865 100644 --- a/tests/fe/abf_projection_01.cc +++ b/tests/fe/abf_projection_01.cc @@ -28,5 +28,6 @@ char logname[] = "output"; void test () { FE_ABF<2> fe (0); - check (fe); + const std::array min_convergence_steps = {{8,7,7}}; + check (fe, min_convergence_steps); } diff --git a/tests/fe/abf_projection_01.output b/tests/fe/abf_projection_01.output index 0c18495c70..d46c52b4cb 100644 --- a/tests/fe/abf_projection_01.output +++ b/tests/fe/abf_projection_01.output @@ -3,44 +3,43 @@ DEAL::Dofs/cell 6Dofs/face 1 DEAL::Dofs total 6 DEAL::MM created DEAL::RHS created -DEAL:cg::Starting value 1.99 -DEAL:cg::Convergence step 9 value 0 +DEAL::Solver stopped within 8 - 10 iterations # 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 +# +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::-0.10 @@ -50,44 +49,43 @@ DEAL::0.40 DEAL::Dofs total 6 DEAL::MM created DEAL::RHS created -DEAL:cg::Starting value 1.19 -DEAL:cg::Convergence step 8 value 0 +DEAL::Solver stopped within 7 - 9 iterations # 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 +# +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.60 @@ -97,44 +95,43 @@ DEAL::0.50 DEAL::Dofs total 6 DEAL::MM created DEAL::RHS created -DEAL:cg::Starting value 1.99 -DEAL:cg::Convergence step 8 value 0 +DEAL::Solver stopped within 7 - 9 iterations # 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 +# +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::1.00 diff --git a/tests/fe/deformed_projection.h b/tests/fe/deformed_projection.h index bb1c41a9d2..0e4b520575 100644 --- a/tests/fe/deformed_projection.h +++ b/tests/fe/deformed_projection.h @@ -476,6 +476,7 @@ void project (const Mapping &mapping, const Quadrature &quadrature, const Function &function, Vector &vec, + const unsigned int min_convergence_steps, const bool enforce_zero_boundary = false, const Quadrature & = QGauss(2), const bool project_to_boundary_first = false) @@ -582,7 +583,9 @@ void project (const Mapping &mapping, PreconditionSSOR<> prec; prec.initialize(mass_matrix, 1.2); // solve - cg.solve (mass_matrix, vec, tmp, prec); + check_solver_within_range(cg.solve(mass_matrix,vec,tmp,prec), + control.last_step(), + min_convergence_steps, min_convergence_steps+2); // distribute solution constraints.distribute (vec); @@ -701,7 +704,7 @@ int main (int /*argc*/, char **/*argv*/) -void check (const FiniteElement<2> &fe) +void check (const FiniteElement<2> &fe, const std::array &min_convergence_steps) { Triangulation<2> tria_test; DoFHandler<2> *dof_handler; @@ -733,7 +736,7 @@ void check (const FiniteElement<2> &fe) project (map_default, *dof_handler, hn_constraints, QGauss<2> (6), TestMap1<2>(2), - solution); + solution, min_convergence_steps[elm]); // Test the core functionality DataOut<2> *data_out = new DataOut<2>; diff --git a/tests/fe/fe_sys_projection_01.cc b/tests/fe/fe_sys_projection_01.cc index 51c1cc61e2..bb8d19cd44 100644 --- a/tests/fe/fe_sys_projection_01.cc +++ b/tests/fe/fe_sys_projection_01.cc @@ -29,5 +29,6 @@ char logname[] = "output"; void test () { FESystem<2> fe (FE_Q<2>(3), 2); - check (fe); + const std::array min_convergence_steps = {{12,12,12}}; + check (fe, min_convergence_steps); } diff --git a/tests/fe/fe_sys_projection_01.output b/tests/fe/fe_sys_projection_01.output index 4ce08a998b..1aa2c6e107 100644 --- a/tests/fe/fe_sys_projection_01.output +++ b/tests/fe/fe_sys_projection_01.output @@ -3,8 +3,7 @@ DEAL::Dofs/cell 32Dofs/face 8 DEAL::Dofs total 32 DEAL::MM created DEAL::RHS created -DEAL:cg::Starting value 0.18 -DEAL:cg::Convergence step 13 value 0 +DEAL::Solver stopped within 12 - 14 iterations # This file was generated by the deal.II library. @@ -50,8 +49,7 @@ DEAL::1.00 DEAL::Dofs total 32 DEAL::MM created DEAL::RHS created -DEAL:cg::Starting value 0.12 -DEAL:cg::Convergence step 13 value 0 +DEAL::Solver stopped within 12 - 14 iterations # This file was generated by the deal.II library. @@ -97,8 +95,7 @@ DEAL::1.00 DEAL::Dofs total 32 DEAL::MM created DEAL::RHS created -DEAL:cg::Starting value 0.22 -DEAL:cg::Convergence step 13 value 0 +DEAL::Solver stopped within 12 - 14 iterations # This file was generated by the deal.II library. diff --git a/tests/fe/q_bubbles_projection_01.cc b/tests/fe/q_bubbles_projection_01.cc index e3ee32defc..92e3dfd586 100644 --- a/tests/fe/q_bubbles_projection_01.cc +++ b/tests/fe/q_bubbles_projection_01.cc @@ -29,5 +29,6 @@ char logname[] = "output"; void test () { FESystem<2> fe (FE_Q_Bubbles<2>(QIterated<1>(QTrapez<1>(),3)), 2); - check (fe); + const std::array min_convergence_steps = {{15,15,15}}; + check (fe, min_convergence_steps); } diff --git a/tests/fe/q_bubbles_projection_01.output b/tests/fe/q_bubbles_projection_01.output index 00c5ffdd59..8e2fe13ad1 100644 --- a/tests/fe/q_bubbles_projection_01.output +++ b/tests/fe/q_bubbles_projection_01.output @@ -3,44 +3,43 @@ DEAL::Dofs/cell 36Dofs/face 8 DEAL::Dofs total 36 DEAL::MM created DEAL::RHS created -DEAL:cg::Starting value 0.17 -DEAL:cg::Convergence step 16 value 0 +DEAL::Solver stopped within 15 - 17 iterations # 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 +# +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.00 @@ -50,44 +49,43 @@ DEAL::1.00 DEAL::Dofs total 36 DEAL::MM created DEAL::RHS created -DEAL:cg::Starting value 0.11 -DEAL:cg::Convergence step 16 value 0 +DEAL::Solver stopped within 15 - 17 iterations # 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 +# +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::1.00 @@ -97,44 +95,43 @@ DEAL::1.00 DEAL::Dofs total 36 DEAL::MM created DEAL::RHS created -DEAL:cg::Starting value 0.21 -DEAL:cg::Convergence step 16 value 0 +DEAL::Solver stopped within 15 - 17 iterations # 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 +# +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::1.00 diff --git a/tests/fe/q_iso_q1_projection_01.cc b/tests/fe/q_iso_q1_projection_01.cc index d170772f52..ab34d44940 100644 --- a/tests/fe/q_iso_q1_projection_01.cc +++ b/tests/fe/q_iso_q1_projection_01.cc @@ -29,5 +29,6 @@ char logname[] = "output"; void test () { FESystem<2> fe (FE_Q_iso_Q1<2>(3), 2); - check (fe); + const std::array min_convergence_steps = {{13,13,13}}; + check (fe, min_convergence_steps); } diff --git a/tests/fe/q_iso_q1_projection_01.output b/tests/fe/q_iso_q1_projection_01.output index 0c16e693d4..94c150c104 100644 --- a/tests/fe/q_iso_q1_projection_01.output +++ b/tests/fe/q_iso_q1_projection_01.output @@ -3,44 +3,43 @@ DEAL::Dofs/cell 32Dofs/face 8 DEAL::Dofs total 32 DEAL::MM created DEAL::RHS created -DEAL:cg::Starting value 0.14 -DEAL:cg::Convergence step 14 value 0 +DEAL::Solver stopped within 13 - 15 iterations # 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 +# +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.00 @@ -50,44 +49,43 @@ DEAL::1.00 DEAL::Dofs total 32 DEAL::MM created DEAL::RHS created -DEAL:cg::Starting value 0.09 -DEAL:cg::Convergence step 14 value 0 +DEAL::Solver stopped within 13 - 15 iterations # 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 +# +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::1.00 @@ -97,44 +95,43 @@ DEAL::1.00 DEAL::Dofs total 32 DEAL::MM created DEAL::RHS created -DEAL:cg::Starting value 0.17 -DEAL:cg::Convergence step 14 value 0 +DEAL::Solver stopped within 13 - 15 iterations # 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 +# +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::1.00 diff --git a/tests/fe/rt_projection_01.cc b/tests/fe/rt_projection_01.cc index b45cacdf54..8ee607a15e 100644 --- a/tests/fe/rt_projection_01.cc +++ b/tests/fe/rt_projection_01.cc @@ -28,5 +28,6 @@ char logname[] = "output"; void test () { FE_RaviartThomas<2> fe (0); - check (fe); + const std::array min_convergence_steps = {{3,3,3}}; + check (fe, min_convergence_steps); } diff --git a/tests/fe/rt_projection_01.output b/tests/fe/rt_projection_01.output index b68844264e..79e98e0fe8 100644 --- a/tests/fe/rt_projection_01.output +++ b/tests/fe/rt_projection_01.output @@ -3,44 +3,43 @@ DEAL::Dofs/cell 4Dofs/face 1 DEAL::Dofs total 4 DEAL::MM created DEAL::RHS created -DEAL:cg::Starting value 0.75 -DEAL:cg::Convergence step 4 value 0 +DEAL::Solver stopped within 3 - 5 iterations # 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 +# +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::-0.10 @@ -50,44 +49,43 @@ DEAL::0.40 DEAL::Dofs total 4 DEAL::MM created DEAL::RHS created -DEAL:cg::Starting value 0.45 -DEAL:cg::Convergence step 4 value 0 +DEAL::Solver stopped within 3 - 5 iterations # 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 +# +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.60 @@ -97,44 +95,43 @@ DEAL::0.50 DEAL::Dofs total 4 DEAL::MM created DEAL::RHS created -DEAL:cg::Starting value 0.75 -DEAL:cg::Convergence step 4 value 0 +DEAL::Solver stopped within 3 - 5 iterations # 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 +# +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::1.00 -- 2.39.5