Changeset 13991

Timestamp:

11/20/12 12:10:23 (12 years ago)

Author:

jschierm

Message:

CHG: Eliminate conversion of python int and bool before module input.

Location:

issm/trunk-jpl/src/m

Files:

• boundaryconditions/SetIceShelfBC.py (modified) (1 diff)
• boundaryconditions/SetMarineIceSheetBC.py (modified) (1 diff)
• classes/dependent.py (modified) (1 diff)
• classes/model/model.py (modified) (3 diffs)
• geometry/FlagElements.py (modified) (1 diff)
• mesh/bamg.py (modified) (1 diff)
• mesh/meshconvert.py (modified) (1 diff)
• mesh/rifts/meshprocessoutsiderifts.py (modified) (1 diff)
• mesh/rifts/meshprocessrifts.py (modified) (2 diffs)
• mesh/triangle.py (modified) (1 diff)
• parameterization/contourenvelope.py (modified) (3 diffs)

issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py

@@ -25 +25 @@
                 if not os.path.exists(icefrontfile):
                         raise IOError("SetIceShelfBC error message: ice front file '%s' not found." % icefrontfile)
-                [nodeinsideicefront,dum]=ContourToMesh(md.mesh.elements.astype(float),md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),icefrontfile,'node',2)
+                [nodeinsideicefront,dum]=ContourToMesh(md.mesh.elements,md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),icefrontfile,'node',2)
                 nodeonicefront=numpy.logical_and(md.mesh.vertexonboundary,nodeinsideicefront.reshape(-1))
         else:

issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.py

@@ -27 +27 @@
                 if not os.path.exists(icefrontfile):
                         raise IOError("SetMarineIceSheetBC error message: ice front file '%s' not found." % icefrontfile)
-                [nodeinsideicefront,dum]=ContourToMesh(md.mesh.elements.astype(float),md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),icefrontfile,'node',2)
+                [nodeinsideicefront,dum]=ContourToMesh(md.mesh.elements,md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),icefrontfile,'node',2)
                 vertexonicefront=numpy.logical_and(md.mesh.vertexonboundary,nodeinsideicefront.reshape(-1))
         else:

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

@@ -45 +45 @@
                         #process the file and retrieve segments
                         mesh=options.getfieldvalue('mesh')
-                        self.segments=MeshProfileIntersection(mesh.elements.astype(float),mesh.x,mesh.y,self.exp)
+                        self.segments=MeshProfileIntersection(mesh.elements,mesh.x,mesh.y,self.exp)
         # }}}
 

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

@@ -361 +361 @@
                 #recreate segments
                 if md1.mesh.dimension==2:
-                        [md2.mesh.vertexconnectivity]=NodeConnectivity(md2.mesh.elements.astype(float),md2.mesh.numberofvertices)
+                        [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.astype(float),md2.mesh.vertexconnectivity.astype(float))
+                        [md2.mesh.elementconnectivity]=ElementConnectivity(md2.mesh.elements,md2.mesh.vertexconnectivity)
                         md2.mesh.elementconnectivity=md2.mesh.elementconnectivity.astype(int)
                         md2.mesh.segments=contourenvelope(md2)
@@ -370 +370 @@
                 else:
                         #First do the connectivity for the contourenvelope in 2d
-                        [md2.mesh.vertexconnectivity]=NodeConnectivity(md2.mesh.elements2d.astype(float),md2.mesh.numberofvertices2d)
+                        [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.astype(float),md2.mesh.vertexconnectivity.astype(float))
+                        [md2.mesh.elementconnectivity]=ElementConnectivity(md2.mesh.elements2d,md2.mesh.vertexconnectivity)
                         md2.mesh.elementconnectivity=md2.mesh.elementconnectivity.astype(int)
                         md2.mesh.segments=contourenvelope(md2)
@@ -379 +379 @@
                         md2.mesh.vertexonboundary=numpy.tile(md2.mesh.vertexonboundary,md2.mesh.numberoflayers)
                         #Then do it for 3d as usual
-                        [md2.mesh.vertexconnectivity]=NodeConnectivity(md2.mesh.elements.astype(float),md2.mesh.numberofvertices)
+                        [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.astype(float),md2.mesh.vertexconnectivity.astype(float))
+                        [md2.mesh.elementconnectivity]=ElementConnectivity(md2.mesh.elements,md2.mesh.vertexconnectivity)
                         md2.mesh.elementconnectivity=md2.mesh.elementconnectivity.astype(int)
 

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

