Changeset 5550

Timestamp:

Jul 22, 2008, 1:38:03 PM (16 years ago)

Author:

ole

Message:

Better reading of ordering file

File:

• anuga_core/source/anuga/shallow_water/data_manager.py (modified) (2 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -5040 +5040 @@
     # Establish permutation array
     if ordering_filename is not None:
-    
+
+        if verbose is True:
+            print 'Reading ordering file', ordering_filename
         # Read ordering file 
         try:
@@ -5054 +5056 @@
         reference_header_split = reference_header.split(',')
         for i in range(3):
-            if not file_header[i] == reference_header_split[i]:
-                msg = 'File must contain header: '+reference_header+'\n'
+            if not file_header[i].strip() == reference_header_split[i].strip():
+                msg = 'File must contain header: '+reference_header
                 raise Exception, msg