Fix failing tests

diff --git a/tests/bits/deal_solver_05.output b/tests/bits/deal_solver_05.output
index 1f52813be68da53ba7225959c93ae044fe4e7b2e..767efc55c9fb0b8999cc3944a1735748fe42b562 100644 (file)
--- a/tests/bits/deal_solver_05.output
+++ b/tests/bits/deal_solver_05.output
@@ -1,6 +1,6 @@
 
 DEAL::Size 32 Unknowns 961
 DEAL::Solver type: N6dealii10SolverQMRSINS_6VectorIdEEEE
-DEAL:QMRS::Starting value 31.00
-DEAL:QMRS::Convergence step 46 value 0.0009063
+DEAL:SQMR::Starting value 31.00
+DEAL:SQMR::Convergence step 46 value 0.0009063
 DEAL::Solver stopped after 46 iterations

diff --git a/tests/lac/linear_operator_08.with_umfpack=off.with_lapack=true.output b/tests/lac/linear_operator_08.with_umfpack=off.with_lapack=true.output
index 55468cb785450465244d8741d005fb7e05f06825..571ea2c24e0ce34c53cf9a92c1351ba4b5ddb58d 100644 (file)
--- a/tests/lac/linear_operator_08.with_umfpack=off.with_lapack=true.output
+++ b/tests/lac/linear_operator_08.with_umfpack=off.with_lapack=true.output
@@ -2,7 +2,7 @@
 DEAL::Preconditioners
 DEAL:Preconditioners::PreconditionChebyshev
 DEAL:Preconditioners:Exact inverse:cg::Starting value 16.88194302
-DEAL:Preconditioners:Exact inverse:cg::Convergence step 1 value 2.601335705e-15
+DEAL:Preconditioners:Exact inverse:cg::Convergence step 1 value 9.930136613e-16
 DEAL:Preconditioners::PreconditionIdentity
 DEAL:Preconditioners:Exact inverse:cg::Starting value 16.88194302
 DEAL:Preconditioners:Exact inverse:cg::Convergence step 1 value 3.903187958e-15
@@ -47,24 +47,24 @@ DEAL:Solvers:Linear operator:cg::Starting value 16.88194302
 DEAL:Solvers:Linear operator:cg::Convergence step 1 value 0.000000000
 DEAL:Solvers::SolverFGMRES
 DEAL:Solvers:Standard solver:FGMRES::Starting value 16.88194302
-DEAL:Solvers:Standard solver:FGMRES::Convergence step 1 value 2.744725072e-15
+DEAL:Solvers:Standard solver:FGMRES::Convergence step 1 value 3.696939525e-15
 DEAL:Solvers:Linear operator:FGMRES::Starting value 16.88194302
-DEAL:Solvers:Linear operator:FGMRES::Convergence step 1 value 2.744725072e-15
+DEAL:Solvers:Linear operator:FGMRES::Convergence step 1 value 3.696939525e-15
 DEAL:Solvers::SolverGMRES
 DEAL:Solvers:Standard solver:GMRES::Starting value 8.440971508
-DEAL:Solvers:Standard solver:GMRES::Convergence step 1 value 1.372362536e-15
+DEAL:Solvers:Standard solver:GMRES::Convergence step 1 value 1.848469762e-15
 DEAL:Solvers:Linear operator:GMRES::Starting value 8.440971508
-DEAL:Solvers:Linear operator:GMRES::Convergence step 1 value 1.372362536e-15
+DEAL:Solvers:Linear operator:GMRES::Convergence step 1 value 1.848469762e-15
 DEAL:Solvers::SolverMinRes
 DEAL:Solvers:Standard solver:minres::Starting value 11.93733639
 DEAL:Solvers:Standard solver:minres::Convergence step 1 value 2.059168646e-15
 DEAL:Solvers:Linear operator:minres::Starting value 11.93733639
 DEAL:Solvers:Linear operator:minres::Convergence step 1 value 2.059168646e-15
 DEAL:Solvers::SolverQMRS
