Changeset 21949

Timestamp:

08/14/17 09:12:31 (8 years ago)

Author:

adhikari

Message:

CHG: steric_rate defined

File:

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

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

@@ -33 +33 @@
                 self.rotation          = 0
                 self.ocean_area_scaling = 0;
+                steric_rate                                     = 0; #rate of ocean expansion from steric effects.
                 self.degacc            = 0
                 self.requested_outputs = []
@@ -84 +85 @@
                 self.tide_love_k=0.3055; #degree 2
                 
-                #secular fluid love number: 
+      #secular fluid love number: 
                 self.fluid_love=0.942; 
                 
@@ -96 +97 @@
                 #numerical discretization accuracy
                 self.degacc=.01
+
+                #steric:
+                self.steric_rate=0;
                 
                 #output default:
@@ -127 +131 @@
                 md = checkfield(md,'fieldname','slr.abstol','size',[1,1])
                 md = checkfield(md,'fieldname','slr.maxiter','size',[1,1],'>=',1)
+                md = checkfield(md,'fieldname','slr.steric_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices]);
                 md = checkfield(md,'fieldname','slr.degacc','size',[1,1],'>=',1e-10)
                 md = checkfield(md,'fieldname','slr.requested_outputs','stringrow',1)
@@ -157 +162 @@
                 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','steric_rate','format','DoubleMat','mattype',1,'scale',1e-3/md.constants.yts);
                 WriteData(fid,prefix,'object',self,'fieldname','degacc','format','Double')
                 WriteData(fid,prefix,'object',self,'fieldname','transitions','format','MatArray')