Index: /issm/trunk-jpl/src/m/classes/SMBdebrisEvatt.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBdebrisEvatt.m (revision 27853) +++ /issm/trunk-jpl/src/m/classes/SMBdebrisEvatt.m (revision 27854) @@ -7,10 +7,10 @@ properties (SetAccess=public) - monthlyprecipitation = NaN; - monthlytemperatures = NaN; - monthlydsradiation = NaN; - monthlydlradiation = NaN; - monthlywindspeed = NaN; - monthlyairhumidity = NaN; + precipitation = NaN; + temperature = NaN; + dsradiation = NaN; + dlradiation = NaN; + windspeed = NaN; + airhumidity = NaN; precipitation_anomaly = NaN; temperature_anomaly = NaN; @@ -27,5 +27,4 @@ windspeedlaps = 0; humiditylaps = 0; - ismonthly = 0; isAnderson = 0; iscryokarst = 0; @@ -48,10 +47,10 @@ end % }}} function self = extrude(self,md) % {{{ - self.monthlyprecipitation=project3d(md,'vector',self.monthlyprecipitation,'type','node'); - self.monthlytemperatures=project3d(md,'vector',self.monthlytemperatures,'type','node'); - self.monthlydsradiation=project3d(md,'vector',self.monthlydsradiation,'type','node'); - self.monthlydlradiation=project3d(md,'vector',self.monthlydlradiation,'type','node'); - self.monthlywindspeed=project3d(md,'vector',self.monthlywindspeed,'type','node'); - self.monthlyairhumidity=project3d(md,'vector',self.monthlyairhumidity,'type','node'); + self.precipitation=project3d(md,'vector',self.precipitation,'type','node'); + self.temperature=project3d(md,'vector',self.temperature,'type','node'); + self.dsradiation=project3d(md,'vector',self.dsradiation,'type','node'); + self.dlradiation=project3d(md,'vector',self.dlradiation,'type','node'); + self.windspeed=project3d(md,'vector',self.windspeed,'type','node'); + self.airhumidity=project3d(md,'vector',self.airhumidity,'type','node'); self.temperature_anomaly=project3d(md,'vector',self.temperature_anomaly,'type','node'); self.precipitation_anomaly=project3d(md,'vector',self.precipitation_anomaly,'type','node'); @@ -87,5 +86,4 @@ self.snowalbedo = 0.75; self.debrisalbedo = 0.07; - self.ismonthly = 0; self.isAnderson = 0; self.iscryokarst = 0; @@ -99,10 +97,10 @@ if ismember('MasstransportAnalysis',analyses), - md = checkfield(md,'fieldname','smb.monthlytemperatures','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 365]); - md = checkfield(md,'fieldname','smb.monthlyprecipitation','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 365]); - md = checkfield(md,'fieldname','smb.monthlydsradiation','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 365]); - md = checkfield(md,'fieldname','smb.monthlydlradiation','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 365]); - md = checkfield(md,'fieldname','smb.monthlywindspeed','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 365]); - md = checkfield(md,'fieldname','smb.monthlyairhumidity','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 365]); + md = checkfield(md,'fieldname','smb.temperature','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 365]); + md = checkfield(md,'fieldname','smb.precipitation','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 365]); + md = checkfield(md,'fieldname','smb.dsradiation','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 365]); + md = checkfield(md,'fieldname','smb.dlradiation','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 365]); + md = checkfield(md,'fieldname','smb.windspeed','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 365]); + md = checkfield(md,'fieldname','smb.airhumidity','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 365]); md = checkfield(md,'fieldname','smb.snowheight','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]); end @@ -113,5 +111,4 @@ md = checkfield(md,'fieldname','smb.snowalbedo','>=',0,'NaN',1,'Inf',1); md = checkfield(md,'fieldname','smb.debrisalbedo','>=',0,'NaN',1,'Inf',1); - md = checkfield(md,'fieldname','smb.ismonthly','numel', [1], 'values', [0, 1]); md = checkfield(md,'fieldname','smb.isAnderson','numel', [1], 'values', [0, 1]); md = checkfield(md,'fieldname','smb.iscryokarst','numel', [1], 'values', [0, 1]); @@ -125,19 +122,18 @@ disp(sprintf('Clean-ice SMB is taken from the Evatt et al. (2015) EBM with debris=0')); - fielddisplay(self,'ismonthly','do we use monthly forcing (otherwise yearly averaged forcing is applied) (default is 0)'); fielddisplay(self,'isAnderson','do we use the Anderson parametrization (default is 0)'); fielddisplay(self,'iscryokarst','do we use a cryokarst parametrization (default is 0)'); - fielddisplay(self,'monthlytemperatures','monthly surface temperatures [K]'); - fielddisplay(self,'monthlyprecipitation','monthly surface precipitation [m/yr water eq]'); - fielddisplay(self,'monthlydsradiation','monthly downwelling shortwave radiation [W m-2]'); - fielddisplay(self,'monthlydlradiation','monthly downwelling longwave radiation [W m-2]'); - fielddisplay(self,'monthlywindspeed','monthly surface wind speed [m s-1]'); - fielddisplay(self,'monthlyairhumidity','monthly near-surface specific humidity [kg kg-1]'); - fielddisplay(self,'temperature_anomaly','anomaly to monthly reference temperature (additive)'); - fielddisplay(self,'precipitation_anomaly','anomaly to monthly precipitation (multiplicative)'); - fielddisplay(self,'dsradiation_anomaly','anomaly to monthly reference downwelling shortwave radiation'); - fielddisplay(self,'dlradiation_anomaly','anomaly to monthly reference downwelling longwave radiation (additive'); - fielddisplay(self,'windspeed_anomaly','anomaly to monthly reference surface wind speed (additive)'); - fielddisplay(self,'airhumidity_anomaly','anomaly to monthly reference near-surface specific humidity (additive)'); + fielddisplay(self,'temperature',' surface temperature [K]'); + fielddisplay(self,'precipitation',' surface precipitation [m/yr water eq]'); + fielddisplay(self,'dsradiation',' downwelling shortwave radiation [W m-2]'); + fielddisplay(self,'dlradiation',' downwelling longwave radiation [W m-2]'); + fielddisplay(self,'windspeed',' surface wind speed [m s-1]'); + fielddisplay(self,'airhumidity',' near-surface specific humidity [kg kg-1]'); + fielddisplay(self,'temperature_anomaly','anomaly to reference temperature (additive)'); + fielddisplay(self,'precipitation_anomaly','anomaly to precipitation (multiplicative)'); + fielddisplay(self,'dsradiation_anomaly','anomaly to reference downwelling shortwave radiation'); + fielddisplay(self,'dlradiation_anomaly','anomaly to reference downwelling longwave radiation (additive'); + fielddisplay(self,'windspeed_anomaly','anomaly to reference surface wind speed (additive)'); + fielddisplay(self,'airhumidity_anomaly','anomaly to reference near-surface specific humidity (additive)'); fielddisplay(self,'s0t','should be set to elevation from RCM/GCM source (between 0 and a few 1000s m, default is 0) [m]'); @@ -177,14 +173,13 @@ WriteData(fid,prefix,'object',self,'class','smb','fieldname','snowalbedo','format','Double'); WriteData(fid,prefix,'object',self,'class','smb','fieldname','debrisalbedo','format','Double'); - WriteData(fid,prefix,'object',self,'class','smb','fieldname','ismonthly','format','Boolean'); WriteData(fid,prefix,'object',self,'class','smb','fieldname','isAnderson','format','Boolean'); WriteData(fid,prefix,'object',self,'class','smb','fieldname','iscryokarst','format','Boolean'); WriteData(fid,prefix,'object',self,'class','smb','fieldname','AndersonD0','format','Double'); - WriteData(fid,prefix,'object',self,'class','smb','fieldname','monthlytemperatures','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); - WriteData(fid,prefix,'object',self,'class','smb','fieldname','monthlyprecipitation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); - WriteData(fid,prefix,'object',self,'class','smb','fieldname','monthlydsradiation','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); - WriteData(fid,prefix,'object',self,'class','smb','fieldname','monthlydlradiation','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); - WriteData(fid,prefix,'object',self,'class','smb','fieldname','monthlywindspeed','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); - WriteData(fid,prefix,'object',self,'class','smb','fieldname','monthlyairhumidity','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); + WriteData(fid,prefix,'object',self,'class','smb','fieldname','temperature','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); + WriteData(fid,prefix,'object',self,'class','smb','fieldname','precipitation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); + WriteData(fid,prefix,'object',self,'class','smb','fieldname','dsradiation','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); + WriteData(fid,prefix,'object',self,'class','smb','fieldname','dlradiation','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); + WriteData(fid,prefix,'object',self,'class','smb','fieldname','windspeed','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); + WriteData(fid,prefix,'object',self,'class','smb','fieldname','airhumidity','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); WriteData(fid,prefix,'object',self,'class','smb','fieldname','temperature_anomaly','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); WriteData(fid,prefix,'object',self,'class','smb','fieldname','precipitation_anomaly','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);