Changeset 21000 for issm/trunk-jpl/src/m/classes/slr.m

Timestamp:

07/26/16 14:44:16 (9 years ago)

Author:

adhikari

Message:

CHG: added capabilities to compute absolute sea level and 3D crustal motion

File:

• issm/trunk-jpl/src/m/classes/slr.m (modified) (6 diffs)

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

@@ -13 +13 @@
                 love_h         = 0; %provided by PREM model
                 love_k         = 0; %ideam
+                love_l         = 0; %ideam
                 tide_love_k    = 0; %ideam
                 tide_love_h    = 0; %ideam
@@ -66 +67 @@
                         md = checkfield(md,'fieldname','slr.love_h','NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','slr.love_k','NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','slr.love_l','NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','slr.tide_love_h','NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','slr.tide_love_k','NaN',1,'Inf',1);
-                        md = checkfield(md,'fieldname','slr.love_k','NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','slr.reltol','size',[1 1]);
                         md = checkfield(md,'fieldname','slr.abstol','size',[1 1]);
@@ -76 +77 @@
 
                         %check that love numbers are provided at the same level of accuracy: 
-                        if (size(self.love_h,1) ~= size(self.love_k,1)),
+                        if (size(self.love_h,1)~=size(self.love_k,1) | size(self.love_h,1)~=size(self.love_l,1)),
                                 error('slr error message: love numbers should be provided at the same level of accuracy');
                         end
@@ -100 +101 @@
                         fielddisplay(self,'abstol','sea level rise absolute convergence criterion, NaN: not applied');
                         fielddisplay(self,'maxiter','maximum number of nonlinear iterations');
-                        fielddisplay(self,'love_h','love load number for radial displacement');
-                        fielddisplay(self,'love_k','love load number for gravitational potential perturbation');
-                        fielddisplay(self,'tide_love_k','tidal love number (deg 2)');
-                        fielddisplay(self,'tide_love_h','tidal love number (deg 2)');
+                        fielddisplay(self,'love_h','load Love number for radial displacement');
+                        fielddisplay(self,'love_k','load Love number for gravitational potential perturbation');
+                        fielddisplay(self,'love_l','load Love number for horizontal displacements');
+                        fielddisplay(self,'tide_love_k','tidal load Love number (deg 2)');
+                        fielddisplay(self,'tide_love_h','tidal load Love number (deg 2)');
                         fielddisplay(self,'rotation','earth rotational potential perturbation');
                         fielddisplay(self,'rigid','rigid earth graviational potential perturbation');
@@ -120 +122 @@
                         WriteData(fid,prefix,'object',self,'fieldname','love_h','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',self,'fieldname','love_k','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'fieldname','love_l','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',self,'fieldname','tide_love_h','format','Double');
                         WriteData(fid,prefix,'object',self,'fieldname','tide_love_k','format','Double');
@@ -147 +150 @@
                         writejs1Darray(fid,[modelname '.slr.love_h'],self.love_h);
                         writejs1Darray(fid,[modelname '.slr.love_k'],self.love_k);
+                        writejs1Darray(fid,[modelname '.slr.love_l'],self.love_l);
                         writejsdouble(fid,[modelname '.slr.tide_love_k'],self.tide_love_k);
                         writejsdouble(fid,[modelname '.slr.tide_love_h'],self.tide_love_h);