Changeset 24313 for issm/trunk/src/m/classes/calvingcrevassedepth.m

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/calvingcrevassedepth.m (modified) (4 diffs)

issm/trunk/src/m/classes/calvingcrevassedepth.m

@@ -6 +6 @@
 classdef calvingcrevassedepth
         properties (SetAccess=public) 
-                critical_fraction = 0.;
+                crevasse_opening_stress=1.;
                 water_height = 0.;
-                meltingrate   = NaN;
         end
         methods
@@ -30 +29 @@
                 end % }}}
                 function self = extrude(self,md) % {{{
-                        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) % {{{
@@ -42 +39 @@
                         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]');
 
                 end % }}}
@@ -56 +51 @@
                         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 % }}}
         end