Index: ../trunk-jpl/src/m/classes/SMBhenning.m =================================================================== --- ../trunk-jpl/src/m/classes/SMBhenning.m (revision 20895) +++ ../trunk-jpl/src/m/classes/SMBhenning.m (revision 20896) @@ -49,7 +49,7 @@ end % }}} 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'); WriteData(fid,prefix,'object',self,'class','smb','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); Index: ../trunk-jpl/src/m/classes/SMBd18opdd.py =================================================================== --- ../trunk-jpl/src/m/classes/SMBd18opdd.py (revision 20895) +++ ../trunk-jpl/src/m/classes/SMBd18opdd.py (revision 20896) @@ -107,7 +107,7 @@ # }}} 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: ../trunk-jpl/src/m/classes/basalforcings.py =================================================================== --- ../trunk-jpl/src/m/classes/basalforcings.py (revision 20895) +++ ../trunk-jpl/src/m/classes/basalforcings.py (revision 20896) @@ -70,7 +70,7 @@ # }}} 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'); WriteData(fid,prefix,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) Index: ../trunk-jpl/src/m/classes/friction.m =================================================================== --- ../trunk-jpl/src/m/classes/friction.m (revision 20895) +++ ../trunk-jpl/src/m/classes/friction.m (revision 20896) @@ -43,7 +43,7 @@ fielddisplay(self,'q','q exponent'); 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'); WriteData(fid,prefix,'object',self,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); Index: ../trunk-jpl/src/m/classes/SMBgradients.py =================================================================== --- ../trunk-jpl/src/m/classes/SMBgradients.py (revision 20895) +++ ../trunk-jpl/src/m/classes/SMBgradients.py (revision 20896) @@ -58,7 +58,7 @@ # }}} 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'); WriteData(fid,prefix,'object',self,'class','smb','fieldname','href','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1) Index: ../trunk-jpl/src/m/classes/frictionweertman.m =================================================================== --- ../trunk-jpl/src/m/classes/frictionweertman.m (revision 20895) +++ ../trunk-jpl/src/m/classes/frictionweertman.m (revision 20896) @@ -42,7 +42,7 @@ fielddisplay(self,'m','m exponent'); 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'); WriteData(fid,prefix,'class','friction','object',self,'fieldname','C','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); Index: ../trunk-jpl/src/m/classes/SMBcomponents.m =================================================================== --- ../trunk-jpl/src/m/classes/SMBcomponents.m (revision 20895) +++ ../trunk-jpl/src/m/classes/SMBcomponents.m (revision 20896) @@ -77,7 +77,7 @@ end % }}} 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'); WriteData(fid,prefix,'object',self,'class','smb','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); Index: ../trunk-jpl/src/m/classes/timestepping.js =================================================================== --- ../trunk-jpl/src/m/classes/timestepping.js (revision 20895) +++ ../trunk-jpl/src/m/classes/timestepping.js (revision 20896) @@ -51,7 +51,7 @@ this.marshall=function(md,prefix,fid) { //{{{ 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); WriteData(fid,prefix,'object',this,'fieldname','final_time','format','Double','scale',scale); Index: ../trunk-jpl/src/m/classes/stressbalance.m =================================================================== --- ../trunk-jpl/src/m/classes/stressbalance.m (revision 20895) +++ ../trunk-jpl/src/m/classes/stressbalance.m (revision 20896) @@ -176,7 +176,7 @@ 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); WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); Index: ../trunk-jpl/src/m/classes/friction.js =================================================================== --- ../trunk-jpl/src/m/classes/friction.js (revision 20895) +++ ../trunk-jpl/src/m/classes/friction.js (revision 20896) @@ -35,7 +35,7 @@ } // }}} 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'); WriteData(fid,prefix,'object',this,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); Index: ../trunk-jpl/src/m/classes/masstransport.js =================================================================== --- ../trunk-jpl/src/m/classes/masstransport.js (revision 20895) +++ ../trunk-jpl/src/m/classes/masstransport.js (revision 20896) @@ -59,7 +59,7 @@ } // }}} 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); WriteData(fid,prefix,'object',this,'fieldname','isfreesurface','format','Boolean'); Index: ../trunk-jpl/src/m/classes/SMBd18opdd.m =================================================================== --- ../trunk-jpl/src/m/classes/SMBd18opdd.m (revision 20895) +++ ../trunk-jpl/src/m/classes/SMBd18opdd.m (revision 20896) @@ -103,7 +103,7 @@ end % }}} 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: ../trunk-jpl/src/m/classes/linearbasalforcings.m =================================================================== --- ../trunk-jpl/src/m/classes/linearbasalforcings.m (revision 20895) +++ ../trunk-jpl/src/m/classes/linearbasalforcings.m (revision 20896) @@ -72,7 +72,7 @@ end % }}} 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); floatingice_melting_rate(find(md.geometry.base<=md.basalforcings.deepwater_elevation))=md.basalforcings.deepwater_melting_rate; Index: ../trunk-jpl/src/m/classes/SMBpdd.m =================================================================== --- ../trunk-jpl/src/m/classes/SMBpdd.m (revision 20895) +++ ../trunk-jpl/src/m/classes/SMBpdd.m (revision 20896) @@ -142,7 +142,7 @@ end % }}} 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: ../trunk-jpl/src/m/classes/basalforcings.m =================================================================== --- ../trunk-jpl/src/m/classes/basalforcings.m (revision 20895) +++ ../trunk-jpl/src/m/classes/basalforcings.m (revision 20896) @@ -65,7 +65,7 @@ end % }}} 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'); WriteData(fid,prefix,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) Index: ../trunk-jpl/src/m/classes/SMBcomponents.py =================================================================== --- ../trunk-jpl/src/m/classes/SMBcomponents.py (revision 20895) +++ ../trunk-jpl/src/m/classes/SMBcomponents.py (revision 20896) @@ -78,7 +78,7 @@ # }}} 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'); WriteData(fid,prefix,'object',self,'class','smb','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) Index: ../trunk-jpl/src/m/classes/snowpack.m =================================================================== --- ../trunk-jpl/src/m/classes/snowpack.m (revision 20895) +++ ../trunk-jpl/src/m/classes/snowpack.m (revision 20896) @@ -452,7 +452,7 @@ end % }}} 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); WriteData(fid,prefix,'object',self,'class','snowpack','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); Index: ../trunk-jpl/src/m/classes/SMBforcing.py =================================================================== --- ../trunk-jpl/src/m/classes/SMBforcing.py (revision 20895) +++ ../trunk-jpl/src/m/classes/SMBforcing.py (revision 20896) @@ -52,7 +52,7 @@ # }}} 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'); WriteData(fid,prefix,'object',self,'class','smb','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) Index: ../trunk-jpl/src/m/classes/mismipbasalforcings.m =================================================================== --- ../trunk-jpl/src/m/classes/mismipbasalforcings.m (revision 20895) +++ ../trunk-jpl/src/m/classes/mismipbasalforcings.m (revision 20896) @@ -79,7 +79,10 @@ end % }}} 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); floatingice_melting_rate=md.basalforcings.meltrate_factor*tanh((md.geometry.base-md.geometry.bed)./md.basalforcings.threshold_thickness).*max(md.basalforcings.upperdepth_melt-md.geometry.base,0); Index: ../trunk-jpl/src/m/classes/balancethickness.py =================================================================== --- ../trunk-jpl/src/m/classes/balancethickness.py (revision 20895) +++ ../trunk-jpl/src/m/classes/balancethickness.py (revision 20896) @@ -49,7 +49,7 @@ # }}} 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) WriteData(fid,prefix,'object',self,'fieldname','thickening_rate','format','DoubleMat','mattype',1,'scale',1./yts) Index: ../trunk-jpl/src/m/classes/basalforcings.js =================================================================== --- ../trunk-jpl/src/m/classes/basalforcings.js (revision 20895) +++ ../trunk-jpl/src/m/classes/basalforcings.js (revision 20896) @@ -61,7 +61,7 @@ } // }}} 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'); WriteData(fid,prefix,'object',this,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) Index: ../trunk-jpl/src/m/classes/calvingminthickness.m =================================================================== --- ../trunk-jpl/src/m/classes/calvingminthickness.m (revision 20895) +++ ../trunk-jpl/src/m/classes/calvingminthickness.m (revision 20896) @@ -49,7 +49,7 @@ 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'); WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts); Index: ../trunk-jpl/src/m/classes/SMBmeltcomponents.py =================================================================== --- ../trunk-jpl/src/m/classes/SMBmeltcomponents.py (revision 20895) +++ ../trunk-jpl/src/m/classes/SMBmeltcomponents.py (revision 20896) @@ -89,7 +89,7 @@ # }}} 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'); WriteData(fid,prefix,'object',self,'class','smb','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) Index: ../trunk-jpl/src/m/classes/constants.py =================================================================== --- ../trunk-jpl/src/m/classes/constants.py (revision 20895) +++ ../trunk-jpl/src/m/classes/constants.py (revision 20896) @@ -35,7 +35,7 @@ self.g=9.81 #converstion from year to seconds - self.yts=365*24*3600 + self.yts=365.*24.*3600. #the reference temperature for enthalpy model (cf Aschwanden) self.referencetemperature=223.15 Index: ../trunk-jpl/src/m/classes/taoinversion.m =================================================================== --- ../trunk-jpl/src/m/classes/taoinversion.m (revision 20895) +++ ../trunk-jpl/src/m/classes/taoinversion.m (revision 20896) @@ -160,7 +160,7 @@ end % }}} 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'); WriteData(fid,prefix,'name','md.inversion.type','data',1,'format','Integer'); Index: ../trunk-jpl/src/m/classes/adinversion.m =================================================================== --- ../trunk-jpl/src/m/classes/adinversion.m (revision 20895) +++ ../trunk-jpl/src/m/classes/adinversion.m (revision 20896) @@ -126,7 +126,7 @@ end % }}} 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'); WriteData(fid,prefix,'name','md.inversion.type','data',4,'format','Integer'); Index: ../trunk-jpl/src/m/classes/inversionvalidation.m =================================================================== --- ../trunk-jpl/src/m/classes/inversionvalidation.m (revision 20895) +++ ../trunk-jpl/src/m/classes/inversionvalidation.m (revision 20896) @@ -111,7 +111,7 @@ end % }}} 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'); WriteData(fid,prefix,'name','md.inversion.type','data',3,'format','Integer'); Index: ../trunk-jpl/src/m/classes/linearbasalforcings.py =================================================================== --- ../trunk-jpl/src/m/classes/linearbasalforcings.py (revision 20895) +++ ../trunk-jpl/src/m/classes/linearbasalforcings.py (revision 20896) @@ -90,7 +90,7 @@ # }}} 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)) pos=numpy.nonzero(md.geometry.base<=md.basalforcings.deepwater_elevation) Index: ../trunk-jpl/src/m/classes/SMBforcing.js =================================================================== --- ../trunk-jpl/src/m/classes/SMBforcing.js (revision 20895) +++ ../trunk-jpl/src/m/classes/SMBforcing.js (revision 20896) @@ -44,7 +44,7 @@ } // }}} 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'); WriteData(fid,prefix,'object',this,'class','smb','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); Index: ../trunk-jpl/src/m/classes/SMBgemb.m =================================================================== --- ../trunk-jpl/src/m/classes/SMBgemb.m (revision 20895) +++ ../trunk-jpl/src/m/classes/SMBgemb.m (revision 20896) @@ -257,7 +257,7 @@ end % }}} 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: ../trunk-jpl/src/m/classes/calving.py =================================================================== --- ../trunk-jpl/src/m/classes/calving.py (revision 20895) +++ ../trunk-jpl/src/m/classes/calving.py (revision 20896) @@ -51,7 +51,7 @@ # }}} 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'); WriteData(fid,prefix,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts) Index: ../trunk-jpl/src/m/classes/balancethickness.js =================================================================== --- ../trunk-jpl/src/m/classes/balancethickness.js (revision 20895) +++ ../trunk-jpl/src/m/classes/balancethickness.js (revision 20896) @@ -34,7 +34,7 @@ } //}}} 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); WriteData(fid,prefix,'object',this,'fieldname','thickening_rate','format','DoubleMat','mattype',1,'scale',1/yts); Index: ../trunk-jpl/src/m/classes/frictionsommers.m =================================================================== --- ../trunk-jpl/src/m/classes/frictionsommers.m (revision 20895) +++ ../trunk-jpl/src/m/classes/frictionsommers.m (revision 20896) @@ -35,7 +35,7 @@ fielddisplay(self,'coefficient','friction coefficient [SI]'); 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'); WriteData(fid,prefix,'class','friction','object',self,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); Index: ../trunk-jpl/src/m/classes/stressbalance.py =================================================================== --- ../trunk-jpl/src/m/classes/stressbalance.py (revision 20895) +++ ../trunk-jpl/src/m/classes/stressbalance.py (revision 20896) @@ -177,7 +177,7 @@ 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) WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) Index: ../trunk-jpl/src/m/classes/hydrologysommers.m =================================================================== --- ../trunk-jpl/src/m/classes/hydrologysommers.m (revision 20895) +++ ../trunk-jpl/src/m/classes/hydrologysommers.m (revision 20896) @@ -61,7 +61,7 @@ end % }}} 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'); WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','head','format','DoubleMat','mattype',1); Index: ../trunk-jpl/src/m/classes/calvinglevermann.py =================================================================== --- ../trunk-jpl/src/m/classes/calvinglevermann.py (revision 20895) +++ ../trunk-jpl/src/m/classes/calvinglevermann.py (revision 20896) @@ -49,7 +49,7 @@ return md # }}} 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) WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts) Index: ../trunk-jpl/src/m/classes/m1qn3inversion.py =================================================================== --- ../trunk-jpl/src/m/classes/m1qn3inversion.py (revision 20895) +++ ../trunk-jpl/src/m/classes/m1qn3inversion.py (revision 20896) @@ -164,7 +164,7 @@ # }}} 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') WriteData(fid,prefix,'name','md.inversion.type','data',2,'format','Integer') Index: ../trunk-jpl/src/m/classes/constants.js =================================================================== --- ../trunk-jpl/src/m/classes/constants.js (revision 20895) +++ ../trunk-jpl/src/m/classes/constants.js (revision 20896) @@ -14,7 +14,7 @@ this.omega = 7.292*1e-5; //converstion from year to seconds - this.yts=365*24*3600; + this.yts=365.*24.*3600.; //the reference temperature for enthalpy model (cf Aschwanden) this.referencetemperature=223.15; Index: ../trunk-jpl/src/m/classes/SMBpdd.py =================================================================== --- ../trunk-jpl/src/m/classes/SMBpdd.py (revision 20895) +++ ../trunk-jpl/src/m/classes/SMBpdd.py (revision 20896) @@ -150,7 +150,7 @@ #}}} 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: ../trunk-jpl/src/m/classes/inversion.py =================================================================== --- ../trunk-jpl/src/m/classes/inversion.py (revision 20895) +++ ../trunk-jpl/src/m/classes/inversion.py (revision 20896) @@ -159,7 +159,7 @@ # }}} 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') WriteData(fid,prefix,'object',self,'fieldname','iscontrol','format','Boolean') Index: ../trunk-jpl/src/m/classes/constants.m =================================================================== --- ../trunk-jpl/src/m/classes/constants.m (revision 20895) +++ ../trunk-jpl/src/m/classes/constants.m (revision 20896) @@ -28,7 +28,7 @@ self.omega = 7.292*1e-5; %converstion from year to seconds - self.yts=365*24*3600; + self.yts=365.*24.*3600.; %the reference temperature for enthalpy model (cf Aschwanden) self.referencetemperature=223.15; Index: ../trunk-jpl/src/m/classes/taoinversion.py =================================================================== --- ../trunk-jpl/src/m/classes/taoinversion.py (revision 20895) +++ ../trunk-jpl/src/m/classes/taoinversion.py (revision 20896) @@ -164,7 +164,7 @@ 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') if not self.iscontrol: Index: ../trunk-jpl/src/m/classes/calvingdev.m =================================================================== --- ../trunk-jpl/src/m/classes/calvingdev.m (revision 20895) +++ ../trunk-jpl/src/m/classes/calvingdev.m (revision 20896) @@ -50,7 +50,7 @@ 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); WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts); Index: ../trunk-jpl/src/m/classes/SMBgradients.m =================================================================== --- ../trunk-jpl/src/m/classes/SMBgradients.m (revision 20895) +++ ../trunk-jpl/src/m/classes/SMBgradients.m (revision 20896) @@ -61,7 +61,7 @@ end % }}} 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'); WriteData(fid,prefix,'object',self,'class','smb','fieldname','href','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); Index: ../trunk-jpl/src/m/classes/initialization.m =================================================================== --- ../trunk-jpl/src/m/classes/initialization.m (revision 20895) +++ ../trunk-jpl/src/m/classes/initialization.m (revision 20896) @@ -113,7 +113,7 @@ end % }}} 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); WriteData(fid,prefix,'object',self,'fieldname','vy','format','DoubleMat','mattype',1,'scale',1./yts); Index: ../trunk-jpl/src/m/classes/calving.js =================================================================== --- ../trunk-jpl/src/m/classes/calving.js (revision 20895) +++ ../trunk-jpl/src/m/classes/calving.js (revision 20896) @@ -31,7 +31,7 @@ checkfield(md,'fieldname','calving.meltingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1,'Inf',1); } //}}} 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); WriteData(fid,prefix,'object',this,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts); Index: ../trunk-jpl/src/m/classes/frictionweertmantemp.m =================================================================== --- ../trunk-jpl/src/m/classes/frictionweertmantemp.m (revision 20895) +++ ../trunk-jpl/src/m/classes/frictionweertmantemp.m (revision 20896) @@ -37,7 +37,7 @@ fielddisplay(self,'m','m exponent'); 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'); WriteData(fid,prefix,'class','friction','object',self,'fieldname','gamma','format','Double'); Index: ../trunk-jpl/src/m/classes/timestepping.m =================================================================== --- ../trunk-jpl/src/m/classes/timestepping.m (revision 20895) +++ ../trunk-jpl/src/m/classes/timestepping.m (revision 20896) @@ -62,7 +62,7 @@ end % }}} 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); WriteData(fid,prefix,'object',self,'fieldname','time_step','format','Double','scale',scale); Index: ../trunk-jpl/src/m/classes/stressbalance.js =================================================================== --- ../trunk-jpl/src/m/classes/stressbalance.js (revision 20895) +++ ../trunk-jpl/src/m/classes/stressbalance.js (revision 20896) @@ -147,7 +147,7 @@ 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); WriteData(fid,prefix,'object',this,'class','stressbalance','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); Index: ../trunk-jpl/src/m/classes/adinversion.py =================================================================== --- ../trunk-jpl/src/m/classes/adinversion.py (revision 20895) +++ ../trunk-jpl/src/m/classes/adinversion.py (revision 20896) @@ -139,7 +139,7 @@ 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'); WriteData(fid,prefix,'name','md.inversion.type','data',4,'format','Integer'); Index: ../trunk-jpl/src/m/classes/plumebasalforcings.m =================================================================== --- ../trunk-jpl/src/m/classes/plumebasalforcings.m (revision 20895) +++ ../trunk-jpl/src/m/classes/plumebasalforcings.m (revision 20896) @@ -110,7 +110,7 @@ end % }}} 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'); WriteData(fid,prefix,'object',self,'fieldname','floatingice_melting_rate','format','DoubleMat','name','md.basalforcings.floatingice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) Index: ../trunk-jpl/src/m/classes/masstransport.m =================================================================== --- ../trunk-jpl/src/m/classes/masstransport.m (revision 20895) +++ ../trunk-jpl/src/m/classes/masstransport.m (revision 20896) @@ -112,7 +112,7 @@ end % }}} 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); WriteData(fid,prefix,'object',self,'fieldname','isfreesurface','format','Boolean'); Index: ../trunk-jpl/src/m/classes/initialization.py =================================================================== --- ../trunk-jpl/src/m/classes/initialization.py (revision 20895) +++ ../trunk-jpl/src/m/classes/initialization.py (revision 20896) @@ -108,7 +108,7 @@ # }}} 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) WriteData(fid,prefix,'object',self,'fieldname','vy','format','DoubleMat','mattype',1,'scale',1./yts) Index: ../trunk-jpl/src/m/classes/inversion.js =================================================================== --- ../trunk-jpl/src/m/classes/inversion.js (revision 20895) +++ ../trunk-jpl/src/m/classes/inversion.js (revision 20896) @@ -134,7 +134,7 @@ } // }}} 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'); WriteData(fid,prefix,'object',this,'fieldname','iscontrol','format','Boolean'); Index: ../trunk-jpl/src/m/classes/m1qn3inversion.m =================================================================== --- ../trunk-jpl/src/m/classes/m1qn3inversion.m (revision 20895) +++ ../trunk-jpl/src/m/classes/m1qn3inversion.m (revision 20896) @@ -137,7 +137,7 @@ end % }}} 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'); WriteData(fid,prefix,'name','md.inversion.type','data',2,'format','Integer'); Index: ../trunk-jpl/src/m/classes/inversion.m =================================================================== --- ../trunk-jpl/src/m/classes/inversion.m (revision 20895) +++ ../trunk-jpl/src/m/classes/inversion.m (revision 20896) @@ -149,7 +149,7 @@ end % }}} 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'); WriteData(fid,prefix,'object',self,'fieldname','iscontrol','format','Boolean'); Index: ../trunk-jpl/src/m/classes/calving.m =================================================================== --- ../trunk-jpl/src/m/classes/calving.m (revision 20895) +++ ../trunk-jpl/src/m/classes/calving.m (revision 20896) @@ -47,7 +47,7 @@ fielddisplay(self,'meltingrate','melting rate at given location [m/a]'); 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); WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts); Index: ../trunk-jpl/src/m/classes/SMBforcing.m =================================================================== --- ../trunk-jpl/src/m/classes/SMBforcing.m (revision 20895) +++ ../trunk-jpl/src/m/classes/SMBforcing.m (revision 20896) @@ -64,7 +64,7 @@ end % }}} 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'); WriteData(fid,prefix,'object',self,'class','smb','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); Index: ../trunk-jpl/src/m/classes/calvinglevermann.m =================================================================== --- ../trunk-jpl/src/m/classes/calvinglevermann.m (revision 20895) +++ ../trunk-jpl/src/m/classes/calvinglevermann.m (revision 20896) @@ -50,7 +50,7 @@ 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); WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts); Index: ../trunk-jpl/src/m/classes/balancethickness.m =================================================================== --- ../trunk-jpl/src/m/classes/balancethickness.m (revision 20895) +++ ../trunk-jpl/src/m/classes/balancethickness.m (revision 20896) @@ -46,7 +46,7 @@ end % }}} 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); WriteData(fid,prefix,'object',self,'fieldname','thickening_rate','format','DoubleMat','mattype',1,'scale',1./yts); Index: ../trunk-jpl/src/m/classes/timestepping.py =================================================================== --- ../trunk-jpl/src/m/classes/timestepping.py (revision 20895) +++ ../trunk-jpl/src/m/classes/timestepping.py (revision 20896) @@ -65,8 +65,7 @@ # }}} 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) WriteData(fid,prefix,'object',self,'fieldname','time_step','format','Double','scale',yts) Index: ../trunk-jpl/src/m/classes/initialization.js =================================================================== --- ../trunk-jpl/src/m/classes/initialization.js (revision 20895) +++ ../trunk-jpl/src/m/classes/initialization.js (revision 20896) @@ -98,7 +98,7 @@ } //}}} 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); WriteData(fid,prefix,'object',this,'fieldname','vy','format','DoubleMat','mattype',1,'scale',1./yts); Index: ../trunk-jpl/src/m/classes/SMBmeltcomponents.m =================================================================== --- ../trunk-jpl/src/m/classes/SMBmeltcomponents.m (revision 20895) +++ ../trunk-jpl/src/m/classes/SMBmeltcomponents.m (revision 20896) @@ -88,7 +88,7 @@ end % }}} 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'); WriteData(fid,prefix,'object',self,'class','smb','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); Index: ../trunk-jpl/src/m/classes/masstransport.py =================================================================== --- ../trunk-jpl/src/m/classes/masstransport.py (revision 20895) +++ ../trunk-jpl/src/m/classes/masstransport.py (revision 20896) @@ -82,7 +82,7 @@ # }}} 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) WriteData(fid,prefix,'object',self,'fieldname','isfreesurface','format','Boolean')