Index: ../trunk-jpl/src/m/classes/SMBpddSicopolis.m =================================================================== --- ../trunk-jpl/src/m/classes/SMBpddSicopolis.m (revision 25381) +++ ../trunk-jpl/src/m/classes/SMBpddSicopolis.m (revision 25382) @@ -82,8 +82,8 @@ md = checkfield(md,'fieldname','smb.s0p','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]); md = checkfield(md,'fieldname','smb.s0t','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]); md = checkfield(md,'fieldname','smb.rlaps','>=',0,'numel',1); - md = checkfield(md,'fieldname','smb.monthlytemperatures','timeseries',1,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 12]); - md = checkfield(md,'fieldname','smb.precipitation','timeseries',1,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 12]); + md = checkfield(md,'fieldname','smb.monthlytemperatures','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 12]); + md = checkfield(md,'fieldname','smb.precipitation','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 12]); end md = checkfield(md,'fieldname','smb.steps_per_step','>=',1,'numel',[1]); Index: ../trunk-jpl/src/m/classes/SMBd18opdd.m =================================================================== --- ../trunk-jpl/src/m/classes/SMBd18opdd.m (revision 25381) +++ ../trunk-jpl/src/m/classes/SMBd18opdd.m (revision 25382) @@ -91,8 +91,8 @@ md = checkfield(md,'fieldname','smb.rlapslgm','>=',0,'numel',1); if(self.isd18opd==1) - md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices 12],'NaN',1,'Inf',1,'timeseries',1); - md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices 12],'NaN',1,'Inf',1,'timeseries',1); + md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices 12],'NaN',1,'Inf',1); + md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices 12],'NaN',1,'Inf',1); md = checkfield(md,'fieldname','smb.delta18o','NaN',1,'Inf',1,'size',[2,NaN],'singletimeseries',1); md = checkfield(md,'fieldname','smb.dpermil','>=',0,'numel',1); md = checkfield(md,'fieldname','smb.f','>=',0,'numel',1); Index: ../trunk-jpl/src/m/classes/SMBd18opdd.py =================================================================== --- ../trunk-jpl/src/m/classes/SMBd18opdd.py (revision 25381) +++ ../trunk-jpl/src/m/classes/SMBd18opdd.py (revision 25382) @@ -42,7 +42,6 @@ self.setdefaultparameters() self.requested_outputs = [] #}}} - def __repr__(self): # {{{ string = " surface forcings parameters:" @@ -81,7 +80,6 @@ return string #}}} - def extrude(self, md): # {{{ if self.isd18opd: self.temperatures_presentday = project3d(md, 'vector', self.temperatures_presentday, 'type', 'node') @@ -97,11 +95,9 @@ self.s0t = project3d(md, 'vector', self.s0t, 'type', 'node') return self #}}} - def defaultoutputs(self, md): # {{{ return [] #}}} - def initialize(self, md): # {{{ if np.all(np.isnan(self.s0p)): self.s0p = np.zeros((md.mesh.numberofvertices)) @@ -112,7 +108,6 @@ print(" no SMBd18opdd.s0t specified: values set as zero") return self # }}} - def setdefaultparameters(self): # {{{ #pdd method not used in default mode self.ismungsm = 0 @@ -127,7 +122,6 @@ self.issetpddfac = 0 return self #}}} - def checkconsistency(self, md, solution, analyses): # {{{ if 'MasstransportAnalysis' in analyses: md = checkfield(md, 'fieldname', 'smb.desfac', '<=', 1, 'numel', [1]) @@ -167,7 +161,6 @@ md = checkfield(md, 'fieldname', 'masstransport.requested_outputs', 'stringrow', 1) return md # }}} - def marshall(self, prefix, md, fid): # {{{ yts = md.constants.yts