[cig-commits] [commit] master: sane number of solver iterations (a3bca56)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/d14051bb8dc3b2a63654bfac6174f2c4371133f0...4feef1289481aedcd34a3010f4b9261baed0b485

>---------------------------------------------------------------

commit a3bca56302a92fe5813d311c71eb93e92125097d
Author: Timo Heister <timo.heister at gmail.com>
Date:   Sun Jun 8 10:39:47 2014 -0400

    sane number of solver iterations


>---------------------------------------------------------------

a3bca56302a92fe5813d311c71eb93e92125097d
 source/simulator/solver.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/source/simulator/solver.cc b/source/simulator/solver.cc
index 9316fa5..08ed3da 100644
--- a/source/simulator/solver.cc
+++ b/source/simulator/solver.cc
@@ -265,7 +265,7 @@ namespace aspect
       LinearAlgebra::Vector utmp(src.block(0));
 
       {
-        SolverControl solver_control(5000, 1e-6 * src.block(1).l2_norm());
+        SolverControl solver_control(1000, 1e-6 * src.block(1).l2_norm());
 
 #ifdef ASPECT_USE_PETSC
         SolverCG<LinearAlgebra::Vector> solver(solver_control);
@@ -314,7 +314,7 @@ namespace aspect
 
       if (do_solve_A == true)
         {
-          SolverControl solver_control(5000, utmp.l2_norm()*1e-2);
+          SolverControl solver_control(1000, utmp.l2_norm()*1e-2);
 #ifdef ASPECT_USE_PETSC
           SolverCG<LinearAlgebra::Vector> solver(solver_control);
 #else
@@ -373,8 +373,7 @@ namespace aspect
 
     const double tolerance = std::max(1e-50,
                                       advection_solver_tolerance*system_rhs.block(block_idx).l2_norm());
-    SolverControl solver_control (system_matrix.block(block_idx, block_idx).m(),
-                                  tolerance);
+    SolverControl solver_control (1000, tolerance);
 
     SolverGMRES<LinearAlgebra::Vector>   solver (solver_control,
                                                  SolverGMRES<LinearAlgebra::Vector>::AdditionalData(30,true));