Changeset 13984 for issm/trunk-jpl/src/m/mesh/bamg.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/mesh/bamg.py (modified) (3 diffs)

issm/trunk-jpl/src/m/mesh/bamg.py

@@ -276 +276 @@
                 else:
                         bamg_mesh.Vertices=numpy.hstack((md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),numpy.ones((md.mesh.numberofvertices,1))))
-                        bamg_mesh.Triangles=numpy.hstack((md.mesh.elements,numpy.ones((md.mesh.numberofelements,1))))
+                        bamg_mesh.Triangles=numpy.hstack((md.mesh.elements.astype(float),numpy.ones((md.mesh.numberofelements,1))))
 
                 if isinstance(md.rifts.riftstruct,dict):
@@ -320 +320 @@
         md.mesh.x=bamgmesh_out['Vertices'][:,0].copy()
         md.mesh.y=bamgmesh_out['Vertices'][:,1].copy()
-        md.mesh.elements=bamgmesh_out['Triangles'][:,0:3].copy()
-        md.mesh.edges=bamgmesh_out['IssmEdges'].copy()
-        md.mesh.segments=bamgmesh_out['IssmSegments'][:,0:3].copy()
-        md.mesh.segmentmarkers=bamgmesh_out['IssmSegments'][:,3].copy()
+        md.mesh.elements=bamgmesh_out['Triangles'][:,0:3].astype(int)
+        md.mesh.edges=bamgmesh_out['IssmEdges'].astype(int)
+        md.mesh.segments=bamgmesh_out['IssmSegments'][:,0:3].astype(int)
+        md.mesh.segmentmarkers=bamgmesh_out['IssmSegments'][:,3].astype(int)
 
         #Fill in rest of fields:
@@ -331 +331 @@
         md.mesh.numberofedges=numpy.size(md.mesh.edges,axis=0)
         md.mesh.z=numpy.zeros(md.mesh.numberofvertices)
-        md.mesh.vertexonbed=numpy.ones(md.mesh.numberofvertices)
-        md.mask.vertexonwater=numpy.zeros(md.mesh.numberofvertices)
-        md.mesh.vertexonsurface=numpy.ones(md.mesh.numberofvertices)
-        md.mesh.elementonbed=numpy.ones(md.mesh.numberofelements)
-        md.mesh.elementonsurface=numpy.ones(md.mesh.numberofelements)
-        md.mesh.vertexonboundary=numpy.zeros(md.mesh.numberofvertices)
-        md.mesh.vertexonboundary[md.mesh.segments[:,0:2].astype(int)-1]=1
+        md.mesh.vertexonbed=numpy.ones(md.mesh.numberofvertices,bool)
+        md.mask.vertexonwater=numpy.zeros(md.mesh.numberofvertices,bool)
+        md.mesh.vertexonsurface=numpy.ones(md.mesh.numberofvertices,bool)
+        md.mesh.elementonbed=numpy.ones(md.mesh.numberofelements,bool)
+        md.mesh.elementonsurface=numpy.ones(md.mesh.numberofelements,bool)
+        md.mesh.vertexonboundary=numpy.zeros(md.mesh.numberofvertices,bool)
+        md.mesh.vertexonboundary[md.mesh.segments[:,0:2]-1]=True
         md.mesh.elementconnectivity=md.private.bamg['mesh'].ElementConnectivity
         md.mesh.elementconnectivity[numpy.nonzero(numpy.isnan(md.mesh.elementconnectivity))]=0
+        md.mesh.elementconnectivity=md.mesh.elementconnectivity.astype(int)
 
         #Check for orphan