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

Timestamp:

Feb 21, 2005, 5:21:02 PM (20 years ago)

Author:

duncan

Message:

removing mesh ref's to test_loadascii

File:

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

inundation/ga/storm_surge/pmesh/mesh.py

@@ -802 +802 @@
         return deletedObs
                                                  
-    def Mesh2triangList(self):
+    def Mesh2triangList(self, userVertices=None,
+                        userSegments=None,
+                        holes=None,
+                        regions=None):
         """
         Convert the Mesh to a dictionary of the lists needed for the triang modul;
@@ -813 +816 @@
         """
         
+        if userVertices is None:
+            userVertices = self.getUserVertices()
+        if userSegments is None:
+            userSegments = self.getUserSegments()
+        if holes is None:
+            holes = self.getHoles()
+        if regions is None:
+            regions = self.getRegions()
+            
         meshDict = {}
         
@@ -818 +830 @@
         pointattributelist=[]
         index = 0
-        for vertex in self.userVertices:
+        for vertex in userVertices:
             vertex.index = index 
             pointlist.append((vertex.x,vertex.y))
@@ -829 +841 @@
         segmentlist=[]
         segmentmarkerlist=[]
-        for seg in self.getUserSegments():
+        for seg in userSegments:
             segmentlist.append((seg.vertices[0].index,seg.vertices[1].index))
             segmentmarkerlist.append(seg.marker)
         meshDict['segmentlist'] =segmentlist 
         meshDict['segmentmarkerlist'] =segmentmarkerlist
+        
         holelist=[]
-        for hole in self.holes:
+        for hole in holes:
             holelist.append((hole.x,hole.y)) 
         meshDict['holelist'] = holelist
         
         regionlist=[]
-        for region in self.regions:
+        for region in regions:
             if (region.getMaxArea() != None): 
                 regionlist.append((region.x,region.y,region.getTag(),
@@ -1511 +1524 @@
             #Most probably, the Tkinter module is not available.
             #"""
-      
+            
+    # Is this used by anything?  
     def exportASCIItriangulationfile(self,ofile):
         """
@@ -1545 +1559 @@
         meshDict['generatedsegmentlist'] = []
         meshDict['generatedsegmentmarkerlist'] = []
-
         meshDict['generatedtrianglelist'] = [] 
         meshDict['generatedtriangleattributelist'] = []
@@ -1636 +1649 @@
                        holes,
                        regions):
-        numVert = str(len(userVertices))
-        if (numVert == "0"):
-            numVertAttrib = "0"
-        else:
-            numVertAttrib = str(len(userVertices[0].attributes))
-        fd.write(numVert + " " + numVertAttrib + " # <# of verts> <# of vert attributes>, next lines <vertex #> <x> <y> [attributes] ...Mesh Vertices..." + "\n")
-        
-        # <x> <y> [attributes]
-        index = 0 
-        for vert in userVertices:
-            vert.index = index
-            index += 1
-            attlist = ""
-            for att in vert.attributes:
-                attlist = attlist + str(att)+" "
-            attlist.strip()
-            fd.write(str(vert.index) + " "
-                     +str(vert.x) + " "
-                     + str(vert.y) + " "
-                     + attlist + "\n")
-            
-        #One line:  <# of segments> 
-        fd.write(str(len(userSegments)) + 
-                 " # <# of segments>, next lines <segment #> <vertex #>  <vertex #> [boundary marker] ...Mesh Segments..." + "\n")
-        
-        #Following lines:  <vertex #>  <vertex #> [boundary marker]
-        index = 0
-        for seg in userSegments:
-            fd.write(str(index) + " "
-                     + str(seg.vertices[0].index) + " " 
-                     + str(seg.vertices[1].index) + " " 
-                     + str(seg.marker) + "\n")
-            index += 1
-
-        #One line:  <# of holes> 
-        fd.write(str(len(holes)) + 
-                 " # <# of holes>, next lines <Hole #> <x> <y> ...Mesh Holes..." + "\n")    
-        # <x> <y>
-        index = 0
-        for h in holes:
-            fd.write(str(index) + " "
-                     + str(h.x) + " "
-                     + str(h.y) + "\n")
-            index += 1
-        
-        #One line:  <# of regions> 
-        fd.write(str(len(regions)) + 
-                 " # <# of regions>, next lines <Region #> <x> <y> <tag>...Mesh Regions..." + "\n")    
-        # <index> <x> <y> <tag>
-        index = 0
-        for r in regions:
-            fd.write(str(index) + " " 
-                     + str(r.x) + " "
-                     + str(r.y)+ " "
-                     + str(r.getTag()) + "\n")
-            index += 1
-        index = 0
-        
-        # <index> [<MaxArea>|""]
-        
-        #One line:  <# of regions> 
-        fd.write(str(len(regions)) + 
-                 " # <# of regions>, next lines <Region #> [Max Area] ...Mesh Regions..." + "\n") 
-        for r in regions:
-            area = r.getMaxArea()
-            if area == None:
-                area = ""
-            else:
-                area = str(area)
-            
-            fd.write(str(index) + " " + area + "\n")
-            index += 1
+        
+        dict = self.Mesh2triangList(userVertices,
+                       userSegments,
+                       holes,
+                       regions)
+        #print "mesh*********"
+        #print "dict",dict 
+        #print "mesh*********"
+        load_mesh.loadASCII.write_ASCII_mesh(fd, dict)
                 
     def exportxyafile(self,ofile):