Changeset 14558

Timestamp:

04/12/13 10:19:50 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moved default parameter settings to class

Location:

issm/trunk-jpl/src/m/classes

Files:

• model/model.m (modified) (1 diff)
• model/model.py (modified) (1 diff)
• solver.m (modified) (2 diffs)
• solver.py (modified) (1 diff)
• verbose.m (modified) (1 diff)
• verbose.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/model/model.m ¶

@@ -1078 +1078 @@
                         md.flowequation     = flowequation();
                         md.debug            = debug();
-                        md.verbose          = verbose('solution',true,'qmu',true,'control',true);
+                        md.verbose          = verbose();
                         md.settings         = settings();
                         md.solver           = solver();
-                        if ismumps(),
-                                md.solver           = addoptions(md.solver,DiagnosticVertAnalysisEnum(),mumpsoptions());
-                        else
-                                md.solver           = addoptions(md.solver,DiagnosticVertAnalysisEnum(),iluasmoptions());
-                        end
                         md.cluster          = generic();
                         md.balancethickness = balancethickness();

issm/trunk-jpl/src/m/classes/model/model.py ¶

@@ -66 +66 @@
 
                 self.debug            = debug()
-                self.verbose          = verbose('solution',True,'qmu',True,'control',True)
+                self.verbose          = verbose()
                 self.settings         = settings()
                 self.solver           = solver()
-                if ismumps():
-                        self.solver.addoptions(DiagnosticVertAnalysisEnum(),mumpsoptions())
-                else:
-                        self.solver.addoptions(DiagnosticVertAnalysisEnum(),iluasmoptions())
                 self.cluster          = generic()
 

issm/trunk-jpl/src/m/classes/solver.m ¶

@@ -6 +6 @@
 classdef solver < dynamicprops
     properties (SetAccess=public) 
-                 NoneAnalysis = struct();
+                 NoneAnalysis           = struct();
+                 DiagnosticVertAnalysis = struct();
                  %The other properties are dynamic
          end
@@ -39 +40 @@
                          %MUMPS is the default solver
                          if ismumps(),
-                                 obj.NoneAnalysis=mumpsoptions();
+                                 obj.NoneAnalysis           = mumpsoptions();
+                                 obj.DiagnosticVertAnalysis = mumpsoptions();
                          else
-                                 obj.NoneAnalysis=iluasmoptions();
+                                 obj.NoneAnalysis           = iluasmoptions();
+                                 obj.DiagnosticVertAnalysis = iluasmoptions();
                          end
 

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

@@ -19 +19 @@
                 #MUMPS is the default solver
                 if ismumps():
-                        self.NoneAnalysis=mumpsoptions()
+                        self.NoneAnalysis           = mumpsoptions()
+                        self.DiagnosticVertAnalysis = mumpsoptions()
                 else:
-                        self.NoneAnalysis=iluasmoptions()
+                        self.NoneAnalysis           = iluasmoptions()
+                        self.DiagnosticVertAnalysis = iluasmoptions()
 
                 #The other properties are dynamic

issm/trunk-jpl/src/m/classes/verbose.m ¶

@@ -41 +41 @@
                         switch(nargin),
                                 case 0,
-                                        %Don't do anything
+                                        verbose.solution=true;
+                                        verbose.qmu=true;
+                                        verbose.control=true;
                                 case 1,
                                         binary=varargin{1};

issm/trunk-jpl/src/m/classes/verbose.py ¶

@@ -42 +42 @@
                 if not len(args):
                         #Don't do anything
+                        self.solution=True;
+                        self.qmu=True;
+                        self.control=True;
                         pass