source: issm/oecreview/Archive/14312-15392/ISSM-14557-14558.diff@ 15393

Index: ../trunk-jpl/src/m/classes/solver.m
===================================================================
--- ../trunk-jpl/src/m/classes/solver.m (revision 14557)
+++ ../trunk-jpl/src/m/classes/solver.m (revision 14558)
@@ -5,7 +5,8 @@
 
 classdef solver < dynamicprops
     properties (SetAccess=public) 
-                NoneAnalysis = struct();
+                NoneAnalysis           = struct();
+                DiagnosticVertAnalysis = struct();
                 %The other properties are dynamic
         end
         methods
@@ -38,9 +39,11 @@
 
                         %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
 
                 end % }}}
Index: ../trunk-jpl/src/m/classes/verbose.py
===================================================================
--- ../trunk-jpl/src/m/classes/verbose.py       (revision 14557)
+++ ../trunk-jpl/src/m/classes/verbose.py       (revision 14558)
@@ -41,6 +41,9 @@
 
                if not len(args):
                        #Don't do anything
+                       self.solution=True;
+                       self.qmu=True;
+                       self.control=True;
                        pass
 
                elif len(args) == 1:
Index: ../trunk-jpl/src/m/classes/verbose.m
===================================================================
--- ../trunk-jpl/src/m/classes/verbose.m        (revision 14557)
+++ ../trunk-jpl/src/m/classes/verbose.m        (revision 14558)
@@ -40,7 +40,9 @@
 
                        switch(nargin),
                                case 0,
-                                       %Don't do anything
+                                       verbose.solution=true;
+                                       verbose.qmu=true;
+                                       verbose.control=true;
                                case 1,
                                        binary=varargin{1};
                                        if     ischar(binary),
Index: ../trunk-jpl/src/m/classes/model/model.py
===================================================================
--- ../trunk-jpl/src/m/classes/model/model.py   (revision 14557)
+++ ../trunk-jpl/src/m/classes/model/model.py   (revision 14558)
@@ -65,13 +65,9 @@
                self.rifts            = rifts()
 
                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()
 
                self.balancethickness = balancethickness()
Index: ../trunk-jpl/src/m/classes/model/model.m
===================================================================
--- ../trunk-jpl/src/m/classes/model/model.m    (revision 14557)
+++ ../trunk-jpl/src/m/classes/model/model.m    (revision 14558)
@@ -1077,14 +1077,9 @@
                        md.materials        = matice();
                        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();
                        md.diagnostic       = diagnostic();
Index: ../trunk-jpl/src/m/classes/solver.py
===================================================================
--- ../trunk-jpl/src/m/classes/solver.py        (revision 14557)
+++ ../trunk-jpl/src/m/classes/solver.py        (revision 14558)
@@ -18,9 +18,11 @@
        def __init__(self):    # {{{
                #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
        # }}}