-DEAL:Solvers:Standard solver:QMRS::Starting value 16.88194302
-DEAL:Solvers:Standard solver:QMRS::Convergence step 1 value 0.000000000
-DEAL:Solvers:Linear operator:QMRS::Starting value 16.88194302
-DEAL:Solvers:Linear operator:QMRS::Convergence step 1 value 0.000000000
+DEAL:Solvers:Standard solver:SQMR::Starting value 16.88194302
+DEAL:Solvers:Standard solver:SQMR::Convergence step 1 value 0.000000000
+DEAL:Solvers:Linear operator:SQMR::Starting value 16.88194302
+DEAL:Solvers:Linear operator:SQMR::Convergence step 1 value 0.000000000
 DEAL:Solvers::SolverRelaxation
 DEAL:Solvers:Standard solver:Relaxation::Starting value 16.88194302
 DEAL:Solvers:Standard solver:Relaxation::Convergence step 1 value 0.000000000

diff --git a/tests/lac/linear_operator_08.with_umfpack=on.output b/tests/lac/linear_operator_08.with_umfpack=on.output
index d47fd5d5edbc298d3275eb05d284c5e24273295b..575b393bdadbc9c07da7b9031d59e181c544dcb1 100644 (file)
--- a/tests/lac/linear_operator_08.with_umfpack=on.output
+++ b/tests/lac/linear_operator_08.with_umfpack=on.output
@@ -2,7 +2,7 @@
 DEAL::Preconditioners
 DEAL:Preconditioners::PreconditionChebyshev
 DEAL:Preconditioners:Exact inverse:cg::Starting value 16.88194302
-DEAL:Preconditioners:Exact inverse:cg::Convergence step 1 value 2.601335705e-15
+DEAL:Preconditioners:Exact inverse:cg::Convergence step 1 value 9.930136613e-16
 DEAL:Preconditioners::PreconditionIdentity
 DEAL:Preconditioners:Exact inverse:cg::Starting value 16.88194302
 DEAL:Preconditioners:Exact inverse:cg::Convergence step 1 value 3.903187958e-15
@@ -47,24 +47,24 @@ DEAL:Solvers:Linear operator:cg::Starting value 16.88194302
 DEAL:Solvers:Linear operator:cg::Convergence step 1 value 0.000000000
 DEAL:Solvers::SolverFGMRES
 DEAL:Solvers:Standard solver:FGMRES::Starting value 16.88194302
-DEAL:Solvers:Standard solver:FGMRES::Convergence step 1 value 2.744725072e-15
+DEAL:Solvers:Standard solver:FGMRES::Convergence step 1 value 3.696939525e-15
 DEAL:Solvers:Linear operator:FGMRES::Starting value 16.88194302
-DEAL:Solvers:Linear operator:FGMRES::Convergence step 1 value 2.744725072e-15
+DEAL:Solvers:Linear operator:FGMRES::Convergence step 1 value 3.696939525e-15
 DEAL:Solvers::SolverGMRES
 DEAL:Solvers:Standard solver:GMRES::Starting value 8.440971508
-DEAL:Solvers:Standard solver:GMRES::Convergence step 1 value 1.372362536e-15
+DEAL:Solvers:Standard solver:GMRES::Convergence step 1 value 1.848469762e-15
 DEAL:Solvers:Linear operator:GMRES::Starting value 8.440971508
-DEAL:Solvers:Linear operator:GMRES::Convergence step 1 value 1.372362536e-15
+DEAL:Solvers:Linear operator:GMRES::Convergence step 1 value 1.848469762e-15
 DEAL:Solvers::SolverMinRes
 DEAL:Solvers:Standard solver:minres::Starting value 11.93733639
 DEAL:Solvers:Standard solver:minres::Convergence step 1 value 2.059168646e-15
 DEAL:Solvers:Linear operator:minres::Starting value 11.93733639
 DEAL:Solvers:Linear operator:minres::Convergence step 1 value 2.059168646e-15
 DEAL:Solvers::SolverQMRS
