From: heister Date: Tue, 12 Oct 2010 19:00:41 +0000 (+0000) Subject: Fix SolverSelector test with new interface. We also need to set a SolverControl in... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b47f35efa10b4268fa3edbc1a54667ae9f070048;p=dealii-svn.git Fix SolverSelector test with new interface. We also need to set a SolverControl in every case. git-svn-id: https://svn.dealii.org/trunk@22315 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/lac/solver_selector_01.cc b/tests/lac/solver_selector_01.cc index 8ce9355626..ccc5e9e7f9 100644 --- a/tests/lac/solver_selector_01.cc +++ b/tests/lac/solver_selector_01.cc @@ -10,6 +10,7 @@ // //---------------------------------------------------------------------- +// Test the SolverSelector class. #include "../tests.h" #include "testmatrix.h" @@ -31,23 +32,18 @@ check(const MATRIX& A, const VECTOR& f) names.push_back("gmres"); names.push_back("fgmres"); + ReductionControl cont1(100, 0., 1.e-4); + SolverControl cont2(100, 1.e-7); SolverSelector solver; PreconditionSSOR > pre; pre.initialize(A); VECTOR u; u.reinit(f); - - std::vector::const_iterator name; - for (name = names.begin(); name != names.end();++name) - { - solver.select(*name); - u = 0.; - solver.solve(A, u, f, pre); - } - ReductionControl cont1(100, 0., 1.e-4); - solver.control = cont1; + std::vector::const_iterator name; + + solver.set_control(cont1); for (name = names.begin(); name != names.end();++name) { solver.select(*name); @@ -55,8 +51,7 @@ check(const MATRIX& A, const VECTOR& f) solver.solve(A, u, f, pre); } - SolverControl cont2(100, 1.e-7); - solver.control = cont2; + solver.set_control(cont2); for (name = names.begin(); name != names.end();++name) { solver.select(*name); diff --git a/tests/lac/solver_selector_01/cmp/generic b/tests/lac/solver_selector_01/cmp/generic index 983fde2641..200218e230 100644 --- a/tests/lac/solver_selector_01/cmp/generic +++ b/tests/lac/solver_selector_01/cmp/generic @@ -1,14 +1,6 @@ DEAL::Size 37 Unknowns 1296 DEAL:cg::Starting value 36.00 -DEAL:cg::Convergence step 14 value 0.2102 -DEAL:Bicgstab::Starting value 36.00 -DEAL:Bicgstab::Convergence step 5 value 0.2814 -DEAL:GMRES::Starting value 34.45 -DEAL:GMRES::Convergence step 13 value 0.1890 -DEAL:FGMRES::Starting value 36.00 -DEAL:FGMRES::Convergence step 13 value 0.2928 -DEAL:cg::Starting value 36.00 DEAL:cg::Convergence step 21 value 0.003095 DEAL:Bicgstab::Starting value 36.00 DEAL:Bicgstab::Convergence step 10 value 0.003158