Changeset 23842 for issm/trunk-jpl/src/m/classes/linearbasalforcings.m

Timestamp:

04/12/19 09:28:50 (6 years ago)

Author:

Mathieu Morlighem

Message:

NEW: adding upperwater melting rate

File:

• issm/trunk-jpl/src/m/classes/linearbasalforcings.m (modified) (7 diffs)

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

@@ -6 +6 @@
 classdef linearbasalforcings
         properties (SetAccess=public) 
-                groundedice_melting_rate  = NaN;
                 deepwater_melting_rate    = 0.;
+                upperwater_melting_rate   = 0.;
                 deepwater_elevation       = 0.;
                 upperwater_elevation      = 0.;
+                groundedice_melting_rate  = NaN;
                 geothermalflux            = NaN;
         end
@@ -38 +39 @@
 
                         %default values for melting parameterization
-                        self.deepwater_melting_rate = 50;
-                        self.deepwater_elevation    = -800;
-                        self.upperwater_elevation   = -400;
+                        self.deepwater_melting_rate = 50.;
+                        self.upperwater_melting_rate = 0.;
+                        self.deepwater_elevation    = -800.;
+                        self.upperwater_elevation   = -400.;
 
                 end % }}}
@@ -48 +50 @@
                                 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0,'singletimeseries',1);
+                                md = checkfield(md,'fieldname','basalforcings.upperwater_melting_rate','>=',0,'singletimeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<','basalforcings.upperwater_elevation','singletimeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<=',0,'singletimeseries',1);
@@ -54 +57 @@
                                 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0,'singletimeseries',1);
+                                md = checkfield(md,'fieldname','basalforcings.upperwater_melting_rate','>=',0,'singletimeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<','basalforcings.upperwater_elevation','singletimeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<=',0,'singletimeseries',1);
@@ -60 +64 @@
                                 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0,'singletimeseries',1);
+                                md = checkfield(md,'fieldname','basalforcings.upperwater_melting_rate','>=',0,'singletimeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<','basalforcings.upperwater_elevation','singletimeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<=',0,'singletimeseries',1);
@@ -68 +73 @@
                         disp(sprintf('   basal forcings parameters:'));
 
-                        fielddisplay(self,'groundedice_melting_rate','basal melting rate (positive if melting) [m/yr]');
                         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,'groundedice_melting_rate','basal melting rate (positive if melting) [m/yr]');
                         fielddisplay(self,'geothermalflux','geothermal heat flux [W/m^2]');
 
@@ -84 +90 @@
                         WriteData(fid,prefix,'object',self,'fieldname','deepwater_melting_rate','format','DoubleMat','mattype',3,'timeserieslength',2,'name','md.basalforcings.deepwater_melting_rate','scale',1./yts,'yts',md.constants.yts)
                         WriteData(fid,prefix,'object',self,'fieldname','deepwater_elevation','format','DoubleMat','mattype',3,'name','md.basalforcings.deepwater_elevation','yts',md.constants.yts)
+                        WriteData(fid,prefix,'object',self,'fieldname','upperwater_melting_rate','format','DoubleMat','mattype',3,'timeserieslength',2,'name','md.basalforcings.upperwater_melting_rate','scale',1./yts,'yts',md.constants.yts)
                         WriteData(fid,prefix,'object',self,'fieldname','upperwater_elevation','format','DoubleMat','mattype',3,'name','md.basalforcings.upperwater_elevation','yts',md.constants.yts)
                 end % }}}