-DEAL:Solvers:Standard solver:QMRS::Starting value 16.88194302
-DEAL:Solvers:Standard solver:QMRS::Convergence step 1 value 0.000000000
-DEAL:Solvers:Linear operator:QMRS::Starting value 16.88194302
-DEAL:Solvers:Linear operator:QMRS::Convergence step 1 value 0.000000000
+DEAL:Solvers:Standard solver:SQMR::Starting value 16.88194302
+DEAL:Solvers:Standard solver:SQMR::Convergence step 1 value 0.000000000
+DEAL:Solvers:Linear operator:SQMR::Starting value 16.88194302
+DEAL:Solvers:Linear operator:SQMR::Convergence step 1 value 0.000000000
 DEAL:Solvers::SolverRelaxation
 DEAL:Solvers:Standard solver:Relaxation::Starting value 16.88194302
 DEAL:Solvers:Standard solver:Relaxation::Convergence step 1 value 0.000000000

diff --git a/tests/lac/solver.output b/tests/lac/solver.output
index 8e9b4b983b04fd213d00a5a647b092a0a75d8986..655497573cbec6ff88d243289e086d4b0ad44e08 100644 (file)
--- a/tests/lac/solver.output
+++ b/tests/lac/solver.output
@@ -4,13 +4,13 @@ DEAL::SOR-diff:0.000
 DEAL:no-fail:cg::Starting value 3.000
 DEAL:no-fail:cg::Convergence step 3 value 4.807e-17
 DEAL:no-fail:Bicgstab::Starting value 3.000
-DEAL:no-fail:Bicgstab::Convergence step 3 value 5.998e-18
+DEAL:no-fail:Bicgstab::Convergence step 3 value 1.104e-17
 DEAL:no-fail:GMRES::Starting value 3.000
-DEAL:no-fail:GMRES::Convergence step 3 value 1.110e-16
+DEAL:no-fail:GMRES::Convergence step 3 value 4.551e-16
 DEAL:no-fail:GMRES::Starting value 3.000
-DEAL:no-fail:GMRES::Convergence step 3 value 1.110e-16
-DEAL:no-fail:QMRS::Starting value 3.000
-DEAL:no-fail:QMRS::Convergence step 3 value 9.615e-17
+DEAL:no-fail:GMRES::Convergence step 3 value 4.551e-16
+DEAL:no-fail:SQMR::Starting value 3.000
+DEAL:no-fail:SQMR::Convergence step 3 value 1.280e-15
 DEAL:no-fail:FIRE::Starting value 9.000
 DEAL:no-fail:FIRE::Convergence step 38 value 0.0002184
 DEAL:no:Richardson::Starting value 3.000
@@ -18,27 +18,27 @@ DEAL:no:Richardson::Convergence step 24 value 0.0007118
 DEAL:no:cg::Starting value 3.000
 DEAL:no:cg::Convergence step 3 value 4.807e-17
 DEAL:no:Bicgstab::Starting value 3.000
-DEAL:no:Bicgstab::Convergence step 3 value 5.998e-18
+DEAL:no:Bicgstab::Convergence step 3 value 1.104e-17
 DEAL:no:GMRES::Starting value 3.000
-DEAL:no:GMRES::Convergence step 3 value 1.110e-16
+DEAL:no:GMRES::Convergence step 3 value 4.551e-16
 DEAL:no:GMRES::Starting value 3.000
-DEAL:no:GMRES::Convergence step 3 value 1.110e-16
-DEAL:no:QMRS::Starting value 3.000
-DEAL:no:QMRS::Convergence step 3 value 9.615e-17
+DEAL:no:GMRES::Convergence step 3 value 4.551e-16
+DEAL:no:SQMR::Starting value 3.000
+DEAL:no:SQMR::Convergence step 3 value 1.280e-15
 DEAL:no:FIRE::Starting value 9.000
 DEAL:no:FIRE::Convergence step 38 value 0.0002184
 DEAL:rich:Richardson::Starting value 3.000
 DEAL:rich:Richardson::Convergence step 42 value 0.0008696
 DEAL:rich:cg::Starting value 3.000
-DEAL:rich:cg::Convergence step 3 value 3.102e-16
+DEAL:rich:cg::Convergence step 3 value 2.871e-16
 DEAL:rich:Bicgstab::Starting value 3.000
-DEAL:rich:Bicgstab::Convergence step 3 value 7.254e-18
+DEAL:rich:Bicgstab::Convergence step 3 value 3.238e-18
 DEAL:rich:GMRES::Starting value 1.800
