Changeset 24305

Timestamp:

10/31/19 13:48:07 (5 years ago)

Author:

youngmc3

Message:

CHG: remove meltingrate in some classes

Location:

issm/trunk-jpl/src/m/classes

Files:

• calving.js (modified) (4 diffs)
• calving.m (modified) (2 diffs)
• calving.py (modified) (1 diff)
• calvingcrevassedepth.m (modified) (1 diff)
• calvingdev.py (modified) (4 diffs)
• calvingdev2.m (modified) (6 diffs)
• calvinghab.m (modified) (4 diffs)
• calvinglevermann.m (modified) (1 diff)
• calvinglevermann.py (modified) (1 diff)
• calvingminthickness.m (modified) (1 diff)
• calvingminthickness.py (modified) (1 diff)
• calvingvonmises.m (modified) (1 diff)
• calvingvonmises.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/calving.js

@@ -13 +13 @@
                 console.log(sprintf('   Calving parameters:'));
                 fielddisplay(this,'calvingrate','calving rate at given location [m/a]');
-                fielddisplay(this,'meltingrate','melting rate at given location [m/a]');
 
         }// }}}
     this.extrude = function(md) {//{{{
         this.calvingrate=project3d(md,'vector',this.calvingrate,'type','node');
-        this.meltingrate=project3d(md,'vector',this.meltingrate,'type','node');
         return this;
     }//}}}
@@ -29 +27 @@
 
                 checkfield(md,'fieldname','calving.calvingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1,'Inf',1);
-                checkfield(md,'fieldname','calving.meltingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1,'Inf',1);
         } //}}}
                 this.marshall=function(md,prefix,fid) { //{{{
@@ -35 +32 @@
                         WriteData(fid,prefix,'name','md.calving.law','data',1,'format','Integer');
                         WriteData(fid,prefix,'object',this,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts);
-                        WriteData(fid,prefix,'object',this,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts);
                 }//}}}
                 this.fix=function() { //{{{
                         this.calvingrate=NullFix(this.calvingrate,NaN);
-                        this.meltingrate=NullFix(this.meltingrate,NaN);
                 }//}}}
         //properties 
@@ -45 +40 @@
 
         this.calvingrate   = NaN;
-        this.meltingrate   = NaN;
 
         this.setdefaultparameters();

issm/trunk-jpl/src/m/classes/calving.m

@@ -7 +7 @@
         properties (SetAccess=public) 
                 calvingrate   = NaN;
-                meltingrate   = NaN;
         end
         methods
@@ -52 +51 @@
                 
                         writejs1Darray(fid,[modelname '.calving.calvingrate'],self.calvingrate);
-                        writejs1Darray(fid,[modelname '.calving.meltingrate'],self.meltingrate);
 
                 end % }}}

issm/trunk-jpl/src/m/classes/calving.py

@@ -16 +16 @@
 
         self.calvingrate = float('NaN')
-        self.meltingrate = float('NaN')
 
     #set defaults

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

@@ -8 +8 @@
                 crevasse_opening_stress=1.;
                 water_height = 0.;
-                meltingrate   = NaN;
         end
         methods

issm/trunk-jpl/src/m/classes/calvingdev.py

@@ -17 +17 @@
         self.stress_threshold_groundedice = 0.
         self.stress_threshold_floatingice = 0.
-        self.meltingrate = float('NaN')
 
     #set defaults
@@ -29 +28 @@
         string = "%s\n%s" % (string, fielddisplay(self, 'stress_threshold_floatingice', 'sigma_max applied to floating ice only [Pa]'))
 
-        string = "%s\n%s" % (string, fielddisplay(self, 'meltingrate', 'melting rate at given location [m / a]'))
         return string
     #}}}
 
     def extrude(self, md):  # {{{
-        self.meltingrate = project3d(md, 'vector', self.meltingrate, 'type', 'node')
         return self
     #}}}
@@ -52 +49 @@
         md = checkfield(md, 'fieldname', 'calving.stress_threshold_groundedice', '>', 0, 'nan', 1, 'Inf', 1)
         md = checkfield(md, 'fieldname', 'calving.stress_threshold_floatingice', '>', 0, 'nan', 1, 'Inf', 1)
-        md = checkfield(md, 'fieldname', 'calving.meltingrate', 'NaN', 1, 'Inf', 1, 'timeseries', 1, '>=', 0)
 
         return md
