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

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/SMBd18opdd.py (modified) (4 diffs)

issm/trunk-jpl/src/m/classes/SMBd18opdd.py

@@ -37 +37 @@
         self.pddfac_ice = float('NaN')
         self.steps_per_step = 1
+        self.averaging = 0
 
     #set defaults
@@ -72 +73 @@
             string = "%s\n%s" % (string, fielddisplay(self, 'pddfac_ice', 'Pdd factor for ice, at each vertex [mm ice equiv/day/degree C]'))
         string = "%s\n%s" % (string, fielddisplay(self, 'steps_per_step', 'number of smb steps per time step'))
+        string = "%s\n%s" % (string, fielddisplay(self, 'averaging', 'averaging methods from short to long steps'))
+        string = "%s\n\t\t%s" % (string, '0: Arithmetic (default)')
+        string = "%s\n\t\t%s" % (string, '1: Geometric')
+        string = "%s\n\t\t%s" % (string, '2: Harmonic')
+
         string = "%s\n%s" % (string, fielddisplay(self, 'requested_outputs', 'additional outputs requested'))
 
@@ -135 +141 @@
             md = checkfield(md, 'fieldname', 'smb.rlapslgm', '>=', 0, 'numel', [1])
             md = checkfield(md, 'fieldname', 'smb.steps_per_step', '>=', 1, 'numel', [1])
+            md = checkfield(md, 'fieldname', 'smb.averaging', 'numel', [1], 'values', [0, 1, 2])
 
             if self.isd18opd:
@@ -181 +188 @@
         WriteData(fid, prefix, 'object', self, 'class', 'smb', 'fieldname', 'sealev', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', 2, 'yts', md.constants.yts)
         WriteData(fid, prefix, 'object', self, 'fieldname', 'steps_per_step', 'format', 'Integer')
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'averaging', 'format', 'Integer')
 
         if self.isd18opd: