From dfaa6b89bda03e18d5f2fe55404586c8782d0061 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Wed, 8 Feb 2017 13:54:10 +0100 Subject: [PATCH] Simplify fe/abf_02 --- tests/fe/abf_02.cc | 20 ++-- tests/fe/abf_02.output | 228 +---------------------------------------- 2 files changed, 7 insertions(+), 241 deletions(-) diff --git a/tests/fe/abf_02.cc b/tests/fe/abf_02.cc index c8de43aee1..5975264ca0 100644 --- a/tests/fe/abf_02.cc +++ b/tests/fe/abf_02.cc @@ -140,9 +140,10 @@ void EvaluateDerivative (DoFHandler<3> &dof_handler, } } - deallog << "L2-Err=" << pow (err_l2, 0.5) - << ", Hdiv-Err=" << pow (err_hdiv, 0.5) - << std::endl; + AssertThrow(err_l2 < 1.e-20, ExcInternalError()); + AssertThrow(err_hdiv < 1.e-20, ExcInternalError()); + + deallog << "OK" << std::endl; } @@ -489,7 +490,7 @@ void project (const Mapping &mapping, mass_matrix, vec, tmp, true); - SolverControl control(1000,1e-16); + SolverControl control(1000,1e-16, false, false); PrimitiveVectorMemory<> memory; SolverCG<> cg(control,memory); @@ -504,11 +505,10 @@ void project (const Mapping &mapping, -int main (int /*argc*/, char **/*argv*/) +int main () { initlog(); - Triangulation<3> tria_test; GridGenerator::hyper_cube(tria_test); @@ -546,12 +546,4 @@ int main (int /*argc*/, char **/*argv*/) solution); EvaluateDerivative (dof_handler, solution); - solution.print (deallog); - - DataOut<3> data_out; - data_out.attach_dof_handler (dof_handler); - data_out.add_data_vector (solution, "solution"); - data_out.build_patches (2); - - data_out.write_gnuplot (deallog.get_file_stream()); } diff --git a/tests/fe/abf_02.output b/tests/fe/abf_02.output index c7524e535b..82f4a64df9 100644 --- a/tests/fe/abf_02.output +++ b/tests/fe/abf_02.output @@ -6,230 +6,4 @@ DEAL:: 0.00000 1.00000 0.00000 DEAL:: 1.00000 1.00000 0.00000 DEAL::Dofs/cell 9, Dofs/face 1 DEAL::Dofs total 9 -DEAL:cg::Starting value 3.76386 -DEAL:cg::Convergence step 16 value 3.08853e-17 -DEAL::L2-Err=1.04195e-13, Hdiv-Err=7.10593e-13 -DEAL::1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 2.50000 2.00000 1.27452 -# This file was generated by the deal.II library. - - -# -# For a description of the GNUPLOT format see the GNUPLOT manual. -# -# -0.00000 0.00000 0.00000 1.00000 1.00000 1.00000 -0.500000 0.00000 0.00000 -1.66178 1.00000 1.00000 - - -0.00000 0.00000 0.00000 1.00000 1.00000 1.00000 -0.00000 0.500000 0.00000 1.00000 -3.16178 1.00000 - - -0.00000 0.00000 0.00000 1.00000 1.00000 1.00000 -0.00000 0.00000 0.500000 1.00000 1.00000 -5.33822 - - -0.500000 0.00000 0.00000 -1.66178 1.00000 1.00000 -1.00000 0.00000 0.00000 1.00000 1.00000 1.00000 - - -0.500000 0.00000 0.00000 -1.66178 1.00000 1.00000 -0.500000 0.500000 0.00000 -1.66178 -3.16178 1.00000 - - -0.500000 0.00000 0.00000 -1.66178 1.00000 1.00000 -0.500000 0.00000 0.500000 -1.66178 1.00000 -5.33822 - - -1.00000 0.00000 0.00000 1.00000 1.00000 1.00000 -1.00000 0.500000 0.00000 1.00000 -3.16178 1.00000 - - -1.00000 0.00000 0.00000 1.00000 1.00000 1.00000 -1.00000 0.00000 0.500000 1.00000 1.00000 -5.33822 - - -0.00000 0.500000 0.00000 1.00000 -3.16178 1.00000 -0.500000 0.500000 0.00000 -1.66178 -3.16178 1.00000 - - -0.00000 0.500000 0.00000 1.00000 -3.16178 1.00000 -0.00000 1.00000 0.00000 1.00000 1.00000 1.00000 - - -0.00000 0.500000 0.00000 1.00000 -3.16178 1.00000 -0.00000 0.500000 0.500000 1.00000 -3.16178 -5.33822 - - -0.500000 0.500000 0.00000 -1.66178 -3.16178 1.00000 -1.00000 0.500000 0.00000 1.00000 -3.16178 1.00000 - - -0.500000 0.500000 0.00000 -1.66178 -3.16178 1.00000 -0.500000 1.00000 0.00000 -1.66178 1.00000 1.00000 - - -0.500000 0.500000 0.00000 -1.66178 -3.16178 1.00000 -0.500000 0.500000 0.500000 -1.66178 -3.16178 -5.33822 - - -1.00000 0.500000 0.00000 1.00000 -3.16178 1.00000 -1.00000 1.00000 0.00000 1.00000 1.00000 1.00000 - - -1.00000 0.500000 0.00000 1.00000 -3.16178 1.00000 -1.00000 0.500000 0.500000 1.00000 -3.16178 -5.33822 - - -0.00000 1.00000 0.00000 1.00000 1.00000 1.00000 -0.500000 1.00000 0.00000 -1.66178 1.00000 1.00000 - - -0.00000 1.00000 0.00000 1.00000 1.00000 1.00000 -0.00000 1.00000 0.500000 1.00000 1.00000 -5.33822 - - -0.500000 1.00000 0.00000 -1.66178 1.00000 1.00000 -1.00000 1.00000 0.00000 1.00000 1.00000 1.00000 - - -0.500000 1.00000 0.00000 -1.66178 1.00000 1.00000 -0.500000 1.00000 0.500000 -1.66178 1.00000 -5.33822 - - -1.00000 1.00000 0.00000 1.00000 1.00000 1.00000 -1.00000 1.00000 0.500000 1.00000 1.00000 -5.33822 - - -0.00000 0.00000 0.500000 1.00000 1.00000 -5.33822 -0.500000 0.00000 0.500000 -1.66178 1.00000 -5.33822 - - -0.00000 0.00000 0.500000 1.00000 1.00000 -5.33822 -0.00000 0.500000 0.500000 1.00000 -3.16178 -5.33822 - - -0.00000 0.00000 0.500000 1.00000 1.00000 -5.33822 -0.00000 0.00000 1.00000 1.00000 1.00000 1.00000 - - -0.500000 0.00000 0.500000 -1.66178 1.00000 -5.33822 -1.00000 0.00000 0.500000 1.00000 1.00000 -5.33822 - - -0.500000 0.00000 0.500000 -1.66178 1.00000 -5.33822 -0.500000 0.500000 0.500000 -1.66178 -3.16178 -5.33822 - - -0.500000 0.00000 0.500000 -1.66178 1.00000 -5.33822 -0.500000 0.00000 1.00000 -1.66178 1.00000 1.00000 - - -1.00000 0.00000 0.500000 1.00000 1.00000 -5.33822 -1.00000 0.500000 0.500000 1.00000 -3.16178 -5.33822 - - -1.00000 0.00000 0.500000 1.00000 1.00000 -5.33822 -1.00000 0.00000 1.00000 1.00000 1.00000 1.00000 - - -0.00000 0.500000 0.500000 1.00000 -3.16178 -5.33822 -0.500000 0.500000 0.500000 -1.66178 -3.16178 -5.33822 - - -0.00000 0.500000 0.500000 1.00000 -3.16178 -5.33822 -0.00000 1.00000 0.500000 1.00000 1.00000 -5.33822 - - -0.00000 0.500000 0.500000 1.00000 -3.16178 -5.33822 -0.00000 0.500000 1.00000 1.00000 -3.16178 1.00000 - - -0.500000 0.500000 0.500000 -1.66178 -3.16178 -5.33822 -1.00000 0.500000 0.500000 1.00000 -3.16178 -5.33822 - - -0.500000 0.500000 0.500000 -1.66178 -3.16178 -5.33822 -0.500000 1.00000 0.500000 -1.66178 1.00000 -5.33822 - - -0.500000 0.500000 0.500000 -1.66178 -3.16178 -5.33822 -0.500000 0.500000 1.00000 -1.66178 -3.16178 1.00000 - - -1.00000 0.500000 0.500000 1.00000 -3.16178 -5.33822 -1.00000 1.00000 0.500000 1.00000 1.00000 -5.33822 - - -1.00000 0.500000 0.500000 1.00000 -3.16178 -5.33822 -1.00000 0.500000 1.00000 1.00000 -3.16178 1.00000 - - -0.00000 1.00000 0.500000 1.00000 1.00000 -5.33822 -0.500000 1.00000 0.500000 -1.66178 1.00000 -5.33822 - - -0.00000 1.00000 0.500000 1.00000 1.00000 -5.33822 -0.00000 1.00000 1.00000 1.00000 1.00000 1.00000 - - -0.500000 1.00000 0.500000 -1.66178 1.00000 -5.33822 -1.00000 1.00000 0.500000 1.00000 1.00000 -5.33822 - - -0.500000 1.00000 0.500000 -1.66178 1.00000 -5.33822 -0.500000 1.00000 1.00000 -1.66178 1.00000 1.00000 - - -1.00000 1.00000 0.500000 1.00000 1.00000 -5.33822 -1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 - - -0.00000 0.00000 1.00000 1.00000 1.00000 1.00000 -0.500000 0.00000 1.00000 -1.66178 1.00000 1.00000 - - -0.00000 0.00000 1.00000 1.00000 1.00000 1.00000 -0.00000 0.500000 1.00000 1.00000 -3.16178 1.00000 - - -0.500000 0.00000 1.00000 -1.66178 1.00000 1.00000 -1.00000 0.00000 1.00000 1.00000 1.00000 1.00000 - - -0.500000 0.00000 1.00000 -1.66178 1.00000 1.00000 -0.500000 0.500000 1.00000 -1.66178 -3.16178 1.00000 - - -1.00000 0.00000 1.00000 1.00000 1.00000 1.00000 -1.00000 0.500000 1.00000 1.00000 -3.16178 1.00000 - - -0.00000 0.500000 1.00000 1.00000 -3.16178 1.00000 -0.500000 0.500000 1.00000 -1.66178 -3.16178 1.00000 - - -0.00000 0.500000 1.00000 1.00000 -3.16178 1.00000 -0.00000 1.00000 1.00000 1.00000 1.00000 1.00000 - - -0.500000 0.500000 1.00000 -1.66178 -3.16178 1.00000 -1.00000 0.500000 1.00000 1.00000 -3.16178 1.00000 - - -0.500000 0.500000 1.00000 -1.66178 -3.16178 1.00000 -0.500000 1.00000 1.00000 -1.66178 1.00000 1.00000 - - -1.00000 0.500000 1.00000 1.00000 -3.16178 1.00000 -1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 - - -0.00000 1.00000 1.00000 1.00000 1.00000 1.00000 -0.500000 1.00000 1.00000 -1.66178 1.00000 1.00000 - - -0.500000 1.00000 1.00000 -1.66178 1.00000 1.00000 -1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 - - +DEAL::OK -- 2.39.5