Index: /issm/trunk-jpl/src/m/classes/SMB.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMB.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/SMB.m (revision 19040) @@ -9,11 +9,11 @@ end methods - function createxml(obj,fid) % {{{ + function createxml(self,fid) % {{{ fprintf(fid, '\n\n'); fprintf(fid, '%s\n', ''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n','','
',' surface mass balance [m/yr ice eq] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n','','
',' surface mass balance [m/yr ice eq] ',''); end % }}} - function obj = SMB(varargin) % {{{ + function self = SMB(varargin) % {{{ switch nargin case 0 @@ -35,5 +35,5 @@ end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ + function md = checkconsistency(self,md,solution,analyses) % {{{ if ismember(MasstransportAnalysisEnum(),analyses), @@ -44,14 +44,14 @@ end end % }}} - function disp(obj) % {{{ + function disp(self) % {{{ disp(sprintf(' surface forcings parameters:')); - fielddisplay(obj,'mass_balance','surface mass balance [m/yr ice eq]'); + fielddisplay(self,'mass_balance','surface mass balance [m/yr ice eq]'); end % }}} - function marshall(obj,md,fid) % {{{ + function marshall(self,md,fid) % {{{ yts=365.0*24.0*3600.0; WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBEnum(),'format','Integer'); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',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); end % }}} end Index: /issm/trunk-jpl/src/m/classes/SMBcomponents.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBcomponents.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/SMBcomponents.m (revision 19040) @@ -11,5 +11,5 @@ end methods - function obj = SMBcomponents(varargin) % {{{ + function self = SMBcomponents(varargin) % {{{ switch nargin case 0 @@ -41,5 +41,5 @@ end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ + function md = checkconsistency(self,md,solution,analyses) % {{{ if ismember(MasstransportAnalysisEnum(),analyses), @@ -62,18 +62,18 @@ end end % }}} - function disp(obj) % {{{ + function disp(self) % {{{ disp(sprintf(' surface forcings parameters (SMB=accumulation-runoff-evaporation) :')); - fielddisplay(obj,'accumulation','accumulated snow [m/yr ice eq]'); - fielddisplay(obj,'runoff','amount of ice melt lost from the ice column [m/yr ice eq]'); - fielddisplay(obj,'evaporation','amount of ice lost to evaporative processes [m/yr ice eq]'); + fielddisplay(self,'accumulation','accumulated snow [m/yr ice eq]'); + fielddisplay(self,'runoff','amount of ice melt lost from the ice column [m/yr ice eq]'); + fielddisplay(self,'evaporation','amount of ice lost to evaporative processes [m/yr ice eq]'); end % }}} - function marshall(obj,md,fid) % {{{ + function marshall(self,md,fid) % {{{ yts=365.0*24.0*3600.0; WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBcomponentsEnum(),'format','Integer'); - 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); + 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); end % }}} end Index: /issm/trunk-jpl/src/m/classes/SMBgradients.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBgradients.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/SMBgradients.m (revision 19040) @@ -12,8 +12,8 @@ end methods - function obj = SMBgradients(varargin) % {{{ + function self = SMBgradients(varargin) % {{{ switch nargin case 0 - obj=setdefaultparameters(obj); + self=setdefaultparameters(self); otherwise error('constructor not supported'); @@ -30,10 +30,10 @@ end % }}} - function obj = setdefaultparameters(obj) % {{{ + function self = setdefaultparameters(self) % {{{ %Nothing for now end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ + function md = checkconsistency(self,md,solution,analyses) % {{{ if ismember(MasstransportAnalysisEnum(),analyses), @@ -44,23 +44,23 @@ end end % }}} - function disp(obj) % {{{ + function disp(self) % {{{ disp(sprintf(' surface forcings parameters:')); disp(sprintf('\n SMB gradients parameters:')); - fielddisplay(obj,'href',' reference elevation from which deviation is used to calculate SMB adjustment in smb gradients method [m]'); - fielddisplay(obj,'smbref',' reference smb from which deviation is calculated in smb gradients method [mm/yr water equiv]'); - fielddisplay(obj,'b_pos',' slope of hs - smb regression line for accumulation regime required if smb gradients is activated'); - fielddisplay(obj,'b_neg',' slope of hs - smb regression line for ablation regime required if smb gradients is activated'); + fielddisplay(self,'href',' reference elevation from which deviation is used to calculate SMB adjustment in smb gradients method [m]'); + fielddisplay(self,'smbref',' reference smb from which deviation is calculated in smb gradients method [mm/yr water equiv]'); + fielddisplay(self,'b_pos',' slope of hs - smb regression line for accumulation regime required if smb gradients is activated'); + fielddisplay(self,'b_neg',' slope of hs - smb regression line for ablation regime required if smb gradients is activated'); end % }}} - function marshall(obj,md,fid) % {{{ + function marshall(self,md,fid) % {{{ yts=365.0*24.0*3600.0; WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBgradientsEnum(),'format','Integer'); - 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); + 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); end % }}} Index: /issm/trunk-jpl/src/m/classes/SMBhenning.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBhenning.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/SMBhenning.m (revision 19040) @@ -9,5 +9,5 @@ end methods - function obj = SMBhenning(varargin) % {{{ + function self = SMBhenning(varargin) % {{{ switch nargin case 0 @@ -29,5 +29,5 @@ end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ + function md = checkconsistency(self,md,solution,analyses) % {{{ if ismember(MasstransportAnalysisEnum(),analyses), @@ -38,14 +38,14 @@ end end % }}} - function disp(obj) % {{{ + function disp(self) % {{{ disp(sprintf(' surface forcings parameters:')); - fielddisplay(obj,'smbref','reference smb from which deviation is calculated [m/yr ice eq]'); + fielddisplay(self,'smbref','reference smb from which deviation is calculated [m/yr ice eq]'); end % }}} - function marshall(obj,md,fid) % {{{ + function marshall(self,md,fid) % {{{ yts=365.0*24.0*3600.0; WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBhenningEnum(),'format','Integer'); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'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); end % }}} end Index: /issm/trunk-jpl/src/m/classes/SMBmeltcomponents.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBmeltcomponents.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/SMBmeltcomponents.m (revision 19040) @@ -12,5 +12,5 @@ end methods - function obj = SMBmeltcomponents(varargin) % {{{ + function self = SMBmeltcomponents(varargin) % {{{ switch nargin case 0 @@ -47,5 +47,5 @@ end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ + function md = checkconsistency(self,md,solution,analyses) % {{{ if ismember(MasstransportAnalysisEnum(),analyses), @@ -74,20 +74,20 @@ end end % }}} - function disp(obj) % {{{ + function disp(self) % {{{ disp(sprintf(' surface forcings parameters with melt (SMB=accumulation-evaporation-melt+refreeze) :')); - fielddisplay(obj,'accumulation','accumulated snow [m/yr ice eq]'); - fielddisplay(obj,'evaporation','amount of ice lost to evaporative processes [m/yr ice eq]'); - fielddisplay(obj,'melt','amount of ice melt in ice column [m/yr ice eq]'); - fielddisplay(obj,'refreeze','amount of ice melt refrozen in ice column [m/yr ice eq]'); + fielddisplay(self,'accumulation','accumulated snow [m/yr ice eq]'); + fielddisplay(self,'evaporation','amount of ice lost to evaporative processes [m/yr ice eq]'); + fielddisplay(self,'melt','amount of ice melt in ice column [m/yr ice eq]'); + fielddisplay(self,'refreeze','amount of ice melt refrozen in ice column [m/yr ice eq]'); end % }}} - function marshall(obj,md,fid) % {{{ + function marshall(self,md,fid) % {{{ yts=365.0*24.0*3600.0; WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBmeltcomponentsEnum(),'format','Integer'); - 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); + 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); end % }}} end Index: /issm/trunk-jpl/src/m/classes/SMBpdd.m =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBpdd.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/SMBpdd.m (revision 19040) @@ -26,8 +26,8 @@ end methods - function obj = SMBpdd(varargin) % {{{ + function self = SMBpdd(varargin) % {{{ switch nargin case 0 - obj=setdefaultparameters(obj); + self=setdefaultparameters(self); otherwise error('constructor not supported'); @@ -55,16 +55,16 @@ end % }}} - function obj = setdefaultparameters(obj) % {{{ + function self = setdefaultparameters(self) % {{{ - obj.isdelta18o = 0; - obj.ismungsm = 0; - obj.desfac = 0.5; - obj.s0p = 0; - obj.s0t = 0; - obj.rlaps = 6.5; - obj.rlapslgm = 6.5; + self.isdelta18o = 0; + self.ismungsm = 0; + self.desfac = 0.5; + self.s0p = 0; + self.s0t = 0; + self.rlaps = 6.5; + self.rlapslgm = 6.5; end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ + function md = checkconsistency(self,md,solution,analyses) % {{{ if ismember(MasstransportAnalysisEnum(),analyses), @@ -74,8 +74,8 @@ md = checkfield(md,'fieldname','surfaceforcings.rlaps','>=',0,'numel',1); md = checkfield(md,'fieldname','surfaceforcings.rlapslgm','>=',0,'numel',1); - if(obj.isdelta18o==0 & obj.ismungsm==0) + if(self.isdelta18o==0 & self.ismungsm==0) md = checkfield(md,'fieldname','surfaceforcings.monthlytemperatures','timeseries',1,'NaN',1); md = checkfield(md,'fieldname','surfaceforcings.precipitation','timeseries',1,'NaN',1); - elseif(obj.isdelta18o==1) + elseif(self.isdelta18o==1) md = checkfield(md,'fieldname','surfaceforcings.delta18o','NaN',1); md = checkfield(md,'fieldname','surfaceforcings.delta18o_surface','NaN',1); @@ -86,5 +86,5 @@ md = checkfield(md,'fieldname','surfaceforcings.Tdiff','NaN',1); md = checkfield(md,'fieldname','surfaceforcings.sealev','NaN',1); - elseif(obj.ismungsm==1) + elseif(self.ismungsm==1) md = checkfield(md,'fieldname','surfaceforcings.temperatures_presentday','size',[md.mesh.numberofvertices+1 12],'NaN',1); md = checkfield(md,'fieldname','surfaceforcings.temperatures_lgm','size',[md.mesh.numberofvertices+1 12],'NaN',1); @@ -97,38 +97,38 @@ end end % }}} - function disp(obj) % {{{ + function disp(self) % {{{ disp(sprintf(' surface forcings parameters:')); disp(sprintf('\n PDD and deltaO18 parameters:')); - fielddisplay(obj,'isdelta18o','is temperature and precipitation delta18o parametrisation activated (0 or 1, default is 0)'); - fielddisplay(obj,'ismungsm','is temperature and precipitation mungsm parametrisation activated (0 or 1, default is 0)'); - fielddisplay(obj,'desfac','desertification elevation factor (between 0 and 1, default is 0.5) [m]'); - fielddisplay(obj,'s0p','should be set to elevation from precip source (between 0 and a few 1000s m, default is 0) [m]'); - fielddisplay(obj,'s0t','should be set to elevation from temperature source (between 0 and a few 1000s m, default is 0) [m]'); - fielddisplay(obj,'rlaps','present day lapse rate [degree/km]'); - fielddisplay(obj,'rlapslgm','LGM lapse rate [degree/km]'); - if(obj.isdelta18o==0 & obj.ismungsm==0) - fielddisplay(obj,'monthlytemperatures',['monthly surface temperatures [K], required if pdd is activated and delta18o not activated']); - fielddisplay(obj,'precipitation',['monthly surface precipitation [m/yr water eq], required if pdd is activated and delta18o or mungsm not activated']); - elseif(obj.isdelta18o==1) - fielddisplay(obj,'delta18o','delta18o, required if pdd is activated and delta18o activated'); - fielddisplay(obj,'delta18o_surface','surface elevation of the delta18o site, required if pdd is activated and delta18o activated'); - fielddisplay(obj,'temperatures_presentday','monthly present day surface temperatures [K], required if delta18o/mungsm is activated'); - fielddisplay(obj,'temperatures_lgm','monthly LGM surface temperatures [K], required if delta18o or mungsm is activated'); - fielddisplay(obj,'precipitations_presentday','monthly surface precipitation [m/yr water eq], required if delta18o or mungsm is activated'); - fielddisplay(obj,'precipitations_lgm','monthly surface precipitation [m/yr water eq], required if delta18o or mungsm is activated'); - fielddisplay(obj,'Tdiff','time interpolation parameter for temperature, 1D(year), required if mungsm is activated'); - fielddisplay(obj,'sealev','sea level [m], 1D(year), required if mungsm is activated'); - elseif(obj.ismungsm==1) - fielddisplay(obj,'temperatures_presentday','monthly present day surface temperatures [K], required if delta18o/mungsm is activated'); - fielddisplay(obj,'temperatures_lgm','monthly LGM surface temperatures [K], required if delta18o or mungsm is activated'); - fielddisplay(obj,'precipitations_presentday','monthly surface precipitation [m/yr water eq], required if delta18o or mungsm is activated'); - fielddisplay(obj,'precipitations_lgm','monthly surface precipitation [m/yr water eq], required if delta18o or mungsm is activated'); - fielddisplay(obj,'Pfac','time interpolation parameter for precipitation, 1D(year), required if mungsm is activated'); - fielddisplay(obj,'Tdiff','time interpolation parameter for temperature, 1D(year), required if mungsm is activated'); - fielddisplay(obj,'sealev','sea level [m], 1D(year), required if mungsm is activated'); + fielddisplay(self,'isdelta18o','is temperature and precipitation delta18o parametrisation activated (0 or 1, default is 0)'); + fielddisplay(self,'ismungsm','is temperature and precipitation mungsm parametrisation activated (0 or 1, default is 0)'); + fielddisplay(self,'desfac','desertification elevation factor (between 0 and 1, default is 0.5) [m]'); + fielddisplay(self,'s0p','should be set to elevation from precip source (between 0 and a few 1000s m, default is 0) [m]'); + fielddisplay(self,'s0t','should be set to elevation from temperature source (between 0 and a few 1000s m, default is 0) [m]'); + fielddisplay(self,'rlaps','present day lapse rate [degree/km]'); + fielddisplay(self,'rlapslgm','LGM lapse rate [degree/km]'); + if(self.isdelta18o==0 & self.ismungsm==0) + fielddisplay(self,'monthlytemperatures',['monthly surface temperatures [K], required if pdd is activated and delta18o not activated']); + fielddisplay(self,'precipitation',['monthly surface precipitation [m/yr water eq], required if pdd is activated and delta18o or mungsm not activated']); + elseif(self.isdelta18o==1) + fielddisplay(self,'delta18o','delta18o, required if pdd is activated and delta18o activated'); + fielddisplay(self,'delta18o_surface','surface elevation of the delta18o site, required if pdd is activated and delta18o activated'); + fielddisplay(self,'temperatures_presentday','monthly present day surface temperatures [K], required if delta18o/mungsm is activated'); + fielddisplay(self,'temperatures_lgm','monthly LGM surface temperatures [K], required if delta18o or mungsm is activated'); + fielddisplay(self,'precipitations_presentday','monthly surface precipitation [m/yr water eq], required if delta18o or mungsm is activated'); + fielddisplay(self,'precipitations_lgm','monthly surface precipitation [m/yr water eq], required if delta18o or mungsm is activated'); + fielddisplay(self,'Tdiff','time interpolation parameter for temperature, 1D(year), required if mungsm is activated'); + fielddisplay(self,'sealev','sea level [m], 1D(year), required if mungsm is activated'); + elseif(self.ismungsm==1) + fielddisplay(self,'temperatures_presentday','monthly present day surface temperatures [K], required if delta18o/mungsm is activated'); + fielddisplay(self,'temperatures_lgm','monthly LGM surface temperatures [K], required if delta18o or mungsm is activated'); + fielddisplay(self,'precipitations_presentday','monthly surface precipitation [m/yr water eq], required if delta18o or mungsm is activated'); + fielddisplay(self,'precipitations_lgm','monthly surface precipitation [m/yr water eq], required if delta18o or mungsm is activated'); + fielddisplay(self,'Pfac','time interpolation parameter for precipitation, 1D(year), required if mungsm is activated'); + fielddisplay(self,'Tdiff','time interpolation parameter for temperature, 1D(year), required if mungsm is activated'); + fielddisplay(self,'sealev','sea level [m], 1D(year), required if mungsm is activated'); end end % }}} - function marshall(obj,md,fid) % {{{ + function marshall(self,md,fid) % {{{ yts=365.0*24.0*3600.0; @@ -136,33 +136,33 @@ WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBpddEnum(),'format','Integer'); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','isdelta18o','format','Boolean'); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','ismungsm','format','Boolean'); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','desfac','format','Double'); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','s0p','format','Double'); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','s0t','format','Double'); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','rlaps','format','Double'); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','rlapslgm','format','Double'); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','isdelta18o','format','Boolean'); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','ismungsm','format','Boolean'); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','desfac','format','Double'); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','s0p','format','Double'); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','s0t','format','Double'); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','rlaps','format','Double'); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','rlapslgm','format','Double'); - 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,'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); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','temperatures_lgm','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','precipitations_presentday','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','precipitations_lgm','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','delta18o_surface','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','delta18o','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','Tdiff','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','sealev','format','DoubleMat','mattype',1); - elseif obj.ismungsm - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','temperatures_presentday','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','temperatures_lgm','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','precipitations_presentday','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','precipitations_lgm','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','Pfac','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','Tdiff','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','sealev','format','DoubleMat','mattype',1); + if(self.isdelta18o==0 & self.ismungsm==0) + %WriteData(fid,'object',self,'class','surfaceforcings','fieldname','monthlytemperatures','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','monthlytemperatures','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','precipitation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1); + elseif self.isdelta18o + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','temperatures_presentday','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','temperatures_lgm','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','precipitations_presentday','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','precipitations_lgm','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','delta18o_surface','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','delta18o','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','Tdiff','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','sealev','format','DoubleMat','mattype',1); + elseif self.ismungsm + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','temperatures_presentday','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','temperatures_lgm','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','precipitations_presentday','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','precipitations_lgm','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','Pfac','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','Tdiff','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'class','surfaceforcings','fieldname','sealev','format','DoubleMat','mattype',1); end end % }}} Index: /issm/trunk-jpl/src/m/classes/adinversion.m =================================================================== --- /issm/trunk-jpl/src/m/classes/adinversion.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/adinversion.m (revision 19040) @@ -26,8 +26,8 @@ end methods - function obj = adinversion(varargin) % {{{ + function self = adinversion(varargin) % {{{ switch nargin case 0 - obj=setdefaultparameters(obj); + self=setdefaultparameters(self); case 1 obj=structtoobj(adinversion(),varargin{1}); @@ -57,8 +57,8 @@ end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ + function md = checkconsistency(self,md,solution,analyses) % {{{ %Early return - if ~obj.iscontrol, return; end + if ~self.iscontrol, return; end if ~IssmConfig('_HAVE_M1QN3_'), @@ -95,22 +95,22 @@ end end % }}} - function disp(obj) % {{{ + function disp(self) % {{{ disp(sprintf(' adinversion parameters:')); - fielddisplay(obj,'iscontrol','is inversion activated?'); - fielddisplay(obj,'control_parameters','ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''}'); - fielddisplay(obj,'control_scaling_factors','order of magnitude of each control (useful for multi-parameter optimization)'); - fielddisplay(obj,'maxsteps','maximum number of iterations (gradient computation)'); - fielddisplay(obj,'maxiter','maximum number of Function evaluation (forward run)'); - fielddisplay(obj,'dxmin','convergence criterion: two points less than dxmin from eachother (sup-norm) are considered identical'); - fielddisplay(obj,'gttol','convergence criterion: ||g(X)||/||g(X0)|| (g(X0): gradient at initial guess X0)'); - fielddisplay(obj,'cost_functions','indicate the type of response for each optimization step'); - fielddisplay(obj,'cost_functions_coefficients','cost_functions_coefficients applied to the misfit of each vertex and for each control_parameter'); - fielddisplay(obj,'min_parameters','absolute minimum acceptable value of the inversed parameter on each vertex'); - fielddisplay(obj,'max_parameters','absolute maximum acceptable value of the inversed parameter on each vertex'); - fielddisplay(obj,'vx_obs','observed velocity x component [m/yr]'); - fielddisplay(obj,'vy_obs','observed velocity y component [m/yr]'); - fielddisplay(obj,'vel_obs','observed velocity magnitude [m/yr]'); - fielddisplay(obj,'thickness_obs','observed thickness [m]'); - fielddisplay(obj,'surface_obs','observed surface elevation [m]'); + fielddisplay(self,'iscontrol','is inversion activated?'); + fielddisplay(self,'control_parameters','ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''}'); + fielddisplay(self,'control_scaling_factors','order of magnitude of each control (useful for multi-parameter optimization)'); + fielddisplay(self,'maxsteps','maximum number of iterations (gradient computation)'); + fielddisplay(self,'maxiter','maximum number of Function evaluation (forward run)'); + fielddisplay(self,'dxmin','convergence criterion: two points less than dxmin from eachother (sup-norm) are considered identical'); + fielddisplay(self,'gttol','convergence criterion: ||g(X)||/||g(X0)|| (g(X0): gradient at initial guess X0)'); + fielddisplay(self,'cost_functions','indicate the type of response for each optimization step'); + fielddisplay(self,'cost_functions_coefficients','cost_functions_coefficients applied to the misfit of each vertex and for each control_parameter'); + fielddisplay(self,'min_parameters','absolute minimum acceptable value of the inversed parameter on each vertex'); + fielddisplay(self,'max_parameters','absolute maximum acceptable value of the inversed parameter on each vertex'); + fielddisplay(self,'vx_obs','observed velocity x component [m/yr]'); + fielddisplay(self,'vy_obs','observed velocity y component [m/yr]'); + fielddisplay(self,'vel_obs','observed velocity magnitude [m/yr]'); + fielddisplay(self,'thickness_obs','observed thickness [m]'); + fielddisplay(self,'surface_obs','observed surface elevation [m]'); disp('Available cost functions:'); @@ -125,35 +125,35 @@ disp(' 503: ThicknessAbsGradient'); end % }}} - function marshall(obj,md,fid) % {{{ + function marshall(self,md,fid) % {{{ yts=365.0*24.0*3600.0; - WriteData(fid,'object',obj,'class','inversion','fieldname','iscontrol','format','Boolean'); + WriteData(fid,'object',self,'class','inversion','fieldname','iscontrol','format','Boolean'); WriteData(fid,'enum',InversionTypeEnum(),'data',4,'format','Integer'); - if ~obj.iscontrol, return; end - WriteData(fid,'object',obj,'class','inversion','fieldname','control_scaling_factors','format','DoubleMat','mattype',3); - WriteData(fid,'object',obj,'class','inversion','fieldname','maxsteps','format','Integer'); - WriteData(fid,'object',obj,'class','inversion','fieldname','maxiter','format','Integer'); - WriteData(fid,'object',obj,'class','inversion','fieldname','dxmin','format','Double'); - WriteData(fid,'object',obj,'class','inversion','fieldname','gttol','format','Double'); - WriteData(fid,'object',obj,'class','inversion','fieldname','cost_functions_coefficients','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'class','inversion','fieldname','min_parameters','format','DoubleMat','mattype',3); - WriteData(fid,'object',obj,'class','inversion','fieldname','max_parameters','format','DoubleMat','mattype',3); - WriteData(fid,'object',obj,'class','inversion','fieldname','vx_obs','format','DoubleMat','mattype',1,'scale',1./yts); - WriteData(fid,'object',obj,'class','inversion','fieldname','vy_obs','format','DoubleMat','mattype',1,'scale',1./yts); - WriteData(fid,'object',obj,'class','inversion','fieldname','vz_obs','format','DoubleMat','mattype',1,'scale',1./yts); - if(numel(obj.thickness_obs)==md.mesh.numberofelements), + if ~self.iscontrol, return; end + WriteData(fid,'object',self,'class','inversion','fieldname','control_scaling_factors','format','DoubleMat','mattype',3); + WriteData(fid,'object',self,'class','inversion','fieldname','maxsteps','format','Integer'); + WriteData(fid,'object',self,'class','inversion','fieldname','maxiter','format','Integer'); + WriteData(fid,'object',self,'class','inversion','fieldname','dxmin','format','Double'); + WriteData(fid,'object',self,'class','inversion','fieldname','gttol','format','Double'); + WriteData(fid,'object',self,'class','inversion','fieldname','cost_functions_coefficients','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'class','inversion','fieldname','min_parameters','format','DoubleMat','mattype',3); + WriteData(fid,'object',self,'class','inversion','fieldname','max_parameters','format','DoubleMat','mattype',3); + WriteData(fid,'object',self,'class','inversion','fieldname','vx_obs','format','DoubleMat','mattype',1,'scale',1./yts); + WriteData(fid,'object',self,'class','inversion','fieldname','vy_obs','format','DoubleMat','mattype',1,'scale',1./yts); + WriteData(fid,'object',self,'class','inversion','fieldname','vz_obs','format','DoubleMat','mattype',1,'scale',1./yts); + if(numel(self.thickness_obs)==md.mesh.numberofelements), mattype=2; else mattype=1; end - WriteData(fid,'object',obj,'class','inversion','fieldname','thickness_obs','format','DoubleMat','mattype',mattype); - WriteData(fid,'object',obj,'class','inversion','fieldname','surface_obs','format','DoubleMat','mattype',mattype); + WriteData(fid,'object',self,'class','inversion','fieldname','thickness_obs','format','DoubleMat','mattype',mattype); + WriteData(fid,'object',self,'class','inversion','fieldname','surface_obs','format','DoubleMat','mattype',mattype); %process control parameters - num_control_parameters=numel(obj.control_parameters); + num_control_parameters=numel(self.control_parameters); data=zeros(1,num_control_parameters); for i=1:num_control_parameters, - data(i)=StringToEnum(obj.control_parameters{i}); + data(i)=StringToEnum(self.control_parameters{i}); end WriteData(fid,'data',data,'enum',InversionControlParametersEnum(),'format','DoubleMat','mattype',3); @@ -161,29 +161,29 @@ %process cost functions - num_cost_functions=size(obj.cost_functions,2); - data=obj.cost_functions; - pos=find(obj.cost_functions==101); data(pos)=SurfaceAbsVelMisfitEnum(); - pos=find(obj.cost_functions==102); data(pos)=SurfaceRelVelMisfitEnum(); - pos=find(obj.cost_functions==103); data(pos)=SurfaceLogVelMisfitEnum(); - pos=find(obj.cost_functions==104); data(pos)=SurfaceLogVxVyMisfitEnum(); - pos=find(obj.cost_functions==105); data(pos)=SurfaceAverageVelMisfitEnum(); - pos=find(obj.cost_functions==201); data(pos)=ThicknessAbsMisfitEnum(); - pos=find(obj.cost_functions==501); data(pos)=DragCoefficientAbsGradientEnum(); - pos=find(obj.cost_functions==502); data(pos)=RheologyBbarAbsGradientEnum(); - pos=find(obj.cost_functions==503); data(pos)=ThicknessAbsGradientEnum(); - pos=find(obj.cost_functions==504); data(pos)=ThicknessAlongGradientEnum(); - pos=find(obj.cost_functions==505); data(pos)=ThicknessAcrossGradientEnum(); - pos=find(obj.cost_functions==506); data(pos)=BalancethicknessMisfitEnum(); - pos=find(obj.cost_functions==601); data(pos)=SurfaceAbsMisfitEnum(); - pos=find(obj.cost_functions==1001); data(pos)=Outputdefinition1Enum(); - pos=find(obj.cost_functions==1002); data(pos)=Outputdefinition2Enum(); - pos=find(obj.cost_functions==1003); data(pos)=Outputdefinition3Enum(); - pos=find(obj.cost_functions==1004); data(pos)=Outputdefinition4Enum(); - pos=find(obj.cost_functions==1005); data(pos)=Outputdefinition5Enum(); - pos=find(obj.cost_functions==1006); data(pos)=Outputdefinition6Enum(); - pos=find(obj.cost_functions==1007); data(pos)=Outputdefinition7Enum(); - pos=find(obj.cost_functions==1008); data(pos)=Outputdefinition8Enum(); - pos=find(obj.cost_functions==1009); data(pos)=Outputdefinition8Enum(); - pos=find(obj.cost_functions==1010); data(pos)=Outputdefinition10Enum(); + num_cost_functions=size(self.cost_functions,2); + data=self.cost_functions; + pos=find(self.cost_functions==101); data(pos)=SurfaceAbsVelMisfitEnum(); + pos=find(self.cost_functions==102); data(pos)=SurfaceRelVelMisfitEnum(); + pos=find(self.cost_functions==103); data(pos)=SurfaceLogVelMisfitEnum(); + pos=find(self.cost_functions==104); data(pos)=SurfaceLogVxVyMisfitEnum(); + pos=find(self.cost_functions==105); data(pos)=SurfaceAverageVelMisfitEnum(); + pos=find(self.cost_functions==201); data(pos)=ThicknessAbsMisfitEnum(); + pos=find(self.cost_functions==501); data(pos)=DragCoefficientAbsGradientEnum(); + pos=find(self.cost_functions==502); data(pos)=RheologyBbarAbsGradientEnum(); + pos=find(self.cost_functions==503); data(pos)=ThicknessAbsGradientEnum(); + pos=find(self.cost_functions==504); data(pos)=ThicknessAlongGradientEnum(); + pos=find(self.cost_functions==505); data(pos)=ThicknessAcrossGradientEnum(); + pos=find(self.cost_functions==506); data(pos)=BalancethicknessMisfitEnum(); + pos=find(self.cost_functions==601); data(pos)=SurfaceAbsMisfitEnum(); + pos=find(self.cost_functions==1001); data(pos)=Outputdefinition1Enum(); + pos=find(self.cost_functions==1002); data(pos)=Outputdefinition2Enum(); + pos=find(self.cost_functions==1003); data(pos)=Outputdefinition3Enum(); + pos=find(self.cost_functions==1004); data(pos)=Outputdefinition4Enum(); + pos=find(self.cost_functions==1005); data(pos)=Outputdefinition5Enum(); + pos=find(self.cost_functions==1006); data(pos)=Outputdefinition6Enum(); + pos=find(self.cost_functions==1007); data(pos)=Outputdefinition7Enum(); + pos=find(self.cost_functions==1008); data(pos)=Outputdefinition8Enum(); + pos=find(self.cost_functions==1009); data(pos)=Outputdefinition8Enum(); + pos=find(self.cost_functions==1010); data(pos)=Outputdefinition10Enum(); WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3); WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer'); Index: /issm/trunk-jpl/src/m/classes/autodiff.m =================================================================== --- /issm/trunk-jpl/src/m/classes/autodiff.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/autodiff.m (revision 19040) @@ -20,44 +20,44 @@ %}}} methods - function createxml(obj,fid) % {{{ + function createxml(self,fid) % {{{ fprintf(fid, '\n'); % automatic differentiation parameters fprintf(fid,'%s\n%s\n%s\n','','
'); - fprintf(fid,'%s%s%s\n%s\n%s%s%s\n%s\n%s\n',' ','
',' ',' indicates if the automatic differentiation is activated ',' '); + fprintf(fid,'%s%s%s\n%s\n%s%s%s\n%s\n%s\n',' ','
',' ',' indicates if the automatic differentiation is activated ',' '); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' list of dependent variables ',' '); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' list of independent variables ',' '); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' ADOLC driver (''fos_forward'' or ''fov_forward'') ',' '); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' Number of operations per buffer (==OBUFSIZE in usrparms.h) ',' '); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' Number of locations per buffer (==LBUFSIZE in usrparms.h) ',' '); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' Number of values per buffer (==CBUFSIZE in usrparms.h) ',' '); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' Number of taylors per buffer (<=TBUFSIZE in usrparms.h) ',' '); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' free location block sorting/consolidation triggered if the ratio between allocated and used locations exceeds gcTriggerRatio ',' '); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' free location block sorting/consolidation triggered if the allocated locations exceed gcTriggerMaxSize ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' list of dependent variables ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' list of independent variables ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' ADOLC driver (''fos_forward'' or ''fov_forward'') ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' Number of operations per buffer (==OBUFSIZE in usrparms.h) ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' Number of locations per buffer (==LBUFSIZE in usrparms.h) ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' Number of values per buffer (==CBUFSIZE in usrparms.h) ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' Number of taylors per buffer (<=TBUFSIZE in usrparms.h) ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' free location block sorting/consolidation triggered if the ratio between allocated and used locations exceeds gcTriggerRatio ',' '); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ','
',' free location block sorting/consolidation triggered if the allocated locations exceed gcTriggerMaxSize ',' '); fprintf(fid,'%s\n%s\n',''); end % }}} - function obj = autodiff(varargin) % {{{ + function self = autodiff(varargin) % {{{ switch nargin case 0 - obj=setdefaultparameters(obj); + self=setdefaultparameters(self); otherwise error('constructor not supported'); end end % }}} - function obj = setdefaultparameters(obj) % {{{ - obj.obufsize = 524288; - obj.lbufsize = 524288; - obj.cbufsize = 524288; - obj.tbufsize = 524288; - obj.gcTriggerRatio=2.0; - obj.gcTriggerMaxSize=65536; - end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ + function self = setdefaultparameters(self) % {{{ + self.obufsize = 524288; + self.lbufsize = 524288; + self.cbufsize = 524288; + self.tbufsize = 524288; + self.gcTriggerRatio=2.0; + self.gcTriggerMaxSize=65536; + end % }}} + function md = checkconsistency(self,md,solution,analyses) % {{{ %Early return - if ~obj.isautodiff, return; end + if ~self.isautodiff, return; end %Driver value: @@ -73,34 +73,34 @@ %go through our dependents and independents and check consistency: - for i=1:numel(obj.dependents), - dep=obj.dependents{i}; + for i=1:numel(self.dependents), + dep=self.dependents{i}; md=checkconsistency(dep,md,solution,analyses); end - for i=1:numel(obj.independents), - indep=obj.independents{i}; - md=checkconsistency(indep,md,i,solution,analyses,obj.driver); - end - - end % }}} - function disp(obj) % {{{ + for i=1:numel(self.independents), + indep=self.independents{i}; + md=checkconsistency(indep,md,i,solution,analyses,self.driver); + end + + end % }}} + function disp(self) % {{{ disp(sprintf(' automatic differentiation parameters:')); - fielddisplay(obj,'isautodiff','indicates if the automatic differentiation is activated'); - fielddisplay(obj,'dependents','list of dependent variables'); - fielddisplay(obj,'independents','list of independent variables'); - fielddisplay(obj,'driver','ADOLC driver (''fos_forward'' or ''fov_forward'')'); - fielddisplay(obj,'obufsize','Number of operations per buffer (==OBUFSIZE in usrparms.h)'); - fielddisplay(obj,'lbufsize','Number of locations per buffer (==LBUFSIZE in usrparms.h)'); - fielddisplay(obj,'cbufsize','Number of values per buffer (==CBUFSIZE in usrparms.h)'); - fielddisplay(obj,'tbufsize','Number of taylors per buffer (<=TBUFSIZE in usrparms.h)'); - fielddisplay(obj,'gcTriggerRatio','free location block sorting/consolidation triggered if the ratio between allocated and used locations exceeds gcTriggerRatio'); - fielddisplay(obj,'gcTriggerMaxSize','free location block sorting/consolidation triggered if the allocated locations exceed gcTriggerMaxSize'); - end % }}} - function marshall(obj,md,fid) % {{{ - - WriteData(fid,'object',obj,'fieldname','isautodiff','format','Boolean'); - WriteData(fid,'object',obj,'fieldname','driver','format','String'); + fielddisplay(self,'isautodiff','indicates if the automatic differentiation is activated'); + fielddisplay(self,'dependents','list of dependent variables'); + fielddisplay(self,'independents','list of independent variables'); + fielddisplay(self,'driver','ADOLC driver (''fos_forward'' or ''fov_forward'')'); + fielddisplay(self,'obufsize','Number of operations per buffer (==OBUFSIZE in usrparms.h)'); + fielddisplay(self,'lbufsize','Number of locations per buffer (==LBUFSIZE in usrparms.h)'); + fielddisplay(self,'cbufsize','Number of values per buffer (==CBUFSIZE in usrparms.h)'); + fielddisplay(self,'tbufsize','Number of taylors per buffer (<=TBUFSIZE in usrparms.h)'); + fielddisplay(self,'gcTriggerRatio','free location block sorting/consolidation triggered if the ratio between allocated and used locations exceeds gcTriggerRatio'); + fielddisplay(self,'gcTriggerMaxSize','free location block sorting/consolidation triggered if the allocated locations exceed gcTriggerMaxSize'); + end % }}} + function marshall(self,md,fid) % {{{ + + WriteData(fid,'object',self,'fieldname','isautodiff','format','Boolean'); + WriteData(fid,'object',self,'fieldname','driver','format','String'); %early return - if ~obj.isautodiff, + if ~self.isautodiff, WriteData(fid,'data',false,'enum',AutodiffMassFluxSegmentsPresentEnum(),'format','Boolean'); WriteData(fid,'data',false,'enum',AutodiffKeepEnum(),'format','Boolean'); @@ -109,13 +109,13 @@ %buffer sizes {{{ - WriteData(fid,'object',obj,'fieldname','obufsize','format','Double'); - WriteData(fid,'object',obj,'fieldname','lbufsize','format','Double'); - WriteData(fid,'object',obj,'fieldname','cbufsize','format','Double'); - WriteData(fid,'object',obj,'fieldname','tbufsize','format','Double'); - WriteData(fid,'object',obj,'fieldname','gcTriggerRatio','format','Double'); - WriteData(fid,'object',obj,'fieldname','gcTriggerMaxSize','format','Double'); + WriteData(fid,'object',self,'fieldname','obufsize','format','Double'); + WriteData(fid,'object',self,'fieldname','lbufsize','format','Double'); + WriteData(fid,'object',self,'fieldname','cbufsize','format','Double'); + WriteData(fid,'object',self,'fieldname','tbufsize','format','Double'); + WriteData(fid,'object',self,'fieldname','gcTriggerRatio','format','Double'); + WriteData(fid,'object',self,'fieldname','gcTriggerMaxSize','format','Double'); %}}} %process dependent variables {{{ - num_dependent_objects=numel(obj.dependents); + num_dependent_objects=numel(self.dependents); WriteData(fid,'data',num_dependent_objects,'enum',AutodiffNumDependentObjectsEnum(),'format','Integer'); @@ -126,5 +126,5 @@ for i=1:num_dependent_objects, - dep=obj.dependents{i}; + dep=self.dependents{i}; names{i}=dep.name; @@ -138,5 +138,5 @@ %}}} %process independent variables {{{ - num_independent_objects=numel(obj.independents); + num_independent_objects=numel(self.independents); WriteData(fid,'data',num_independent_objects,'enum',AutodiffNumIndependentObjectsEnum(),'format','Integer'); @@ -146,5 +146,5 @@ for i=1:num_independent_objects, - indep=obj.independents{i}; + indep=self.independents{i}; names(i)=StringToEnum(indep.name); @@ -156,9 +156,9 @@ %}}} %if driver is fos_forward, build index: {{{ - if strcmpi(obj.driver,'fos_forward'), + if strcmpi(self.driver,'fos_forward'), index=0; for i=1:num_independent_objects, - indep=obj.independents{i}; + indep=self.independents{i}; if ~isnan(indep.fos_forward_index), index=index+indep.fos_forward_index; @@ -177,9 +177,9 @@ %}}} %if driver is fos_reverse, build index: {{{ - if strcmpi(obj.driver,'fos_reverse'), + if strcmpi(self.driver,'fos_reverse'), index=0; for i=1:num_dependent_objects, - dep=obj.dependents{i}; + dep=self.dependents{i}; if ~isnan(dep.fos_reverse_index), index=index+dep.fos_reverse_index; @@ -198,9 +198,9 @@ %}}} %if driver is fov_forward, build indices: {{{ - if strcmpi(obj.driver,'fov_forward'), + if strcmpi(self.driver,'fov_forward'), indices=0; for i=1:num_independent_objects, - indep=obj.independents{i}; + indep=self.independents{i}; if ~isempty(indep.fos_forward_index), indices=indices+indep.fov_forward_indices; @@ -221,5 +221,5 @@ mass_flux_segments=cell(0,1); for i=1:num_dependent_objects, - dep=obj.dependents{i}; + dep=self.dependents{i}; if strcmpi(dep.name,'MassFlux'), mass_flux_segments{end+1,1}=dep.segments; @@ -244,8 +244,8 @@ % - if length(obj.driver)<=3, + if length(self.driver)<=3, keep=false; %there is no "_reverse" string within the driver string: else - if strncmpi(obj.driver(4:end),'_reverse',8), + if strncmpi(self.driver(4:end),'_reverse',8), keep=true; else Index: /issm/trunk-jpl/src/m/classes/balancethickness.m =================================================================== --- /issm/trunk-jpl/src/m/classes/balancethickness.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/balancethickness.m (revision 19040) @@ -13,19 +13,19 @@ end methods - function obj = balancethickness(varargin) % {{{ + function self = balancethickness(varargin) % {{{ switch nargin case 0 - obj=setdefaultparameters(obj); + self=setdefaultparameters(self); otherwise error('constructor not supported'); end end % }}} - function obj = setdefaultparameters(obj) % {{{ + function self = setdefaultparameters(self) % {{{ %Type of stabilization used - obj.stabilization=1; + self.stabilization=1; end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ + function md = checkconsistency(self,md,solution,analyses) % {{{ %Early return if solution~=BalancethicknessSolutionEnum(), return; end @@ -37,21 +37,21 @@ %md = checkfield(md,'fieldname','balancethickness.omega','size',[md.mesh.numberofvertices 1],'NaN',1,'>=',0); end % }}} - function disp(obj) % {{{ + function disp(self) % {{{ disp(sprintf(' balance thickness solution parameters:')); - fielddisplay(obj,'spcthickness','thickness constraints (NaN means no constraint) [m]'); - fielddisplay(obj,'thickening_rate','ice thickening rate used in the mass conservation (dh/dt) [m/yr]'); - fielddisplay(obj,'stabilization','0: None, 1: SU, 2: SSA''s artificial diffusivity, 3:DG'); + fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint) [m]'); + fielddisplay(self,'thickening_rate','ice thickening rate used in the mass conservation (dh/dt) [m/yr]'); + fielddisplay(self,'stabilization','0: None, 1: SU, 2: SSA''s artificial diffusivity, 3:DG'); end % }}} - function marshall(obj,md,fid) % {{{ + function marshall(self,md,fid) % {{{ yts=365.0*24.0*3600.0; - WriteData(fid,'object',obj,'fieldname','spcthickness','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'fieldname','thickening_rate','format','DoubleMat','mattype',1,'scale',1./yts); - WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer'); + WriteData(fid,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'fieldname','thickening_rate','format','DoubleMat','mattype',1,'scale',1./yts); + WriteData(fid,'object',self,'fieldname','stabilization','format','Integer'); - WriteData(fid,'object',obj,'fieldname','omega','format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'fieldname','omega','format','DoubleMat','mattype',1); end % }}} end Index: /issm/trunk-jpl/src/m/classes/basalforcings.m =================================================================== --- /issm/trunk-jpl/src/m/classes/basalforcings.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/basalforcings.m (revision 19040) @@ -11,15 +11,15 @@ end methods - function createxml(obj,fid) % {{{ + function createxml(self,fid) % {{{ fprintf(fid, '\n\n'); fprintf(fid, '%s\n', ''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' basal melting rate (positive if melting) [m/yr] ',''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n', '', '
',' geothermal heat flux [W/m^2] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' basal melting rate (positive if melting) [m/yr] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n', '', '
',' geothermal heat flux [W/m^2] ',''); end % }}} - function obj = basalforcings(varargin) % {{{ + function self = basalforcings(varargin) % {{{ switch nargin case 0 - obj=setdefaultparameters(obj); + self=setdefaultparameters(self); otherwise error('constructor not supported'); @@ -39,8 +39,8 @@ end % }}} - function obj = setdefaultparameters(obj) % {{{ + function self = setdefaultparameters(self) % {{{ end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ + function md = checkconsistency(self,md,solution,analyses) % {{{ if ismember(MasstransportAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.ismasstransport==0), @@ -58,20 +58,20 @@ end end % }}} - function disp(obj) % {{{ + function disp(self) % {{{ disp(sprintf(' basal forcings parameters:')); - fielddisplay(obj,'groundedice_melting_rate','basal melting rate (positive if melting) [m/yr]'); - fielddisplay(obj,'floatingice_melting_rate','basal melting rate (positive if melting) [m/yr]'); - fielddisplay(obj,'geothermalflux','geothermal heat flux [W/m^2]'); + fielddisplay(self,'groundedice_melting_rate','basal melting rate (positive if melting) [m/yr]'); + fielddisplay(self,'floatingice_melting_rate','basal melting rate (positive if melting) [m/yr]'); + fielddisplay(self,'geothermalflux','geothermal heat flux [W/m^2]'); end % }}} - function marshall(obj,md,fid) % {{{ + function marshall(self,md,fid) % {{{ yts=365.0*24.0*3600.0; WriteData(fid,'enum',BasalforcingsEnum(),'data',FloatingMeltRateEnum(),'format','Integer'); - 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); + 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); end % }}} end Index: /issm/trunk-jpl/src/m/classes/calving.m =================================================================== --- /issm/trunk-jpl/src/m/classes/calving.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/calving.m (revision 19040) @@ -11,8 +11,8 @@ end methods - function obj = calving(varargin) % {{{ + function self = calving(varargin) % {{{ switch nargin case 0 - obj=setdefaultparameters(obj); + self=setdefaultparameters(self); case 1 inputstruct=varargin{1}; @@ -22,5 +22,5 @@ fieldname = list1{i}; if ismember(fieldname,list2), - obj.(fieldname) = inputstruct.(fieldname); + self.(fieldname) = inputstruct.(fieldname); end end @@ -29,11 +29,11 @@ end end % }}} - function obj = setdefaultparameters(obj) % {{{ + function self = setdefaultparameters(self) % {{{ %stabilization = 2 by default - obj.stabilization = 2; + self.stabilization = 2; end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ + function md = checkconsistency(self,md,solution,analyses) % {{{ %Early return if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end @@ -43,16 +43,16 @@ md = checkfield(md,'fieldname','calving.meltingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1); end % }}} - function disp(obj) % {{{ + function disp(self) % {{{ disp(sprintf(' Calving parameters:')); - fielddisplay(obj,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding'); - fielddisplay(obj,'calvingrate','calving rate at given location [m/a]'); - fielddisplay(obj,'meltingrate','melting rate at given location [m/a]'); + fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding'); + fielddisplay(self,'calvingrate','calving rate at given location [m/a]'); + fielddisplay(self,'meltingrate','melting rate at given location [m/a]'); end % }}} - function marshall(obj,md,fid) % {{{ + function marshall(self,md,fid) % {{{ yts=365.0*24.0*3600.0; 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,'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); + WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer'); + 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); end % }}} end Index: /issm/trunk-jpl/src/m/classes/calvingdev.m =================================================================== --- /issm/trunk-jpl/src/m/classes/calvingdev.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/calvingdev.m (revision 19040) @@ -11,8 +11,8 @@ end methods - function obj = calvingdev(varargin) % {{{ + function self = calvingdev(varargin) % {{{ switch nargin case 0 - obj=setdefaultparameters(obj); + self=setdefaultparameters(self); case 1 inputstruct=varargin{1}; @@ -22,5 +22,5 @@ fieldname = list1{i}; if ismember(fieldname,list2), - obj.(fieldname) = inputstruct.(fieldname); + self.(fieldname) = inputstruct.(fieldname); end end @@ -29,13 +29,13 @@ end end % }}} - function obj = setdefaultparameters(obj) % {{{ + function self = setdefaultparameters(self) % {{{ %stabilization = 2 by default - obj.stabilization = 2; + self.stabilization = 2; %Proportionality coefficient in Pi model - obj.coeff=2e13; + self.coeff=2e13; end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ + function md = checkconsistency(self,md,solution,analyses) % {{{ %Early return if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end @@ -45,17 +45,17 @@ md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'size',[md.mesh.numberofvertices 1],'>=',0); end % }}} - function disp(obj) % {{{ + function disp(self) % {{{ disp(sprintf(' Calving Pi parameters:')); - fielddisplay(obj,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding'); - fielddisplay(obj,'coeff','proportionality coefficient in Pi model'); - fielddisplay(obj,'meltingrate','melting rate at given location [m/a]'); + fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding'); + fielddisplay(self,'coeff','proportionality coefficient in Pi model'); + fielddisplay(self,'meltingrate','melting rate at given location [m/a]'); end % }}} - function marshall(obj,md,fid) % {{{ + function marshall(self,md,fid) % {{{ yts=365.0*24.0*3600.0; WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingDevEnum(),'format','Integer'); - WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',obj.stabilization,'format','Integer'); - WriteData(fid,'enum',CalvingpiCoeffEnum(),'data',obj.coeff,'format','DoubleMat','mattype',1); - WriteData(fid,'class','calving','object',obj,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts); + WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer'); + WriteData(fid,'enum',CalvingpiCoeffEnum(),'data',self.coeff,'format','DoubleMat','mattype',1); + WriteData(fid,'class','calving','object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts); end % }}} end Index: /issm/trunk-jpl/src/m/classes/calvinglevermann.m =================================================================== --- /issm/trunk-jpl/src/m/classes/calvinglevermann.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/calvinglevermann.m (revision 19040) @@ -11,8 +11,8 @@ end methods - function obj = calvinglevermann(varargin) % {{{ + function self = calvinglevermann(varargin) % {{{ switch nargin case 0 - obj=setdefaultparameters(obj); + self=setdefaultparameters(self); case 1 inputstruct=varargin{1}; @@ -22,5 +22,5 @@ fieldname = list1{i}; if ismember(fieldname,list2), - obj.(fieldname) = inputstruct.(fieldname); + self.(fieldname) = inputstruct.(fieldname); end end @@ -29,13 +29,13 @@ end end % }}} - function obj = setdefaultparameters(obj) % {{{ + function self = setdefaultparameters(self) % {{{ %stabilization = 2 by default - obj.stabilization = 2; + self.stabilization = 2; %Proportionality coefficient in Levermann model - obj.coeff=2e13; + self.coeff=2e13; end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ + function md = checkconsistency(self,md,solution,analyses) % {{{ %Early return if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end @@ -45,17 +45,17 @@ md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'size',[md.mesh.numberofvertices 1],'>=',0); end % }}} - function disp(obj) % {{{ + function disp(self) % {{{ disp(sprintf(' Calving Levermann parameters:')); - fielddisplay(obj,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding'); - fielddisplay(obj,'coeff','proportionality coefficient in Levermann model'); - fielddisplay(obj,'meltingrate','melting rate at given location [m/a]'); + fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding'); + fielddisplay(self,'coeff','proportionality coefficient in Levermann model'); + fielddisplay(self,'meltingrate','melting rate at given location [m/a]'); end % }}} - function marshall(obj,md,fid) % {{{ + function marshall(self,md,fid) % {{{ yts=365.0*24.0*3600.0; WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingLevermannEnum(),'format','Integer'); - 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,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts); + 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,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts); end % }}} end Index: /issm/trunk-jpl/src/m/classes/calvingpi.m =================================================================== --- /issm/trunk-jpl/src/m/classes/calvingpi.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/calvingpi.m (revision 19040) @@ -11,8 +11,8 @@ end methods - function obj = calvingpi(varargin) % {{{ + function self = calvingpi(varargin) % {{{ switch nargin case 0 - obj=setdefaultparameters(obj); + self=setdefaultparameters(self); case 1 inputstruct=varargin{1}; @@ -22,5 +22,5 @@ fieldname = list1{i}; if ismember(fieldname,list2), - obj.(fieldname) = inputstruct.(fieldname); + self.(fieldname) = inputstruct.(fieldname); end end @@ -29,13 +29,13 @@ end end % }}} - function obj = setdefaultparameters(obj) % {{{ + function self = setdefaultparameters(self) % {{{ %stabilization = 2 by default - obj.stabilization = 2; + self.stabilization = 2; %Proportionality coefficient in Pi model - obj.coeff=2e13; + self.coeff=2e13; end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ + function md = checkconsistency(self,md,solution,analyses) % {{{ %Early return if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end @@ -45,17 +45,17 @@ md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'size',[md.mesh.numberofvertices 1],'>=',0); end % }}} - function disp(obj) % {{{ + function disp(self) % {{{ disp(sprintf(' Calving Pi parameters:')); - fielddisplay(obj,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding'); - fielddisplay(obj,'coeff','proportionality coefficient in Pi model'); - fielddisplay(obj,'meltingrate','melting rate at given location [m/a]'); + fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding'); + fielddisplay(self,'coeff','proportionality coefficient in Pi model'); + fielddisplay(self,'meltingrate','melting rate at given location [m/a]'); end % }}} - function marshall(obj,md,fid) % {{{ + function marshall(self,md,fid) % {{{ yts=365.0*24.0*3600.0; WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingPiEnum(),'format','Integer'); - 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,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts); + WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer'); + WriteData(fid,'enum',CalvingpiCoeffEnum(),'data',self.coeff,'format','DoubleMat','mattype',1); + WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts); end % }}} end Index: /issm/trunk-jpl/src/m/classes/clusters/generic.m =================================================================== --- /issm/trunk-jpl/src/m/classes/clusters/generic.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/clusters/generic.m (revision 19040) @@ -24,20 +24,20 @@ end methods - function createxml(obj,fid) % {{{ + function createxml(self,fid) % {{{ fprintf(fid, '\n\n'); fprintf(fid, '%s\n', ''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', '
',' N/A ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n', '', '
',' N/A ',''); end % }}} Index: /issm/trunk-jpl/src/m/classes/constants.m =================================================================== --- /issm/trunk-jpl/src/m/classes/constants.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/constants.m (revision 19040) @@ -12,35 +12,35 @@ end methods - function createxml(obj,fid) % {{{ + function createxml(self,fid) % {{{ fprintf(fid, '\n\n'); fprintf(fid, '%s\n', ''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' gravitational acceleration [m/s^2] ',''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' number of seconds in a year [s/yr] ',''); - fprintf(fid,'%s%s%s%s%s\n%s\n%s\n','','
',' reference temperature used in the enthalpy model [K] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' gravitational acceleration [m/s^2] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','','
',' number of seconds in a year [s/yr] ',''); + fprintf(fid,'%s%s%s%s%s\n%s\n%s\n','','
',' reference temperature used in the enthalpy model [K] ',''); end % }}} - function obj = constants(varargin) % {{{ + function self = constants(varargin) % {{{ switch nargin case 0 - obj=setdefaultparameters(obj); + self=setdefaultparameters(self); otherwise error('constructor not supported'); end end % }}} - function obj = setdefaultparameters(obj) % {{{ + function self = setdefaultparameters(self) % {{{ %acceleration due to gravity (m/s^2) - obj.g=9.81; + self.g=9.81; %Earth's rotation speed - obj.omega = 7.292*1e-5; + self.omega = 7.292*1e-5; %converstion from year to seconds - obj.yts=365*24*3600; + self.yts=365*24*3600; %the reference temperature for enthalpy model (cf Aschwanden) - obj.referencetemperature=223.15; + self.referencetemperature=223.15; end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ + function md = checkconsistency(self,md,solution,analyses) % {{{ md = checkfield(md,'fieldname','constants.g','>=',0,'size',[1 1]); %We allow 0 for validation tests @@ -50,18 +50,18 @@ end % }}} - function disp(obj) % {{{ + function disp(self) % {{{ disp(sprintf(' constants parameters:')); - fielddisplay(obj,'g','gravitational acceleration [m/s^2]'); - fielddisplay(obj,'omega','angular velocity of Earth [rad/s]'); - fielddisplay(obj,'yts','number of seconds in a year [s/yr]'); - fielddisplay(obj,'referencetemperature','reference temperature used in the enthalpy model [K]'); + fielddisplay(self,'g','gravitational acceleration [m/s^2]'); + fielddisplay(self,'omega','angular velocity of Earth [rad/s]'); + fielddisplay(self,'yts','number of seconds in a year [s/yr]'); + fielddisplay(self,'referencetemperature','reference temperature used in the enthalpy model [K]'); end % }}} - function marshall(obj,md,fid) % {{{ - WriteData(fid,'object',obj,'fieldname','g','format','Double'); - WriteData(fid,'object',obj,'fieldname','omega','format','Double'); - WriteData(fid,'object',obj,'fieldname','yts','format','Double'); - WriteData(fid,'object',obj,'fieldname','referencetemperature','format','Double'); + function marshall(self,md,fid) % {{{ + WriteData(fid,'object',self,'fieldname','g','format','Double'); + WriteData(fid,'object',self,'fieldname','omega','format','Double'); + WriteData(fid,'object',self,'fieldname','yts','format','Double'); + WriteData(fid,'object',self,'fieldname','referencetemperature','format','Double'); end % }}} end Index: /issm/trunk-jpl/src/m/classes/damage.m =================================================================== --- /issm/trunk-jpl/src/m/classes/damage.m (revision 19039) +++ /issm/trunk-jpl/src/m/classes/damage.m (revision 19040) @@ -32,10 +32,10 @@ end methods - function createxml(obj,fid) % {{{ + function createxml(self,fid) % {{{ fprintf(fid, '\n\n'); fprintf(fid, '%s\n', ''); fprintf(fid, '%s\n', ''); - %fprintf(fid,'%s%s%s%s\n%s\n%s\n%s\n', '', '
',' damage law (string) from {"undamaged","pralong"} ',''); + %fprintf(fid,'%s%s%s%s\n%s\n%s\n%s\n', '', '
',' damage law (string) from {"undamaged","pralong"} ',''); % drop-down fprintf(fid,'%s%s%s%s%s\n\t%s\n','','
'); @@ -49,12 +49,12 @@ fprintf(fid,'\t%s%s%s%s%s\n\t\t%s\n','