Changeset 7003

Timestamp:

May 8, 2009, 4:07:30 PM (16 years ago)

Author:

ole

Message:

Added errorcheck in convert_dem_from_ascii2netcdf in case lines are too short or too long.

File:

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

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -2778 +2778 @@
 # @param verbose True if this function is to be verbose.
 def _convert_dem_from_ascii2netcdf(basename_in, basename_out = None,
-                                  verbose = False):
+                                   verbose = False):
     """Read Digital Elevation model from the following ASCII format (.asc)
 
@@ -2910 +2910 @@
     elevation = fid.variables['elevation']
 
-    #Store data
+    # Store data
     n = len(lines[6:])
     for i, line in enumerate(lines[6:]):
@@ -2916 +2916 @@
         if verbose and i % ((n+10)/10) == 0:
             print 'Processing row %d of %d' % (i, nrows)
+
+           
+        if len(fields) != ncols:
+            msg = 'Wrong number of columns in file "%s" line %d\n' % (basename_in + '.asc', i)
+            msg += 'I got %d elements, but there should have been %d\n' % (len(fields), ncols)
+            raise Exception, msg
+
         elevation[i, :] = num.array([float(x) for x in fields])