Changeset 24793 for issm/trunk-jpl/src/m/classes/SMBgemb.m

Timestamp:

05/05/20 06:26:00 (5 years ago)

Author:

bdef

Message:

NEW: adding several averaging methods to pass from substep to main step

File:

• issm/trunk-jpl/src/m/classes/SMBgemb.m (modified) (4 diffs)

issm/trunk-jpl/src/m/classes/SMBgemb.m ¶

@@ -112 +112 @@
 
                 steps_per_step = 1;
+                averaging = 0;
                 requested_outputs      = {};
 
@@ -286 +287 @@
                         end
                         md = checkfield(md,'fieldname','smb.steps_per_step','>=',1,'numel',[1]);
+                        md = checkfield(md,'fieldname','smb.averaging',,'numel',[1],'values',[0 1 2]);
                         md = checkfield(md,'fieldname','smb.requested_outputs','stringrow',1);
 
@@ -379 +381 @@
 
                         fielddisplay(self, 'steps_per_step', 'number of smb steps per time step');
+                        fielddisplay(self, 'averaging', 'averaging methods from short to long steps');
+                        disp(sprintf('%55s  0: Arithmetic (default)');
+                        disp(sprintf('%55s  0: Geometric');
+                        disp(sprintf('%55s  0: Harmonic');
                         fielddisplay(self,'requested_outputs','additional outputs requested');
 
@@ -450 +456 @@
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','Sizeini','format','IntMat','mattype',2);
                         WriteData(fid, prefix, 'object', self, 'fieldname', 'steps_per_step', 'format', 'Integer');
+                        WriteData(fid, prefix, 'object', self, 'fieldname', 'averaging', 'format', 'Integer');
                         %figure out dt from forcings:
                         if (any(md.smb.P(end,:) - md.smb.Ta(end,:) ~= 0) | ...