Changeset 2500

Timestamp:

Mar 8, 2006, 6:19:34 PM (19 years ago)

Author:

ole

Message:

Minor cleanup

File:

• inundation/pyvolution/data_manager.py (modified) (4 diffs)

inundation/pyvolution/data_manager.py

@@ -1198 +1198 @@
     dem_elevation_r = reshape(dem_elevation, (nrows, ncols))
 
-    # calculating number of NODATA_values
+    # calculating number of NODATA_values for each row
     nn = 0
     no_counts = []
     for i in range(nrows):
-        v = []
         v = [dem_elevation_r[i,:]]
         this_count = v.count(NODATA_value)
@@ -1208 +1207 @@
         no_counts.append(this_count)
 
-    if nn > 0: print 'There are %d NODATA_values in the elevation' %nn
+    if verbose and nn > 0: print 'There are %d NODATA_values in the elevation' %nn
     
     # dimension definitions
     nrows_in_bounding_box = int(round((northing_max-northing_min)/cellsize))
     ncols_in_bounding_box = int(round((easting_max-easting_min)/cellsize))
-    #outfile.createDimension('number_of_points', nrows_in_bounding_box*ncols_in_bounding_box)
+    
     nopoints = nrows_in_bounding_box*ncols_in_bounding_box-nn
     outfile.createDimension('number_of_points', nopoints)
@@ -1228 +1227 @@
 
     #Store data
-    #FIXME: Could perhaps be faster using array operations (Fixed 27/7/05)
     global_index = 0
     for i in range(nrows):
@@ -1239 +1237 @@
         if no_NODATA > 0:
             newcols = ncols_in_bounding_box - no_NODATA
-            telev = zeros(newcols, Float)
-            tpoints = zeros((newcols, 2), Float)
         else:
             newcols = ncols_in_bounding_box
-            telev = zeros(ncols_in_bounding_box, Float)
-            tpoints = zeros((ncols_in_bounding_box, 2), Float)
+
+        telev = zeros(newcols, Float)
+        tpoints = zeros((newcols, 2), Float)
+            
 
         local_index = 0
-        mylocal_index = 0
         
         y = (nrows-i)*cellsize + yllcorner