Changeset 14018

Timestamp:

11/27/12 14:44:33 (12 years ago)

Author:

jschierm

Message:

CHG: Eliminate conversions to int after calls to NodeConnectivity and ElementConnectivity for python.

Location:

issm/trunk-jpl/src/m

Files:

• classes/model/model.py (modified) (3 diffs)
• mesh/triangle.py (modified) (1 diff)
• parameterization/contourenvelope.py (modified) (1 diff)

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

@@ -363 +363 @@
                 if md1.mesh.dimension==2:
                         [md2.mesh.vertexconnectivity]=NodeConnectivity(md2.mesh.elements,md2.mesh.numberofvertices)
-                        md2.mesh.vertexconnectivity=md2.mesh.vertexconnectivity.astype(int)
                         [md2.mesh.elementconnectivity]=ElementConnectivity(md2.mesh.elements,md2.mesh.vertexconnectivity)
-                        md2.mesh.elementconnectivity=md2.mesh.elementconnectivity.astype(int)
                         md2.mesh.segments=contourenvelope(md2)
                         md2.mesh.vertexonboundary=numpy.zeros(numberofvertices2,bool)
@@ -372 +370 @@
                         #First do the connectivity for the contourenvelope in 2d
                         [md2.mesh.vertexconnectivity]=NodeConnectivity(md2.mesh.elements2d,md2.mesh.numberofvertices2d)
-                        md2.mesh.vertexconnectivity=md2.mesh.vertexconnectivity.astype(int)
                         [md2.mesh.elementconnectivity]=ElementConnectivity(md2.mesh.elements2d,md2.mesh.vertexconnectivity)
-                        md2.mesh.elementconnectivity=md2.mesh.elementconnectivity.astype(int)
                         md2.mesh.segments=contourenvelope(md2)
                         md2.mesh.vertexonboundary=numpy.zeros(numberofvertices2/md2.mesh.numberoflayers,bool)
@@ -381 +377 @@
                         #Then do it for 3d as usual
                         [md2.mesh.vertexconnectivity]=NodeConnectivity(md2.mesh.elements,md2.mesh.numberofvertices)
-                        md2.mesh.vertexconnectivity=md2.mesh.vertexconnectivity.astype(int)
                         [md2.mesh.elementconnectivity]=ElementConnectivity(md2.mesh.elements,md2.mesh.vertexconnectivity)
-                        md2.mesh.elementconnectivity=md2.mesh.elementconnectivity.astype(int)
 
                 #Boundary conditions: Dirichlets on new boundary

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

@@ -60 +60 @@
 
         #Now, build the connectivity tables for this mesh.
-        [md.mesh.vertexconnectivity]= NodeConnectivity(md.mesh.elements, md.mesh.numberofvertices)
-        md.mesh.vertexconnectivity=md.mesh.vertexconnectivity.astype(int)
+        [md.mesh.vertexconnectivity] = NodeConnectivity(md.mesh.elements, md.mesh.numberofvertices)
         [md.mesh.elementconnectivity] = ElementConnectivity(md.mesh.elements, md.mesh.vertexconnectivity)
-        md.mesh.elementconnectivity=md.mesh.elementconnectivity.astype(int)
 
         #type of model

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

@@ -41 +41 @@
         if numpy.size(md.mesh.vertexconnectivity,axis=0)!=md.mesh.numberofvertices and numpy.size(md.mesh.vertexconnectivity,axis=0)!=md.mesh.numberofvertices2d:
                 [md.mesh.vertexconnectivity]=NodeConnectivity(md.mesh.elements,md.mesh.numberofvertices)
-                md.mesh.vertexconnectivity=md.mesh.vertexconnectivity.astype(int)
         if numpy.size(md.mesh.elementconnectivity,axis=0)!=md.mesh.numberofelements and numpy.size(md.mesh.elementconnectivity,axis=0)!=md.mesh.numberofelements2d:
                 [md.mesh.elementconnectivity]=ElementConnectivity(md.mesh.elements,md.mesh.vertexconnectivity)
-                md.mesh.elementconnectivity=md.mesh.elementconnectivity.astype(int)
 
         #get nodes inside profile