-DEAL:rich:GMRES::Convergence step 3 value 6.029e-16
+DEAL:rich:GMRES::Convergence step 3 value 3.294e-16
 DEAL:rich:GMRES::Starting value 3.000
-DEAL:rich:GMRES::Convergence step 3 value 1.078e-15
-DEAL:rich:QMRS::Starting value 3.000
-DEAL:rich:QMRS::Convergence step 3 value 7.195e-16
+DEAL:rich:GMRES::Convergence step 3 value 7.148e-16
+DEAL:rich:SQMR::Starting value 3.000
+DEAL:rich:SQMR::Convergence step 3 value 1.422e-15
 DEAL:rich:FIRE::Starting value 9.000
 DEAL:rich:FIRE::Convergence step 32 value 0.0009708
 DEAL:ssor:RichardsonT::Starting value 3.000
@@ -53,8 +53,8 @@ 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:ssor:SQMR::Starting value 3.000
+DEAL:ssor:SQMR::Convergence step 4 value 0.0001345
 DEAL:ssor:FIRE::Starting value 9.000
 DEAL:ssor:FIRE::Convergence step 38 value 0.0008314
 DEAL:sor:RichardsonT::Starting value 3.000
@@ -65,11 +65,11 @@ DEAL:sor:cg::Starting value 3.000
 DEAL:sor:cg::Failure step 100 value 0.2585
 DEAL:sor::Exception: SolverControl::NoConvergence (it, res)
 DEAL:sor:Bicgstab::Starting value 3.000
-DEAL:sor:Bicgstab::Convergence step 5 value 6.247e-18
+DEAL:sor:Bicgstab::Convergence step 5 value 4.331e-18
 DEAL:sor:GMRES::Starting value 1.462
-DEAL:sor:GMRES::Convergence step 5 value 7.914e-19
+DEAL:sor:GMRES::Convergence step 5 value 9.441e-19
 DEAL:sor:GMRES::Starting value 3.000
-DEAL:sor:GMRES::Convergence step 5 value 6.144e-18
+DEAL:sor:GMRES::Convergence step 5 value 1.393e-17
 DEAL:sor:FIRE::Starting value 9.000
 DEAL:sor:FIRE::Convergence step 51 value 0.0004993
 DEAL:psor:RichardsonT::Starting value 3.000
