Changeset 3084

Timestamp:

Jun 5, 2006, 4:33:39 PM (19 years ago)

Author:

ole

Message:

Made end detection in readUnGenerate more robust

File:

• inundation/pmesh/mesh.py (modified) (3 diffs)

inundation/pmesh/mesh.py

@@ -2840 +2840 @@
     last line:  "END"
     """
-    END_DELIMITER = 'END\n'
+    END_DELIMITER = 'END'
     
     points = []
@@ -2856 +2856 @@
         
         line = fd.readline() #Read the next line
-        while line <> END_DELIMITER: 
+        while not line.startswith(END_DELIMITER): 
             #print "line >" + line + "<"
             fragments = line.split()
@@ -2883 +2883 @@
         line = fd.readline() # read <# of polynomial> <x> <y> OR END
         #print "line >>" + line + "<<"
-        if line == END_DELIMITER:
+        if line.startswith(END_DELIMITER):
             isEnd = True