Changeset 14413

Timestamp:

02/28/13 08:38:21 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: isnewton is now 0,1 or 2 (hybrid)

Location:

issm/trunk-jpl/src/m/classes

Files:

• diagnostic.m (modified) (3 diffs)
• diagnostic.py (modified) (3 diffs)

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

@@ -76 +76 @@
                         md = checkfield(md,'diagnostic.reltol','size',[1 1]);
                         md = checkfield(md,'diagnostic.abstol','size',[1 1]);
-                        md = checkfield(md,'diagnostic.isnewton','numel',[1],'values',[0 1]);
+                        md = checkfield(md,'diagnostic.isnewton','numel',[1],'values',[0 1 2]);
                         md = checkfield(md,'diagnostic.stokesreconditioning','size',[1 1],'NaN',1);
                         md = checkfield(md,'diagnostic.viscosity_overshoot','size',[1 1],'NaN',1);
@@ -122 +122 @@
                         fielddisplay(obj,'reltol','velocity relative convergence criterion, NaN -> not applied');
                         fielddisplay(obj,'abstol','velocity absolute convergence criterion, NaN -> not applied');
-                        fielddisplay(obj,'isnewton','Apply Newton''s method instead of a Picard fixed point method');
+                        fielddisplay(obj,'isnewton','0: Picard''s fixed point, 1: Newton''s method, 2: hybrid');
                         fielddisplay(obj,'maxiter','maximum number of nonlinear iterations');
                         fielddisplay(obj,'viscosity_overshoot','over-shooting constant new=new+C*(new-old)');
@@ -154 +154 @@
                         WriteData(fid,'object',obj,'fieldname','reltol','format','Double');
                         WriteData(fid,'object',obj,'fieldname','abstol','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','isnewton','format','Boolean');
+                        WriteData(fid,'object',obj,'fieldname','isnewton','format','Integer');
                         WriteData(fid,'object',obj,'fieldname','stokesreconditioning','format','Double');
                         WriteData(fid,'object',obj,'fieldname','viscosity_overshoot','format','Double');

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

@@ -51 +51 @@
                 string="%s\n%s"%(string,fielddisplay(self,'reltol','velocity relative convergence criterion, NaN -> not applied'))
                 string="%s\n%s"%(string,fielddisplay(self,'abstol','velocity absolute convergence criterion, NaN -> not applied'))
-                string="%s\n%s"%(string,fielddisplay(self,'isnewton',"Apply Newton's method instead of a Picard fixed point method"))
+                string="%s\n%s"%(string,fielddisplay(self,'isnewton',"0: Picard's fixed point, 1: Newton's method, 2: hybrid"))
                 string="%s\n%s"%(string,fielddisplay(self,'maxiter','maximum number of nonlinear iterations'))
                 string="%s\n%s"%(string,fielddisplay(self,'viscosity_overshoot','over-shooting constant new=new+C*(new-old)'))
@@ -126 +126 @@
                 md = checkfield(md,'diagnostic.reltol','size',[1])
                 md = checkfield(md,'diagnostic.abstol','size',[1])
-                md = checkfield(md,'diagnostic.isnewton','numel',[1],'values',[0,1])
+                md = checkfield(md,'diagnostic.isnewton','numel',[1],'values',[0,1,2])
                 md = checkfield(md,'diagnostic.stokesreconditioning','size',[1],'NaN',1)
                 md = checkfield(md,'diagnostic.viscosity_overshoot','size',[1],'NaN',1)
@@ -174 +174 @@
                 WriteData(fid,'object',self,'fieldname','reltol','format','Double')
                 WriteData(fid,'object',self,'fieldname','abstol','format','Double')
-                WriteData(fid,'object',self,'fieldname','isnewton','format','Boolean')
+                WriteData(fid,'object',self,'fieldname','isnewton','format','Integer')
                 WriteData(fid,'object',self,'fieldname','stokesreconditioning','format','Double')
                 WriteData(fid,'object',self,'fieldname','viscosity_overshoot','format','Double')