Index: /issm/trunk-jpl/src/m/classes/balancethickness.py =================================================================== --- /issm/trunk-jpl/src/m/classes/balancethickness.py (revision 22121) +++ /issm/trunk-jpl/src/m/classes/balancethickness.py (revision 22122) @@ -15,4 +15,6 @@ self.thickening_rate = float('NaN') self.stabilization = 0 + + self.omega = float('NaN') #set defaults @@ -44,5 +46,5 @@ 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,3 +56,4 @@ 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); # }}} Index: /issm/trunk-jpl/src/m/classes/constants.py =================================================================== --- /issm/trunk-jpl/src/m/classes/constants.py (revision 22121) +++ /issm/trunk-jpl/src/m/classes/constants.py (revision 22122) @@ -13,4 +13,5 @@ def __init__(self): # {{{ self.g = 0 + self.omega = 0 self.yts = 0 self.referencetemperature = 0 @@ -24,4 +25,5 @@ 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,4 +35,7 @@ #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,4 +50,5 @@ 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]) Index: /issm/trunk-jpl/src/m/classes/esa.py =================================================================== --- /issm/trunk-jpl/src/m/classes/esa.py (revision 22121) +++ /issm/trunk-jpl/src/m/classes/esa.py (revision 22122) @@ -15,5 +15,5 @@ def __init__(self): # {{{ - self.deltathickness = np.nan + self.deltathickness = float('NaN') self.love_h = 0 #provided by PREM model() self.love_l = 0 #ideam Index: /issm/trunk-jpl/src/m/classes/fourierlove.py =================================================================== --- /issm/trunk-jpl/src/m/classes/fourierlove.py (revision 22121) +++ /issm/trunk-jpl/src/m/classes/fourierlove.py (revision 22122) @@ -68,5 +68,5 @@ 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 Index: /issm/trunk-jpl/src/m/classes/model.py =================================================================== --- /issm/trunk-jpl/src/m/classes/model.py (revision 22121) +++ /issm/trunk-jpl/src/m/classes/model.py (revision 22122) @@ -48,4 +48,5 @@ from transient import transient from giaivins import giaivins +from esa import esa from autodiff import autodiff from inversion import inversion @@ -111,4 +112,5 @@ self.love = fourierlove() self.gia = giaivins() + self.esa = esa() self.autodiff = autodiff() @@ -155,4 +157,5 @@ 'calving', 'gia', + 'esa', 'love', 'autodiff', @@ -197,5 +200,7 @@ 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")) Index: /issm/trunk-jpl/src/m/classes/slr.py =================================================================== --- /issm/trunk-jpl/src/m/classes/slr.py (revision 22121) +++ /issm/trunk-jpl/src/m/classes/slr.py (revision 22122) @@ -44,4 +44,5 @@ 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,4 +61,5 @@ 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'))