Changeset 20500 for issm/trunk/src/m/classes/calvinglevermann.m

Timestamp:

04/12/16 21:32:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20497

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/calvinglevermann.m (modified) (4 diffs)

issm/trunk

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

issm/trunk/src/m/classes/calvinglevermann.m

@@ -6 +6 @@
 classdef calvinglevermann
         properties (SetAccess=public) 
-                stabilization = 0;
                 coeff         = NaN;
                 meltingrate   = NaN;
@@ -35 +34 @@
                 function self = setdefaultparameters(self) % {{{
 
-                        %stabilization = 2 by default
-                        self.stabilization = 2;
-
                         %Proportionality coefficient in Levermann model
                         self.coeff=2e13;
@@ -43 +39 @@
                 function md = checkconsistency(self,md,solution,analyses) % {{{
                         %Early return
-                        if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end
+                        if (solution~=TransientSolutionEnum() | md.transient.ismovingfront==0), return; end
 
-                        md = checkfield(md,'fieldname','calving.stabilization','values',[0 1 2]);
                         md = checkfield(md,'fieldname','calving.coeff','>',0,'size',[md.mesh.numberofvertices 1]);
-                        md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'size',[md.mesh.numberofvertices 1],'>=',0);
+                        md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1],'>=',0);
                 end % }}}
                 function disp(self) % {{{
                         disp(sprintf('   Calving Levermann parameters:'));
-                        fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding');
                         fielddisplay(self,'coeff','proportionality coefficient in Levermann model');
                         fielddisplay(self,'meltingrate','melting rate at given location [m/a]');
@@ -59 +53 @@
                         yts=365.0*24.0*3600.0;
                         WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingLevermannEnum(),'format','Integer');
-                        WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer');
                         WriteData(fid,'enum',CalvinglevermannCoeffEnum(),'data',self.coeff,'format','DoubleMat','mattype',1);
                         WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts);

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad