Changeset 25688 for issm/trunk-jpl/src/m/classes/surfaceload.py

Timestamp:

10/19/20 13:31:26 (4 years ago)

Author:

jdquinn

Message:

CHG: MATLAB -> Python translations in support of tests 2005 and 2006 (still have errors to work out here); clean up; various minor improvements

Location:

issm/trunk-jpl/src

Files:

• . (modified) (1 prop)
• m/classes/surfaceload.py (modified) (2 diffs)

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

@@ -31 +31 @@
         s += '{}\n'.format(fielddisplay(self, 'waterheightchange', 'water height change: water height equivalent [mWater/yr]'))
         s += '{}\n'.format(fielddisplay(self, 'other', 'other loads (sediments) [kg/m^2/yr]'))
-
         return s
     #}}}
 
     def setdefaultparameters(self): # {{{
-        return
+        return self
     #}}}
 
     def checkconsistency(self, md, solution, analyses): # {{{
-        if ('SealevelriseAnalysis' not in analyses) or (solution == 'TransientSolution' and md.transient.isslr == 0):
+        if ('SealevelriseAnalysis' not in analyses) or (solution == 'TransientSolution' and not md.transient.isslr):
             return md
-
         if len(self.icethicknesschange):
             md  = checkfield(md,'fieldname', 'solidearth.surfaceload.icethicknesschange', 'timeseries', 1, 'NaN', 1, 'Inf', 1)
-
         if len(self.waterheightchange):
             md  = checkfield(md,'fieldname', 'solidearth.surfaceload.waterheightchange', 'timeseries', 1, 'NaN', 1, 'Inf', 1)
-
         if len(self.other):
             md  = checkfield(md,'fieldname', 'solidearth.surfaceload.other', 'timeseries', 1, 'NaN', 1, 'Inf', 1)
-
         return md
     #}}}
@@ -58 +53 @@
         if len(self.icethicknesschange) == 0:
             self.icethicknesschange = np.zeros((md.mesh.numberofelements + 1, ))
-
         if len(self.waterheightchange) == 0:
             self.waterheightchange = np.zeros((md.mesh.numberofelements + 1, ))
-
         if len(self.other) == 0:
             self.other = np.zeros((md.mesh.numberofelements + 1, ))
-
         WriteData(fid, prefix, 'object', self, 'fieldname', 'icethicknesschange', 'name', 'md.solidearth.surfaceload.icethicknesschange', 'format', 'DoubleMat', 'mattype', 2, 'timeserieslength', md.mesh.numberofelements + 1, 'yts', md.constants.yts)
         WriteData(fid, prefix, 'object', self, 'fieldname', 'waterheightchange', 'name', 'md.solidearth.surfaceload.waterheightchange', 'format', 'DoubleMat', 'mattype', 2, 'timeserieslength', md.mesh.numberofelements + 1, 'yts', md.constants.yts)