Index: /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.h (revision 19026) +++ /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.h (revision 19027) @@ -42,7 +42,7 @@ Input* SpawnTriaInput(int index1,int index2,int index3); Input* SpawnSegInput(int index1,int index2); - Input* PointwiseDivide(Input* forcingB){_error_("not implemented yet");}; - Input* PointwiseMin(Input* forcingB){_error_("not implemented yet");}; - Input* PointwiseMax(Input* forcingB){_error_("not implemented yet");}; + Input* PointwiseDivide(Input* input_in){_error_("not implemented yet");}; + Input* PointwiseMin(Input* input_in){_error_("not implemented yet");}; + Input* PointwiseMax(Input* input_in){_error_("not implemented yet");}; int GetResultInterpolation(void); int GetResultNumberOfNodes(void); Index: /issm/trunk-jpl/src/m/classes/SMB.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMB.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/SMB.m (revision 19027) @@ -38,5 +38,5 @@ if ismember(MasstransportAnalysisEnum(),analyses), - md = checkfield(md,'fieldname','surfaceforcings.mass_balance','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.mass_balance','timeseries',1,'NaN',1); end if ismember(BalancethicknessAnalysisEnum(),analyses), @@ -53,5 +53,5 @@ WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBEnum(),'format','Integer'); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); end % }}} end Index: /issm/trunk-jpl/src/m/classes/SMB.py =================================================================== --- /issm/trunk-jpl/src/m/classes/SMB.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/SMB.py (revision 19027) @@ -38,5 +38,5 @@ if MasstransportAnalysisEnum() in analyses: - md = checkfield(md,'fieldname','surfaceforcings.mass_balance','forcing',1,'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.mass_balance','timeseries',1,'NaN',1) if BalancethicknessAnalysisEnum() in analyses: @@ -50,4 +50,4 @@ WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBEnum(),'format','Integer'); - WriteData(fid,'object',self,'class','surfaceforcings','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) # }}} Index: /issm/trunk-jpl/src/m/classes/SMBcomponents.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBcomponents.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/SMBcomponents.m (revision 19027) @@ -44,5 +44,5 @@ if ismember(MasstransportAnalysisEnum(),analyses), - md = checkfield(md,'fieldname','surfaceforcings.accumulation','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.accumulation','timeseries',1,'NaN',1); end if ismember(BalancethicknessAnalysisEnum(),analyses), @@ -50,5 +50,5 @@ end if ismember(MasstransportAnalysisEnum(),analyses), - md = checkfield(md,'fieldname','surfaceforcings.runoff','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.runoff','timeseries',1,'NaN',1); end if ismember(BalancethicknessAnalysisEnum(),analyses), @@ -56,5 +56,5 @@ end if ismember(MasstransportAnalysisEnum(),analyses), - md = checkfield(md,'fieldname','surfaceforcings.evaporation','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.evaporation','timeseries',1,'NaN',1); end if ismember(BalancethicknessAnalysisEnum(),analyses), @@ -73,7 +73,7 @@ WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBcomponentsEnum(),'format','Integer'); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','runoff','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','runoff','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); end % }}} end Index: /issm/trunk-jpl/src/m/classes/SMBcomponents.py =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBcomponents.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/SMBcomponents.py (revision 19027) @@ -51,5 +51,5 @@ if MasstransportAnalysisEnum() in analyses: - md = checkfield(md,'fieldname','surfaceforcings.accumulation','forcing',1,'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.accumulation','timeseries',1,'NaN',1) if BalancethicknessAnalysisEnum() in analyses: @@ -57,5 +57,5 @@ if MasstransportAnalysisEnum() in analyses: - md = checkfield(md,'fieldname','surfaceforcings.runoff','forcing',1,'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.runoff','timeseries',1,'NaN',1) if BalancethicknessAnalysisEnum() in analyses: @@ -63,5 +63,5 @@ if MasstransportAnalysisEnum() in analyses: - md = checkfield(md,'fieldname','surfaceforcings.evaporation','forcing',1,'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.evaporation','timeseries',1,'NaN',1) if BalancethicknessAnalysisEnum() in analyses: @@ -75,6 +75,6 @@ WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBcomponentsEnum(),'format','Integer'); - WriteData(fid,'object',self,'class','surfaceforcings','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',self,'class','surfaceforcings','fieldname','runoff','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',self,'class','surfaceforcings','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','runoff','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) # }}} Index: /issm/trunk-jpl/src/m/classes/SMBgradients.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBgradients.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/SMBgradients.m (revision 19027) @@ -38,8 +38,8 @@ if ismember(MasstransportAnalysisEnum(),analyses), - md = checkfield(md,'fieldname','surfaceforcings.href','forcing',1,'NaN',1); - md = checkfield(md,'fieldname','surfaceforcings.smbref','forcing',1,'NaN',1); - md = checkfield(md,'fieldname','surfaceforcings.b_pos','forcing',1,'NaN',1); - md = checkfield(md,'fieldname','surfaceforcings.b_neg','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.href','timeseries',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.smbref','timeseries',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.b_pos','timeseries',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.b_neg','timeseries',1,'NaN',1); end end % }}} @@ -59,8 +59,8 @@ WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBgradientsEnum(),'format','Integer'); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','href','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','b_pos','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','b_neg','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','href','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','b_pos','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','b_neg','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); end % }}} Index: /issm/trunk-jpl/src/m/classes/SMBgradients.py =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBgradients.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/SMBgradients.py (revision 19027) @@ -44,8 +44,8 @@ if MasstransportAnalysisEnum() in analyses: - md = checkfield(md,'fieldname','surfaceforcings.href','forcing',1,'NaN',1) - md = checkfield(md,'fieldname','surfaceforcings.smbref','forcing',1,'NaN',1) - md = checkfield(md,'fieldname','surfaceforcings.b_pos','forcing',1,'NaN',1) - md = checkfield(md,'fieldname','surfaceforcings.b_neg','forcing',1,'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.href','timeseries',1,'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.smbref','timeseries',1,'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.b_pos','timeseries',1,'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.b_neg','timeseries',1,'NaN',1) return md @@ -56,7 +56,7 @@ WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBgradientsEnum(),'format','Integer'); - WriteData(fid,'object',self,'class','surfaceforcings','fieldname','href','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',self,'class','surfaceforcings','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',self,'class','surfaceforcings','fieldname','b_pos','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',self,'class','surfaceforcings','fieldname','b_neg','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','href','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','b_pos','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','b_neg','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) # }}} Index: /issm/trunk-jpl/src/m/classes/SMBhenning.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBhenning.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/SMBhenning.m (revision 19027) @@ -32,5 +32,5 @@ if ismember(MasstransportAnalysisEnum(),analyses), - md = checkfield(md,'fieldname','surfaceforcings.smbref','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.smbref','timeseries',1,'NaN',1); end if ismember(BalancethicknessAnalysisEnum(),analyses), @@ -47,5 +47,5 @@ WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBhenningEnum(),'format','Integer'); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); end % }}} end Index: /issm/trunk-jpl/src/m/classes/SMBmeltcomponents.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBmeltcomponents.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/SMBmeltcomponents.m (revision 19027) @@ -50,5 +50,5 @@ if ismember(MasstransportAnalysisEnum(),analyses), - md = checkfield(md,'fieldname','surfaceforcings.accumulation','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.accumulation','timeseries',1,'NaN',1); end if ismember(BalancethicknessAnalysisEnum(),analyses), @@ -56,5 +56,5 @@ end if ismember(MasstransportAnalysisEnum(),analyses), - md = checkfield(md,'fieldname','surfaceforcings.evaporation','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.evaporation','timeseries',1,'NaN',1); end if ismember(BalancethicknessAnalysisEnum(),analyses), @@ -62,5 +62,5 @@ end if ismember(MasstransportAnalysisEnum(),analyses), - md = checkfield(md,'fieldname','surfaceforcings.refreeze','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.refreeze','timeseries',1,'NaN',1); end if ismember(BalancethicknessAnalysisEnum(),analyses), @@ -68,5 +68,5 @@ end if ismember(MasstransportAnalysisEnum(),analyses), - md = checkfield(md,'fieldname','surfaceforcings.melt','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.melt','timeseries',1,'NaN',1); end if ismember(BalancethicknessAnalysisEnum(),analyses), @@ -86,8 +86,8 @@ WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBmeltcomponentsEnum(),'format','Integer'); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','melt','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','refreeze','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','melt','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','refreeze','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); end % }}} end Index: /issm/trunk-jpl/src/m/classes/SMBmeltcomponents.py =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBmeltcomponents.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/SMBmeltcomponents.py (revision 19027) @@ -57,5 +57,5 @@ if MasstransportAnalysisEnum() in analyses: - md = checkfield(md,'fieldname','surfaceforcings.accumulation','forcing',1,'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.accumulation','timeseries',1,'NaN',1) if BalancethicknessAnalysisEnum() in analyses: @@ -63,5 +63,5 @@ if MasstransportAnalysisEnum() in analyses: - md = checkfield(md,'fieldname','surfaceforcings.melt','forcing',1,'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.melt','timeseries',1,'NaN',1) if BalancethicknessAnalysisEnum() in analyses: @@ -69,5 +69,5 @@ if MasstransportAnalysisEnum() in analyses: - md = checkfield(md,'fieldname','surfaceforcings.refreeze','forcing',1,'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.refreeze','timeseries',1,'NaN',1) if BalancethicknessAnalysisEnum() in analyses: @@ -75,5 +75,5 @@ if MasstransportAnalysisEnum() in analyses: - md = checkfield(md,'fieldname','surfaceforcings.evaporation','forcing',1,'NaN',1) + md = checkfield(md,'fieldname','surfaceforcings.evaporation','timeseries',1,'NaN',1) if BalancethicknessAnalysisEnum() in analyses: @@ -87,7 +87,7 @@ WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBmeltcomponentsEnum(),'format','Integer'); - WriteData(fid,'object',self,'class','surfaceforcings','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',self,'class','surfaceforcings','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',self,'class','surfaceforcings','fieldname','melt','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',self,'class','surfaceforcings','fieldname','refreeze','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','melt','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','refreeze','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) # }}} Index: /issm/trunk-jpl/src/m/classes/SMBpdd.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBpdd.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/SMBpdd.m (revision 19027) @@ -75,6 +75,6 @@ md = checkfield(md,'fieldname','surfaceforcings.rlapslgm','>=',0,'numel',1); if(obj.isdelta18o==0 & obj.ismungsm==0) - md = checkfield(md,'fieldname','surfaceforcings.monthlytemperatures','forcing',1,'NaN',1); - md = checkfield(md,'fieldname','surfaceforcings.precipitation','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.monthlytemperatures','timeseries',1,'NaN',1); + md = checkfield(md,'fieldname','surfaceforcings.precipitation','timeseries',1,'NaN',1); elseif(obj.isdelta18o==1) md = checkfield(md,'fieldname','surfaceforcings.delta18o','NaN',1); @@ -146,6 +146,6 @@ if(obj.isdelta18o==0 & obj.ismungsm==0) %WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','monthlytemperatures','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','monthlytemperatures','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','precipitation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','monthlytemperatures','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','precipitation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); elseif obj.isdelta18o WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','temperatures_presentday','format','DoubleMat','mattype',1); Index: /issm/trunk-jpl/src/m/classes/SMBpdd.py =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBpdd.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/SMBpdd.py (revision 19027) @@ -153,5 +153,5 @@ if (self.isdelta18o==0 and self.ismungsm==0): WriteData(fid,'object',self,'class','surfaceforcings','fieldname','monthlytemperatures','format','DoubleMat','mattype',1) - WriteData(fid,'object',self,'class','surfaceforcings','fieldname','precipitation','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','precipitation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) elif self.isdelta18o: WriteData(fid,'object',self,'class','surfaceforcings','fieldname','temperatures_presentday','format','DoubleMat','mattype',1) Index: /issm/trunk-jpl/src/m/classes/basalforcings.m =================================================================== --- /issm/trunk-jpl/src/m/classes/basalforcings.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/basalforcings.m (revision 19027) @@ -45,6 +45,6 @@ if ismember(MasstransportAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.ismasstransport==0), - md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1); - md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'forcing',1); + md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1); + md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1); end if ismember(BalancethicknessAnalysisEnum(),analyses), @@ -53,7 +53,7 @@ end if ismember(ThermalAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.isthermal==0), - md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1); - md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'forcing',1); - md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'forcing',1,'>=',0); + md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1); + md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1); + md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0); end end % }}} @@ -71,7 +71,7 @@ WriteData(fid,'enum',BasalforcingsEnum(),'data',FloatingMeltRateEnum(),'format','Integer'); - WriteData(fid,'object',obj,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',obj,'fieldname','floatingice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',obj,'fieldname','geothermalflux','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',obj,'fieldname','floatingice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',obj,'fieldname','geothermalflux','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); end % }}} end Index: /issm/trunk-jpl/src/m/classes/basalforcings.py =================================================================== --- /issm/trunk-jpl/src/m/classes/basalforcings.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/basalforcings.py (revision 19027) @@ -48,6 +48,6 @@ if MasstransportAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.ismasstransport): - md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1) - md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'forcing',1) + md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1) + md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1) if BalancethicknessAnalysisEnum() in analyses: @@ -56,7 +56,7 @@ if ThermalAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.isthermal): - md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1) - md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'forcing',1) - md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'forcing',1,'>=',0) + md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1) + md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1) + md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0) return md @@ -67,6 +67,6 @@ WriteData(fid,'enum',BasalforcingsEnum(),'data',FloatingMeltRateEnum(),'format','Integer'); - WriteData(fid,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',self,'fieldname','floatingice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',self,'fieldname','geothermalflux','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'fieldname','floatingice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'fieldname','geothermalflux','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1) # }}} Index: /issm/trunk-jpl/src/m/classes/calving.m =================================================================== --- /issm/trunk-jpl/src/m/classes/calving.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/calving.m (revision 19027) @@ -40,6 +40,6 @@ md = checkfield(md,'fieldname','calving.stabilization','values',[0 1 2]); - md = checkfield(md,'fieldname','calving.calvingrate(1:md.mesh.numberofvertices,:)','>=',0,'forcing',1,'NaN',1); - md = checkfield(md,'fieldname','calving.meltingrate(1:md.mesh.numberofvertices,:)','>=',0,'forcing',1,'NaN',1); + md = checkfield(md,'fieldname','calving.calvingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1); + md = checkfield(md,'fieldname','calving.meltingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1); end % }}} function disp(obj) % {{{ @@ -53,6 +53,6 @@ WriteData(fid,'enum',CalvingLawEnum(),'data',DefaultCalvingEnum(),'format','Integer'); WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',obj.stabilization,'format','Integer'); - WriteData(fid,'object',obj,'fieldname','calvingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts); - WriteData(fid,'object',obj,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts); + WriteData(fid,'object',obj,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts); + WriteData(fid,'object',obj,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts); end % }}} end Index: /issm/trunk-jpl/src/m/classes/calving.py =================================================================== --- /issm/trunk-jpl/src/m/classes/calving.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/calving.py (revision 19027) @@ -45,6 +45,6 @@ md = checkfield(md,'fieldname','calving.stabilization','values',[0,1,2]); - md = checkfield(md,'fieldname','calving.calvingrate','>=',0,'forcing',1,'NaN',1); - md = checkfield(md,'fieldname','calving.meltingrate','>=',0,'forcing',1,'NaN',1); + md = checkfield(md,'fieldname','calving.calvingrate','>=',0,'timeseries',1,'NaN',1); + md = checkfield(md,'fieldname','calving.meltingrate','>=',0,'timeseries',1,'NaN',1); return md @@ -56,5 +56,5 @@ WriteData(fid,'enum',CalvingLawEnum(),'data',DefaultCalvingEnum(),'format','Integer'); WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer'); - WriteData(fid,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts) - WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts) + WriteData(fid,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts) + WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts) # }}} Index: /issm/trunk-jpl/src/m/classes/calvinglevermann.m =================================================================== --- /issm/trunk-jpl/src/m/classes/calvinglevermann.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/calvinglevermann.m (revision 19027) @@ -57,5 +57,5 @@ WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',obj.stabilization,'format','Integer'); WriteData(fid,'enum',CalvinglevermannCoeffEnum(),'data',obj.coeff,'format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts); + WriteData(fid,'object',obj,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts); end % }}} end Index: /issm/trunk-jpl/src/m/classes/calvinglevermann.py =================================================================== --- /issm/trunk-jpl/src/m/classes/calvinglevermann.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/calvinglevermann.py (revision 19027) @@ -54,4 +54,4 @@ WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer'); WriteData(fid,'enum',CalvinglevermannCoeffEnum(),'data',self.coeff,'format','DoubleMat','mattype',1) - WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts) + WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts) # }}} Index: /issm/trunk-jpl/src/m/classes/calvingpi.m =================================================================== --- /issm/trunk-jpl/src/m/classes/calvingpi.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/calvingpi.m (revision 19027) @@ -57,5 +57,5 @@ WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',obj.stabilization,'format','Integer'); WriteData(fid,'enum',CalvingpiCoeffEnum(),'data',obj.coeff,'format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts); + WriteData(fid,'object',obj,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts); end % }}} end Index: /issm/trunk-jpl/src/m/classes/damage.m =================================================================== --- /issm/trunk-jpl/src/m/classes/damage.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/damage.m (revision 19027) @@ -150,5 +150,5 @@ md = checkfield(md,'fieldname','damage.law','numel',[1],'values',[0,1,2]); md = checkfield(md,'fieldname','damage.D','>=',0,'<=',obj.max_damage,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'fieldname','damage.spcdamage','forcing',1); + md = checkfield(md,'fieldname','damage.spcdamage','timeseries',1); md = checkfield(md,'fieldname','damage.max_damage','<',1,'>=',0); md = checkfield(md,'fieldname','damage.stabilization','numel',[1],'values',[0 1 2]); @@ -213,5 +213,5 @@ WriteData(fid,'object',obj,'fieldname','law','format','Integer'); WriteData(fid,'object',obj,'fieldname','D','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'fieldname','spcdamage','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'fieldname','spcdamage','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'object',obj,'fieldname','max_damage','format','Double'); Index: /issm/trunk-jpl/src/m/classes/damage.py =================================================================== --- /issm/trunk-jpl/src/m/classes/damage.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/damage.py (revision 19027) @@ -131,5 +131,5 @@ md = checkfield(md,'fieldname','damage.max_damage','<',1,'>=',0) md = checkfield(md,'fieldname','damage.law','numel',[1],'values',[0,1,2,3]) - md = checkfield(md,'fieldname','damage.spcdamage','forcing',1) + md = checkfield(md,'fieldname','damage.spcdamage','timeseries',1) md = checkfield(md,'fieldname','damage.stabilization','numel',[1],'values',[0,1,2]) md = checkfield(md,'fieldname','damage.maxiter','>=0',0) @@ -159,5 +159,5 @@ WriteData(fid,'object',self,'fieldname','D','format','DoubleMat','mattype',1) WriteData(fid,'object',self,'fieldname','law','format','Integer') - WriteData(fid,'object',self,'fieldname','spcdamage','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'fieldname','spcdamage','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1) WriteData(fid,'object',self,'fieldname','max_damage','format','Double') WriteData(fid,'object',self,'fieldname','stabilization','format','Integer') Index: /issm/trunk-jpl/src/m/classes/friction.m =================================================================== --- /issm/trunk-jpl/src/m/classes/friction.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/friction.m (revision 19027) @@ -35,5 +35,5 @@ %Early return if ~ismember(StressbalanceAnalysisEnum(),analyses) & ~ismember(ThermalAnalysisEnum(),analyses), return; end - md = checkfield(md,'fieldname','friction.coefficient','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1); md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements 1]); md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements 1]); @@ -49,5 +49,5 @@ WriteData(fid,'enum',FrictionLawEnum,'data',1,'format','Integer'); - WriteData(fid,'object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); %WriteData(fid,'object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1); WriteData(fid,'object',obj,'fieldname','p','format','DoubleMat','mattype',2); Index: /issm/trunk-jpl/src/m/classes/friction.py =================================================================== --- /issm/trunk-jpl/src/m/classes/friction.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/friction.py (revision 19027) @@ -38,5 +38,5 @@ return md - md = checkfield(md,'fieldname','friction.coefficient','forcing',1,'NaN',1) + md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1) md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements]) md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements]) Index: /issm/trunk-jpl/src/m/classes/frictionhydro.m =================================================================== --- /issm/trunk-jpl/src/m/classes/frictionhydro.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/frictionhydro.m (revision 19027) @@ -43,5 +43,5 @@ WriteData(fid,'class','friction','object',obj,'fieldname','C','format','DoubleMat','mattype',2); WriteData(fid,'class','friction','object',obj,'fieldname','As','format','DoubleMat','mattype',2); - WriteData(fid,'class','friction','object',obj,'fieldname','effective_pressure','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'class','friction','object',obj,'fieldname','effective_pressure','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); end % }}} end Index: /issm/trunk-jpl/src/m/classes/frictiontemp.m =================================================================== --- /issm/trunk-jpl/src/m/classes/frictiontemp.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/frictiontemp.m (revision 19027) @@ -34,5 +34,5 @@ if ~ismember(StressbalanceAnalysisEnum(),analyses) & ~ismember(ThermalAnalysisEnum(),analyses), return; end - md = checkfield(md,'fieldname','friction.coefficient','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1); md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements 1]); md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements 1]); @@ -53,5 +53,5 @@ WriteData(fid,'enum',FrictionLawEnum,'data',4,'format','Integer'); WriteData(fid,'class','friction','object',obj,'fieldname','gamma','format','Double'); - WriteData(fid,'class','friction','object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'class','friction','object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'class','friction','object',obj,'fieldname','p','format','DoubleMat','mattype',2); WriteData(fid,'class','friction','object',obj,'fieldname','q','format','DoubleMat','mattype',2); Index: /issm/trunk-jpl/src/m/classes/frictionwaterlayer.m =================================================================== --- /issm/trunk-jpl/src/m/classes/frictionwaterlayer.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/frictionwaterlayer.m (revision 19027) @@ -30,8 +30,8 @@ if ~ismember(StressbalanceAnalysisEnum(),analyses) & ~ismember(ThermalAnalysisEnum(),analyses), return; end - md = checkfield(md,'fieldname','friction.coefficient','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1); md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements 1]); md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements 1]); - md = checkfield(md,'fieldname','thermal.spctemperature','forcing',1,'>=',0.); + md = checkfield(md,'fieldname','thermal.spctemperature','timeseries',1,'>=',0.); end % }}} @@ -46,8 +46,8 @@ WriteData(fid,'enum',FrictionLawEnum,'data',5,'format','Integer'); - WriteData(fid,'class','friction','object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'class','friction','object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'class','friction','object',obj,'fieldname','p','format','DoubleMat','mattype',2); WriteData(fid,'class','friction','object',obj,'fieldname','q','format','DoubleMat','mattype',2); - WriteData(fid,'class','friction','object',obj,'fieldname','water_layer','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'class','friction','object',obj,'fieldname','water_layer','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); end % }}} end Index: /issm/trunk-jpl/src/m/classes/frictionweertman.m =================================================================== --- /issm/trunk-jpl/src/m/classes/frictionweertman.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/frictionweertman.m (revision 19027) @@ -34,5 +34,5 @@ %Early return if ~ismember(StressbalanceAnalysisEnum(),analyses) & ~ismember(ThermalAnalysisEnum(),analyses), return; end - md = checkfield(md,'fieldname','friction.C','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','friction.C','timeseries',1,'NaN',1); md = checkfield(md,'fieldname','friction.m','NaN',1,'size',[md.mesh.numberofelements 1]); end % }}} @@ -51,5 +51,5 @@ WriteData(fid,'enum',FrictionLawEnum,'data',2,'format','Integer'); - WriteData(fid,'class','friction','object',obj,'fieldname','C','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'class','friction','object',obj,'fieldname','C','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'class','friction','object',obj,'fieldname','m','format','DoubleMat','mattype',2); Index: /issm/trunk-jpl/src/m/classes/frictionweertman.py =================================================================== --- /issm/trunk-jpl/src/m/classes/frictionweertman.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/frictionweertman.py (revision 19027) @@ -36,5 +36,5 @@ return md - md = checkfield(md,'fieldname','friction.C','forcing',1,'NaN',1) + md = checkfield(md,'fieldname','friction.C','timeseries',1,'NaN',1) md = checkfield(md,'fieldname','friction.m','NaN',1,'size',[md.mesh.numberofelements]) Index: /issm/trunk-jpl/src/m/classes/frictionweertmantemp.m =================================================================== --- /issm/trunk-jpl/src/m/classes/frictionweertmantemp.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/frictionweertmantemp.m (revision 19027) @@ -26,5 +26,5 @@ %Early return if ~ismember(StressbalanceAnalysisEnum(),analyses) & ~ismember(ThermalAnalysisEnum(),analyses), return; end - md = checkfield(md,'fieldname','friction.C','forcing',1,'NaN',1); + md = checkfield(md,'fieldname','friction.C','timeseries',1,'NaN',1); md = checkfield(md,'fieldname','friction.m','NaN',1,'size',[md.mesh.numberofelements 1]); end % }}} @@ -42,5 +42,5 @@ WriteData(fid,'enum',FrictionLawEnum,'data',6,'format','Integer'); WriteData(fid,'class','friction','object',obj,'fieldname','gamma','format','Double'); - WriteData(fid,'class','friction','object',obj,'fieldname','C','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'class','friction','object',obj,'fieldname','C','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'class','friction','object',obj,'fieldname','m','format','DoubleMat','mattype',2); Index: /issm/trunk-jpl/src/m/classes/geometry.m =================================================================== --- /issm/trunk-jpl/src/m/classes/geometry.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/geometry.m (revision 19027) @@ -63,5 +63,5 @@ if (solution==TransientSolutionEnum() & md.transient.isgia) | (solution==GiaSolutionEnum()), - md = checkfield(md,'fieldname','geometry.thickness','forcing',1,'NaN',1,'>=',0); + md = checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'>=',0); else md = checkfield(md,'fieldname','geometry.surface' ,'NaN',1,'size',[md.mesh.numberofvertices 1]); @@ -87,5 +87,5 @@ function marshall(obj,md,fid) % {{{ WriteData(fid,'data',obj.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum()); - WriteData(fid,'data',obj.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'data',obj.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'data',obj.base,'format','DoubleMat','mattype',1,'enum',BaseEnum()); WriteData(fid,'data',obj.bed,'format','DoubleMat','mattype',1,'enum',BedEnum()); Index: /issm/trunk-jpl/src/m/classes/geometry.py =================================================================== --- /issm/trunk-jpl/src/m/classes/geometry.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/geometry.py (revision 19027) @@ -39,5 +39,5 @@ md = checkfield(md,'fieldname','geometry.surface' ,'NaN',1,'size',[md.mesh.numberofvertices]) md = checkfield(md,'fieldname','geometry.base' ,'NaN',1,'size',[md.mesh.numberofvertices]) - md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices],'>',0,'forcing',1) + md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices],'>',0,'timeseries',1) if any((self.thickness-self.surface+self.base)>10**-9): md.checkmessage("equality thickness=surface-base violated") @@ -49,5 +49,5 @@ def marshall(self,md,fid): # {{{ WriteData(fid,'data',self.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum()) - WriteData(fid,'data',self.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'data',self.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'timeserieslength',md.mesh.numberofvertices+1) WriteData(fid,'data',self.base,'format','DoubleMat','mattype',1,'enum',BaseEnum()) WriteData(fid,'data',self.bed,'format','DoubleMat','mattype',1,'enum',BedEnum()) Index: /issm/trunk-jpl/src/m/classes/hydrologydc.m =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologydc.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/hydrologydc.m (revision 19027) @@ -105,7 +105,7 @@ md = checkfield(md,'fieldname','hydrology.leakage_factor','>',0,'numel',1); end - md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'forcing',1); - - md = checkfield(md,'fieldname','hydrology.spcsediment_head','forcing',1); + md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'timeseries',1); + + md = checkfield(md,'fieldname','hydrology.spcsediment_head','timeseries',1); md = checkfield(md,'fieldname','hydrology.sediment_compressibility','>',0,'numel',1); md = checkfield(md,'fieldname','hydrology.sediment_porosity','>',0,'numel',1); @@ -114,5 +114,5 @@ if obj.isefficientlayer==1, - md = checkfield(md,'fieldname','hydrology.spcepl_head','forcing',1); + md = checkfield(md,'fieldname','hydrology.spcepl_head','timeseries',1); md = checkfield(md,'fieldname','hydrology.mask_eplactive_node','size',[md.mesh.numberofvertices 1],'values',[0 1]); md = checkfield(md,'fieldname','hydrology.epl_compressibility','>',0,'numel',1); @@ -195,7 +195,7 @@ WriteData(fid,'object',obj,'fieldname','leakage_factor','format','Double'); end - WriteData(fid,'object',obj,'fieldname','basal_moulin_input','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) - - WriteData(fid,'object',obj,'fieldname','spcsediment_head','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'fieldname','basal_moulin_input','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1) + + WriteData(fid,'object',obj,'fieldname','spcsediment_head','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'object',obj,'fieldname','sediment_compressibility','format','Double'); WriteData(fid,'object',obj,'fieldname','sediment_porosity','format','Double'); @@ -204,5 +204,5 @@ if obj.isefficientlayer==1, - WriteData(fid,'object',obj,'fieldname','spcepl_head','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'fieldname','spcepl_head','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'object',obj,'fieldname','mask_eplactive_node','format','DoubleMat','mattype',1); WriteData(fid,'object',obj,'fieldname','epl_compressibility','format','Double'); Index: /issm/trunk-jpl/src/m/classes/hydrologydc.py =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologydc.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/hydrologydc.py (revision 19027) @@ -154,6 +154,6 @@ md = checkfield(md,'fieldname','hydrology.leakage_factor','>',0.,'numel',[1]) - md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'forcing',1) - md = checkfield(md,'fieldname','hydrology.spcsediment_head','forcing',1) + md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'timeseries',1) + md = checkfield(md,'fieldname','hydrology.spcsediment_head','timeseries',1) md = checkfield(md,'fieldname','hydrology.sediment_compressibility','>',0.,'numel',[1]) md = checkfield(md,'fieldname','hydrology.sediment_porosity','>',0.,'numel',[1]) @@ -161,5 +161,5 @@ md = checkfield(md,'fieldname','hydrology.sediment_transmitivity','>=',0,'size',[md.mesh.numberofvertices,1]) if self.isefficientlayer==1: - md = checkfield(md,'fieldname','hydrology.spcepl_head','forcing',1) + md = checkfield(md,'fieldname','hydrology.spcepl_head','timeseries',1) md = checkfield(md,'fieldname','hydrology.mask_eplactive_node','size',[md.mesh.numberofvertices,1],'values',[0,1]) md = checkfield(md,'fieldname','hydrology.epl_compressibility','>',0.,'numel',[1]) @@ -190,6 +190,6 @@ WriteData(fid,'object',self,'fieldname','leakage_factor','format','Double') - WriteData(fid,'object',self,'fieldname','basal_moulin_input','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',self,'fieldname','spcsediment_head','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'fieldname','basal_moulin_input','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'fieldname','spcsediment_head','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1) WriteData(fid,'object',self,'fieldname','sediment_compressibility','format','Double') WriteData(fid,'object',self,'fieldname','sediment_porosity','format','Double') @@ -198,5 +198,5 @@ if self.isefficientlayer==1: - WriteData(fid,'object',self,'fieldname','spcepl_head','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'fieldname','spcepl_head','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1) WriteData(fid,'object',self,'fieldname','mask_eplactive_node','format','DoubleMat','mattype',1) WriteData(fid,'object',self,'fieldname','epl_compressibility','format','Double') Index: /issm/trunk-jpl/src/m/classes/hydrologyshreve.m =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologyshreve.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/hydrologyshreve.m (revision 19027) @@ -43,5 +43,5 @@ end - md = checkfield(md,'fieldname','hydrology.spcwatercolumn','forcing',1); + md = checkfield(md,'fieldname','hydrology.spcwatercolumn','timeseries',1); md = checkfield(md,'fieldname','hydrology.stabilization','>=',0); end % }}} @@ -54,5 +54,5 @@ function marshall(obj,md,fid) % {{{ WriteData(fid,'enum',HydrologyModelEnum(),'data',HydrologyshreveEnum(),'format','Integer'); - WriteData(fid,'object',obj,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'object',obj,'fieldname','stabilization','format','Double'); end % }}} Index: /issm/trunk-jpl/src/m/classes/hydrologyshreve.py =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologyshreve.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/hydrologyshreve.py (revision 19027) @@ -40,5 +40,5 @@ return md - md = checkfield(md,'fieldname','hydrology.spcwatercolumn','forcing',1) + md = checkfield(md,'fieldname','hydrology.spcwatercolumn','timeseries',1) md = checkfield(md,'fieldname','hydrology.stabilization','>=',0) @@ -47,5 +47,5 @@ def marshall(self,md,fid): # {{{ WriteData(fid,'enum',HydrologyModelEnum(),'data',HydrologyshreveEnum(),'format','Integer'); - WriteData(fid,'object',self,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1) WriteData(fid,'object',self,'fieldname','stabilization','format','Double') # }}} Index: /issm/trunk-jpl/src/m/classes/linearbasalforcings.m =================================================================== --- /issm/trunk-jpl/src/m/classes/linearbasalforcings.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/linearbasalforcings.m (revision 19027) @@ -49,5 +49,5 @@ if ismember(MasstransportAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.ismasstransport==0), - md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1); + md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1); md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0,'numel',1); md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<','basalforcings.upperwater_elevation','numel',1); @@ -61,9 +61,9 @@ end if ismember(ThermalAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.isthermal==0), - md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1); + md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1); md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0,'numel',1); md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<','basalforcings.upperwater_elevation','numel',1); md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<',0,'numel',1); - md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'forcing',1,'>=',0); + md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0); end end % }}} @@ -87,7 +87,7 @@ floatingice_melting_rate(pos)=md.basalforcings.deepwater_melting_rate*(md.geometry.base(pos)-md.basalforcings.upperwater_elevation)/(md.basalforcings.deepwater_elevation-md.basalforcings.upperwater_elevation); WriteData(fid,'enum',BasalforcingsEnum(),'data',LinearFloatingMeltRateEnum(),'format','Integer'); - WriteData(fid,'data',floatingice_melting_rate,'format','DoubleMat','enum',BasalforcingsFloatingiceMeltingRateEnum(),'mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',obj,'fieldname','groundedice_melting_rate','format','DoubleMat','enum',BasalforcingsGroundediceMeltingRateEnum(),'mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',obj,'fieldname','geothermalflux','enum',BasalforcingsGeothermalfluxEnum(),'format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'data',floatingice_melting_rate,'format','DoubleMat','enum',BasalforcingsFloatingiceMeltingRateEnum(),'mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',obj,'fieldname','groundedice_melting_rate','format','DoubleMat','enum',BasalforcingsGroundediceMeltingRateEnum(),'mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',obj,'fieldname','geothermalflux','enum',BasalforcingsGeothermalfluxEnum(),'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'object',obj,'fieldname','deepwater_melting_rate','format','Double','enum',BasalforcingsDeepwaterMeltingRateEnum(),'scale',1./yts) WriteData(fid,'object',obj,'fieldname','deepwater_elevation','format','Double','enum',BasalforcingsDeepwaterElevationEnum()) Index: /issm/trunk-jpl/src/m/classes/linearbasalforcings.py =================================================================== --- /issm/trunk-jpl/src/m/classes/linearbasalforcings.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/linearbasalforcings.py (revision 19027) @@ -69,5 +69,5 @@ if MasstransportAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.ismasstransport): - md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1) + md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1) md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0); md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<',md.basalforcings.upperwater_elevation); @@ -81,9 +81,9 @@ if ThermalAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.isthermal): - md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1) + md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1) md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0); md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<',md.basalforcings.upperwater_elevation); md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<',0); - md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'forcing',1,'>=',0) + md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0) return md @@ -100,7 +100,7 @@ WriteData(fid,'enum',BasalforcingsEnum(),'data',LinearFloatingMeltRateEnum(),'format','Integer'); - WriteData(fid,'object',self,'fieldname','groundedice_melting_rate','enum',BasalforcingsGroundediceMeltingRateEnum(),'format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'data',floatingice_melting_rate,'enum',BasalforcingsFloatingiceMeltingRateEnum(),'format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',self,'fieldname','geothermalflux','enum',BasalforcingsGeothermalfluxEnum(),'format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'fieldname','groundedice_melting_rate','enum',BasalforcingsGroundediceMeltingRateEnum(),'format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'data',floatingice_melting_rate,'enum',BasalforcingsFloatingiceMeltingRateEnum(),'format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'fieldname','geothermalflux','enum',BasalforcingsGeothermalfluxEnum(),'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1) WriteData(fid,'object',self,'fieldname','deepwater_melting_rate','enum',BasalforcingsDeepwaterMeltingRateEnum(),'format','Double','scale',1./yts) WriteData(fid,'object',self,'fieldname','deepwater_elevation','enum',BasalforcingsDeepwaterElevationEnum(),'format','Double') Index: /issm/trunk-jpl/src/m/classes/masscon.m =================================================================== --- /issm/trunk-jpl/src/m/classes/masscon.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/masscon.m (revision 19027) @@ -43,5 +43,5 @@ md = checkfield(md,'fieldname','obj.definitionenum','field',obj.definitionenum,'values',[Outputdefinition1Enum,Outputdefinition2Enum,Outputdefinition3Enum,Outputdefinition4Enum,Outputdefinition5Enum,Outputdefinition6Enum,Outputdefinition7Enum,Outputdefinition8Enum,Outputdefinition9Enum,Outputdefinition10Enum]); - md = checkfield(md,'fieldname','obj.levelset','field',obj.levelset,'forcing',1,'NaN',1); + md = checkfield(md,'fieldname','obj.levelset','field',obj.levelset,'timeseries',1,'NaN',1); end % }}} Index: /issm/trunk-jpl/src/m/classes/masstransport.m =================================================================== --- /issm/trunk-jpl/src/m/classes/masstransport.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/masstransport.m (revision 19027) @@ -87,5 +87,5 @@ if ~ismember(MasstransportAnalysisEnum(),analyses) | (solution==TransientSolutionEnum() & md.transient.ismasstransport==0), return; end - md = checkfield(md,'fieldname','masstransport.spcthickness','forcing',1); + md = checkfield(md,'fieldname','masstransport.spcthickness','timeseries',1); md = checkfield(md,'fieldname','masstransport.isfreesurface','values',[0 1]); md = checkfield(md,'fieldname','masstransport.hydrostatic_adjustment','values',{'Absolute' 'Incremental'}); @@ -113,5 +113,5 @@ yts=365.*24.*3600.; - WriteData(fid,'object',obj,'fieldname','spcthickness','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'fieldname','spcthickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'object',obj,'fieldname','isfreesurface','format','Boolean'); WriteData(fid,'object',obj,'fieldname','min_thickness','format','Double'); Index: /issm/trunk-jpl/src/m/classes/masstransport.py =================================================================== --- /issm/trunk-jpl/src/m/classes/masstransport.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/masstransport.py (revision 19027) @@ -67,5 +67,5 @@ return md - md = checkfield(md,'fieldname','masstransport.spcthickness','forcing',1) + md = checkfield(md,'fieldname','masstransport.spcthickness','timeseries',1) md = checkfield(md,'fieldname','masstransport.isfreesurface','values',[0,1]) md = checkfield(md,'fieldname','masstransport.hydrostatic_adjustment','values',['Absolute','Incremental']) @@ -80,5 +80,5 @@ yts=365.*24.*3600. - WriteData(fid,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1) WriteData(fid,'object',self,'fieldname','isfreesurface','format','Boolean') WriteData(fid,'object',self,'fieldname','min_thickness','format','Double') Index: /issm/trunk-jpl/src/m/classes/matice.m =================================================================== --- /issm/trunk-jpl/src/m/classes/matice.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/matice.m (revision 19027) @@ -143,5 +143,5 @@ md = checkfield(md,'fieldname','materials.rho_freshwater','>',0); md = checkfield(md,'fieldname','materials.mu_water','>',0); - md = checkfield(md,'fieldname','materials.rheology_B','>',0,'forcing',1,'NaN',1); + md = checkfield(md,'fieldname','materials.rheology_B','>',0,'timeseries',1,'NaN',1); md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements 1]); md = checkfield(md,'fieldname','materials.rheology_law','values',{'None' 'Cuffey' 'Paterson' 'Arrhenius' 'LliboutryDuval'}); @@ -192,5 +192,5 @@ WriteData(fid,'object',obj,'class','materials','fieldname','mixed_layer_capacity','format','Double'); WriteData(fid,'object',obj,'class','materials','fieldname','thermal_exchange_velocity','format','Double'); - WriteData(fid,'object',obj,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'object',obj,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2); WriteData(fid,'data',StringToEnum(obj.rheology_law),'enum',MaterialsRheologyLawEnum(),'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/matice.py =================================================================== --- /issm/trunk-jpl/src/m/classes/matice.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/matice.py (revision 19027) @@ -117,5 +117,5 @@ md = checkfield(md,'fieldname','materials.rho_freshwater','>',0) md = checkfield(md,'fieldname','materials.mu_water','>',0) - md = checkfield(md,'fieldname','materials.rheology_B','>',0,'forcing',1,'NaN',1) + md = checkfield(md,'fieldname','materials.rheology_B','>',0,'timeseries',1,'NaN',1) md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements]) md = checkfield(md,'fieldname','materials.rheology_law','values',['None','Cuffey','Paterson','Arrhenius','LliboutryDuval']) @@ -140,5 +140,5 @@ WriteData(fid,'object',self,'class','materials','fieldname','mixed_layer_capacity','format','Double') WriteData(fid,'object',self,'class','materials','fieldname','thermal_exchange_velocity','format','Double') - WriteData(fid,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1) WriteData(fid,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1) WriteData(fid,'object',self,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2) Index: /issm/trunk-jpl/src/m/classes/misfit.m =================================================================== --- /issm/trunk-jpl/src/m/classes/misfit.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/misfit.m (revision 19027) @@ -60,7 +60,7 @@ error('misfit error message: ''timeinterpolation'' field should be a string!'); end - md = checkfield(md,'fieldname','obj.observation','field',obj.observation,'forcing',1,'NaN',1); + md = checkfield(md,'fieldname','obj.observation','field',obj.observation,'timeseries',1,'NaN',1); md = checkfield(md,'fieldname','obj.timeinterpolation','field',obj.timeinterpolation,'values',{'nearestneighbor'}); - md = checkfield(md,'fieldname','obj.weights','field',obj.weights,'forcing',1,'NaN',1); + md = checkfield(md,'fieldname','obj.weights','field',obj.weights,'timeseries',1,'NaN',1); end % }}} @@ -84,8 +84,8 @@ WriteData(fid,'object',obj,'fieldname','definitionenum','format','Integer'); WriteData(fid,'object',obj,'fieldname','model_enum','format','Integer'); - WriteData(fid,'object',obj,'fieldname','observation','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'fieldname','observation','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'object',obj,'fieldname','observation_enum','format','Integer'); WriteData(fid,'object',obj,'fieldname','timeinterpolation','format','String'); - WriteData(fid,'object',obj,'fieldname','weights','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'fieldname','weights','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'object',obj,'fieldname','weights_enum','format','Integer'); Index: /issm/trunk-jpl/src/m/classes/snowpack.m =================================================================== --- /issm/trunk-jpl/src/m/classes/snowpack.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/snowpack.m (revision 19027) @@ -455,7 +455,7 @@ yts=365.0*24.0*3600.0; - WriteData(fid,'object',obj,'class','snowpack','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'object',obj,'class','snowpack','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'object',obj,'class','snowpack','fieldname','spcvz','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','snowpack','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','snowpack','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','snowpack','fieldname','spcvz','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'object',obj,'class','snowpack','fieldname','restol','format','Double'); WriteData(fid,'object',obj,'class','snowpack','fieldname','reltol','format','Double'); Index: /issm/trunk-jpl/src/m/classes/stressbalance.m =================================================================== --- /issm/trunk-jpl/src/m/classes/stressbalance.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/stressbalance.m (revision 19027) @@ -126,7 +126,7 @@ if ~ismember(StressbalanceAnalysisEnum(),analyses), return; end - md = checkfield(md,'fieldname','stressbalance.spcvx','forcing',1); - md = checkfield(md,'fieldname','stressbalance.spcvy','forcing',1); - md = checkfield(md,'fieldname','stressbalance.spcvz','forcing',1); + md = checkfield(md,'fieldname','stressbalance.spcvx','timeseries',1); + md = checkfield(md,'fieldname','stressbalance.spcvy','timeseries',1); + md = checkfield(md,'fieldname','stressbalance.spcvz','timeseries',1); md = checkfield(md,'fieldname','stressbalance.restol','size',[1 1],'>',0,'NaN',1); md = checkfield(md,'fieldname','stressbalance.reltol','size',[1 1]); @@ -218,7 +218,7 @@ yts=365.0*24.0*3600.0; - WriteData(fid,'object',obj,'class','stressbalance','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'object',obj,'class','stressbalance','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'object',obj,'class','stressbalance','fieldname','spcvz','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','stressbalance','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','stressbalance','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'class','stressbalance','fieldname','spcvz','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'object',obj,'class','stressbalance','fieldname','restol','format','Double'); WriteData(fid,'object',obj,'class','stressbalance','fieldname','reltol','format','Double'); Index: /issm/trunk-jpl/src/m/classes/stressbalance.py =================================================================== --- /issm/trunk-jpl/src/m/classes/stressbalance.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/stressbalance.py (revision 19027) @@ -123,8 +123,8 @@ return md - md = checkfield(md,'fieldname','stressbalance.spcvx','forcing',1) - md = checkfield(md,'fieldname','stressbalance.spcvy','forcing',1) + md = checkfield(md,'fieldname','stressbalance.spcvx','timeseries',1) + md = checkfield(md,'fieldname','stressbalance.spcvy','timeseries',1) if m.strcmp(md.mesh.domaintype(),'3D'): - md = checkfield(md,'fieldname','stressbalance.spcvz','forcing',1) + md = checkfield(md,'fieldname','stressbalance.spcvz','timeseries',1) md = checkfield(md,'fieldname','stressbalance.restol','size',[1],'>',0) md = checkfield(md,'fieldname','stressbalance.reltol','size',[1]) @@ -168,7 +168,7 @@ yts=365.0*24.0*3600.0 - WriteData(fid,'object',self,'class','stressbalance','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',self,'class','stressbalance','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'object',self,'class','stressbalance','fieldname','spcvz','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','stressbalance','fieldname','spcvx','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','stressbalance','fieldname','spcvy','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'class','stressbalance','fieldname','spcvz','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1) WriteData(fid,'object',self,'class','stressbalance','fieldname','restol','format','Double') WriteData(fid,'object',self,'class','stressbalance','fieldname','reltol','format','Double') Index: /issm/trunk-jpl/src/m/classes/thermal.m =================================================================== --- /issm/trunk-jpl/src/m/classes/thermal.m (revision 19026) +++ /issm/trunk-jpl/src/m/classes/thermal.m (revision 19027) @@ -91,5 +91,5 @@ md = checkfield(md,'fieldname','thermal.stabilization','numel',[1],'values',[0 1 2]); - md = checkfield(md,'fieldname','thermal.spctemperature','forcing',1); + md = checkfield(md,'fieldname','thermal.spctemperature','timeseries',1); if (ismember(EnthalpyAnalysisEnum(),analyses) & md.thermal.isenthalpy & dimension(md.mesh)==3), pos=find(md.thermal.spctemperature(1:md.mesh.numberofvertices,:)~=NaN); @@ -124,5 +124,5 @@ end % }}} function marshall(obj,md,fid) % {{{ - WriteData(fid,'object',obj,'fieldname','spctemperature','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); + WriteData(fid,'object',obj,'fieldname','spctemperature','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'object',obj,'fieldname','penalty_threshold','format','Integer'); WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer'); Index: /issm/trunk-jpl/src/m/classes/thermal.py =================================================================== --- /issm/trunk-jpl/src/m/classes/thermal.py (revision 19026) +++ /issm/trunk-jpl/src/m/classes/thermal.py (revision 19027) @@ -86,5 +86,5 @@ md = checkfield(md,'fieldname','thermal.stabilization','numel',[1],'values',[0,1,2]) - md = checkfield(md,'fieldname','thermal.spctemperature','forcing',1) + md = checkfield(md,'fieldname','thermal.spctemperature','timeseries',1) if EnthalpyAnalysisEnum() in analyses and md.thermal.isenthalpy and md.mesh.dimension()==3: pos=numpy.nonzero(numpy.logical_not(numpy.isnan(md.thermal.spctemperature[0:md.mesh.numberofvertices]))) @@ -102,5 +102,5 @@ # }}} def marshall(self,md,fid): # {{{ - WriteData(fid,'object',self,'fieldname','spctemperature','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1) + WriteData(fid,'object',self,'fieldname','spctemperature','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1) WriteData(fid,'object',self,'fieldname','penalty_threshold','format','Integer') WriteData(fid,'object',self,'fieldname','stabilization','format','Integer') Index: /issm/trunk-jpl/src/m/consistency/checkfield.m =================================================================== --- /issm/trunk-jpl/src/m/consistency/checkfield.m (revision 19026) +++ /issm/trunk-jpl/src/m/consistency/checkfield.m (revision 19027) @@ -14,5 +14,5 @@ % - <=: smaller or equal to provided value % - < vec: smallerthan provided values on each vertex -% - forcing: 1 if check forcing consistency (size and time) +% - timeseries: 1 if check time series consistency (size and time) % - values: cell of strings or vector of acceptable values % - numel: list of acceptable number of elements @@ -198,5 +198,5 @@ %Check forcings (size and times) -if getfieldvalue(options,'forcing',0), +if getfieldvalue(options,'timeseries',0), if size(field,1)==md.mesh.numberofvertices, if ~size(field,2)==1, Index: /issm/trunk-jpl/src/m/consistency/checkfield.py =================================================================== --- /issm/trunk-jpl/src/m/consistency/checkfield.py (revision 19026) +++ /issm/trunk-jpl/src/m/consistency/checkfield.py (revision 19027) @@ -21,5 +21,5 @@ - <=: smaller or equal to provided value - < vec: smallerthan provided values on each vertex - - forcing: 1 if check forcing consistency (size and time) + - timeseries: 1 if check time series consistency (size and time) - values: cell of strings or vector of acceptable values - numel: list of acceptable number of elements @@ -151,5 +151,5 @@ #Check forcings (size and times) - if options.getfieldvalue('forcing',0): + if options.getfieldvalue('timeseries',0): if numpy.size(field,0)==md.mesh.numberofvertices: if numpy.ndim(field)>1 and not numpy.size(field,1)==1: Index: /issm/trunk-jpl/src/m/solve/WriteData.m =================================================================== --- /issm/trunk-jpl/src/m/solve/WriteData.m (revision 19026) +++ /issm/trunk-jpl/src/m/solve/WriteData.m (revision 19027) @@ -27,5 +27,5 @@ format = getfieldvalue(options,'format'); mattype = getfieldvalue(options,'mattype',0); %only required for matrices -forcinglength = getfieldvalue(options,'forcinglength',-1); +timeserieslength = getfieldvalue(options,'timeserieslength',-1); %Process sparse matrices @@ -37,5 +37,5 @@ if exist(options,'scale'), scale = getfieldvalue(options,'scale'); - if size(data,1)==forcinglength, + if size(data,1)==timeserieslength, data(1:end-1,:) = scale.*data(1:end-1,:); else @@ -43,5 +43,5 @@ end end -if(size(data,1)==forcinglength), +if(size(data,1)==timeserieslength), yts=365.0*24.0*3600.0; data(end,:) = data(end,:)*yts; Index: /issm/trunk-jpl/src/m/solve/WriteData.py =================================================================== --- /issm/trunk-jpl/src/m/solve/WriteData.py (revision 19026) +++ /issm/trunk-jpl/src/m/solve/WriteData.py (revision 19027) @@ -35,5 +35,5 @@ format = options.getfieldvalue('format') mattype = options.getfieldvalue('mattype',0) #only required for matrices - forcinglength = options.getfieldvalue('forcinglength',-1) + timeserieslength = options.getfieldvalue('timeserieslength',-1) #Process sparse matrices @@ -46,5 +46,5 @@ scale = options.getfieldvalue('scale') if numpy.size(data) > 1 : - if numpy.size(data,0)==forcinglength: + if numpy.size(data,0)==timeserieslength: data=numpy.array(data) data[0:-1,:] = scale*data[0:-1,:] @@ -54,5 +54,5 @@ data = scale*data if numpy.size(data) > 1 : - if numpy.size(data,0)==forcinglength: + if numpy.size(data,0)==timeserieslength: yts=365.0*24.0*3600.0 data[-1,:] = yts*data[-1,:]