@@ -102,8 +102,8 @@ DEAL:no-fail::Exception: SolverControl::NoConvergence (accumulated_iterations, l
 DEAL:no-fail:GMRES::Starting value 11.00
 DEAL:no-fail:GMRES::Failure step 10 value 0.8414
 DEAL:no-fail::Exception: SolverControl::NoConvergence (accumulated_iterations, last_res)
-DEAL:no-fail:QMRS::Starting value 11.00
-DEAL:no-fail:QMRS::Failure step 10 value 0.4215
+DEAL:no-fail:SQMR::Starting value 11.00
+DEAL:no-fail:SQMR::Failure step 10 value 0.4215
 DEAL:no-fail::Exception: SolverControl::NoConvergence (step, state.last_residual)
 DEAL:no-fail:FIRE::Starting value 121.0
 DEAL:no-fail:FIRE::Failure step 50 value 2.971
@@ -119,8 +119,8 @@ DEAL:no:GMRES::Starting value 11.00
 DEAL:no:GMRES::Convergence step 43 value 0.0009788
 DEAL:no:GMRES::Starting value 11.00
 DEAL:no:GMRES::Convergence step 43 value 0.0009788
-DEAL:no:QMRS::Starting value 11.00
-DEAL:no:QMRS::Convergence step 16 value 0.0002583
+DEAL:no:SQMR::Starting value 11.00
+DEAL:no:SQMR::Convergence step 16 value 0.0002583
 DEAL:no:FIRE::Starting value 121.0
 DEAL:no:FIRE::Failure step 100 value 0.003317
 DEAL:no::Exception: SolverControl::NoConvergence (iter, gradients * gradients)
@@ -135,8 +135,8 @@ 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:rich:SQMR::Starting value 11.00
+DEAL:rich:SQMR::Convergence step 16 value 0.0002583
 DEAL:rich:FIRE::Starting value 121.0
 DEAL:rich:FIRE::Convergence step 98 value 0.0009234
 DEAL:ssor:RichardsonT::Starting value 11.00
@@ -151,8 +151,8 @@ 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:ssor:SQMR::Starting value 11.00
+DEAL:ssor:SQMR::Convergence step 9 value 0.0004140
 DEAL:ssor:FIRE::Starting value 121.0
 DEAL:ssor:FIRE::Convergence step 65 value 0.0006547
 DEAL:sor:RichardsonT::Starting value 11.00

diff --git a/tests/lac/solver_memorytest.output b/tests/lac/solver_memorytest.output
index 3e315b60fcad8f8c68a590fbeec10795800746e7..deeeefcea798ff69fddae2ddeb32868561a46883 100644 (file)
--- a/tests/lac/solver_memorytest.output
+++ b/tests/lac/solver_memorytest.output
@@ -1,25 +1,25 @@
 
 DEAL::Size 4 Unknowns 9
-DEAL:alreadydone:cg::Starting value 0
-DEAL:alreadydone:cg::Convergence step 0 value 0
-DEAL:alreadydone:GMRES::Starting value 0
-DEAL:alreadydone:GMRES::Convergence step 0 value 0
-DEAL:alreadydone:Bicgstab::Starting value 0
-DEAL:alreadydone:Bicgstab::Convergence step 0 value 0
-DEAL:alreadydone:QMRS::Starting value 0
-DEAL:alreadydone:QMRS::Convergence step 0 value 0
-DEAL:alreadydone:GMRES::default_res=0
-DEAL:alreadydone:GMRES::Starting value 0
-DEAL:alreadydone:GMRES::Convergence step 0 value 0
+DEAL:alreadydone:cg::Starting value 0.000
+DEAL:alreadydone:cg::Convergence step 0 value 0.000
+DEAL:alreadydone:GMRES::Starting value 0.000
+DEAL:alreadydone:GMRES::Convergence step 0 value 0.000
+DEAL:alreadydone:Bicgstab::Starting value 0.000
+DEAL:alreadydone:Bicgstab::Convergence step 0 value 0.000
+DEAL:alreadydone:SQMR::Starting value 0.000
+DEAL:alreadydone:SQMR::Convergence step 0 value 0.000
+DEAL:alreadydone:GMRES::default_res=0.000
+DEAL:alreadydone:GMRES::Starting value 0.000
+DEAL:alreadydone:GMRES::Convergence step 0 value 0.000
 DEAL::Size 12 Unknowns 121
-DEAL:alreadydone:cg::Starting value 0
-DEAL:alreadydone:cg::Convergence step 0 value 0
-DEAL:alreadydone:GMRES::Starting value 0
-DEAL:alreadydone:GMRES::Convergence step 0 value 0
-DEAL:alreadydone:Bicgstab::Starting value 0
-DEAL:alreadydone:Bicgstab::Convergence step 0 value 0
-DEAL:alreadydone:QMRS::Starting value 0
-DEAL:alreadydone:QMRS::Convergence step 0 value 0
-DEAL:alreadydone:GMRES::default_res=0
-DEAL:alreadydone:GMRES::Starting value 0
-DEAL:alreadydone:GMRES::Convergence step 0 value 0
+DEAL:alreadydone:cg::Starting value 0.000
+DEAL:alreadydone:cg::Convergence step 0 value 0.000
+DEAL:alreadydone:GMRES::Starting value 0.000
+DEAL:alreadydone:GMRES::Convergence step 0 value 0.000
+DEAL:alreadydone:Bicgstab::Starting value 0.000
+DEAL:alreadydone:Bicgstab::Convergence step 0 value 0.000
+DEAL:alreadydone:SQMR::Starting value 0.000
+DEAL:alreadydone:SQMR::Convergence step 0 value 0.000
+DEAL:alreadydone:GMRES::default_res=0.000
+DEAL:alreadydone:GMRES::Starting value 0.000
+DEAL:alreadydone:GMRES::Convergence step 0 value 0.000