Index: /issm/trunk-jpl/src/m/classes/frictionpism.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/frictionpism.m	(revision 23104)
+++ /issm/trunk-jpl/src/m/classes/frictionpism.m	(revision 23105)
@@ -12,4 +12,5 @@
 		till_friction_angle                  = NaN;
 		sediment_compressibility_coefficient = NaN;
+		watercolumn_max                      = NaN;
 	end
 	methods
@@ -33,5 +34,5 @@
          self.threshold_speed           = 100.;
          self.delta                     = 0.02;
-         self.void_ratio                = 0.;   %unknown!!
+         self.void_ratio                = 0.69;
 
 		end % }}}
@@ -46,14 +47,17 @@
 			md = checkfield(md,'fieldname','friction.delta','numel',[1],'>',0,'<',1,'NaN',1,'Inf',1);
 			md = checkfield(md,'fieldname','friction.void_ratio','numel',[1],'>',0,'<',1,'NaN',1,'Inf',1);
-			md = checkfield(md,'fieldname','friction.till_friction_angle','NaN',1,'Inf',1,'<',360.,'>',0.,'size',[md.mesh.vertices 1]); %TODO: check rad or deg
+			md = checkfield(md,'fieldname','friction.till_friction_angle','NaN',1,'Inf',1,'<',360.,'>',0.,'size',[md.mesh.vertices 1]); %User should give angle in degrees, Matlab calculates in rad
+			md = checkfield(md,'fieldname','friction.sediment_compressibility_coefficient','NaN',1,'Inf',1,'<',1.,'>',0.,'size',[md.mesh.vertices 1]);
+			md = checkfield(md,'fieldname','friction.watercolumn_max','NaN',1,'Inf',1,'<',1.,'>',0.,'size',[md.mesh.vertices 1]);
 		end % }}}
 		function disp(self) % {{{
-			disp(sprintf('Basal shear stress parameters  for the PISM friction law (See Aschwwanden et al. 2016 for more details)'));
+			disp(sprintf('Basal shear stress parameters for the PISM friction law (See Aschwanden et al. 2016 for more details)'));
 			fielddisplay(self,'pseudoplasticity_exponent','pseudoplasticity exponent [dimensionless]');
 			fielddisplay(self,'threshold_speed','threshold speed [m/yr]');
 			fielddisplay(self,'delta','lower limit of the effective pressure, expressed as a fraction of overburden pressure [dimensionless]');
 			fielddisplay(self,'void_ratio','void ratio at a reference effective pressure [dimensionless]');
-			fielddisplay(self,'till_friction_angle','till friction angle [deg or rad??]');
-			fielddisplay(self,'sediment_compressibility_coefficient','coefficient of compressibility of the sediment [dimensionless?]');
+			fielddisplay(self,'till_friction_angle','till friction angle [deg], recommended default: 30 deg');
+			fielddisplay(self,'sediment_compressibility_coefficient','coefficient of compressibility of the sediment [dimensionless], recommended default: 0.12');
+			fielddisplay(self,'watercolumn_max','maximum water column height [m], recommended default: 2 m');
 		end % }}}
 		function marshall(self,prefix,md,fid) % {{{
@@ -67,4 +71,5 @@
 			WriteData(fid,prefix,'class','friction','object',self,'fieldname','till_friction_angle','format','DoubleMat','mattype',1);
 			WriteData(fid,prefix,'class','friction','object',self,'fieldname','sediment_compressibility_coefficient','format','DoubleMat','mattype',1);
+			WriteData(fid,prefix,'class','friction','object',self,'fieldname','watercolumn_max','format','DoubleMat','mattype',1);
 		end % }}}
 		function savemodeljs(self,fid,modelname) % {{{