Index: ../trunk-jpl/src/m/classes/calvingcrevassedepth.m
===================================================================
--- ../trunk-jpl/src/m/classes/calvingcrevassedepth.m	(revision 23608)
+++ ../trunk-jpl/src/m/classes/calvingcrevassedepth.m	(revision 23609)
@@ -5,7 +5,7 @@
 
 classdef calvingcrevassedepth
 	properties (SetAccess=public) 
-		critical_fraction = 0.;
+		crevasse_opening_stress=1.;
 		water_height = 0.;
 		meltingrate   = NaN;
 	end
@@ -32,22 +32,21 @@
 			self.meltingrate=project3d(md,'vector',self.meltingrate,'type','node');
 		end % }}}
 		function self = setdefaultparameters(self) % {{{
-
-			% crticial fraction of thickness that surface and basal crevasses penetrate for calving onset
-			self.critical_fraction = 1.;
+			
 			self.water_height = 0.;
+			crevasse_opening_stress=1.;
 		end % }}}
 		function md = checkconsistency(self,md,solution,analyses) % {{{
 			%Early return
 			if (~strcmp(solution,'TransientSolution') | md.transient.ismovingfront==0), return; end
 
-			md = checkfield(md,'fieldname','calving.critical_fraction','>',0,'NaN',1,'Inf',1);
+			md = checkfield(md,'fieldname','calving.crevasse_opening_stress','numel',[1],'values',[0,1]);
 			md = checkfield(md,'fieldname','calving.water_height','NaN',1,'Inf',1,'timeseries',1,'>=',0);
 			md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'Inf',1,'timeseries',1,'>=',0);
 		end % }}}
 		function disp(self) % {{{
 			disp(sprintf('   Calving Pi parameters:'));
-			fielddisplay(self,'critical_fraction','critical fraction of thickness that surface and basal crevasses penetrate for calving onset');
+			fielddisplay(self,'crevasse_opening_stress','0: stress only in the ice-flow direction, 1: max principal');
 			fielddisplay(self,'water_height','water height in the crevasse [m]');
 			fielddisplay(self,'meltingrate','melting rate at given location [m/a]');
 
@@ -55,7 +54,7 @@
 		function marshall(self,prefix,md,fid) % {{{
 			yts=md.constants.yts;
 			WriteData(fid,prefix,'name','md.calving.law','data',6,'format','Integer');
-			WriteData(fid,prefix,'object',self,'fieldname','critical_fraction','format','Double');
+			WriteData(fid,prefix,'object',self,'fieldname','crevasse_opening_stress','format','Integer');
 			WriteData(fid,prefix,'object',self,'fieldname','water_height','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
 			WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts);
 		end % }}}