Changeset 2518

Timestamp:

Mar 9, 2006, 5:22:30 PM (18 years ago)

Author:

sexton

Message:

fixed dem2pts AGAIN!!! to remove NODATA values

File:

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

inundation/pyvolution/data_manager.py

@@ -1202 +1202 @@
     # calculating number of NODATA_values for each row
     nn = 0
-    no_counts = []
     for i in range(nrows):
-        v = dem_elevation_r[i,:]
-        this_count = sum(v == NODATA_value)
-        nn += this_count
-        no_counts.append(this_count)
-
-    if verbose and nn > 0:
-        print 'There are %d values in the elevation' %totalnopoints
-        print 'There are %d NODATA_values in the elevation' %nn
-    
+        y = (nrows-i)*cellsize + yllcorner
+        for j in range(ncols):
+            x = j*cellsize + xllcorner
+            if easting_min <= x <= easting_max and \
+               northing_min <= y <= northing_max and \
+               dem_elevation_r[i,j] == NODATA_value:
+                nn += 1
+        
     # dimension definitions
     nrows_in_bounding_box = int(round((northing_max-northing_min)/cellsize))
     ncols_in_bounding_box = int(round((easting_max-easting_min)/cellsize))
-    
-    nopoints = nrows_in_bounding_box*ncols_in_bounding_box-nn
-    #nopoints = nrows_in_bounding_box*ncols_in_bounding_box
+
+    clippednopoints = nrows_in_bounding_box*ncols_in_bounding_box
+    nopoints = clippednopoints-nn
+
+    if verbose and nn > 0:
+        print 'There are %d values in the elevation' %totalnopoints
+        print 'There are %d values in the clipped elevation' %clippednopoints
+        print 'There are %d NODATA_values in the clipped elevation' %nn
+   
     outfile.createDimension('number_of_points', nopoints)
     outfile.createDimension('number_of_dimensions', 2) #This is 2d data
@@ -1239 +1243 @@
         lower_index = global_index
        
-        no_NODATA = no_counts[i]
+        v = dem_elevation_r[i,:]
+        no_NODATA = sum(v == NODATA_value)
         if no_NODATA > 0:
             newcols = ncols_in_bounding_box - no_NODATA
@@ -2290 +2295 @@
     number_of_latitudes = latitudes.shape[0]
     number_of_longitudes = longitudes.shape[0]
-
-    msg = 'No data received'
-    assert latitudes.shape[0] > 0, msg
-    assert longitudes.shape[0] > 0, msg
 
     assert amplitudes.shape[0] == number_of_times