Index: /issm/trunk-jpl/src/m/classes/hydrologyshreve.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/hydrologyshreve.m	(revision 17880)
+++ /issm/trunk-jpl/src/m/classes/hydrologyshreve.m	(revision 17881)
@@ -7,9 +7,4 @@
 	properties (SetAccess=public) 
 		spcwatercolumn = NaN;
-		n              = 0;
-		CR             = 0;
-		p              = 0;
-		q              = 0;
-		kn             = 0;
 		stabilization  = 0;
 	end
@@ -23,9 +18,4 @@
             
 			fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',    '<parameter key ="spcwatercolumn" type="',      class(obj.spcwatercolumn),'" default="',        convert2str(obj.spcwatercolumn),'">',	'     <section name="hydrologyshreve" />','     <help> water thickness constraints (NaN means no constraint) [m] </help>','</parameter>');
-            fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',    '<parameter key ="n" type="',          class(obj.n),'" default="',            convert2str(obj.n),'">',     '     <section name="hydrologyshreve" />','     <help> Manning roughness coefficient </help>','</parameter>');
-            fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',	'<parameter key ="CR" type="',        class(obj.CR),'" default="',          convert2str(obj.CR),'">',	'     <section name="hydrologyshreve" />','     <help> tortuosity parameter </help>','</parameter>');
-            fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',    '<parameter key ="p" type="',          class(obj.p),'" default="',            convert2str(obj.p),'">',	'     <section name="hydrologyshreve" />','     <help> dimensionless exponent in Manning velocity formula </help>','</parameter>');
-            fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',    '<parameter key ="q" type="',  	class(obj.q),'" default="',       convert2str(obj.q),'">',     '     <section name="hydrologyshreve" />','     <help> dimensionless exponent in Manning velocity formula </help>','</parameter>');
-            fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',    '<parameter key ="kn" type="',         class(obj.kn),'" default="',           convert2str(obj.kn),'">',	'     <section name="hydrologyshreve" />','     <help> parameter in effective pressure formula </help>','</parameter>');
             fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',    '<parameter key ="stabilization" type="',         class(obj.stabilization),'" default="',           convert2str(obj.stabilization),'">',	'     <section name="hydrologyshreve" />','     <help> artificial diffusivity (default is 1). can be more than 1 to increase diffusivity. </help>','</parameter>');
             fprintf(fid,'%s\n%s\n','</frame>');
@@ -42,11 +32,4 @@
 		end % }}}
 		function obj = setdefaultparameters(obj) % {{{
-
-			%Parameters from Johnson's 2002 thesis, section 3.5.4			 
-			obj.n  = .02;
-			obj.CR = .01;
-			obj.p  = 2;
-			obj.q  = 1;
-			obj.kn = 0;
 
 			%Type of stabilization to use 0:nothing 1:artificial_diffusivity
@@ -65,11 +48,5 @@
 		function disp(obj) % {{{
 			disp(sprintf('   hydrologyshreve solution parameters:'));
-
 			fielddisplay(obj,'spcwatercolumn','water thickness constraints (NaN means no constraint) [m]');
-			fielddisplay(obj,'n','Manning roughness coefficient');
-			fielddisplay(obj,'CR','tortuosity parameter');
-			fielddisplay(obj,'p','dimensionless exponent in Manning velocity formula');
-			fielddisplay(obj,'q','dimensionless exponent in Manning velocity formula');
-			fielddisplay(obj,'kn','parameter in effective pressure formula');
 			fielddisplay(obj,'stabilization','artificial diffusivity (default is 1). can be more than 1 to increase diffusivity.');
 
@@ -78,11 +55,7 @@
 			WriteData(fid,'enum',HydrologyModelEnum(),'data',HydrologyshreveEnum(),'format','Integer');
 			WriteData(fid,'object',obj,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
-			WriteData(fid,'object',obj,'fieldname','n','format','Double');
-			WriteData(fid,'object',obj,'fieldname','CR','format','Double');
-			WriteData(fid,'object',obj,'fieldname','p','format','Double');
-			WriteData(fid,'object',obj,'fieldname','q','format','Double');
-			WriteData(fid,'object',obj,'fieldname','kn','format','Double');
 			WriteData(fid,'object',obj,'fieldname','stabilization','format','Double');
 		end % }}}
 	end
 end
+
Index: /issm/trunk-jpl/src/m/classes/hydrologyshreve.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/hydrologyshreve.py	(revision 17880)
+++ /issm/trunk-jpl/src/m/classes/hydrologyshreve.py	(revision 17881)
@@ -14,9 +14,4 @@
 	def __init__(self): # {{{
 		self.spcwatercolumn = float('NaN')
-		self.n              = 0
-		self.CR             = 0
-		self.p              = 0
-		self.q              = 0
-		self.kn             = 0
 		self.stabilization  = 0
 
@@ -29,9 +24,4 @@
 		string='   hydrologyshreve solution parameters:'
 		string="%s\n%s"%(string,fielddisplay(self,'spcwatercolumn','water thickness constraints (NaN means no constraint) [m]'))
-		string="%s\n%s"%(string,fielddisplay(self,'n','Manning roughness coefficient'))
-		string="%s\n%s"%(string,fielddisplay(self,'CR','tortuosity parameter'))
-		string="%s\n%s"%(string,fielddisplay(self,'p','dimensionless exponent in Manning velocity formula'))
-		string="%s\n%s"%(string,fielddisplay(self,'q','dimensionless exponent in Manning velocity formula'))
-		string="%s\n%s"%(string,fielddisplay(self,'kn','parameter in effective pressure formula'))
 		string="%s\n%s"%(string,fielddisplay(self,'stabilization','artificial diffusivity (default is 1). can be more than 1 to increase diffusivity.'))
 		return string
@@ -39,11 +29,4 @@
 	def setdefaultparameters(self): # {{{
 		
-		#Parameters from Johnson's 2002 thesis, section 3.5.4			 
-		self.n=.02			
-		self.CR=.01
-		self.p=2
-		self.q=1
-		self.kn=0
-
 		#Type of stabilization to use 0:nothing 1:artificial_diffusivity
 		self.stabilization=1
@@ -65,9 +48,4 @@
 		WriteData(fid,'enum',HydrologyModelEnum(),'data',HydrologyshreveEnum(),'format','Integer');
 		WriteData(fid,'object',self,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
-		WriteData(fid,'object',self,'fieldname','n','format','Double')
-		WriteData(fid,'object',self,'fieldname','CR','format','Double')
-		WriteData(fid,'object',self,'fieldname','p','format','Double')
-		WriteData(fid,'object',self,'fieldname','q','format','Double')
-		WriteData(fid,'object',self,'fieldname','kn','format','Double')
 		WriteData(fid,'object',self,'fieldname','stabilization','format','Double')
 	# }}}