Changeset 19527 for issm/trunk-jpl/src/m/classes/SMBgradients.m

Timestamp:

08/29/15 11:55:39 (10 years ago)

Author:

Eric.Larour

Message:

CHG: moved md.surfaceforcings to md.smb.
By doing so, had to rename the SMB class to SMBforcing class (it's just that, a mass_balance forcing inside
a SMB class, hence the name).
We also now have an smb_core solution, taken out of the mass transport core. Makes more sense long term.
Synced all enums according to the new changes, and operated the adjustments in all the test decks.

In addition, progressing in terms of GEMB integration into ISSM, specifically at the SMBgemb level (which
is spurring all the changes described above). Brought the class up to the level of the GEMB.m call in Alex's
code. Starting the C integration now.

File:

• issm/trunk-jpl/src/m/classes/SMBgradients.m (modified) (5 diffs)

issm/trunk-jpl/src/m/classes/SMBgradients.m

@@ -10 +10 @@
                 b_pos  = NaN;
                 b_neg  = NaN;
+                requested_outputs      = {};
         end
         methods
@@ -25 +26 @@
 
                 end % }}}
+                function list = defaultoutputs(self,md) % {{{
+                        list = {''};
+                end % }}}
                 function self = initialize(self,md) % {{{
 
@@ -38 +42 @@
 
                         if ismember(MasstransportAnalysisEnum(),analyses),
-                                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);
+                                md = checkfield(md,'fieldname','smb.href','timeseries',1,'NaN',1);
+                                md = checkfield(md,'fieldname','smb.smbref','timeseries',1,'NaN',1);
+                                md = checkfield(md,'fieldname','smb.b_pos','timeseries',1,'NaN',1);
+                                md = checkfield(md,'fieldname','smb.b_neg','timeseries',1,'NaN',1);
                         end
+                        md = checkfield(md,'fieldname','smb.requested_outputs','stringrow',1);
                 end % }}}
                 function disp(self) % {{{
@@ -52 +57 @@
                         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');
+                        fielddisplay(self,'requested_outputs','additional outputs requested');
 
                 end % }}}
@@ -58 +64 @@
                         yts=365.0*24.0*3600.0;
 
-                        WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBgradientsEnum(),'format','Integer');
-                        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);
+                        WriteData(fid,'enum',SmbEnum(),'data',SMBgradientsEnum(),'format','Integer');
+                        WriteData(fid,'object',self,'class','smb','fieldname','href','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
+                        WriteData(fid,'object',self,'class','smb','fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
+                        WriteData(fid,'object',self,'class','smb','fieldname','b_pos','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
+                        WriteData(fid,'object',self,'class','smb','fieldname','b_neg','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
+                        
+                        %process requested outputs
+                        outputs = self.requested_outputs;
+                        pos  = find(ismember(outputs,'default'));
+                        if ~isempty(pos),
+                                outputs(pos) = [];                         %remove 'default' from outputs
+                                outputs      = [outputs defaultoutputs(self,md)]; %add defaults
+                        end
+                        WriteData(fid,'data',outputs,'enum',SmbRequestedOutputsEnum,'format','StringArray');
 
                 end % }}}