Changeset 21324 for issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/slr.m

Timestamp:

10/29/16 16:54:30 (8 years ago)

Author:

Eric.Larour

Message:

CHG: introducing ocean area scaling from Surendra's work.

File:

• issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/slr.m (modified) (10 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/slr.m

@@ -8 +8 @@
                 deltathickness = NaN;
                 sealevel       = NaN; 
+                spcthickness   = NaN; 
                 maxiter        = 0;
                 reltol         = 0;
@@ -19 +20 @@
                 elastic        = 0;
                 rotation       = 0;
+                ocean_area_scaling = 0;
                 degacc         = 0;
                 requested_outputs      = {};
@@ -45 +47 @@
                 self.elastic=1;
                 self.rotation=1;
+                self.ocean_area_scaling=0;
 
                 %tidal love numbers: 
@@ -65 +68 @@
                         md = checkfield(md,'fieldname','slr.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
                         md = checkfield(md,'fieldname','slr.sealevel','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
+                        md = checkfield(md,'fieldname','slr.spcthickness','Inf',1,'timeseries',1);
                         md = checkfield(md,'fieldname','slr.love_h','NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','slr.love_k','NaN',1,'Inf',1);
@@ -98 +102 @@
                         fielddisplay(self,'deltathickness','thickness change (main loading of the slr solution core [m]');
                         fielddisplay(self,'sealevel','current sea level (prior to computation) [m]');
+                        fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint) [m]');
                         fielddisplay(self,'reltol','sea level rise relative convergence criterion, (default, NaN: not applied)');
                         fielddisplay(self,'abstol','sea level rise absolute convergence criterion, NaN: not applied');
@@ -107 +112 @@
                         fielddisplay(self,'tide_love_h','tidal load Love number (deg 2)');
                         fielddisplay(self,'rotation','earth rotational potential perturbation');
+                        fielddisplay(self,'ocean_area_scaling','correction for model representation of ocean area [default: No correction]'); 
                         fielddisplay(self,'rigid','rigid earth graviational potential perturbation');
                         fielddisplay(self,'elastic','elastic earth graviational potential perturbation');
@@ -117 +123 @@
                         WriteData(fid,prefix,'object',self,'fieldname','deltathickness','format','DoubleMat','mattype',2);
                         WriteData(fid,prefix,'object',self,'fieldname','sealevel','mattype',1,'format','DoubleMat','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','reltol','format','Double');
                         WriteData(fid,prefix,'object',self,'fieldname','abstol','format','Double');
@@ -128 +135 @@
                         WriteData(fid,prefix,'object',self,'fieldname','elastic','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','rotation','format','Boolean');
+                        WriteData(fid,prefix,'object',self,'fieldname','ocean_area_scaling','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','degacc','format','Double');
                         WriteData(fid,prefix,'object',self,'fieldname','transitions','format','MatArray');
@@ -145 +153 @@
                         writejs1Darray(fid,[modelname '.slr.deltathickness'],self.deltathickness);
                         writejs1Darray(fid,[modelname '.slr.sealevel'],self.sealevel);
+                        writejs1Darray(fid,[modelname '.slr.spcthickness'],self.spcthickness);
                         writejsdouble(fid,[modelname '.slr.maxiter'],self.maxiter);
                         writejsdouble(fid,[modelname '.slr.reltol'],self.reltol);
@@ -155 +164 @@
                         writejsdouble(fid,[modelname '.slr.rigid'],self.rigid);
                         writejsdouble(fid,[modelname '.slr.rotation'],self.rotation);
+                        writejsdouble(fid,[modelname '.slr.ocean_area_scaling'],self.ocean_area_scaling);
                         writejsdouble(fid,[modelname '.slr.elastic'],self.elastic);
                         writejsdouble(fid,[modelname '.slr.degacc'],self.degacc);