Changeset 23670 for issm/trunk-jpl/src/py3/mesh/squaremesh.py

Timestamp:

01/31/19 07:34:11 (6 years ago)

Author:

bdef

Message:

CHG: python scripts after 2to3 and indentation fix

File:

• issm/trunk-jpl/src/py3/mesh/squaremesh.py (modified) (5 diffs)

issm/trunk-jpl/src/py3/mesh/squaremesh.py

@@ -1 @@
-import numpy
+import numpy as np
 from NodeConnectivity import NodeConnectivity
 from ElementConnectivity import ElementConnectivity 
@@ -22 +22 @@
 
         #initialization
-        index=numpy.zeros((nel,3),int)
-        x=numpy.zeros((nx*ny))
-        y=numpy.zeros((nx*ny))
+        index=np.zeros((nel,3),int)
+        x=np.zeros((nx*ny))
+        y=np.zeros((nx*ny))
 
         #create coordinates
@@ -43 +43 @@
 
         #Scale  x and y
-        x=x/numpy.max(x)*Lx
-        y=y/numpy.max(y)*Ly
+        x=x/np.max(x)*Lx
+        y=y/np.max(y)*Ly
 
         #create segments
-        segments=numpy.zeros((2*(nx-1)+2*(ny-1),3),int)
+        segments=np.zeros((2*(nx-1)+2*(ny-1),3),int)
         #left edge:
-        segments[0:ny-1,:]=numpy.hstack((numpy.arange(2,ny+1).reshape(-1,1),numpy.arange(1,ny).reshape(-1,1),(2*numpy.arange(1,ny)-1).reshape(-1,1)))
+        segments[0:ny-1,:]=np.vstack((np.arange(2,ny+1),np.arange(1,ny),(2*np.arange(1,ny)-1))).T
         #right edge:
-        segments[ny-1:2*(ny-1),:]=numpy.hstack((numpy.arange(ny*(nx-1)+1,nx*ny).reshape(-1,1),numpy.arange(ny*(nx-1)+2,nx*ny+1).reshape(-1,1),2*numpy.arange((ny-1)*(nx-2)+1,(nx-1)*(ny-1)+1).reshape(-1,1)))
+        segments[ny-1:2*(ny-1),:]=np.vstack((np.arange(ny*(nx-1)+1,nx*ny),np.arange(ny*(nx-1)+2,nx*ny+1),2*np.arange((ny-1)*(nx-2)+1,(nx-1)*(ny-1)+1))).T
         #front edge:
-        segments[2*(ny-1):2*(ny-1)+(nx-1),:]=numpy.hstack((numpy.arange(2*ny,ny*nx+1,ny).reshape(-1,1),numpy.arange(ny,ny*(nx-1)+1,ny).reshape(-1,1),numpy.arange(2*(ny-1),2*(nx-1)*(ny-1)+1,2*(ny-1)).reshape(-1,1)))
+        segments[2*(ny-1):2*(ny-1)+(nx-1),:]=np.vstack((np.arange(2*ny,ny*nx+1,ny),np.arange(ny,ny*(nx-1)+1,ny),np.arange(2*(ny-1),2*(nx-1)*(ny-1)+1,2*(ny-1)))).T
         #back edge
-        segments[2*(ny-1)+(nx-1):2*(nx-1)+2*(ny-1),:]=numpy.hstack((numpy.arange(1,(nx-2)*ny+2,ny).reshape(-1,1),numpy.arange(ny+1,ny*(nx-1)+2,ny).reshape(-1,1),numpy.arange(1,2*(nx-2)*(ny-1)+2,2*(ny-1)).reshape(-1,1)))
+        segments[2*(ny-1)+(nx-1):2*(nx-1)+2*(ny-1),:]=np.vstack((np.arange(1,(nx-2)*ny+2,ny),np.arange(ny+1,ny*(nx-1)+2,ny),np.arange(1,2*(nx-2)*(ny-1)+2,2*(ny-1)))).T
 
         #plug coordinates and nodes
@@ -62 +62 @@
         md.mesh.y=y
         md.mesh.numberofvertices=nods
-        md.mesh.vertexonboundary=numpy.zeros((nods),bool)
+        md.mesh.vertexonboundary=np.zeros((nods),bool)
         md.mesh.vertexonboundary[segments[:,0:2]-1]=True
 
@@ -71 +71 @@
 
         #Now, build the connectivity tables for this mesh.
-        [md.mesh.vertexconnectivity]=NodeConnectivity(md.mesh.elements,md.mesh.numberofvertices)
-        [md.mesh.elementconnectivity]=ElementConnectivity(md.mesh.elements,md.mesh.vertexconnectivity)
+        md.mesh.vertexconnectivity=NodeConnectivity(md.mesh.elements,md.mesh.numberofvertices)[0]
+        md.mesh.elementconnectivity=ElementConnectivity(md.mesh.elements,md.mesh.vertexconnectivity)[0]
 
         return md