@@ -43 +43 @@
                                 raise RuntimeError("FlagElements.py calling basinzoom.py is not complete.")
                                 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).astype(bool)
+                                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]))
+                                flag=numpy.prod(flag_nodes[md.mesh.elements].astype(float),axis=1).astype(bool)
                         else:
                                 #ok, flag elements
-                                [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,dum]=ContourToMesh(md.mesh.elements[:,0:3],md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),region,'element',1)
                                 flag=flag.astype(bool)
 

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.astype(float),numpy.ones((md.mesh.numberofelements,1))))
+                        bamg_mesh.Triangles=numpy.hstack((md.mesh.elements,numpy.ones((md.mesh.numberofelements,1))))
 
                 if isinstance(md.rifts.riftstruct,dict):

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

@@ -27 +27 @@
 
         #call Bamg
-        bamgmesh_out,bamggeom_out=BamgConvertMesh(index.astype(float),x,y)
+        bamgmesh_out,bamggeom_out=BamgConvertMesh(index,x,y)
 
         # plug results onto model

issm/trunk-jpl/src/m/mesh/rifts/meshprocessoutsiderifts.py

@@ -16 +16 @@
         
                 #first, flag nodes that belong to the domain outline
-                flags=ContourToMesh(md.mesh.elements.astype(float),md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),domainoutline,'node',0)
+                flags=ContourToMesh(md.mesh.elements,md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),domainoutline,'node',0)
 
                 tips=rift.tips

issm/trunk-jpl/src/m/mesh/rifts/meshprocessrifts.py

@@ -22 +22 @@
 
         #Call MEX file
-        [md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers,md.rifts.riftstruct]=TriMeshProcessRifts(md.mesh.elements.astype(float),md.mesh.x,md.mesh.y,md.mesh.segments.astype(float),md.mesh.segmentmarkers.astype(float))
+        [md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers,md.rifts.riftstruct]=TriMeshProcessRifts(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers)
         md.mesh.elements=md.mesh.elements.astype(int)
         md.mesh.x=md.mesh.x.reshape(-1)
@@ -49 +49 @@
 
         #In case we have rifts that open up the domain outline, we need to open them: 
-        [flags,dum]=ContourToMesh(md.mesh.elements.astype(float),md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),domainoutline,'node',0)
+        [flags,dum]=ContourToMesh(md.mesh.elements,md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),domainoutline,'node',0)
         found=0
         for rift in md.rifts.riftstruct:

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.astype(float), md.mesh.numberofvertices)
+        [md.mesh.vertexconnectivity]= NodeConnectivity(md.mesh.elements, md.mesh.numberofvertices)
         md.mesh.vertexconnectivity=md.mesh.vertexconnectivity.astype(int)
-        [md.mesh.elementconnectivity] = ElementConnectivity(md.mesh.elements.astype(float), md.mesh.vertexconnectivity.astype(float))
+        [md.mesh.elementconnectivity] = ElementConnectivity(md.mesh.elements, md.mesh.vertexconnectivity)
         md.mesh.elementconnectivity=md.mesh.elementconnectivity.astype(int)
 

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

@@ -40 +40 @@
         #Computing connectivity
         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.astype(float),md.mesh.numberofvertices)
+                [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.astype(float),md.mesh.vertexconnectivity.astype(float))
+                [md.mesh.elementconnectivity]=ElementConnectivity(md.mesh.elements,md.mesh.vertexconnectivity)
                 md.mesh.elementconnectivity=md.mesh.elementconnectivity.astype(int)
 
@@ -65 +65 @@
                 if isfile:
                         #get flag list of elements and nodes inside the contour
-                        nodein=ContourToMesh(mesh.elements.astype(float),mesh.x,mesh.y,file,'node',1)
+                        nodein=ContourToMesh(mesh.elements,mesh.x,mesh.y,file,'node',1)
                         elemin=(numpy.sum(nodein(mesh.elements),axis=1)==numpy.size(mesh.elements,axis=1))
                         #modify element connectivity
@@ -90 +90 @@
         if len(args)==1:
                 flag[numpy.nonzero(flag)]=elemin[flag[numpy.nonzero(flag)]]
-        elementonboundary=numpy.logical_and(numpy.prod(flag,axis=1)==0,numpy.sum(flag,axis=1)>0).astype(float)
+        elementonboundary=numpy.logical_and(numpy.prod(flag,axis=1)==0,numpy.sum(flag,axis=1)>0)
 
         #Find segments on boundary