From e12655ecc2254e3b5f4df3ebe9c6e36a5496caa2 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 11 Jul 2024 10:22:50 -0600 Subject: [PATCH] Manually deal with outputting the number of iterations in step-39. --- examples/step-39/doc/results.dox | 26 ++++---------------------- examples/step-39/step-39.cc | 3 +++ tests/examples/step-39.output | 9 +++------ 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/examples/step-39/doc/results.dox b/examples/step-39/doc/results.dox index 25a47ac4da..1325699cb8 100644 --- a/examples/step-39/doc/results.dox +++ b/examples/step-39/doc/results.dox @@ -12,8 +12,7 @@ DEAL::Assemble matrix DEAL::Assemble multilevel matrix DEAL::Assemble right hand side DEAL::Solve -DEAL:cg::Starting value 37.4071 -DEAL:cg::Convergence step 13 value 1.64974e-13 +DEAL::Converged in 13 iterations DEAL::energy-error: 0.297419 DEAL::L2-error: 0.00452447 DEAL::Estimate 0.990460 @@ -26,26 +25,11 @@ DEAL::Assemble matrix DEAL::Assemble multilevel matrix DEAL::Assemble right hand side DEAL::Solve -DEAL:cg::Starting value 37.4071 -DEAL:cg::Convergence step 14 value 3.72262e-13 +DEAL::Converged in 14 iterations DEAL::energy-error: 0.258559 DEAL::L2-error: 0.00288510 DEAL::Estimate 0.738624 DEAL::Writing solution to ... -DEAL:: -DEAL::Step 2 -DEAL::Triangulation 34 cells, 4 levels -DEAL::DoFHandler 544 dofs, level dofs 64 256 256 128 -DEAL::Assemble matrix -DEAL::Assemble multilevel matrix -DEAL::Assemble right hand side -DEAL::Solve -DEAL:cg::Starting value 37.4071 -DEAL:cg::Convergence step 15 value 1.91610e-13 -DEAL::energy-error: 0.189234 -DEAL::L2-error: 0.00147954 -DEAL::Estimate 0.657507 -DEAL::Writing solution to ... ... @@ -56,8 +40,7 @@ DEAL::Assemble matrix DEAL::Assemble multilevel matrix DEAL::Assemble right hand side DEAL::Solve -DEAL:cg::Starting value 51.1571 -DEAL:cg::Convergence step 15 value 7.19599e-13 +DEAL::Converged in 15 iterations DEAL::energy-error: 0.0132475 DEAL::L2-error: 1.00423e-05 DEAL::Estimate 0.0470724 @@ -70,8 +53,7 @@ DEAL::Assemble matrix DEAL::Assemble multilevel matrix DEAL::Assemble right hand side DEAL::Solve -DEAL:cg::Starting value 52.2226 -DEAL:cg::Convergence step 15 value 8.15195e-13 +DEAL::Converged in 15 iterations DEAL::energy-error: 0.00934891 DEAL::L2-error: 5.41095e-06 DEAL::Estimate 0.0329102 diff --git a/examples/step-39/step-39.cc b/examples/step-39/step-39.cc index f4b1541eec..b594c115d2 100644 --- a/examples/step-39/step-39.cc +++ b/examples/step-39/step-39.cc @@ -837,6 +837,9 @@ namespace Step39 preconditioner(dof_handler, mg, mg_transfer); // and use it to solve the system. solver.solve(matrix, solution, right_hand_side, preconditioner); + + deallog << "Converged in " << control.last_step() << " iterations" + << std::endl; } diff --git a/tests/examples/step-39.output b/tests/examples/step-39.output index 40579e254f..8082a8061f 100644 --- a/tests/examples/step-39.output +++ b/tests/examples/step-39.output @@ -6,8 +6,7 @@ DEAL::Assemble matrix DEAL::Assemble multilevel matrix DEAL::Assemble right hand side DEAL::Solve -DEAL:cg::Starting value 37.4071 -DEAL:cg::Convergence step 13 value 1.64974e-13 +DEAL::Converged in 13 iterations DEAL::energy-error: 0.297419 DEAL::L2-error: 0.00452447 DEAL::Estimate 0.990460 @@ -20,8 +19,7 @@ DEAL::Assemble matrix DEAL::Assemble multilevel matrix DEAL::Assemble right hand side DEAL::Solve -DEAL:cg::Starting value 37.4071 -DEAL:cg::Convergence step 14 value 3.72262e-13 +DEAL::Converged in 14 iterations DEAL::energy-error: 0.258559 DEAL::L2-error: 0.00288510 DEAL::Estimate 0.738624 @@ -34,8 +32,7 @@ DEAL::Assemble matrix DEAL::Assemble multilevel matrix DEAL::Assemble right hand side DEAL::Solve -DEAL:cg::Starting value 37.4071 -DEAL:cg::Convergence step 15 value 1.91610e-13 +DEAL::Converged in 15 iterations DEAL::energy-error: 0.189234 DEAL::L2-error: 0.00147954 DEAL::Estimate 0.657507 -- 2.39.5