Changeset 13984 for issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.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/boundaryconditions/SetIceShelfBC.py (modified) (4 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,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)).astype(float)
+                [nodeinsideicefront,dum]=ContourToMesh(md.mesh.elements.astype(float),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:
-                nodeonicefront=numpy.zeros((md.mesh.numberofvertices))
+                nodeonicefront=numpy.zeros((md.mesh.numberofvertices),bool)
 
 #       pos=find(md.mesh.vertexonboundary & ~nodeonicefront);
@@ -56 +56 @@
         #segment on Neumann (Ice Front)
 #       pos=find(nodeonicefront(md.mesh.segments(:,1)) | nodeonicefront(md.mesh.segments(:,2)));
-        pos=numpy.nonzero(numpy.logical_or(nodeonicefront[md.mesh.segments[:,0].astype(int)-1],nodeonicefront[md.mesh.segments[:,1].astype(int)-1]))[0]
+        pos=numpy.nonzero(numpy.logical_or(nodeonicefront[md.mesh.segments[:,0]-1],nodeonicefront[md.mesh.segments[:,1]-1]))[0]
         if   md.mesh.dimension==2:
                 pressureload=md.mesh.segments[pos,:]
@@ -62 +62 @@
 #               pressureload_layer1=[md.mesh.segments(pos,1:2)  md.mesh.segments(pos,2)+md.mesh.numberofvertices2d  md.mesh.segments(pos,1)+md.mesh.numberofvertices2d  md.mesh.segments(pos,3)];
                 pressureload_layer1=numpy.hstack((md.mesh.segments[pos,0:2],md.mesh.segments[pos,1]+md.mesh.numberofvertices2d,md.mesh.segments[pos,0]+md.mesh.numberofvertices2d,md.mesh.segments[pos,2]))
-                pressureload=numpy.zeros((0,5))
+                pressureload=numpy.zeros((0,5),int)
                 for i in xrange(1,md.mesh.numberoflayers):
 #                       pressureload=[pressureload ;pressureload_layer1(:,1:4)+(i-1)*md.mesh.numberofvertices2d pressureload_layer1(:,5)+(i-1)*md.mesh.numberofelements2d ];
@@ -69 +69 @@
         #Add water or air enum depending on the element
 #       pressureload=[pressureload 1*md.mask.elementonfloatingice(pressureload(:,end))];
-        pressureload=numpy.hstack((pressureload,1.*md.mask.elementonfloatingice[pressureload[:,-1].astype('int')-1].reshape(-1,1)))
+        pressureload=numpy.hstack((pressureload,1*md.mask.elementonfloatingice[pressureload[:,-1]-1].reshape(-1,1)))
 
         #plug onto model