Changeset 21729 for issm/trunk/src/m/classes/levelset.m

Timestamp:

05/19/17 14:48:02 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21727

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/levelset.m (modified) (5 diffs)

issm/trunk/src/m/classes/levelset.m

@@ -9 +9 @@
                 spclevelset                     = NaN;
                 reinit_frequency        = 5;
+                calving_max       = 0.;
         end
         methods
@@ -36 +37 @@
 
                         %stabilization = 2 by default
-                        self.stabilization = 2;
+                        self.stabilization    = 2;
                         self.reinit_frequency = 5;
+                        self.calving_max      = 3000.;
 
                 end % }}}
@@ -46 +48 @@
                         md = checkfield(md,'fieldname','levelset.spclevelset','Inf',1,'timeseries',1);
                         md = checkfield(md,'fieldname','levelset.stabilization','values',[0 1 2]);
+                        md = checkfield(md,'fieldname','levelset.calving_max','numel',1,'NaN',1,'Inf',1,'>',0);
                 end % }}}
                 function disp(self) % {{{
@@ -52 +55 @@
                         fielddisplay(self,'spclevelset','Levelset constraints (NaN means no constraint)');
                         fielddisplay(self,'reinit_frequency','Amount of time steps after which the levelset function in re-initialized');
+                        fielddisplay(self,'calving_max','maximum allowed calving rate (m/a)');
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
+
+                        yts=md.constants.yts;
+
                         WriteData(fid,prefix,'object',self,'fieldname','stabilization','format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','spclevelset','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','reinit_frequency','format','Integer');
+                        WriteData(fid,prefix,'object',self,'fieldname','calving_max','format','Double','scale',1./yts);
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{
@@ -63 +71 @@
                         writejs1Darray(fid,[modelname '.levelset.spclevelset'],self.spclevelset);
                         writejs1Darray(fid,[modelname '.levelset.reinit_frequency'],self.reinit_frequency);
+                        writejsdouble(fid,[modelname '.levelset.calving_max'],self.calving_max);
 
                 end % }}}