Changeset 13994

Timestamp:

11/20/12 15:58:31 (13 years ago)

Author:

jschierm

Message:

CHG: Make python variables labelled as boolean into bool.

Location:

issm/trunk-jpl/src/m

Files:

• classes/flowequation.py (modified) (1 diff)
• parameterization/setflowequation.py (modified) (1 diff)

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

@@ -19 +19 @@
                 # {{{ Properties
                 
-                self.ismacayealpattyn     = 0;
-                self.ishutter             = 0;
-                self.isl1l2             = 0;
-                self.isstokes             = 0;
+                self.ismacayealpattyn     = 0
+                self.ishutter             = 0
+                self.isl1l2               = 0
+                self.isstokes             = 0
                 self.vertex_equation      = float('NaN')
                 self.element_equation     = float('NaN')

issm/trunk-jpl/src/m/parameterization/setflowequation.py

@@ -273 +273 @@
 
         #figure out solution types
-        md.flowequation.ishutter=float(any(md.flowequation.element_equation==1))
-        md.flowequation.ismacayealpattyn=float(numpy.any(numpy.logical_or(md.flowequation.element_equation==2,md.flowequation.element_equation==3)))
-        md.flowequation.isl1l2=float(any(md.flowequation.element_equation==8))
-        md.flowequation.isstokes=float(any(md.flowequation.element_equation==4))
+        md.flowequation.ishutter=any(md.flowequation.element_equation==1)
+        md.flowequation.ismacayealpattyn=bool(numpy.any(numpy.logical_or(md.flowequation.element_equation==2,md.flowequation.element_equation==3)))
+        md.flowequation.isl1l2=any(md.flowequation.element_equation==8)
+        md.flowequation.isstokes=any(md.flowequation.element_equation==4)
 
         return md