From: kronbichler Date: Sat, 1 Mar 2014 10:45:09 +0000 (+0000) Subject: Suppress log messages from SolverCG because the iteration numbers are too sensitive... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf846a09bed1f618467a4477e73d2ba761df8a59;p=dealii-svn.git Suppress log messages from SolverCG because the iteration numbers are too sensitive (and not central to this test, only needed for a reference solution) git-svn-id: https://svn.dealii.org/trunk@32592 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/matrix_free/inverse_mass_01.cc b/tests/matrix_free/inverse_mass_01.cc index 1c015f0fd5..fbbe6a15f8 100644 --- a/tests/matrix_free/inverse_mass_01.cc +++ b/tests/matrix_free/inverse_mass_01.cc @@ -144,9 +144,14 @@ void do_test (const DoFHandler &dof) mf.apply_inverse (inverse, in); - SolverControl control(1000, 1e-10); + SolverControl control(1000, 1e-12); + // do not output iteration numbers to log file because these are too + // sensitive + std::ostringstream stream; + deallog.attach(stream); SolverCG > solver(control); solver.solve (mf, reference, in, PreconditionIdentity()); + deallog.attach(logfile); inverse -= reference; const double diff_norm = inverse.linfty_norm() / reference.linfty_norm(); diff --git a/tests/matrix_free/inverse_mass_01.output b/tests/matrix_free/inverse_mass_01.output index 7f51cbd39d..fec289a4b0 100644 --- a/tests/matrix_free/inverse_mass_01.output +++ b/tests/matrix_free/inverse_mass_01.output @@ -1,41 +1,33 @@ DEAL:2d::Testing FE_DGQ<2>(1) -DEAL:2d:cg::Starting value 6.32 -DEAL:2d:cg::Convergence step 48 value 0 + DEAL:2d::Norm of difference: 0 DEAL:2d:: DEAL:2d:float::Testing FE_DGQ<2>(1) -DEAL:2d:float:cg::Starting value 6.15 -DEAL:2d:float:cg::Convergence step 57 value 0 + DEAL:2d:float::Norm of difference: 0 DEAL:2d:float:: DEAL:2d::Testing FE_DGQ<2>(2) -DEAL:2d:cg::Starting value 8.62 -DEAL:2d:cg::Convergence step 105 value 0 + DEAL:2d::Norm of difference: 0 DEAL:2d:: DEAL:2d:float::Testing FE_DGQ<2>(2) -DEAL:2d:float:cg::Starting value 9.05 -DEAL:2d:float:cg::Convergence step 133 value 0 + DEAL:2d:float::Norm of difference: 0 DEAL:2d:float:: DEAL:2d::Testing FE_DGQ<2>(4) -DEAL:2d:cg::Starting value 14.6 -DEAL:2d:cg::Convergence step 311 value 0 + DEAL:2d::Norm of difference: 0 DEAL:2d:: DEAL:2d:float::Testing FE_DGQ<2>(4) -DEAL:2d:float:cg::Starting value 14.7 -DEAL:2d:float:cg::Convergence step 376 value 0 + DEAL:2d:float::Norm of difference: 0 DEAL:2d:float:: DEAL:3d::Testing FE_DGQ<3>(1) -DEAL:3d:cg::Starting value 13.7 -DEAL:3d:cg::Convergence step 124 value 0 + DEAL:3d::Norm of difference: 0 DEAL:3d:: DEAL:3d::Testing FE_DGQ<3>(2) -DEAL:3d:cg::Starting value 13.5 -DEAL:3d:cg::Convergence step 241 value 0 + DEAL:3d::Norm of difference: 0 DEAL:3d:: diff --git a/tests/matrix_free/inverse_mass_02.cc b/tests/matrix_free/inverse_mass_02.cc index b9f022eb64..4c973ed1d9 100644 --- a/tests/matrix_free/inverse_mass_02.cc +++ b/tests/matrix_free/inverse_mass_02.cc @@ -144,8 +144,11 @@ void do_test (const DoFHandler &dof) mf.apply_inverse (inverse, in); SolverControl control(1000, 1e-12); + std::ostringstream stream; + deallog.attach(stream); SolverCG > solver(control); solver.solve (mf, reference, in, PreconditionIdentity()); + deallog.attach(logfile); inverse -= reference; const double diff_norm = inverse.linfty_norm() / reference.linfty_norm(); diff --git a/tests/matrix_free/inverse_mass_02.output b/tests/matrix_free/inverse_mass_02.output index 67b9f69785..7d5a4feb9e 100644 --- a/tests/matrix_free/inverse_mass_02.output +++ b/tests/matrix_free/inverse_mass_02.output @@ -1,26 +1,21 @@ DEAL:2d::Testing FESystem<2>[FE_DGQ<2>(1)^2] -DEAL:2d:cg::Starting value 7.90 -DEAL:2d:cg::Convergence step 7 value 0 + DEAL:2d::Norm of difference: 0 DEAL:2d:: DEAL:2d::Testing FESystem<2>[FE_DGQ<2>(2)^2] -DEAL:2d:cg::Starting value 11.6 -DEAL:2d:cg::Convergence step 15 value 0 + DEAL:2d::Norm of difference: 0 DEAL:2d:: DEAL:2d::Testing FESystem<2>[FE_DGQ<2>(4)^2] -DEAL:2d:cg::Starting value 19.1 -DEAL:2d:cg::Convergence step 46 value 0 + DEAL:2d::Norm of difference: 0 DEAL:2d:: DEAL:3d::Testing FESystem<3>[FE_DGQ<3>(1)^3] -DEAL:3d:cg::Starting value 25.0 -DEAL:3d:cg::Convergence step 10 value 0 + DEAL:3d::Norm of difference: 0 DEAL:3d:: DEAL:3d::Testing FESystem<3>[FE_DGQ<3>(2)^3] -DEAL:3d:cg::Starting value 24.3 -DEAL:3d:cg::Convergence step 32 value 0 + DEAL:3d::Norm of difference: 0 DEAL:3d:: diff --git a/tests/matrix_free/inverse_mass_03.cc b/tests/matrix_free/inverse_mass_03.cc index 512fb83060..401affb168 100644 --- a/tests/matrix_free/inverse_mass_03.cc +++ b/tests/matrix_free/inverse_mass_03.cc @@ -158,8 +158,11 @@ void do_test (const DoFHandler &dof) mf.apply_inverse (inverse, in); SolverControl control(10000, 1e-12); + std::ostringstream stream; + deallog.attach(stream); SolverCG > solver(control); solver.solve (mf, reference, in, PreconditionIdentity()); + deallog.attach(logfile); inverse -= reference; const double diff_norm = inverse.linfty_norm() / reference.linfty_norm(); diff --git a/tests/matrix_free/inverse_mass_03.output b/tests/matrix_free/inverse_mass_03.output index 35799127ea..d7d939486b 100644 --- a/tests/matrix_free/inverse_mass_03.output +++ b/tests/matrix_free/inverse_mass_03.output @@ -1,26 +1,21 @@ DEAL:2d::Testing FESystem<2>[FE_DGQ<2>(1)^3] -DEAL:2d:cg::Starting value 10.6 -DEAL:2d:cg::Convergence step 108 value 0 + DEAL:2d::Norm of difference: 0 DEAL:2d:: DEAL:2d::Testing FESystem<2>[FE_DGQ<2>(2)^3] -DEAL:2d:cg::Starting value 15.1 -DEAL:2d:cg::Convergence step 252 value 0 + DEAL:2d::Norm of difference: 0 DEAL:2d:: DEAL:2d::Testing FESystem<2>[FE_DGQ<2>(4)^3] -DEAL:2d:cg::Starting value 25.4 -DEAL:2d:cg::Convergence step 699 value 0 + DEAL:2d::Norm of difference: 0 DEAL:2d:: DEAL:3d::Testing FESystem<3>[FE_DGQ<3>(1)^3] -DEAL:3d:cg::Starting value 23.7 -DEAL:3d:cg::Convergence step 412 value 0 + DEAL:3d::Norm of difference: 0 DEAL:3d:: DEAL:3d::Testing FESystem<3>[FE_DGQ<3>(2)^3] -DEAL:3d:cg::Starting value 23.7 -DEAL:3d:cg::Convergence step 1019 value 0 + DEAL:3d::Norm of difference: 0 DEAL:3d::