@@ -63 +59 @@
         WriteData(fid, prefix, 'object', self, 'fieldname', 'stress_threshold_groundedice', 'format', 'DoubleMat', 'mattype', 1)
         WriteData(fid, prefix, 'object', self, 'fieldname', 'stress_threshold_floatingice', 'format', 'DoubleMat', 'mattype', 1)
-        WriteData(fid, prefix, 'object', self, 'fieldname', 'meltingrate', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', yts, 'scale', 1. / yts)
     # }}}

issm/trunk-jpl/src/m/classes/calvingdev2.m

@@ -9 +9 @@
                 stress_threshold_floatingice = 0.;
                 height_above_floatation = 0.;
-                meltingrate   = NaN;
         end
         methods
@@ -31 +30 @@
                 end % }}}
                 function self = extrude(self,md) % {{{
-                        self.meltingrate=project3d(md,'vector',self.meltingrate,'type','node');
                 end % }}}
                 function self = setdefaultparameters(self) % {{{
@@ -39 +37 @@
                         self.stress_threshold_floatingice = 150.e3;
                         self.height_above_floatation= 0.;
-                        self.meltingrate= 0.;
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
@@ -48 +45 @@
                         md = checkfield(md,'fieldname','calving.stress_threshold_floatingice','>',0,'nan',1,'Inf',1);
                         md = checkfield(md,'fieldname','calving.height_above_floatation','<=',0);
-                        md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'Inf',1,'timeseries',1,'>=',0);
                 end % }}}
                 function disp(self) % {{{
@@ -55 +51 @@
                         fielddisplay(self,'stress_threshold_floatingice','sigma_max applied to floating ice only [Pa]');
                         fielddisplay(self,'height_above_floatation','height above floatation that the ice tongue must reach before it can calve [m]');
-                        fielddisplay(self,'meltingrate','frontal undercutting melting rate at given location [m/a]');
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
@@ -63 +58 @@
                         WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_floatingice','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1, 'yts', md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','height_above_floatation', 'format','Double');
-                        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

issm/trunk-jpl/src/m/classes/calvinghab.m

@@ -7 +7 @@
         properties (SetAccess=public) 
                 flotation_fraction = 0.;
-                meltingrate   = NaN;
         end
         methods
@@ -29 +28 @@
                 end % }}}
                 function self = extrude(self,md) % {{{
-                        self.meltingrate=project3d(md,'vector',self.meltingrate,'type','node');
                 end % }}}
                 function self = setdefaultparameters(self) % {{{
@@ -41 +39 @@
 
                         md = checkfield(md,'fieldname','calving.flotation_fraction','>=',0,'NaN',1,'Inf',1);
-                        md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'Inf',1,'timeseries',1,'>=',0);
                 end % }}}
                 function disp(self) % {{{
                         disp(sprintf('   Calving Pi parameters:'));
                         fielddisplay(self,'flotation_fraction','fraction of flotation thickness at the terminus');
-                        fielddisplay(self,'meltingrate','melting rate at given location [m/a]');
 
                 end % }}}
@@ -53 +49 @@
                         WriteData(fid,prefix,'name','md.calving.law','data',5,'format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','flotation_fraction','format','DoubleMat','mattype',1);
-                        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

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

@@ -7 +7 @@
         properties (SetAccess=public) 
                 coeff         = NaN;
-                meltingrate   = NaN;
         end
         methods

issm/trunk-jpl/src/m/classes/calvinglevermann.py

@@ -16 +16 @@
 
         self.coeff = float('NaN')
-        self.meltingrate = float('NaN')
 
     #set defaults

issm/trunk-jpl/src/m/classes/calvingminthickness.m

@@ -7 +7 @@
         properties (SetAccess=public) 
                 min_thickness = 0.;
-                meltingrate   = NaN;
         end
         methods

issm/trunk-jpl/src/m/classes/calvingminthickness.py

@@ -15 +15 @@
 
         self.min_thickness = 0.
-        self.meltingrate = float('NaN')
 
     #set defaults

issm/trunk-jpl/src/m/classes/calvingvonmises.m

@@ -8 +8 @@
                 stress_threshold_groundedice = 0.;
                 stress_threshold_floatingice = 0.;
-                meltingrate=NaN;
                 min_thickness = 0.;
         end

issm/trunk-jpl/src/m/classes/calvingvonmises.py

@@ -16 +16 @@
         self.stress_threshold_groundedice = 0.
         self.stress_threshold_floatingice = 0.
-        self.meltingrate = float('NaN')
         self.min_thickness = 0.