Changeset 22122

Timestamp:

09/26/17 11:59:15 (8 years ago)

Author:

kruegern

Message:

BUG: fixed several bugs: incorrect output streams, high error rates, and mistranslated lines. Added omega to constants.py from constants.m. Added esa to model.py.

Location:

issm/trunk-jpl/src/m/classes

Files:

• balancethickness.py (modified) (3 diffs)
• constants.py (modified) (4 diffs)
• esa.py (modified) (1 diff)
• fourierlove.py (modified) (1 diff)
• model.py (modified) (4 diffs)
• slr.py (modified) (2 diffs)

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

@@ -15 +15 @@
                 self.thickening_rate   = float('NaN')
                 self.stabilization     = 0
+                
+                self.omega             = float('NaN')
 
                 #set defaults
@@ -44 +46 @@
                 md = checkfield(md,'fieldname','balancethickness.thickening_rate','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
                 md = checkfield(md,'fieldname','balancethickness.stabilization','size',[1],'values',[0,1,2,3])
-
+                #md = checkfield(md,'fieldname','balancethickness.omega','size', [md.mesh.numberofvertices],'NaN',1,'Inf',1,'>=',0);
                 return md
         # }}}
@@ -54 +56 @@
                 WriteData(fid,prefix,'object',self,'fieldname','thickening_rate','format','DoubleMat','mattype',1,'scale',1./yts)
                 WriteData(fid,prefix,'object',self,'fieldname','stabilization','format','Integer')
+                WriteData(fid,prefix,'object',self,'fieldname','omega','format','DoubleMat','mattype',1);
         # }}}

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

@@ -13 +13 @@
         def __init__(self): # {{{
                 self.g                    = 0
+                self.omega                = 0
                 self.yts                  = 0
                 self.referencetemperature = 0
@@ -24 +25 @@
 
                 string="%s\n%s"%(string,fielddisplay(self,"g","gravitational acceleration [m/s^2]"))
+                string="%s\n%s"%(string,fielddisplay(self,"omega","angular velocity of Earth [rad/s]"))
                 string="%s\n%s"%(string,fielddisplay(self,"yts","number of seconds in a year [s/yr]"))
                 string="%s\n%s"%(string,fielddisplay(self,"referencetemperature","reference temperature used in the enthalpy model [K]"))
@@ -33 +35 @@
                 #acceleration due to gravity (m/s^2)
                 self.g=9.81
+
+                #Earth's rotation speed 
+                self.omega = 7.292*1e-5;
 
                 #converstion from year to seconds
@@ -45 +50 @@
 
                 md = checkfield(md,'fieldname','constants.g','>',0,'size',[1])
+                md = checkfield(md,'fieldname','constants.omega','>=',0,'size',[1])
                 md = checkfield(md,'fieldname','constants.yts','>',0,'size',[1])
                 md = checkfield(md,'fieldname','constants.referencetemperature','size',[1])

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

@@ -15 +15 @@
         
         def __init__(self): # {{{
-                self.deltathickness    = np.nan
+                self.deltathickness    = float('NaN')
                 self.love_h            = 0 #provided by PREM model()
                 self.love_l            = 0 #ideam

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

@@ -68 +68 @@
             self.g0=10 # m/s^2
             self.r0=6378*1e3 #m
-            self.mu0=10^11 # Pa
+            self.mu0=1e11 # Pa
             self.allow_layer_deletion=1
             self.forcing_type = 11

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

@@ -48 +48 @@
 from transient import transient
 from giaivins import giaivins
+from esa import esa
 from autodiff import autodiff
 from inversion import inversion
@@ -111 +112 @@
                 self.love             = fourierlove()
                 self.gia              = giaivins()
+                self.esa              = esa()
 
                 self.autodiff         = autodiff()
@@ -155 +157 @@
                         'calving',
                                                 'gia',
+                                                'esa',
                                                 'love',
                         'autodiff',
@@ -197 +200 @@
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("levelset","[%s,%s]" % ("1x1",obj.levelset.__class__.__name__),"parameters for moving boundaries (level-set method)"))
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("calving","[%s,%s]" % ("1x1",obj.calving.__class__.__name__),"parameters for calving"))
+                string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("gia","[%s,%s]" % ("1x1",obj.gia.__class__.__name__),"parameters for gia solution"))
                 string="%s\n%s" % (string,'%19s: %-22s -- %s' % ("love","[%s,%s]" % ("1x1",obj.love.__class__.__name__),"parameters for love solution"))
+                string="%s\n%s" % (string,'%19s: %-22s -- %s' % ("esa","[%s,%s]" % ("1x1",obj.esa.__class__.__name__),"parameters for elastic adjustment solution"))
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("autodiff","[%s,%s]" % ("1x1",obj.autodiff.__class__.__name__),"automatic differentiation parameters"))
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("inversion","[%s,%s]" % ("1x1",obj.inversion.__class__.__name__),"parameters for inverse methods"))

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

@@ -44 +44 @@
                         string='   slr parameters:'
                         string="%s\n%s"%(string,fielddisplay(self,'deltathickness','thickness change (main loading of the slr solution core [m]'))
+                        string="%s\n%s"%(string,fielddisplay(self,'sealevel','current sea level (prior to computation) [m]'))
                         string="%s\n%s"%(string,fielddisplay(self,'reltol','sea level rise relative convergence criterion, (NaN: not applied)'))
                         string="%s\n%s"%(string,fielddisplay(self,'abstol','sea level rise absolute convergence criterion, (default, NaN: not applied'))
@@ -60 +61 @@
                         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,'steric_rate','rate of steric ocean expansion (in mm/yr)'))
                         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'))