Changeset 1401 for inundation/ga/storm_surge/pmesh/mesh.py

Timestamp:

May 16, 2005, 4:23:25 PM (19 years ago)

Author:

duncan

Message:

cleaning up importing/exporting in pmesh

File:

• inundation/ga/storm_surge/pmesh/mesh.py (modified) (11 diffs)

inundation/ga/storm_surge/pmesh/mesh.py

@@ -545 +545 @@
         for element in dic_mesh.keys():
             dic[element] = dic_mesh[element]
-        
+        for element in dic.keys():
+            dic[element].sort()
+            
         # A dic for the exported/imported m
         dic_other = other.Mesh2triangList()
@@ -551 +553 @@
         for element in dic_mesh.keys():
             dic_other[element] = dic_mesh[element]
+        for element in dic.keys():
+            dic_other[element].sort()
 
         #print "dsg************************8"
@@ -569 +573 @@
         PreCondition: maxArea is a double
         """
-        print "mode ",mode
+        #print "mode ",mode
         if mode == None:
             self.mode = ""
@@ -736 +740 @@
         Precondition: Each vertex has a dupindex, which is the list
         index.
+
+        Note: this removes vertices that have the same x,y values,
+        not duplicate instances in the Vertices list.
         """
         remove = []
@@ -1312 +1319 @@
                                  expand_pinch=expand_pinch)
         boundary_segs = self.shape.get_boundary()
-        print "boundary_segs",boundary_segs
+        #print "boundary_segs",boundary_segs
         segs2delete = self.alphaUserSegments
 
@@ -1622 +1629 @@
             #Most probably, the Tkinter module is not available.
             #"""
-     # FIXME let's not use this function,
-     # use export _mesh_file instead
-    def export_triangulation_file(self,ofile):
-        """
-        export a file, ofile, with the format
-        
-        First line:  <# of vertices> <# of attributes>
-        Following lines:  <vertex #> <x> <y> [attributes]
-        One line:  <vertex attribute titles> 
-        One line:  <# of triangles> 
-        Following lines:  <triangle #> <vertex #>  <vertex #> <vertex #> <neigbouring triangle #> <neigbouring triangle #> <neigbouring triangle #> [attribute of region]
-        One line:  <# of segments> 
-        Following lines:  <segment #> <vertex #>  <vertex #> [boundary tag]
-        """
-        gen_dict = self.Mesh2IODict()
-        if (ofile[-4:] == ".tsh"):
-            fd = open(ofile,'w')
-            load_mesh.loadASCII.write_ASCII_triangulation(fd,gen_dict)
-            self.writeASCIImesh(fd,
-                                self.userVertices,
-                                self.getUserSegments(),
-                                self.holes,
-                                self.regions)    
-            fd.close()
-        elif (ofile[-4:] == ".msh"):
-            #print "mesh gen_dict",gen_dict 
-            load_mesh.loadASCII.write_msh_file(ofile, gen_dict)
             
-# self.writeASCIImesh(fd, does anything use this?
-
-    #FIXME this function has a bug..        
-    def exportASCIIsegmentoutlinefile(self,ofile):
-        """
-        export a file, ofile, with no triangulation and only vertices connected to segments.
-        """
-        fd = open(ofile,'w')
-        meshDict = {}
-        
-        meshDict['vertices'] = []
-        meshDict['vertex_attributes'] = []
-        meshDict['segments'] = []
-        meshDict['segment_tags'] = []
-        meshDict['triangles'] = [] 
-        meshDict['triangle_tags'] = []
-        meshDict['triangle_neighbors'] = []
-        
-        load_mesh.loadASCII.write_ASCII_triangulation(fd,meshDict)
-        self.writeASCIIsegmentoutline(fd,
-                            self.userVertices,
-                            self.getUserSegments(),
-                            self.holes,
-                            self.regions)    
-        fd.close()
 
     def exportASCIIobj(self,ofile):
@@ -1706 +1661 @@
                      + str(tri.vertices[1].index1) + " " 
                      + str(tri.vertices[2].index1) + "\n")
