From b9cff2610fe93494eebef7c775fd0667b743ecf7 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 1 Sep 2017 15:39:18 +0200 Subject: [PATCH] Relax lac/gmres_reorthogonalize_01 --- tests/lac/gmres_reorthogonalize_01.cc | 31 ++++++++-------- .../lac/gmres_reorthogonalize_01.debug.output | 35 ++++++------------- 2 files changed, 26 insertions(+), 40 deletions(-) diff --git a/tests/lac/gmres_reorthogonalize_01.cc b/tests/lac/gmres_reorthogonalize_01.cc index 9f6bf86198..5dcc5d9e21 100644 --- a/tests/lac/gmres_reorthogonalize_01.cc +++ b/tests/lac/gmres_reorthogonalize_01.cc @@ -26,7 +26,7 @@ template -void test (unsigned int variant) +void test (unsigned int variant, unsigned int min_convergence_steps) { const unsigned int n = 64; Vector rhs(n), sol(n); @@ -70,30 +70,31 @@ void test (unsigned int variant) data.max_n_tmp_vectors = 80; SolverGMRES > solver(control, data); - solver.solve(matrix, sol, rhs, PreconditionIdentity()); + + check_solver_within_range + (solver.solve(matrix, sol, rhs, PreconditionIdentity()), + control.last_step(), min_convergence_steps, min_convergence_steps+2); deallog.pop(); } int main() { - std::ofstream logfile("output"); - deallog << std::setprecision(3); - deallog.attach(logfile); + initlog(); deallog.push("double"); - test(0); - test(1); - test(2); - test(3); - test(4); - test(5); + test(0, 56); + test(1, 64); + test(2, 56); + test(3, 64); + test(4, 56); + test(5, 64); deallog.pop(); deallog.push("float"); - test(0); - test(1); - test(2); - test(3); + test(0, 36); + test(1, 64); + test(2, 36); + test(3, 64); deallog.pop(); } diff --git a/tests/lac/gmres_reorthogonalize_01.debug.output b/tests/lac/gmres_reorthogonalize_01.debug.output index 9f9b65c3c1..5ec7df72ff 100644 --- a/tests/lac/gmres_reorthogonalize_01.debug.output +++ b/tests/lac/gmres_reorthogonalize_01.debug.output @@ -1,26 +1,11 @@ -DEAL:double:0:GMRES::Starting value 8.00 -DEAL:double:0:GMRES::Convergence step 57 value 1.62e-14 -DEAL:double:1:GMRES::Starting value 8.00 -DEAL:double:1:GMRES::Re-orthogonalization enabled at step 65 -DEAL:double:1:GMRES::Convergence step 65 value 1.04e-23 -DEAL:double:2:GMRES::Starting value 8.00 -DEAL:double:2:GMRES::Convergence step 57 value 1.72e-14 -DEAL:double:3:GMRES::Starting value 8.00 -DEAL:double:3:GMRES::Re-orthogonalization enabled at step 65 -DEAL:double:3:GMRES::Convergence step 65 value 2.56e-24 -DEAL:double:4:GMRES::Starting value 8.00 -DEAL:double:4:GMRES::Convergence step 57 value 1.59e-14 -DEAL:double:5:GMRES::Starting value 8.00 -DEAL:double:5:GMRES::Re-orthogonalization enabled at step 65 -DEAL:double:5:GMRES::Convergence step 65 value 1.96e-24 -DEAL:float:0:GMRES::Starting value 8.00 -DEAL:float:0:GMRES::Convergence step 37 value 7.73e-06 -DEAL:float:1:GMRES::Starting value 8.00 -DEAL:float:1:GMRES::Re-orthogonalization enabled at step 65 -DEAL:float:1:GMRES::Convergence step 65 value 1.11e-05 -DEAL:float:2:GMRES::Starting value 8.00 -DEAL:float:2:GMRES::Convergence step 37 value 6.87e-06 -DEAL:float:3:GMRES::Starting value 8.00 -DEAL:float:3:GMRES::Re-orthogonalization enabled at step 65 -DEAL:float:3:GMRES::Convergence step 66 value 3.27e-10 +DEAL:double:0::Solver stopped within 56 - 58 iterations +DEAL:double:1::Solver stopped within 64 - 66 iterations +DEAL:double:2::Solver stopped within 56 - 58 iterations +DEAL:double:3::Solver stopped within 64 - 66 iterations +DEAL:double:4::Solver stopped within 56 - 58 iterations +DEAL:double:5::Solver stopped within 64 - 66 iterations +DEAL:float:0::Solver stopped within 36 - 38 iterations +DEAL:float:1::Solver stopped within 64 - 66 iterations +DEAL:float:2::Solver stopped within 36 - 38 iterations +DEAL:float:3::Solver stopped within 64 - 66 iterations -- 2.39.5