Changeset 28013 for issm/trunk/src/m/classes/SMBforcing.m

Timestamp:

11/15/23 12:14:04 (16 months ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 28011

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/SMBforcing.m (modified) (6 diffs)

issm/trunk/src/m/classes/SMBforcing.m

@@ -10 +10 @@
                 requested_outputs = {};
                 averaging         = 0;
-                isclimatology;
         end
         methods
@@ -16 +15 @@
                         switch nargin
                                 case 0
-
+                                        self=setdefaultparameters(self);
                                 case 1
                                         inputstruct=varargin{1};
@@ -32 +31 @@
                 end % }}}
                 function list = defaultoutputs(self,md) % {{{
-                        list = {''};
+                        list = {'SmbMassBalance'};
                 end % }}}
                 function self = extrude(self,md) % {{{
@@ -55 +54 @@
                         md = checkfield(md,'fieldname','smb.steps_per_step','>=',1,'numel',[1]);
                         md = checkfield(md,'fieldname','smb.requested_outputs','stringrow',1);
-                        md = checkfield(md, 'fieldname', 'smb.averaging', 'numel', [1], 'values', [0, 1, 2]);
+                        md = checkfield(md,'fieldname','smb.averaging','numel',[1],'values',[0 1 2]);
                 end % }}}
                 function disp(self) % {{{
@@ -72 +71 @@
 
                         WriteData(fid,prefix,'name','md.smb.model','data',1,'format','Integer');
-                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
-                        WriteData(fid, prefix, 'object', self, 'fieldname', 'steps_per_step', 'format', 'Integer');
-                        WriteData(fid, prefix, 'object', self, 'fieldname', 'averaging', 'format', 'Integer');
+                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','steps_per_step','format','Integer');
+                        WriteData(fid,prefix,'object',self,'fieldname','averaging','format','Integer');
 
                         %process requested outputs
@@ -92 +91 @@
 
                 end % }}}
+                function self = setdefaultparameters(self) % {{{
+
+                        %output default:
+                        self.requested_outputs={'default'};
+
+                end % }}}
         end
 end