Changeset 25836 for issm/trunk/src/m/classes/SMBpddSicopolis.m

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/SMBpddSicopolis.m (modified) (4 diffs)

issm/trunk/src/m/classes/SMBpddSicopolis.m

@@ -6 +6 @@
 classdef SMBpddSicopolis
         properties (SetAccess=public)
-                precipitation                                   = NaN;
-                monthlytemperatures                     = NaN;
-                temperature_anomaly                     = NaN;
-                precipitation_anomaly           = NaN;
-                smb_corr                                                        = NaN;
-                desfac                                                  = 0;
-                s0p                                                             = NaN;
-                s0t                                                             = NaN;
-                rlaps                                                           = 0;
-                isfirnwarming                                   = 0;
-                steps_per_step=1
-                requested_outputs                               = {};
+
+                precipitation         = NaN;
+                monthlytemperatures   = NaN;
+                temperature_anomaly   = NaN;
+                precipitation_anomaly = NaN;
+                smb_corr              = NaN;
+                desfac                = 0;
+                s0p                   = NaN;
+                s0t                   = NaN;
+                rlaps                 = 0;
+                isfirnwarming         = 0;
+                steps_per_step        = 1
+                averaging             = 0
+                requested_outputs     = {};
         end
         methods
@@ -81 +83 @@
                                 md = checkfield(md,'fieldname','smb.s0t','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                                 md = checkfield(md,'fieldname','smb.rlaps','>=',0,'numel',1);
-                                md = checkfield(md,'fieldname','smb.monthlytemperatures','timeseries',1,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 12]);
-                                md = checkfield(md,'fieldname','smb.precipitation','timeseries',1,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 12]);
+                                md = checkfield(md,'fieldname','smb.monthlytemperatures','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 12]);
+                                md = checkfield(md,'fieldname','smb.precipitation','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 12]);
 
                         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);
 
@@ -104 +107 @@
                         fielddisplay(self,'isfirnwarming','is firnwarming (Reeh 1991) activated (0 or 1, default is 1)');
                         fielddisplay(self, 'steps_per_step', 'number of smb steps per time step');
+                        fielddisplay(self,'averaging','averaging methods from short to long steps');
+                        disp(sprintf('%51s  0: Arithmetic (default)',' '));
+                        disp(sprintf('%51s  1: Geometric',' '));
+                        disp(sprintf('%51s  2: Harmonic',' '));
                         fielddisplay(self,'requested_outputs','additional outputs requested (TemperaturePDD, SmbAccumulation, SmbMelt)');
                 end % }}}
@@ -124 +131 @@
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','smb_corr','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')
 
                         %process requested outputs