Changeset 19967

Timestamp:

01/21/16 16:33:13 (9 years ago)

Author:

glperez

Message:

CHG: Added some modules required for non Petsc solvers as well as removed iteritems from list object.

Location:

issm/trunk-jpl/src/m/classes

Files:

• autodiff.py (modified) (2 diffs)
• toolkits.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/autodiff.py

@@ -6 +6 @@
 from checkfield import checkfield
 from WriteData import WriteData
+from MatlabFuncs import *
 
 class autodiff(object):
@@ -67 +68 @@
                 md = checkfield(md,'fieldname','autodiff.tbufsize','>=',524288)
                 md = checkfield(md,'fieldname','autodiff.gcTriggerRatio','>=',2.0)
-                md = checkfield(md,'fieldname','autodiff.gcTriggerMaxSize','>=',2000000)
+                md = checkfield(md,'fieldname','autodiff.gcTriggerMaxSize','>=',65536)
 
                 #Driver value:

issm/trunk-jpl/src/m/classes/toolkits.py

@@ -6 +6 @@
 from EnumDefinitions import *
 from checkfield import checkfield
+from issmmumpssolver import issmmumpssolver
+from issmgslsolver import issmgslsolver
 
 class toolkits(object):
@@ -94 +96 @@
 
                         #now, write options
-                        for optionname,optionvalue in options.iteritems():
+                        for optionname,optionvalue in options:
 
                                 if not optionvalue: