Changeset 27035 for issm/trunk/src/m/classes/frontalforcings.m

Timestamp:

06/01/22 05:01:48 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 27033

Location:

issm/trunk

Files:

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

issm/trunk/src/m/classes/frontalforcings.m

@@ -7 +7 @@
         properties (SetAccess=public) 
                 meltingrate   = NaN;
+                ablationrate   = NaN;
         end
         methods
@@ -29 +30 @@
                 function self = extrude(self,md) % {{{
                         self.meltingrate=project3d(md,'vector',self.meltingrate,'type','node');
+                        self.ablationrate=project3d(md,'vector',self.ablationrate,'type','node');
                 end % }}}
                 function self = setdefaultparameters(self) % {{{
 
                         meltingrate   = NaN;
+                        ablationrate   = NaN;
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
@@ -39 +42 @@
 
                         md = checkfield(md,'fieldname','frontalforcings.meltingrate','NaN',1,'Inf',1,'timeseries',1,'>=',0);
+                        if ~isnan(md.frontalforcings.ablationrate)
+                                md = checkfield(md,'fieldname','frontalforcings.ablationrate','Inf',1,'timeseries',1);
+                        end
 
                 end % }}}
@@ -44 +50 @@
                         disp(sprintf('   Frontalforcings parameters:'));
                         fielddisplay(self,'meltingrate','melting rate at given location [m/a]');
+                        fielddisplay(self,'ablationrate','frontal ablation rate at given location [m/a], it contains both calving and melting');
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
@@ -49 +56 @@
                         WriteData(fid,prefix,'name','md.frontalforcings.parameterization','data',1,'format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts);
+                        if ~isnan(md.frontalforcings.ablationrate)
+                                WriteData(fid,prefix,'object',self,'fieldname','ablationrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts);
+                        end
                 end % }}}
         end