Changeset 19998

Timestamp:

01/26/16 19:04:13 (9 years ago)

Author:

glperez

Message:

CHG: Fixing python AD bug by upgrading issmgslsolver.py and issmmumpssolver.py. Also adding import statements for both in toolkits.py

Location:

issm/trunk-jpl/src/m

Files:

• classes/toolkits.py (modified) (1 diff)
• solvers/issmgslsolver.py (modified) (2 diffs)
• solvers/issmmumpssolver.py (modified) (1 diff)

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

@@ -6 +6 @@
 from EnumDefinitions import *
 from checkfield import checkfield
+from issmgslsolver import issmgslsolver
 
 class toolkits(object):

issm/trunk-jpl/src/m/solvers/issmgslsolver.py

@@ +1 @@
+from collections import OrderedDict
 import pairoptions
 
@@ -10 +11 @@
         arguments=pairoptions.pairoptions(*args) 
         
-        options=[['toolkit','issm'],['mat_type','dense'],['vec_type','seq'],['solver_type','gsl']];
+        options=OrderedDict()
+        options['toolkit'] = 'issm'
+        options['mat_type'] = 'dense'
+        options['vec_type'] = 'seq'
+        options['solver_type'] = 'gsl'
 
         #now, go through our arguments, and write over default options.

issm/trunk-jpl/src/m/solvers/issmmumpssolver.py

@@ -10 +10 @@
         arguments=pairoptions.pairoptions(*args) 
         
-        options=[['toolkit','issm'],['mat_type','mpidense'],['vec_type','mpi'],['solver_type','mumps']];
+        options=OrderedDict()
+        options['toolkit'] = 'issm'
+        options['mat_type'] = 'mpidense'
+        options['vec_type'] = 'mpi'
+        options['solver_type'] = 'mumps'
 
         #now, go through our arguments, and write over default options.