From: kronbichler Date: Mon, 6 May 2013 19:51:08 +0000 (+0000) Subject: Actually test right preconditioning. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13b607813420bdbfcbaae2d5e241805f2adebfcc;p=dealii-svn.git Actually test right preconditioning. git-svn-id: https://svn.dealii.org/trunk@29463 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/lac/solver.cc b/tests/lac/solver.cc index 07ad60d193..e459072583 100644 --- a/tests/lac/solver.cc +++ b/tests/lac/solver.cc @@ -77,8 +77,8 @@ int main() SolverControl verbose_control(100, 1.e-3, true); SolverCG<> cg(control, mem); SolverGMRES<> gmres(control, mem, 8); - SolverGMRES<>::AdditionalData(8, true); - SolverGMRES<> gmresright(control, mem, 8); + SolverGMRES<>::AdditionalData data(8, true); + SolverGMRES<> gmresright(control, mem, data); SolverMinRes<> minres(control, mem); SolverBicgstab<> bicgstab(control, mem); SolverRichardson<> rich(control, mem); diff --git a/tests/lac/solver/cmp/generic b/tests/lac/solver/cmp/generic index a5b623b562..8cef71a4b4 100644 --- a/tests/lac/solver/cmp/generic +++ b/tests/lac/solver/cmp/generic @@ -31,7 +31,7 @@ DEAL:rich:Bicgstab::Starting value 3.000 DEAL:rich:Bicgstab::Convergence step 3 value 0 DEAL:rich:GMRES::Starting value 1.800 DEAL:rich:GMRES::Convergence step 3 value 0 -DEAL:rich:GMRES::Starting value 1.800 +DEAL:rich:GMRES::Starting value 3.000 DEAL:rich:GMRES::Convergence step 3 value 0 DEAL:rich:QMRS::Starting value 3.000 DEAL:rich:QMRS::Convergence step 3 value 0 @@ -45,8 +45,8 @@ DEAL:ssor:Bicgstab::Starting value 3.000 DEAL:ssor:Bicgstab::Convergence step 2 value 0.0003670 DEAL:ssor:GMRES::Starting value 1.920 DEAL:ssor:GMRES::Convergence step 3 value 0.0003574 -DEAL:ssor:GMRES::Starting value 1.920 -DEAL:ssor:GMRES::Convergence step 3 value 0.0003574 +DEAL:ssor:GMRES::Starting value 3.000 +DEAL:ssor:GMRES::Convergence step 4 value 5.994e-05 DEAL:ssor:QMRS::Starting value 3.000 DEAL:ssor:QMRS::Convergence step 4 value 0.0001345 DEAL:sor:RichardsonT::Starting value 3.000 @@ -59,8 +59,10 @@ DEAL:sor::Iterative method reported convergence failure in step 100 with residua DEAL:sor:Bicgstab::Starting value 3.000 DEAL:sor:Bicgstab::Convergence step 5 value 0 DEAL:sor:GMRES::Starting value 1.462 +DEAL:sor:GMRES::Re-orthogonalization enabled at step 5 DEAL:sor:GMRES::Convergence step 5 value 0 -DEAL:sor:GMRES::Starting value 1.462 +DEAL:sor:GMRES::Starting value 3.000 +DEAL:sor:GMRES::Re-orthogonalization enabled at step 5 DEAL:sor:GMRES::Convergence step 5 value 0 DEAL:psor:RichardsonT::Starting value 3.000 DEAL:psor:RichardsonT::Convergence step 8 value 0.0004237 @@ -73,8 +75,8 @@ DEAL:psor:Bicgstab::Starting value 3.000 DEAL:psor:Bicgstab::Convergence step 4 value 0.0002656 DEAL:psor:GMRES::Starting value 1.467 DEAL:psor:GMRES::Convergence step 5 value 0.0006649 -DEAL:psor:GMRES::Starting value 1.467 -DEAL:psor:GMRES::Convergence step 5 value 0.0006649 +DEAL:psor:GMRES::Starting value 3.000 +DEAL:psor:GMRES::Convergence step 6 value 0.0004455 DEAL::Size 12 Unknowns 121 DEAL::SOR-diff:0 DEAL:no-fail:cg::Starting value 11.00 @@ -113,8 +115,8 @@ DEAL:rich:Bicgstab::Starting value 11.00 DEAL:rich:Bicgstab::Convergence step 10 value 0.0002572 DEAL:rich:GMRES::Starting value 6.600 DEAL:rich:GMRES::Convergence step 42 value 0.0007803 -DEAL:rich:GMRES::Starting value 6.600 -DEAL:rich:GMRES::Convergence step 42 value 0.0007803 +DEAL:rich:GMRES::Starting value 11.00 +DEAL:rich:GMRES::Convergence step 43 value 0.0009788 DEAL:rich:QMRS::Starting value 11.00 DEAL:rich:QMRS::Convergence step 16 value 0.0002583 DEAL:ssor:RichardsonT::Starting value 11.00 @@ -127,8 +129,8 @@ DEAL:ssor:Bicgstab::Starting value 11.00 DEAL:ssor:Bicgstab::Convergence step 4 value 0.0003834 DEAL:ssor:GMRES::Starting value 13.27 DEAL:ssor:GMRES::Convergence step 7 value 0.0008206 -DEAL:ssor:GMRES::Starting value 13.27 -DEAL:ssor:GMRES::Convergence step 7 value 0.0008206 +DEAL:ssor:GMRES::Starting value 11.00 +DEAL:ssor:GMRES::Convergence step 8 value 0.0004929 DEAL:ssor:QMRS::Starting value 11.00 DEAL:ssor:QMRS::Convergence step 9 value 0.0004140 DEAL:sor:RichardsonT::Starting value 11.00 @@ -142,8 +144,8 @@ DEAL:sor:Bicgstab::Starting value 11.00 DEAL:sor:Bicgstab::Convergence step 12 value 0.0007246 DEAL:sor:GMRES::Starting value 7.322 DEAL:sor:GMRES::Convergence step 23 value 0.0006981 -DEAL:sor:GMRES::Starting value 7.322 -DEAL:sor:GMRES::Convergence step 23 value 0.0006981 +DEAL:sor:GMRES::Starting value 11.00 +DEAL:sor:GMRES::Convergence step 24 value 0.0007120 DEAL:psor:RichardsonT::Starting value 11.00 DEAL:psor:RichardsonT::Convergence step 89 value 0.0009736 DEAL:psor:Richardson::Starting value 11.00 @@ -155,5 +157,5 @@ DEAL:psor:Bicgstab::Starting value 11.00 DEAL:psor:Bicgstab::Convergence step 10 value 0.0003167 DEAL:psor:GMRES::Starting value 7.345 DEAL:psor:GMRES::Convergence step 20 value 0.0008491 -DEAL:psor:GMRES::Starting value 7.345 -DEAL:psor:GMRES::Convergence step 20 value 0.0008491 +DEAL:psor:GMRES::Starting value 11.00 +DEAL:psor:GMRES::Convergence step 23 value 0.0007600