From: Timo Heister Date: Mon, 20 Jul 2015 21:01:27 +0000 (-0400) Subject: fix muelu test output X-Git-Tag: v8.4.0-rc2~733^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88ae1feb4a7153cd59016c5edc8b65b34cdba77e;p=dealii.git fix muelu test output --- diff --git a/tests/trilinos/precondition_muelu_dgp.cc b/tests/trilinos/precondition_muelu_dgp.cc index 1435129757..696df34f9e 100644 --- a/tests/trilinos/precondition_muelu_dgp.cc +++ b/tests/trilinos/precondition_muelu_dgp.cc @@ -187,8 +187,11 @@ void Step4::solve () SolverControl solver_control (1000, 1e-10); SolverCG<> solver (solver_control); preconditioner.initialize(system_matrix, data); - solver.solve (system_matrix, solution, system_rhs, - preconditioner); + + check_solver_within_range( + solver.solve (system_matrix, solution, system_rhs, + preconditioner), + solver_control.last_step(), 18, 32); } deallog.pop(); } diff --git a/tests/trilinos/precondition_muelu_dgp.with_trilinos=11.14.with_64bit_indices=off.output b/tests/trilinos/precondition_muelu_dgp.with_trilinos=11.14.with_64bit_indices=off.output index f7ee5d0889..12e69b069c 100644 --- a/tests/trilinos/precondition_muelu_dgp.with_trilinos=11.14.with_64bit_indices=off.output +++ b/tests/trilinos/precondition_muelu_dgp.with_trilinos=11.14.with_64bit_indices=off.output @@ -1,5 +1,3 @@ -DEAL:12288:cg::Starting value 1970.22 -DEAL:12288:cg::Convergence step 19 value 0 -DEAL:49152:cg::Starting value 179304. -DEAL:49152:cg::Convergence step 31 value 0 +DEAL:12288::Solver stopped within 18 - 32 iterations +DEAL:49152::Solver stopped within 18 - 32 iterations diff --git a/tests/trilinos/precondition_muelu_q_iso_q1.cc b/tests/trilinos/precondition_muelu_q_iso_q1.cc index c4e1366043..aaead6fd03 100644 --- a/tests/trilinos/precondition_muelu_q_iso_q1.cc +++ b/tests/trilinos/precondition_muelu_q_iso_q1.cc @@ -269,24 +269,28 @@ void Step4::solve () deallog.push("MueLu_Q"); { solution = 0; - SolverControl solver_control (1000, 1e-12); + SolverControl solver_control (1000, 1e-8); SolverCG<> solver (solver_control); TrilinosWrappers::PreconditionAMGMueLu preconditioner; preconditioner.initialize(system_matrix); - solver.solve (system_matrix, solution, system_rhs, - preconditioner); + check_solver_within_range( + solver.solve (system_matrix, solution, system_rhs, + preconditioner), + solver_control.last_step(), 31, 33); } deallog.pop(); deallog.push("MueLu_Q_iso_Q1"); { solution = 0; - SolverControl solver_control (1000, 1e-12); + SolverControl solver_control (1000, 1e-8); SolverCG<> solver (solver_control); TrilinosWrappers::PreconditionAMGMueLu preconditioner; preconditioner.initialize(preconditioner_matrix); - solver.solve (system_matrix, solution, system_rhs, - preconditioner); + check_solver_within_range( + solver.solve (system_matrix, solution, system_rhs, + preconditioner), + solver_control.last_step(), 36, 38); } deallog.pop(); deallog << std::endl; diff --git a/tests/trilinos/precondition_muelu_q_iso_q1.with_trilinos=11.14.with_64bit_indices=off.output b/tests/trilinos/precondition_muelu_q_iso_q1.with_trilinos=11.14.with_64bit_indices=off.output index c592763f04..60b5ab0bee 100644 --- a/tests/trilinos/precondition_muelu_q_iso_q1.with_trilinos=11.14.with_64bit_indices=off.output +++ b/tests/trilinos/precondition_muelu_q_iso_q1.with_trilinos=11.14.with_64bit_indices=off.output @@ -1,11 +1,7 @@ -DEAL:02401:MueLu_Q:cg::Starting value 31.4643 -DEAL:02401:MueLu_Q:cg::Convergence step 45 value 0 -DEAL:02401:MueLu_Q_iso_Q1:cg::Starting value 31.4643 -DEAL:02401:MueLu_Q_iso_Q1:cg::Convergence step 34 value 0 +DEAL:02401:MueLu_Q::Solver stopped within 31 - 33 iterations +DEAL:02401:MueLu_Q_iso_Q1::Solver stopped within 36 - 38 iterations DEAL:02401:: -DEAL:09409:MueLu_Q:cg::Starting value 44.5271 -DEAL:09409:MueLu_Q:cg::Convergence step 47 value 0 -DEAL:09409:MueLu_Q_iso_Q1:cg::Starting value 44.5271 -DEAL:09409:MueLu_Q_iso_Q1:cg::Convergence step 34 value 0 +DEAL:09409:MueLu_Q::Solver stopped within 31 - 33 iterations +DEAL:09409:MueLu_Q_iso_Q1::Solver stopped within 36 - 38 iterations DEAL:09409::