Index: /issm/trunk-jpl/src/m/classes/diagnostic.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/diagnostic.m	(revision 14412)
+++ /issm/trunk-jpl/src/m/classes/diagnostic.m	(revision 14413)
@@ -76,5 +76,5 @@
 			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,5 +122,5 @@
 			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,5 +154,5 @@
 			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');
Index: /issm/trunk-jpl/src/m/classes/diagnostic.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/diagnostic.py	(revision 14412)
+++ /issm/trunk-jpl/src/m/classes/diagnostic.py	(revision 14413)
@@ -51,5 +51,5 @@
 		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,5 +126,5 @@
 		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,5 +174,5 @@
 		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')