Changeset 19105 for issm/trunk/src/m/classes/SMBcomponents.m

Timestamp:

02/12/15 16:48:40 (10 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 19103

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/SMBcomponents.m (modified) (5 diffs)

issm/trunk

@@ +1 @@
+build-fw
+build-ad
 nightlylog
 configure.sh

@@ +1 @@
+build-fw
+build-ad
 nightlylog
 configure.sh

issm/trunk/src/m/classes/SMBcomponents.m

@@ -11 +11 @@
         end
         methods
-                function obj = SMBcomponents(varargin) % {{{
+                function self = SMBcomponents(varargin) % {{{
                         switch nargin
                                 case 0
@@ -41 +41 @@
 
                 end % }}}
-                function md = checkconsistency(obj,md,solution,analyses) % {{{
+                function md = checkconsistency(self,md,solution,analyses) % {{{
 
                         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 +50 @@
                         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 +56 @@
                         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 +62 @@
                         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,'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',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

@@ +1 @@
+build-fw
+build-ad
 nightlylog
 configure.sh