Changeset 11788

Timestamp:

03/25/12 00:26:14 (13 years ago)

Author:

Eric.Larour

Message:

New pairoptions python class + solver class

Location:

issm/trunk-jpl/src/py/classes

Files:

• . (modified) (1 prop)
• pairoptions.py (added)
• solver.py (modified) (4 diffs)

issm/trunk-jpl/src/py/classes/solver.py

@@ -1 +1 @@
 #module imports
-from fielddisplay import fielddisplay
+import fielddisplay 
+import ismumps
 
 class solver:
@@ -6 +7 @@
         def __init__(self):
                 # {{{ Properties
-                self.options           = [];
+                if ismumps:
+                        self.options=['NoneAnalysis',mumpsoptions]
+                else:
+                        self.options=['NoneAnalysis',iluasmoptions]
                 #}}}
         def __repr__(obj):
@@ -12 +16 @@
                 
                 string2="   solver parameters:"
-                for i in range(len(obj.options,1)):
+                for i in range(len(obj.options)):
                         option=obj.options[i]
                         analysis=option[0]
@@ -33 +37 @@
                                                 string="%s%s%s%s%s"%(string," -",option[0]," ",option[1])
                                         else:
-                                                print("%s%s%s"%("PetscString error: option #","%i"%(i)," is not well formatted"))
-                                                sys.exit();
+                                                raise RuntimeError("%s%s%s"%("PetscString error: option #","%i"%(i)," is not well formatted"))
                                 else:
-                                        print("%s%s%s"%("PetscString error: option #","%i"%(i)," is not well formatted"))
-                                        sys.exit()
+                                        raise RuntimeError("%s%s%s"%("PetscString error: option #","%i"%(i)," is not well formatted"))
+
                         string2="%s\n%s"%(string2,"   %s -> '%s'"%(analysis,string))
                 return string2