Changeset 27414

Timestamp:

11/22/22 19:51:30 (2 years ago)

Author:

jdquinn

Message:

BUG: Fix for missing default requested output; more translations pending

Location:

issm/trunk-jpl

Files:

• src/m/classes/SMBforcing.py (modified) (3 diffs)
• src/m/classes/SMBgradientscomponents.py (modified) (1 diff)
• src/m/classes/SMBpddSicopolis.py (modified) (1 diff)
• test/NightlyRun/test228.py (modified) (1 diff)

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

@@ -22 +22 @@
         nargs = len(args)
         if nargs == 0:
-            pass
+            self.setdefaultparameters()
         else:
             raise Exception('constructor not supported')
@@ -68 +68 @@
     # }}}
 
-    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')
@@ -83 +83 @@
         WriteData(fid, prefix, 'data', outputs, 'name', 'md.smb.requested_outputs', 'format', 'StringArray')
     # }}}
+
+    def setdefaultparameters(self):  #{{{
+        self.requested_outputs = ['SmbMassBalance']
+        return self
+    # }}}

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

@@ -49 +49 @@
 
     def defaultoutputs(self, md):  # {{{
-        list = ['SmbMassBalance', 'SmbRunoff']
+        list = ['SmbMassBalance']
         if self.steps_per_step > 1:
-            list.extend(['SmbMassBalanceSubstep', 'SmbRunoffSubstep'])
+            list.extend(['SmbMassBalanceSubstep'])
         return list
     #}}}

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

@@ -102 +102 @@
         self.desfac = -np.log(2.0) / 1000
         self.rlaps = 7.4
+        self.requested_outputs = ['default']
         return self
     # }}}

issm/trunk-jpl/test/NightlyRun/test228.py

@@ -18 +18 @@
 md.timestepping.time_step = 1.
 md.settings.output_frequency = 1
-md.timestepping.final_time = 4.
+md.timestepping.final_time = 4
 
 #Set up transient