Merge pull request #28 from danielru/make_gmres_maxiter_parameter

gmres parameters now defined in playground; can be selected level dep…

Author: pancetta

examples/boussinesq_2d_imex/ProblemClass.py

@@ -63,6 +63,9 @@ def __init__(self, cparams, dtype_u, dtype_f):
         assert 'x_bounds' in cparams
         assert 'z_bounds' in cparams
         assert 'order' in cparams
+        assert 'gmres_maxiter' in cparams
+        assert 'gmres_restart' in cparams
+        assert 'gmres_tol' in cparams
 
         # add parameters as attributes for further reference
         for k,v in cparams.items():
@@ -99,7 +102,7 @@ def solve_system(self,rhs,factor,u0,t):
 
         b         = rhs.values.flatten()
         cb        = Callback()
-        sol, info = LA.gmres( self.Id - factor*self.M, b, x0=u0.values.flatten(), tol=1e-13, restart=10, maxiter=500, callback=cb)
+        sol, info = LA.gmres( self.Id - factor*self.M, b, x0=u0.values.flatten(), tol=self.gmres_tol, restart=self.gmres_restart, maxiter=self.gmres_maxiter, callback=cb)
         # If this is a dummy call with factor==0.0, do not log because it should not be counted as a solver call
         if factor!=0.0:
           print "Number of GMRES iterations: %3i --- Final residual: %6.3e" % ( cb.getcounter(), cb.getresidual() )

examples/boussinesq_2d_imex/playground.py

@@ -36,7 +36,7 @@
     swparams['do_LU'] = True
 
     sparams = {}
-    sparams['maxiter'] = 2
+    sparams['maxiter'] = 15
 
     # setup parameters "in time"
     t0     = 0
@@ -53,6 +53,9 @@
     pparams['x_bounds'] = [(-150.0, 150.0)]
     pparams['z_bounds'] = [(   0.0,  10.0)]
     pparams['order']    = [0, 0] # [fine_level, coarse_level]
+    pparams['gmres_maxiter'] = [50, 5]
+    pparams['gmres_restart'] = 20
+    pparams['gmres_tol']     = 1e-14
 
     # This comes as read-in for the transfer operations
     tparams = {}