[cig-commits] commit 1904 by buerg to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 1904

Insert r1612.

U   trunk/aspire/source/simulator/parameters.cc
U   trunk/aspire/source/simulator/solver.cc


http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=1904&peg=1904

Diff:
Modified: trunk/aspire/source/simulator/parameters.cc
===================================================================
--- trunk/aspire/source/simulator/parameters.cc	2013-09-23 14:16:16 UTC (rev 1903)
+++ trunk/aspire/source/simulator/parameters.cc	2013-09-23 14:25:18 UTC (rev 1904)
@@ -453,7 +453,7 @@
       }
 
     surface_pressure              = prm.get_double ("Surface pressure");
-    linear_solver_tolerance       = prm.get_double ("Linear solver tolerance");
+    linear_stokes_solver_tolerance = prm.get_double ("Linear solver tolerance");
     n_cheap_stokes_solver_steps = prm.get_integer ("Number of cheap Stokes solver steps");
     temperature_solver_tolerance  = prm.get_double ("Temperature solver tolerance");
     composition_solver_tolerance  = prm.get_double ("Composition solver tolerance");

Modified: trunk/aspire/source/simulator/solver.cc
===================================================================
--- trunk/aspire/source/simulator/solver.cc	2013-09-23 14:16:16 UTC (rev 1903)
+++ trunk/aspire/source/simulator/solver.cc	2013-09-23 14:25:18 UTC (rev 1904)
@@ -385,7 +385,7 @@
     distributed_stokes_rhs.collect_sizes();
     distributed_stokes_rhs.block (0).equ (-1.0, system_rhs_velocity.block (0));
 
-    const double solver_tolerance = std::max (parameters.linear_solver_tolerance *
+    const double solver_tolerance = std::max (parameters.linear_stokes_solver_tolerance *
                                               distributed_stokes_rhs.l2_norm(), 1e-12);
     SolverControl solver_control_velocity (distributed_stokes_rhs.block (0).size (), solver_tolerance);