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

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.py (modified) (5 diffs)

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

@@ -19 +19 @@
         self.requested_outputs = []
         self.averaging = 0
-        self.isclimatology = np.nan
 
         nargs = len(args)
         if nargs == 0:
-            pass
+            self.setdefaultparameters()
+        elif nargs == 1:
+            # TODO: Replace the following with constructor
+            self.setdefaultparameters()
         else:
             raise Exception('constructor not supported')
-    #}}}
+    # }}}
 
     def __repr__(self):  # {{{
@@ -32 +34 @@
         s += '{}\n'.format(fielddisplay(self, 'mass_balance', 'surface mass balance [m/yr ice eq]'))
         s += '{}\n'.format(fielddisplay(self, 'steps_per_step', 'number of smb steps per time step'))
-        s += '{}\n'.format(fielddisplay(self, 'requested_outputs', 'additional outputs requested'))
         s += '{}\n'.format(fielddisplay(self, 'averaging', 'averaging methods from short to long steps'))
         s += '\t\t{}\n'.format('0: Arithmetic (default)')
         s += '\t\t{}\n'.format('1: Geometric')
         s += '\t\t{}\n'.format('2: Harmonic')
+        s += '{}\n'.format(fielddisplay(self, 'requested_outputs', 'additional outputs requested'))
         return s
-    #}}}
+    # }}}
 
     def extrude(self, md):  # {{{
         self.mass_balance = project3d(md, 'vector', self.mass_balance, 'type', 'node')
         return self
-    #}}}
+    # }}}
 
     def defaultoutputs(self, md):  # {{{
-        return []
-    #}}}
+        return ['SmbMassBalance']
+    # }}}
 
     def initialize(self, md):  # {{{
@@ -54 +56 @@
             print("      no smb.mass_balance specified: values set as zero")
         return self
-    #}}}
+    # }}}
 
     def checkconsistency(self, md, solution, analyses):  # {{{
@@ -69 +71 @@
     # }}}
 
-    def marshall(self, prefix, md, fid):    # {{{
+    def marshall(self, prefix, md, fid):  # {{{
         yts = md.constants.yts
         WriteData(fid, prefix, 'name', 'md.smb.model', 'data', 1, 'format', 'Integer')
@@ -84 +86 @@
         WriteData(fid, prefix, 'data', outputs, 'name', 'md.smb.requested_outputs', 'format', 'StringArray')
     # }}}
+
+    def setdefaultparameters(self):  #{{{
+        self.requested_outputs = ['SmbMassBalance']
+        return self
+    # }}}