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

Timestamp:

07/16/18 15:39:26 (7 years ago)

Author:

Eric.Larour

Message:

CHG: new reorganization of the slr capabilities.

File:

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

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

@@ -60 +60 @@
                         string="%s\n%s"%(string,fielddisplay(self,'elastic','elastic earth graviational potential perturbation'))
                         string="%s\n%s"%(string,fielddisplay(self,'rotation','earth rotational potential perturbation'))
-                        string="%s\n%s"%(string,fielddisplay(self,'ocean_area_scaling','correction for model representation of ocean area (default: No correction)'))
+                        string="%s\n%s"%(string,fielddisplay(self,'ocean_area_scaling','correction for model representation of ocean area [default: No correction]'))
                         string="%s\n%s"%(string,fielddisplay(self,'steric_rate','rate of steric ocean expansion [mm/yr]'))
                         string="%s\n%s"%(string,fielddisplay(self,'degacc','accuracy (default .01 deg) for numerical discretization of the Green''s functions'))
@@ -71 +71 @@
                 
                 #Convergence criterion: absolute, relative and residual
-                self.reltol=0.01 # 1 per cent 
-                self.abstol=float('NaN') #default
+                self.reltol=float('NaN') #default
+                self.abstol=0.001 #1 mm of sea level rise
 
                 #maximum of non-linear iterations.
@@ -87 +87 @@
                 self.tide_love_k=0.3055; #degree 2
                 
-      #secular fluid love number: 
+                #secular fluid love number: 
                 self.fluid_love=0.942; 
                 
@@ -93 +93 @@
                 self.equatorial_moi=8.0077*10**37; # [kg m^2] 
                 self.polar_moi     =8.0345*10**37; # [kg m^2] 
-
+                
                 #mean rotational velocity of earth 
                 self.angular_velocity=7.2921*10**-5; # [s^-1]