Index: /issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py =================================================================== --- /issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py (revision 13990) +++ /issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py (revision 13991) @@ -25,5 +25,5 @@ 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: Index: /issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.py =================================================================== --- /issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.py (revision 13990) +++ /issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.py (revision 13991) @@ -27,5 +27,5 @@ 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: Index: /issm/trunk-jpl/src/m/classes/dependent.py =================================================================== --- /issm/trunk-jpl/src/m/classes/dependent.py (revision 13990) +++ /issm/trunk-jpl/src/m/classes/dependent.py (revision 13991) @@ -45,5 +45,5 @@ #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) # }}} Index: /issm/trunk-jpl/src/m/classes/model/model.py =================================================================== --- /issm/trunk-jpl/src/m/classes/model/model.py (revision 13990) +++ /issm/trunk-jpl/src/m/classes/model/model.py (revision 13991) @@ -361,7 +361,7 @@ #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,7 +370,7 @@ 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,7 +379,7 @@ 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) Index: /issm/trunk-jpl/src/m/geometry/FlagElements.py =================================================================== --- /issm/trunk-jpl/src/m/geometry/FlagElements.py (revision 13990) +++ /issm/trunk-jpl/src/m/geometry/FlagElements.py (revision 13991) @@ -43,9 +43,9 @@ 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.xxlim[0]),numpy.logical_and(md.mesh.yylim[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.xxlim[0]),numpy.logical_and(md.mesh.yylim[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) Index: /issm/trunk-jpl/src/m/mesh/bamg.py =================================================================== --- /issm/trunk-jpl/src/m/mesh/bamg.py (revision 13990) +++ /issm/trunk-jpl/src/m/mesh/bamg.py (revision 13991) @@ -276,5 +276,5 @@ 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): Index: /issm/trunk-jpl/src/m/mesh/meshconvert.py =================================================================== --- /issm/trunk-jpl/src/m/mesh/meshconvert.py (revision 13990) +++ /issm/trunk-jpl/src/m/mesh/meshconvert.py (revision 13991) @@ -27,5 +27,5 @@ #call Bamg - bamgmesh_out,bamggeom_out=BamgConvertMesh(index.astype(float),x,y) + bamgmesh_out,bamggeom_out=BamgConvertMesh(index,x,y) # plug results onto model Index: /issm/trunk-jpl/src/m/mesh/rifts/meshprocessoutsiderifts.py =================================================================== --- /issm/trunk-jpl/src/m/mesh/rifts/meshprocessoutsiderifts.py (revision 13990) +++ /issm/trunk-jpl/src/m/mesh/rifts/meshprocessoutsiderifts.py (revision 13991) @@ -16,5 +16,5 @@ #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 Index: /issm/trunk-jpl/src/m/mesh/rifts/meshprocessrifts.py =================================================================== --- /issm/trunk-jpl/src/m/mesh/rifts/meshprocessrifts.py (revision 13990) +++ /issm/trunk-jpl/src/m/mesh/rifts/meshprocessrifts.py (revision 13991) @@ -22,5 +22,5 @@ #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,5 +49,5 @@ #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: Index: /issm/trunk-jpl/src/m/mesh/triangle.py =================================================================== --- /issm/trunk-jpl/src/m/mesh/triangle.py (revision 13990) +++ /issm/trunk-jpl/src/m/mesh/triangle.py (revision 13991) @@ -60,7 +60,7 @@ #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) Index: /issm/trunk-jpl/src/m/parameterization/contourenvelope.py =================================================================== --- /issm/trunk-jpl/src/m/parameterization/contourenvelope.py (revision 13990) +++ /issm/trunk-jpl/src/m/parameterization/contourenvelope.py (revision 13991) @@ -40,8 +40,8 @@ #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,5 +65,5 @@ 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,5 +90,5 @@ 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