Changeset 13984 for issm/trunk-jpl/src/m/geometry/FlagElements.py

Timestamp:

11/19/12 14:11:00 (12 years ago)

Author:

jschierm

Message:

CHG: Change properties in python md.mesh and md.mask to int or bool.

File:

• issm/trunk-jpl/src/m/geometry/FlagElements.py (modified) (2 diffs)

issm/trunk-jpl/src/m/geometry/FlagElements.py ¶

@@ -24 +24 @@
         if   isinstance(region,(str,unicode)):
                 if   not region:
-                        flag=numpy.zeros(md.mesh.numberofelements,'bool')
+                        flag=numpy.zeros(md.mesh.numberofelements,bool)
                         invert=0
                 elif strcmpi(region,'all'):
-                        flag=numpy.ones(md.mesh.numberofelements,'bool')
+                        flag=numpy.ones(md.mesh.numberofelements,bool)
                         invert=0
                 else:
@@ -44 +44 @@
                                 xlim,ylim=basinzoom('basin',region)
                                 flag_nodes=numpy.logical_and(numpy.logical_and(md.mesh.x<xlim[1],md.mesh.x>xlim[0]),numpy.logical_and(md.mesh.y<ylim[1],md.mesh.y>ylim[0])).astype(float)
-                                flag=numpy.prod(flag_nodes[md.mesh.elements],axis=1)
+                                flag=numpy.prod(flag_nodes[md.mesh.elements],axis=1).astype(bool)
                         else:
                                 #ok, flag elements
-                                [flag,dum]=ContourToMesh(md.mesh.elements[:,0:3].copy(),md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),region,'element',1)
+                                [flag,dum]=ContourToMesh(md.mesh.elements[:,0:3].astype(float),md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),region,'element',1)
+                                flag=flag.astype(bool)
 
                 if invert: