Changeset 27035 for issm/trunk/src/m/classes/spatiallinearbasalforcings.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/spatiallinearbasalforcings.m (modified) (8 diffs)

issm/trunk/src/m/classes/spatiallinearbasalforcings.m

@@ -9 +9 @@
                 deepwater_melting_rate    = NaN;
                 deepwater_elevation       = NaN;
+                upperwater_melting_rate   = NaN;
                 upperwater_elevation      = NaN;
+                perturbation_melting_rate = NaN;
                 geothermalflux            = NaN;
         end
@@ -25 +27 @@
                                                 self.deepwater_elevation=lb.deepwater_elevation*ones(nvertices,1);
                                                 self.deepwater_melting_rate=lb.deepwater_melting_rate*ones(nvertices,1);
+                                                self.upperwater_melting_rate=lb.upperwater_melting_rate*ones(nvertices,1);
                                                 self.upperwater_elevation=lb.upperwater_elevation*ones(nvertices,1);
+                                                self.perturbation_melting_rate=lb.perturbation_melting_rate*ones(nvertices,1);
                                         else 
                                                 self=structtoobj(spatiallinearbasalforcings(),varargin{1});
@@ -37 +41 @@
                         self.deepwater_melting_rate=project3d(md,'vector',self.deepwater_melting_rate,'type','node','layer',1); 
                         self.deepwater_elevation=project3d(md,'vector',self.deepwater_elevation,'type','node','layer',1); 
+                        self.upperwater_melting_rate=project3d(md,'vector',self.upperwater_melting_rate,'type','node','layer',1); 
                         self.upperwater_elevation=project3d(md,'vector',self.upperwater_elevation,'type','node','layer',1); 
                         self.geothermalflux=project3d(md,'vector',self.geothermalflux,'type','node','layer',1); %bedrock only gets geothermal flux
+                        self.perturbation_melting_rate=project3d(md,'vector',self.perturbation_melting_rate,'type','node','layer',1); 
                 end % }}}
                 function self = initialize(self,md) % {{{
@@ -58 +64 @@
                 function md = checkconsistency(self,md,solution,analyses) % {{{
 
+                        if numel(md.basalforcings.perturbation_melting_rate)>1
+            md = checkfield(md,'fieldname','basalforcings.perturbation_melting_rate','NaN',1,'Inf',1,'timeseries',1);
+         end
+
                         if ismember('MasstransportAnalysis',analyses) & ~(strcmp(solution,'TransientSolution') & md.transient.ismasstransport==0),
                                 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','NaN',1,'Inf',1,'timeseries',1,'>=',0);
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','NaN',1,'Inf',1,'timeseries',1);
-                                md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','NaN',1,'Inf',1,'timeseries',1,'<',0);
+                                md = checkfield(md,'fieldname','basalforcings.upperwater_melting_rate','NaN',1,'Inf',1,'timeseries',1,'>=',0);
+                                md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','NaN',1,'Inf',1,'timeseries',1,'<=',0);
                         end
                         if ismember('BalancethicknessAnalysis',analyses),
@@ -69 +80 @@
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0,'numel',1);
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<','basalforcings.upperwater_elevation','numel',1);
+                                md = checkfield(md,'fieldname','basalforcings.upperwater_melting_rate','>=',0,'numel',1);
                                 md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<=',0,'numel',1);
                         end
@@ -76 +88 @@
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0,'numel',1);
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<','basalforcings.upperwater_elevation','numel',1);
-                                md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<',0,'numel',1);
+                                md = checkfield(md,'fieldname','basalforcings.upperwater_melting_rate','>=',0,'numel',1);
+                                md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<=',0,'numel',1);
                                 md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'timeseries',1,'>=',0);
                         end
@@ -86 +99 @@
                         fielddisplay(self,'deepwater_melting_rate','basal melting rate (positive if melting applied for floating ice whith base < deepwater_elevation) [m/yr]');
                         fielddisplay(self,'deepwater_elevation','elevation of ocean deepwater [m]');
+                        fielddisplay(self,'upperwater_melting_rate','basal melting rate (positive if melting applied for floating ice whith base >= upperwater_elevation) [m/yr]');
                         fielddisplay(self,'upperwater_elevation','elevation of ocean upperwater [m]');
+                        fielddisplay(self,'perturbation_melting_rate','basal melting rate perturbation added to computed melting rate (positive if melting) [m/yr]');
                         fielddisplay(self,'geothermalflux','geothermal heat flux [W/m^2]');
 
@@ -94 +109 @@
                         yts=md.constants.yts;
 
-                        floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
-                        pos=find(md.geometry.base<=md.basalforcings.deepwater_elevation);
-                        floatingice_melting_rate(pos)=md.basalforcings.deepwater_melting_rate(pos);
-                        pos=find(md.geometry.base>md.basalforcings.deepwater_elevation & md.geometry.base<md.basalforcings.upperwater_elevation);
-                        floatingice_melting_rate(pos)=md.basalforcings.deepwater_melting_rate(pos).*(md.geometry.base(pos)-md.basalforcings.upperwater_elevation(pos))./(md.basalforcings.deepwater_elevation(pos)-md.basalforcings.upperwater_elevation(pos));
                         WriteData(fid,prefix,'name','md.basalforcings.model','data',6,'format','Integer');
-                        WriteData(fid,prefix,'data',floatingice_melting_rate,'format','DoubleMat','name','md.basalforcings.floatingice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','name','md.basalforcings.groundedice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','geothermalflux','name','md.basalforcings.geothermalflux','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','deepwater_melting_rate','format','DoubleMat','name','md.basalforcings.deepwater_melting_rate','scale',1./yts,'mattype',1);
                         WriteData(fid,prefix,'object',self,'fieldname','deepwater_elevation','format','DoubleMat','name','md.basalforcings.deepwater_elevation','mattype',1);
+                        WriteData(fid,prefix,'object',self,'fieldname','upperwater_melting_rate','format','DoubleMat','name','md.basalforcings.upperwater_melting_rate','scale',1./yts,'mattype',1);
                         WriteData(fid,prefix,'object',self,'fieldname','upperwater_elevation','format','DoubleMat','name','md.basalforcings.upperwater_elevation','mattype',1);
+                        WriteData(fid,prefix,'object',self,'fieldname','perturbation_melting_rate','format','DoubleMat','name','md.basalforcings.perturbation_melting_rate','scale',1./yts,'mattype',1);
                 end % }}}
         end