Index: /issm/trunk-jpl/src/m/classes/SMBcomponents.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBcomponents.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/SMBcomponents.m (revision 20896) @@ -78,5 +78,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.smb.model','data',2,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/SMBcomponents.py =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBcomponents.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/SMBcomponents.py (revision 20896) @@ -79,5 +79,5 @@ def marshall(self,prefix,md,fid): # {{{ - yts=365.0*24.0*3600.0 + yts=md.constants.yts WriteData(fid,prefix,'name','md.smb.model','data',2,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/SMBd18opdd.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBd18opdd.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/SMBd18opdd.m (revision 20896) @@ -104,5 +104,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.smb.model','data',5,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/SMBd18opdd.py =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBd18opdd.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/SMBd18opdd.py (revision 20896) @@ -108,5 +108,5 @@ def marshall(self,prefix,md,fid): # {{{ - yts=365.0*24.0*3600.0 + yts=md.constants.yts WriteData(fid,prefix,'name','md.smb.model','data',5,'format','Integer') Index: /issm/trunk-jpl/src/m/classes/SMBforcing.js =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBforcing.js (revision 20895) +++ /issm/trunk-jpl/src/m/classes/SMBforcing.js (revision 20896) @@ -45,5 +45,5 @@ this.marshall=function(md,prefix,fid) { //{{{ - var yts=365.0*24.0*3600.0; + var yts=md.constants.yts; WriteData(fid,prefix,'name','md.smb.model','data',1,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/SMBforcing.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBforcing.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/SMBforcing.m (revision 20896) @@ -65,5 +65,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.smb.model','data',1,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/SMBforcing.py =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBforcing.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/SMBforcing.py (revision 20896) @@ -53,5 +53,5 @@ def marshall(self,prefix,md,fid): # {{{ - yts=365.0*24.0*3600.0 + yts=md.constants.yts WriteData(fid,prefix,'name','md.smb.model','data',1,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/SMBgemb.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBgemb.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/SMBgemb.m (revision 20896) @@ -258,5 +258,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.25*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.smb.model','data',8,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/SMBgradients.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBgradients.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/SMBgradients.m (revision 20896) @@ -62,5 +62,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.smb.model','data',6,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/SMBgradients.py =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBgradients.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/SMBgradients.py (revision 20896) @@ -59,5 +59,5 @@ def marshall(self,prefix,md,fid): # {{{ - yts=365.0*24.0*3600.0 + yts=md.constants.yts WriteData(fid,prefix,'name','md.smb.model','data',6,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/SMBhenning.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBhenning.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/SMBhenning.m (revision 20896) @@ -50,5 +50,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.smb.model','data',7,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/SMBmeltcomponents.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBmeltcomponents.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/SMBmeltcomponents.m (revision 20896) @@ -89,5 +89,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.smb.model','data',3,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/SMBmeltcomponents.py =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBmeltcomponents.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/SMBmeltcomponents.py (revision 20896) @@ -90,5 +90,5 @@ def marshall(self,prefix,md,fid): # {{{ - yts=365.0*24.0*3600.0 + yts=md.constants.yts WriteData(fid,prefix,'name','md.smb.model','data',3,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/SMBpdd.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBpdd.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/SMBpdd.m (revision 20896) @@ -143,5 +143,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.smb.model','data',4,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/SMBpdd.py =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBpdd.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/SMBpdd.py (revision 20896) @@ -151,5 +151,5 @@ def marshall(self,prefix,md,fid): # {{{ - yts=365.0*24.0*3600.0 + yts=md.constants.yts WriteData(fid,prefix,'name','md.smb.model','data',4,'format','Integer') Index: /issm/trunk-jpl/src/m/classes/adinversion.m =================================================================== --- /issm/trunk-jpl/src/m/classes/adinversion.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/adinversion.m (revision 20896) @@ -127,5 +127,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'object',self,'class','inversion','fieldname','iscontrol','format','Boolean'); Index: /issm/trunk-jpl/src/m/classes/adinversion.py =================================================================== --- /issm/trunk-jpl/src/m/classes/adinversion.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/adinversion.py (revision 20896) @@ -140,5 +140,5 @@ def marshall(self): - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'object',self,'class','inversion','fieldname','iscontrol','format','Boolean'); Index: /issm/trunk-jpl/src/m/classes/balancethickness.js =================================================================== --- /issm/trunk-jpl/src/m/classes/balancethickness.js (revision 20895) +++ /issm/trunk-jpl/src/m/classes/balancethickness.js (revision 20896) @@ -35,5 +35,5 @@ this.marshall=function(md,prefix,fid) { //{{{ - var yts=365.0*24.0*3600.0; + var yts=md.constants.yts; WriteData(fid,prefix,'object',this,'fieldname','spcthickness','format','DoubleMat','mattype',1); Index: /issm/trunk-jpl/src/m/classes/balancethickness.m =================================================================== --- /issm/trunk-jpl/src/m/classes/balancethickness.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/balancethickness.m (revision 20896) @@ -47,5 +47,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1); Index: /issm/trunk-jpl/src/m/classes/balancethickness.py =================================================================== --- /issm/trunk-jpl/src/m/classes/balancethickness.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/balancethickness.py (revision 20896) @@ -50,5 +50,5 @@ def marshall(self,prefix,md,fid): # {{{ - yts=365.0*24.0*3600.0 + yts=md.constants.yts WriteData(fid,prefix,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1) Index: /issm/trunk-jpl/src/m/classes/basalforcings.js =================================================================== --- /issm/trunk-jpl/src/m/classes/basalforcings.js (revision 20895) +++ /issm/trunk-jpl/src/m/classes/basalforcings.js (revision 20896) @@ -62,5 +62,5 @@ this.marshall=function(md,prefix,fid) { //{{{ - var yts=365.0*24.0*3600.0; + var yts=md.constants.yts; WriteData(fid,prefix,'name','md.basalforcings.model','data',FloatingMeltRateEnum(),'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/basalforcings.m =================================================================== --- /issm/trunk-jpl/src/m/classes/basalforcings.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/basalforcings.m (revision 20896) @@ -66,5 +66,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.basalforcings.model','data',FloatingMeltRateEnum(),'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/basalforcings.py =================================================================== --- /issm/trunk-jpl/src/m/classes/basalforcings.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/basalforcings.py (revision 20896) @@ -71,5 +71,5 @@ def marshall(self,prefix,md,fid): # {{{ - yts=365.0*24.0*3600.0 + yts=md.constants.yts WriteData(fid,prefix,'name','md.basalforcings.model','data',FloatingMeltRateEnum(),'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/calving.js =================================================================== --- /issm/trunk-jpl/src/m/classes/calving.js (revision 20895) +++ /issm/trunk-jpl/src/m/classes/calving.js (revision 20896) @@ -32,5 +32,5 @@ } //}}} this.marshall=function(md,prefix,fid) { //{{{ - var yts=365.0*24.0*3600.0; + var yts=md.constants.yts; WriteData(fid,prefix,'name','md.calving.law','data',DefaultCalvingEnum(),'format','Integer'); WriteData(fid,prefix,'object',this,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts); Index: /issm/trunk-jpl/src/m/classes/calving.m =================================================================== --- /issm/trunk-jpl/src/m/classes/calving.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/calving.m (revision 20896) @@ -48,5 +48,5 @@ end % }}} function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.calving.law','data',DefaultCalvingEnum(),'format','Integer'); WriteData(fid,prefix,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts); Index: /issm/trunk-jpl/src/m/classes/calving.py =================================================================== --- /issm/trunk-jpl/src/m/classes/calving.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/calving.py (revision 20896) @@ -52,5 +52,5 @@ def marshall(self,prefix,md,fid): # {{{ - yts=365.*24.*3600. + yts=md.constants.yts WriteData(fid,prefix,'name','md.calving.law','data',DefaultCalvingEnum(),'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/calvingdev.m =================================================================== --- /issm/trunk-jpl/src/m/classes/calvingdev.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/calvingdev.m (revision 20896) @@ -51,5 +51,5 @@ end % }}} function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.calving.law','data',CalvingDevEnum(),'format','Integer'); WriteData(fid,prefix,'object',self,'fieldname','coeff','format','DoubleMat','mattype',1); Index: /issm/trunk-jpl/src/m/classes/calvinglevermann.m =================================================================== --- /issm/trunk-jpl/src/m/classes/calvinglevermann.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/calvinglevermann.m (revision 20896) @@ -51,5 +51,5 @@ end % }}} function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.calving.law','data',CalvingLevermannEnum(),'format','Integer'); WriteData(fid,prefix,'object',self,'fieldname','coeff','format','DoubleMat','mattype',1); Index: /issm/trunk-jpl/src/m/classes/calvinglevermann.py =================================================================== --- /issm/trunk-jpl/src/m/classes/calvinglevermann.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/calvinglevermann.py (revision 20896) @@ -50,5 +50,5 @@ # }}} def marshall(self,prefix,md,fid): # {{{ - yts=365.*24.*3600. + yts=md.constants.yts WriteData(fid,prefix,'name','md.calving.law','data',CalvingLevermannEnum(),'format','Integer'); WriteData(fid,prefix,'object',self,'fieldname','coeff','format','DoubleMat','mattype',1) Index: /issm/trunk-jpl/src/m/classes/calvingminthickness.m =================================================================== --- /issm/trunk-jpl/src/m/classes/calvingminthickness.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/calvingminthickness.m (revision 20896) @@ -50,5 +50,5 @@ end % }}} function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.calving.law','data',CalvingMinthicknessEnum(),'format','Integer'); WriteData(fid,prefix,'object',self,'fieldname','min_thickness','format','Double'); Index: /issm/trunk-jpl/src/m/classes/constants.js =================================================================== --- /issm/trunk-jpl/src/m/classes/constants.js (revision 20895) +++ /issm/trunk-jpl/src/m/classes/constants.js (revision 20896) @@ -15,5 +15,5 @@ //converstion from year to seconds - this.yts=365*24*3600; + this.yts=365.*24.*3600.; //the reference temperature for enthalpy model (cf Aschwanden) Index: /issm/trunk-jpl/src/m/classes/constants.m =================================================================== --- /issm/trunk-jpl/src/m/classes/constants.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/constants.m (revision 20896) @@ -29,5 +29,5 @@ %converstion from year to seconds - self.yts=365*24*3600; + self.yts=365.*24.*3600.; %the reference temperature for enthalpy model (cf Aschwanden) Index: /issm/trunk-jpl/src/m/classes/constants.py =================================================================== --- /issm/trunk-jpl/src/m/classes/constants.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/constants.py (revision 20896) @@ -36,5 +36,5 @@ #converstion from year to seconds - self.yts=365*24*3600 + self.yts=365.*24.*3600. #the reference temperature for enthalpy model (cf Aschwanden) Index: /issm/trunk-jpl/src/m/classes/friction.js =================================================================== --- /issm/trunk-jpl/src/m/classes/friction.js (revision 20895) +++ /issm/trunk-jpl/src/m/classes/friction.js (revision 20896) @@ -36,5 +36,5 @@ } // }}} this.marshall=function(md,prefix,fid) { //{{{ - var yts=365.0*24.0*3600.0; + var yts=md.constants.yts; WriteData(fid,prefix,'name','md.friction.law','data',1,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/friction.m =================================================================== --- /issm/trunk-jpl/src/m/classes/friction.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/friction.m (revision 20896) @@ -44,5 +44,5 @@ end % }}} function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.friction.law','data',1,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/frictionsommers.m =================================================================== --- /issm/trunk-jpl/src/m/classes/frictionsommers.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/frictionsommers.m (revision 20896) @@ -36,5 +36,5 @@ end % }}} function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.friction.law','data',8,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/frictionweertman.m =================================================================== --- /issm/trunk-jpl/src/m/classes/frictionweertman.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/frictionweertman.m (revision 20896) @@ -43,5 +43,5 @@ end % }}} function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.friction.law','data',2,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/frictionweertmantemp.m =================================================================== --- /issm/trunk-jpl/src/m/classes/frictionweertmantemp.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/frictionweertmantemp.m (revision 20896) @@ -38,5 +38,5 @@ end % }}} function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.friction.law','data',6,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/hydrologysommers.m =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologysommers.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/hydrologysommers.m (revision 20896) @@ -62,5 +62,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.hydrology.model','data',HydrologysommersEnum(),'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/initialization.js =================================================================== --- /issm/trunk-jpl/src/m/classes/initialization.js (revision 20895) +++ /issm/trunk-jpl/src/m/classes/initialization.js (revision 20896) @@ -99,5 +99,5 @@ this.marshall=function(md,prefix,fid) { //{{{ - var yts=365.0*24.0*3600.0; + var yts=md.constants.yts; WriteData(fid,prefix,'object',this,'fieldname','vx','format','DoubleMat','mattype',1,'scale',1./yts); Index: /issm/trunk-jpl/src/m/classes/initialization.m =================================================================== --- /issm/trunk-jpl/src/m/classes/initialization.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/initialization.m (revision 20896) @@ -114,5 +114,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'object',self,'fieldname','vx','format','DoubleMat','mattype',1,'scale',1./yts); Index: /issm/trunk-jpl/src/m/classes/initialization.py =================================================================== --- /issm/trunk-jpl/src/m/classes/initialization.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/initialization.py (revision 20896) @@ -109,5 +109,5 @@ def marshall(self,prefix,md,fid): # {{{ - yts=365.0*24.0*3600.0 + yts=md.constants.yts WriteData(fid,prefix,'object',self,'fieldname','vx','format','DoubleMat','mattype',1,'scale',1./yts) Index: /issm/trunk-jpl/src/m/classes/inversion.js =================================================================== --- /issm/trunk-jpl/src/m/classes/inversion.js (revision 20895) +++ /issm/trunk-jpl/src/m/classes/inversion.js (revision 20896) @@ -135,5 +135,5 @@ this.marshall=function(md,prefix,fid) { //{{{ - var yts=365.0*24.0*3600.0; + var yts=md.constants.yts; WriteData(fid,prefix,'name','md.inversion.type','data',0,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/inversion.m =================================================================== --- /issm/trunk-jpl/src/m/classes/inversion.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/inversion.m (revision 20896) @@ -150,5 +150,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.inversion.type','data',0,'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/inversion.py =================================================================== --- /issm/trunk-jpl/src/m/classes/inversion.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/inversion.py (revision 20896) @@ -160,5 +160,5 @@ def marshall(self,prefix,md,fid): # {{{ - yts=365.0*24.0*3600.0 + yts=md.constants.yts WriteData(fid,prefix,'name','md.inversion.type','data',0,'format','Integer') Index: /issm/trunk-jpl/src/m/classes/inversionvalidation.m =================================================================== --- /issm/trunk-jpl/src/m/classes/inversionvalidation.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/inversionvalidation.m (revision 20896) @@ -112,5 +112,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'object',self,'class','inversion','fieldname','iscontrol','format','Boolean'); Index: /issm/trunk-jpl/src/m/classes/linearbasalforcings.m =================================================================== --- /issm/trunk-jpl/src/m/classes/linearbasalforcings.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/linearbasalforcings.m (revision 20896) @@ -73,5 +73,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; floatingice_melting_rate=zeros(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/src/m/classes/linearbasalforcings.py =================================================================== --- /issm/trunk-jpl/src/m/classes/linearbasalforcings.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/linearbasalforcings.py (revision 20896) @@ -91,5 +91,5 @@ def marshall(self,prefix,md,fid): # {{{ - yts=365.0*24.0*3600.0 + yts=md.constants.yts floatingice_melting_rate = numpy.zeros((md.mesh.numberofvertices,1)) Index: /issm/trunk-jpl/src/m/classes/m1qn3inversion.m =================================================================== --- /issm/trunk-jpl/src/m/classes/m1qn3inversion.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/m1qn3inversion.m (revision 20896) @@ -138,5 +138,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'object',self,'class','inversion','fieldname','iscontrol','format','Boolean'); Index: /issm/trunk-jpl/src/m/classes/m1qn3inversion.py =================================================================== --- /issm/trunk-jpl/src/m/classes/m1qn3inversion.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/m1qn3inversion.py (revision 20896) @@ -165,5 +165,5 @@ def marshall(self,prefix,md,fid): # {{{ - yts=365.0*24.0*3600.0 + yts=md.constants.yts WriteData(fid,prefix,'object',self,'class','inversion','fieldname','iscontrol','format','Boolean') Index: /issm/trunk-jpl/src/m/classes/masstransport.js =================================================================== --- /issm/trunk-jpl/src/m/classes/masstransport.js (revision 20895) +++ /issm/trunk-jpl/src/m/classes/masstransport.js (revision 20896) @@ -60,5 +60,5 @@ this.marshall=function(md,prefix,fid) { //{{{ - var yts=365.*24.*3600.; + var yts=md.constants.yts; WriteData(fid,prefix,'object',this,'fieldname','spcthickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); Index: /issm/trunk-jpl/src/m/classes/masstransport.m =================================================================== --- /issm/trunk-jpl/src/m/classes/masstransport.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/masstransport.m (revision 20896) @@ -113,5 +113,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.*24.*3600.; + yts=md.constants.yts; WriteData(fid,prefix,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); Index: /issm/trunk-jpl/src/m/classes/masstransport.py =================================================================== --- /issm/trunk-jpl/src/m/classes/masstransport.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/masstransport.py (revision 20896) @@ -83,5 +83,5 @@ def marshall(self,prefix,md,fid): # {{{ - yts=365.*24.*3600. + yts=md.constants.yts WriteData(fid,prefix,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1) Index: /issm/trunk-jpl/src/m/classes/mismipbasalforcings.m =================================================================== --- /issm/trunk-jpl/src/m/classes/mismipbasalforcings.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/mismipbasalforcings.m (revision 20896) @@ -80,5 +80,8 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.2422*24.0*3600.0; + yts=md.constants.yts; + if yts~=365.2422*24.*3600. + disp('WARNING: value of yts for MISMIP+ runs different from ISSM default!'); + end floatingice_melting_rate=zeros(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/src/m/classes/plumebasalforcings.m =================================================================== --- /issm/trunk-jpl/src/m/classes/plumebasalforcings.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/plumebasalforcings.m (revision 20896) @@ -111,5 +111,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.2422*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'name','md.basalforcings.model','data',MantlePlumeGeothermalFluxEnum(),'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/snowpack.m =================================================================== --- /issm/trunk-jpl/src/m/classes/snowpack.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/snowpack.m (revision 20896) @@ -453,5 +453,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'object',self,'class','snowpack','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); Index: /issm/trunk-jpl/src/m/classes/stressbalance.js =================================================================== --- /issm/trunk-jpl/src/m/classes/stressbalance.js (revision 20895) +++ /issm/trunk-jpl/src/m/classes/stressbalance.js (revision 20896) @@ -148,5 +148,5 @@ WriteData(fid,prefix,'object',this,'class','stressbalance','fieldname','vertex_pairing','format','DoubleMat','mattype',3); - var yts=365.0*24.0*3600.0; + var yts=md.constants.yts; WriteData(fid,prefix,'object',this,'class','stressbalance','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); Index: /issm/trunk-jpl/src/m/classes/stressbalance.m =================================================================== --- /issm/trunk-jpl/src/m/classes/stressbalance.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/stressbalance.m (revision 20896) @@ -177,5 +177,5 @@ WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','vertex_pairing','format','DoubleMat','mattype',3); - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); Index: /issm/trunk-jpl/src/m/classes/stressbalance.py =================================================================== --- /issm/trunk-jpl/src/m/classes/stressbalance.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/stressbalance.py (revision 20896) @@ -178,5 +178,5 @@ WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','vertex_pairing','format','DoubleMat','mattype',3) - yts=365.0*24.0*3600.0 + yts=md.constants.yts WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) Index: /issm/trunk-jpl/src/m/classes/taoinversion.m =================================================================== --- /issm/trunk-jpl/src/m/classes/taoinversion.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/taoinversion.m (revision 20896) @@ -161,5 +161,5 @@ function marshall(self,prefix,md,fid) % {{{ - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'object',self,'class','inversion','fieldname','iscontrol','format','Boolean'); Index: /issm/trunk-jpl/src/m/classes/taoinversion.py =================================================================== --- /issm/trunk-jpl/src/m/classes/taoinversion.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/taoinversion.py (revision 20896) @@ -165,5 +165,5 @@ def marshall(self, md, fid): - yts=365.0*24.0*3600.0; + yts=md.constants.yts; WriteData(fid,prefix,'object',self,'class','inversion','fieldname','iscontrol','format','Boolean') WriteData(fid,prefix,'name','md.inversion.type','data',1,'format','Integer') Index: /issm/trunk-jpl/src/m/classes/timestepping.js =================================================================== --- /issm/trunk-jpl/src/m/classes/timestepping.js (revision 20895) +++ /issm/trunk-jpl/src/m/classes/timestepping.js (revision 20896) @@ -52,5 +52,5 @@ var scale; - scale = 365.0*24.0*3600.0; + scale = md.constants.yts; WriteData(fid,prefix,'object',this,'fieldname','start_time','format','Double','scale',scale); Index: /issm/trunk-jpl/src/m/classes/timestepping.m =================================================================== --- /issm/trunk-jpl/src/m/classes/timestepping.m (revision 20895) +++ /issm/trunk-jpl/src/m/classes/timestepping.m (revision 20896) @@ -63,5 +63,5 @@ function marshall(self,prefix,md,fid) % {{{ - scale = 365.0*24.0*3600.0; + scale = md.constants.yts; WriteData(fid,prefix,'object',self,'fieldname','start_time','format','Double','scale',scale); WriteData(fid,prefix,'object',self,'fieldname','final_time','format','Double','scale',scale); Index: /issm/trunk-jpl/src/m/classes/timestepping.py =================================================================== --- /issm/trunk-jpl/src/m/classes/timestepping.py (revision 20895) +++ /issm/trunk-jpl/src/m/classes/timestepping.py (revision 20896) @@ -66,6 +66,5 @@ def marshall(self,prefix,md,fid): # {{{ - yts=md.constants.yts - + yts=md.constants.yts WriteData(fid,prefix,'object',self,'fieldname','start_time','format','Double','scale',yts) WriteData(fid,prefix,'object',self,'fieldname','final_time','format','Double','scale',yts)