Changeset 355

Timestamp:

Oct 5, 2004, 11:52:23 AM (20 years ago)

Author:

duncan

Message:

move export xya out of mesh, into loadASCII

Location:

inundation/ga/storm_surge/pmesh

Files:

• load_mesh/loadASCII.py (modified) (1 diff)
• mesh.py (modified) (2 diffs)
• meshHarness.py (modified) (1 diff)

inundation/ga/storm_surge/pmesh/load_mesh/loadASCII.py

@@ -453 +453 @@
     return xya_dict
 
+                
+def export_xya_file( file_name, xya_dict, title):
+    """
+    export a file, ofile, with the format
+    
+    First line: Title variable
+    Following lines:  <vertex #> <x> <y> [attributes]
+
+    file_name - the name of the new file
+    xya_dict - point and point attribute info in a dictionary
+    title - info to write in the first line
+    """
+    #FIXME, move the test for this from meshharness to loadasciiharness
+    points = xya_dict['pointlist'] 
+    pointattributes = xya_dict['pointattributelist']
+    
+    fd = open(file_name,'w')
+    
+    fd.write(title+"\n")
+    #<vertex #> <x> <y> [attributes]
+    for vert, vertatts in map(None, points, pointattributes):
+        attlist = ""
+        for att in vertatts:
+            attlist = attlist + str(att)+" "
+        attlist.strip()
+        fd.write( str(vert[0]) + " "
+                  + str(vert[1]) + " "
+                  + attlist + "\n")
+    fd.close()
+
 if __name__ == "__main__":
     m = import_mesh("tee.txt")

inundation/ga/storm_surge/pmesh/mesh.py

@@ -1528 +1528 @@
         Following lines:  <vertex #> <x> <y> [attributes]
         """
-        
+        #load_mesh.loadASCII
+
         if self.meshVertices == []:
             Vertices = self.userVertices
@@ -1538 +1539 @@
         if Vertices == []:
             raise RuntimeError
-        fd = open(ofile,'w')
         numVertAttrib = str(len(Vertices[0].attributes))
-        fd.write(numVert + " " + numVertAttrib + " # <vertex #> <x> <y> [attributes]" + "\n")
-        #Vertices = self.userVertices + self.meshVertices
-        #[Vertices, counter]=  self.removeDuplicatedVertices(Vertices)
-            
-        #<vertex #> <x> <y> [attributes]
+        title = numVert + " " + numVertAttrib + " # <vertex #> <x> <y> [attributes]"
+
+        #Convert the Vertices to pointlist and pointattributelist
+        xya_dict = {}
+        pointattributes = []
+        points = []
+        
         for vert in Vertices:
-            attlist = ""
-            for att in vert.attributes:
-                attlist = attlist + str(att)+" "
-            attlist.strip()
-            fd.write( str(vert.x) + " "
-                     + str(vert.y) + " "
-                     + attlist + "\n")
-        fd.close()
+            points.append([vert.x,vert.y])
+            pointattributes.append(vert.attributes)
+            
+        xya_dict['pointlist'] = points
+        xya_dict['pointattributelist'] = pointattributes
+
+        load_mesh.loadASCII.export_xya_file(ofile, xya_dict, title)
 
 

inundation/ga/storm_surge/pmesh/meshHarness.py

@@ -721 +721 @@
         lFile = file.read().split('\n')
         file.close()
+
+        #print "**********************"
+        #print lFile
+        #print "**********************"
+        
         os.remove(fileName)
         self.failUnless(lFile[0] == "5 0 # <vertex #> <x> <y> [attributes]" and