Changeset 346 for inundation/ga/storm_surge/pyvolution/load_mesh/loadASCII.py

Timestamp:

Sep 28, 2004, 4:18:34 PM (21 years ago)

Author:

duncan

Message:

added test for fit_to_mesh_file, removed bugs from loadASCII.

File:

• inundation/ga/storm_surge/pyvolution/load_mesh/loadASCII.py (modified) (8 diffs)

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

@@ -42 +42 @@
     #for fragment in fragments:
     #    print fragment
-    NumOfVertices = fragments[0]
-    NumOfVertAttributes = fragments[1]
+    if fragments ==[]:
+        NumOfVertices = 0
+        NumOfVertAttributes = 0
+    else:
+        NumOfVertices = fragments[0]
+        NumOfVertAttributes = fragments[1]
     points = []
     pointattributes = []
@@ -140 +144 @@
 
 def read_mesh(fd):
+    """
+    Note, if a file has no mesh info, it can still be read - the meshdic
+    returned will be 'empty'.
+    """
     delimiter = " " # warning: split() calls are using default whitespace
     
@@ -147 +155 @@
     fragments = line.split()
     #for fragment in fragments:
-    #    print fragment
-    NumOfVertices = fragments[0]
-    NumOfVertAttributes = fragments[1]
+    if fragments ==[]:
+        NumOfVertices = 0
+        NumOfVertAttributes = 0
+    else:
+        NumOfVertices = fragments[0]
+        NumOfVertAttributes = fragments[1]
     points = []
     pointattributes = []
@@ -173 +184 @@
     #for fragment in fragments:
     #    print fragment
-    NumOfSegments = fragments[0]
+    if fragments ==[]:
+        NumOfSegments = 0
+    else:
+        NumOfSegments = fragments[0]
     segments = []
     segmentmarkers = []
@@ -199 +213 @@
     #for fragment in fragments:
     #    print fragment
-    numOfHoles = fragments[0]
+    if fragments ==[]:
+        numOfHoles = 0
+    else:
+        numOfHoles = fragments[0]
     holes = []
     for index in range(int(numOfHoles)):        
@@ -216 +233 @@
     #for fragment in fragments:
     #    print fragment
-    numOfRegions = fragments[0]
+    if fragments ==[]:
+        numOfRegions = 0
+    else:
+        numOfRegions = fragments[0]
     regions = []
     regionattributes = []
@@ -321 +341 @@
                 else:
                     neighbors +=  "-1 "
-                
+        if triangles_attributes[index] == ['']:
+            att = ""
+        else:
+            att = str(triangles_attributes[index])
         fd.write(str(index) + " "
                  + str(tri[0]) + " " 
@@ -327 +350 @@
                  + str(tri[2]) + " " 
                  + neighbors + " "
-                 + str(triangles_attributes[index]) + "\n")
+                 + att + "\n")
             
     #One line:  <# of segments>