Changeset 14881

Timestamp:

05/03/13 21:20:16 (12 years ago)

Author:

Eric.Larour

Message:

CHG: changing defaults for toolkits

Location:

issm/trunk-jpl/src/m/classes

Files:

• toolkits.m (modified) (1 diff)
• toolkits.py (modified) (1 diff)

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

@@ -39 +39 @@
                  function obj = setdefaultparameters(obj) % {{{
 
-                         %MUMPS is the default toolkits
-                         if ismumps(),
-                                 obj.DefaultAnalysis           = mumpsoptions();
+                         %default toolkits: 
+                         if ispetsc,
+                                 %MUMPS is the default toolkits
+                                 if ismumps(),
+                                         obj.DefaultAnalysis           = mumpsoptions();
+                                 else
+                                         obj.DefaultAnalysis           = iluasmoptions(); 
+                                 end
                          else
-                                 obj.DefaultAnalysis           = iluasmoptions();
+                                 obj.DefaultAnalysis           = issmsolver(); 
                          end
 

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

@@ -17 +17 @@
 
         def __init__(self):    # {{{
-                #MUMPS is the default toolkits
-                if ismumps():
-                        self.DefaultAnalysis           = mumpsoptions()
+                #default toolkits
+                if ispetsc():
+                        #MUMPS is the default toolkits
+                        if ismumps():
+                                self.DefaultAnalysis           = mumpsoptions()
+                        else:
+                                self.DefaultAnalysis           = iluasmoptions()
                 else:
-                        self.DefaultAnalysis           = iluasmoptions()
+                        self.DefaultAnalysis           = issmsolver()
 
                 #The other properties are dynamic