Changeset 13465

Timestamp:

09/27/12 10:46:27 (12 years ago)

Author:

mikep

Message:

minor cleanup

Location:

issm/trunk-jpl

Files:

• src/m/boundaryconditions/SetIceShelfBC.py (modified) (1 diff)
• test/Par/SquareShelf.py (modified) (1 diff)

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)
+                #nodeonicefront= numpy.logical_and( md.mesh.vertexonboundary, nodeinsideicefront.astype(float)) )
                 nodeinsideicefront=ContourToMesh(md.mesh.elements,md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),icefrontfile,'node',2)
                 nodeonicefront= numpy.bitwise_and( map(int,md.mesh.vertexonboundary), map(int,nodeinsideicefront[0].ravel()) )

issm/trunk-jpl/test/Par/SquareShelf.py

@@ -81 +81 @@
 #Boundary conditions:
 # #md=SetIceShelfBC(md)
-print '...calling seticeshelfbc:'
 md=SetIceShelfBC(md,'../Exp/SquareFront.exp')
-print '...called seticeshelfbc:'
 
 #Change name so that no test have the same name