-
-    #FIXME I think this has a bug...            
-    def writeASCIIsegmentoutline(self,
-                       fd,
-                       userVertices,
-                       userSegments,
-                       holes,
-                       regions):
-        """Write the user mesh info, only with vertices that are connected to segs
-        """
-        verts = []
-        #dupindex = 0
-        for seg in self.userSegments:
-            verts.append(seg.vertices[0])
-            verts.append(seg.vertices[1])
-        print 'verts>',verts
-
-        verts, count = self.removeDuplicatedVertices(verts)
-        print 'verts no dups>',verts
-        self.writeASCIImesh(fd,
-                            verts,
-                            self.getUserSegments(),
-                            self.holes,
-                            self.regions)
+           
+    def exportASCIIsegmentoutlinefile(self,ofile):
+        """Write the boundary user mesh info, eg
+         vertices that are connected to segments,
+         segments
+        """
+        
+        verts = {}
+        for seg in self.getUserSegments():
+            verts[seg.vertices[0]] = seg.vertices[0]
+            verts[seg.vertices[1]] = seg.vertices[1]
+        #print "verts.values()",verts.values() 
+        meshDict = self.Mesh2IOOutlineDict(userVertices=verts.values())
+        load_mesh.loadASCII.export_mesh_file(ofile,meshDict)
         
         # exportASCIImeshfile   - this function is used
@@ -1740 +1685 @@
         load_mesh.loadASCII.export_mesh_file(ofile,dict)
 
-    # is this function obsolete? 
-    def writeASCIImesh(self,
-                       fd,
-                       userVertices,
-                       userSegments,
-                       holes,
-                       regions):
-        
-        #print "mesh.writeASCIImesh*********"
-        #print "dict",dict 
-        #print "mesh*********"
-        load_mesh.loadASCII.write_ASCII_outline(fd, dict)
-
-                #FIXME the title is wrong, need more comments
-    def exportxyafile(self,ofile):
-        """
-        export a file, ofile, with the format
-        
-        First line:  <# of vertices> <# of attributes>
-        Following lines:  <vertex #> <x> <y> [attributes]
-        """
-        #load_mesh.loadASCII
-        #FIXME, this should be a mesh2io method
-        if self.meshVertices == []:
-            Vertices = self.userVertices
+    def exportPointsFile(self,ofile):
+        """
+        export a points (.xya or .pts)  file, ofile.
+        
+        """
+        
+        mesh_dict = self.Mesh2IODict()
+        point_dict = {}
+        point_dict['attributelist'] = {} #this will need to be expanded..
+                                         # if attributes are brought back in. 
+        point_dict['geo_reference'] = self.geo_reference
+        if mesh_dict['vertices'] == []:
+            point_dict['pointlist'] = mesh_dict['points']
         else:
-            Vertices = self.meshVertices
-            
-        numVert = str(len(Vertices))
-        
-        if Vertices == []:
-            raise RuntimeError
-        numVertAttrib = str(len(Vertices[0].attributes))
-        #title = numVert + " " + numVertAttrib + " # <vertex #> <x> <y> [attributes]"
-
-        #Convert the Vertices to pointlist and pointattributelist
-        xya_dict = {}
-        pointattributes = []
-        points = []
-        
-        for vert in Vertices:
-            points.append([vert.x,vert.y])
-            pointattributes.append(vert.attributes)
-            
-        xya_dict['pointlist'] = points
-        xya_dict['pointattributelist'] = pointattributes
-        xya_dict['geo_reference'] = self.geo_reference
-
-        load_mesh.loadASCII.export_points_file(ofile, xya_dict)
+            point_dict['pointlist'] = mesh_dict['vertices']
+
+        load_mesh.loadASCII.export_points_file(ofile,point_dict)
 
         
@@ -1844 +1757 @@
         vertices=[]
         vertex_attributes=[]
-
 
         self.maxVertexIndex=0
@@ -1963 +1875 @@
         #print "*(*("
         return meshDict
-          
 
     def IOTriangulation2Mesh(self, genDict):
@@ -2010 +1921 @@
                 self.meshTriangles[index].setAttribute("")
             else:
-                # Note, is the first attribute always the region att?
-                # haven't confirmed this
-                #Peter - I think so (from manuel)
-                #...the first such value is assumed to be a regional attribute...
                 self.meshTriangles[index].setAttribute(att)
             index += 1