Changeset 2521

Timestamp:

Mar 10, 2006, 12:45:04 PM (19 years ago)

Author:

sexton

Message:

fixed dem2pts AGAIN!!! (memory issue with too many pts, so removed saving indices which weren't needed)

File:

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

inundation/pyvolution/data_manager.py

@@ -1203 +1203 @@
     #FIXME: use array operations to do faster
     nn = 0
-    indices = []
+    k = 0
     for i in range(nrows):
         y = (nrows-i)*cellsize + yllcorner
@@ -1209 +1209 @@
             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 
-
-            if easting_min <= x <= easting_max and \
                northing_min <= y <= northing_max:
-                indices.append([i,j])
-
-    # finding indices of the clipped region
-    if len(indices) > 0:
-        firstpoint = indices[0]
-        index1 = firstpoint[0]
-        lastpoint = indices[len(indices)-1]
-        index2 = lastpoint[0]+1 #?
-    else:
-        index1 = 1
-        index2 = ncols
+                if dem_elevation_r[i,j] == NODATA_value: nn += 1
+
+                if k == 0:
+                    i1_0 = i 
+                    j1_0 = j 
+                k += 1   
+          
+
+    index1 = j1_0
+    index2 = i + 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))
-
+    
     clippednopoints = nrows_in_bounding_box*ncols_in_bounding_box
     nopoints = clippednopoints-nn
@@ -1236 +1230 @@
     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 values in the clipped elevation' %clippednopoints
         print 'There are %d NODATA_values in the clipped elevation' %nn