Index: /issm/trunk-jpl/src/m/classes/slr.js =================================================================== --- /issm/trunk-jpl/src/m/classes/slr.js (revision 20348) +++ /issm/trunk-jpl/src/m/classes/slr.js (revision 20349) @@ -18,5 +18,9 @@ this.rigid=1; this.elastic=1; - this.eustatic=1; + this.rotation=1; + + //tidal love numbers: + self.tide_love_h=0.6149; //degree 2 + self.tide_love_k=0.3055; //degree 2 //numerical discretization accuracy @@ -39,4 +43,6 @@ 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.tide_love_h','NaN',1,'Inf',1); + md = checkfield(md,'fieldname','slr.tide_love_k','NaN',1,'Inf',1); md = checkfield(md,'fieldname','slr.reltol','size',[1, 1]); md = checkfield(md,'fieldname','slr.abstol','size',[1, 1]); @@ -68,7 +74,9 @@ fielddisplay(this,'love_h','love load number for radial displacement'); fielddisplay(this,'love_k','love load number for gravitational potential perturbation'); + fielddisplay(this,'tide_love_h','tidal love number (degree 2)'); + fielddisplay(this,'tide_love_k','tidal love number (degree 2)'); fielddisplay(this,'rigid','rigid earth graviational potential perturbation'); fielddisplay(this,'elastic','elastic earth graviational potential perturbation'); - fielddisplay(this,'eustatic','eustatic sea level rise'); + fielddisplay(this,'rotation','rotational earth potential perturbation'); fielddisplay(this,'degacc',"accuracy (default .01 deg) for numerical discretization of the Green's functions"); fielddisplay(this,'transitions','indices into parts of the mesh that will be icecaps'); @@ -84,7 +92,9 @@ WriteData(fid,'object',this,'class','sealevelrise','fieldname','love_h','format','DoubleMat','mattype',1); WriteData(fid,'object',this,'class','sealevelrise','fieldname','love_k','format','DoubleMat','mattype',1); + WriteData(fid,'object',this,'class','sealevelrise','fieldname','tide_love_h','format','Double'); + WriteData(fid,'object',this,'class','sealevelrise','fieldname','tide_love_k','format','Double'); WriteData(fid,'object',this,'class','sealevelrise','fieldname','rigid','format','Boolean'); WriteData(fid,'object',this,'class','sealevelrise','fieldname','elastic','format','Boolean'); - WriteData(fid,'object',this,'class','sealevelrise','fieldname','eustatic','format','Boolean'); + WriteData(fid,'object',this,'class','sealevelrise','fieldname','rotation','format','Boolean'); WriteData(fid,'object',this,'class','sealevelrise','fieldname','degacc','format','Double'); WriteData(fid,'object',this,'class','sealevelrise','fieldname','transitions','format','MatArray'); @@ -109,7 +119,9 @@ this.love_h=NullFix(this.love_h,NaN); this.love_k=NullFix(this.love_k,NaN); + this.tide_love_h=NullFix(this.tide_love_h,NaN); + this.tide_love_k=NullFix(this.tide_love_k,NaN); this.rigid=NullFix(this.rigid,NaN); this.elastic=NullFix(this.elastic,NaN); - this.eustatic=NullFix(this.eustatic,NaN); + this.rotation=NullFix(this.rotation,NaN); this.degacc=NullFix(this.degacc,NaN); }//}}} @@ -122,8 +134,10 @@ this.abstol = 0; this.love_h = 0; //provided by PREM model - this.love_k = 0; //ideam + this.love_k = 0; //idam + this.tide_love_h = 0; + this.tide_love_k = 0; this.rigid = 0; this.elastic = 0; - this.eustatic = 0; + this.rotation = 0; this.degacc = 0; this.requested_outputs = []; Index: /issm/trunk-jpl/src/m/classes/slr.m =================================================================== --- /issm/trunk-jpl/src/m/classes/slr.m (revision 20348) +++ /issm/trunk-jpl/src/m/classes/slr.m (revision 20349) @@ -13,7 +13,9 @@ love_h = 0; %provided by PREM model love_k = 0; %ideam - rigid = 0; - elastic = 0; - eustatic = 0; + tide_love_k = 0; %ideam + tide_love_h = 0; %ideam + rigid = 0; + elastic = 0; + rotation = 0; degacc = 0; requested_outputs = {}; @@ -41,5 +43,9 @@ self.rigid=1; self.elastic=1; - self.eustatic=1; + self.rotation=1; + + %tidal love numbers: + self.tide_love_h=0.6149; %degree 2 + self.tide_love_k=0.3055; % degree 2 %numerical discretization accuracy @@ -60,4 +66,7 @@ md = checkfield(md,'fieldname','slr.sealevel','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]); 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.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]); @@ -94,7 +103,9 @@ 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,'rotation','earth rotational potential perturbation'); fielddisplay(self,'rigid','rigid earth graviational potential perturbation'); fielddisplay(self,'elastic','elastic earth graviational potential perturbation'); - fielddisplay(self,'eustatic','eustatic sea level rise'); fielddisplay(self,'degacc','accuracy (default .01 deg) for numerical discretization of the Green''s functions'); fielddisplay(self,'transitions','indices into parts of the mesh that will be icecaps'); @@ -111,7 +122,9 @@ WriteData(fid,'object',self,'class','sealevelrise','fieldname','love_h','format','DoubleMat','mattype',1); WriteData(fid,'object',self,'class','sealevelrise','fieldname','love_k','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'class','sealevelrise','fieldname','tide_love_k','format','Double'); + WriteData(fid,'object',self,'class','sealevelrise','fieldname','tide_love_h','format','Double'); WriteData(fid,'object',self,'class','sealevelrise','fieldname','rigid','format','Boolean'); WriteData(fid,'object',self,'class','sealevelrise','fieldname','elastic','format','Boolean'); - WriteData(fid,'object',self,'class','sealevelrise','fieldname','eustatic','format','Boolean'); + WriteData(fid,'object',self,'class','sealevelrise','fieldname','rotation','format','Boolean'); WriteData(fid,'object',self,'class','sealevelrise','fieldname','degacc','format','Double'); WriteData(fid,'object',self,'class','sealevelrise','fieldname','transitions','format','MatArray'); @@ -136,6 +149,8 @@ writejs1Darray(fid,[modelname '.slr.love_h'],self.love_h); writejs1Darray(fid,[modelname '.slr.love_k'],self.love_k); + writejsdouble(fid,[modelname '.slr.tide_love_k'],self.tide_love_k); + writejsdouble(fid,[modelname '.slr.tide_love_h'],self.tide_love_h); writejsdouble(fid,[modelname '.slr.rigid'],self.rigid); - writejsdouble(fid,[modelname '.slr.eustatic'],self.eustatic); + writejsdouble(fid,[modelname '.slr.rotation'],self.rotation); writejsdouble(fid,[modelname '.slr.elastic'],self.elastic); writejsdouble(fid,[modelname '.slr.degacc'],self.degacc); Index: /issm/trunk-jpl/src/m/classes/slr.py =================================================================== --- /issm/trunk-jpl/src/m/classes/slr.py (revision 20348) +++ /issm/trunk-jpl/src/m/classes/slr.py (revision 20349) @@ -23,7 +23,9 @@ self.love_h = 0 #provided by PREM model() self.love_k = 0 #ideam + self.tide_love_h = 0 + self.tide_love_k = 0 self.rigid = 0 self.elastic = 0 - self.eustatic = 0 + self.rotation = 0 self.degacc = 0 self.requested_outputs = [] @@ -41,7 +43,9 @@ string="%s\n%s"%(string,fielddisplay(self,'love_h','love load number for radial displacement')) string="%s\n%s"%(string,fielddisplay(self,'love_k','love load number for gravitational potential perturbation')) + string="%s\n%s"%(string,fielddisplay(self,'tide_love_k','tidal love load number (degree 2)')) + string="%s\n%s"%(string,fielddisplay(self,'tide_love_h','tidal love load number (degree 2)')) string="%s\n%s"%(string,fielddisplay(self,'rigid','rigid earth graviational potential perturbation')) string="%s\n%s"%(string,fielddisplay(self,'elastic','elastic earth graviational potential perturbation')) - string="%s\n%s"%(string,fielddisplay(self,'eustatic','eustatic sea level rise')) + string="%s\n%s"%(string,fielddisplay(self,'rotation','earth rotational potential perturbation')) string="%s\n%s"%(string,fielddisplay(self,'degacc','accuracy (default .01 deg) for numerical discretization of the Green''s functions')) string="%s\n%s"%(string,fielddisplay(self,'transitions','indices into parts of the mesh that will be icecaps')) @@ -62,5 +66,9 @@ self.rigid=1 self.elastic=1 - self.eustatic=1 + self.rotation=1 + + #tidal love numbers: + self.tide_love_h=0.6149; #degree 2 + self.tide_love_k=0.3055; #degree 2 #numerical discretization accuracy @@ -87,4 +95,6 @@ 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.tide_love_h','NaN',1,'Inf',1) + md = checkfield(md,'fieldname','slr.tide_love_k','NaN',1,'Inf',1) md = checkfield(md,'fieldname','slr.reltol','size',[1,1]) md = checkfield(md,'fieldname','slr.abstol','size',[1,1]) @@ -110,7 +120,9 @@ WriteData(fid,'object',self,'class','sealevelrise','fieldname','love_h','format','DoubleMat','mattype',1) WriteData(fid,'object',self,'class','sealevelrise','fieldname','love_k','format','DoubleMat','mattype',1) + WriteData(fid,'object',self,'class','sealevelrise','fieldname','tide_love_h','format','Double'); + WriteData(fid,'object',self,'class','sealevelrise','fieldname','tide_love_k','format','Double'); WriteData(fid,'object',self,'class','sealevelrise','fieldname','rigid','format','Boolean') WriteData(fid,'object',self,'class','sealevelrise','fieldname','elastic','format','Boolean') - WriteData(fid,'object',self,'class','sealevelrise','fieldname','eustatic','format','Boolean') + WriteData(fid,'object',self,'class','sealevelrise','fieldname','rotation','format','Boolean') WriteData(fid,'object',self,'class','sealevelrise','fieldname','degacc','format','Double') WriteData(fid,'object',self,'class','sealevelrise','fieldname','transitions','format','MatArray')