Changeset 25171 for issm/trunk-jpl/src/m/classes/slr.py

Timestamp:

06/28/20 00:26:36 (5 years ago)

Author:

jdquinn

Message:

BUG: Fix for test2002; additional MATLAB -> Python translation; cleanup

File:

• issm/trunk-jpl/src/m/classes/slr.py (modified) (3 diffs)

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

@@ -122 +122 @@
     def checkconsistency(self, md, solution, analyses):  # {{{
         #Early return
-        if (solution != 'SealevelriseAnalysis') or (solution == 'TransientSolution' and not md.transient.isslr):
+        if (solution != 'SealevelriseAnalysis') or (solution == 'TransientSolution' and md.transient.isslr == 0):
             return md
 
@@ -147 +147 @@
 
         #check that love numbers are provided at the same level of accuracy:
-        if (size(self.love_h, 0) != size(self.love_k, 0) | size(self.love_h, 0) != size(self.love_l, 0)):
-            error('slr error message: love numbers should be provided at the same level of accuracy')
+        if (size(self.love_h, 0) != size(self.love_k, 0)) or (size(self.love_h, 0) != size(self.love_l, 0)):
+            raise Exception('slr error message: love numbers should be provided at the same level of accuracy')
 
         #cross check that whereever we have an ice load, the mask is < 0 on each vertex:
@@ -160 +160 @@
         #a coupler to a planet model is provided.
         if self.geodetic and not md.transient.iscoupler and domaintype(md.mesh) != 'mesh3dsurface':
-            error('model is requesting geodetic computations without being a mesh3dsurface, or being coupled to one!')
+            raise Exception('model is requesting geodetic computations without being a mesh3dsurface, or being coupled to one!')
         return md
     # }}}