Changeset 26904

Timestamp:

02/25/22 00:17:47 (3 years ago)

Author:

bdef

Message:

BUG: fix to initialization and syntax

Location:

issm/trunk-jpl/src/m/classes

Files:

• SMBpddSicopolis.py (modified) (1 diff)
• m1qn3inversion.py (modified) (1 diff)
• massfluxatgate.py (modified) (2 diffs)
• regionaloutput.py (modified) (3 diffs)

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

@@ -129 +129 @@
         WriteData(fid, prefix, 'object', self, 'class', 'smb', 'fieldname', 's0t', 'format', 'DoubleMat', 'mattype', 1)
         WriteData(fid, prefix, 'object', self, 'class', 'smb', 'fieldname', 'rlaps', 'format', 'Double')
-        WriteData(fid, prefix, 'object', self, 'class', 'smb', 'fieldname', 'monthlytemperatures', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', md.constants.yts)
+        WriteData(fid, prefix, 'object', self, 'class', 'smb', 'fieldname', 'monthlytemperatures', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', yts)
         WriteData(fid, prefix, 'object', self, 'class', 'smb', 'fieldname', 'precipitation', 'format', 'DoubleMat', 'mattype', 1, 'scale', 1. / yts, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', yts)
         WriteData(fid, prefix, 'object', self, 'class', 'smb', 'fieldname', 'temperature_anomaly', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', yts)

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

@@ -1 +1 @@
 import numpy as np
-
 from checkfield import checkfield
 from fielddisplay import fielddisplay

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

@@ +1 @@
+import numpy as np
 from fielddisplay import fielddisplay
 from pairoptions import pairoptions
@@ -20 +21 @@
         self.definitionstring = ''
         self.profilename = ''
-        self.segments = float('NaN')
+        self.segments = np.nan
 
     #set defaults

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

@@ -25 +25 @@
 
         self.name = ''
+        self.model= ''
         self.definitionstring = ''
         self.outputnamestring = ''
-        self.mask = float('NaN')
+        self.mask = np.nan
         self.maskexpstring = ''
 
@@ -46 +47 @@
                 self.setmaskfromexp(modelname)
 
-        if (len(self.mask) <= 1 & np.any(np.isnan(self.mask))):
-            error('regionaloutput error message: ''mask'' field or ''maskexpstring'' and ''model'' fields should be defined!')
+        # if (len(self.mask) <= 1 & np.any(np.isnan(self.mask))):
+        #     raise IOError('regionaloutput error message: ''mask'' field or ''maskexpstring'' and ''model'' fields should be defined!')
 
     #}}}
@@ -76 +77 @@
         return self
     # }}}
+
     def checkconsistency(self, md, solution, analyses):  # {{{