Changeset 2553 for inundation/pyvolution/data_manager.py

Timestamp:

Mar 16, 2006, 5:35:18 PM (17 years ago)

Author:

sexton

Message:

maybe this is it for dem2pts ...

File:

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

inundation/pyvolution/data_manager.py

@@ -1206 +1206 @@
     i1_0 = 0
     j1_0 = 0
+    thisj = 0
+    thisi = 0
     for i in range(nrows):
-        y = (nrows-i)*cellsize + yllcorner
+        y = (nrows-i-1)*cellsize + yllcorner
         for j in range(ncols):
             x = j*cellsize + xllcorner
             if easting_min <= x <= easting_max and \
                northing_min <= y <= northing_max:
+                thisj = j
+                thisi = i
                 if dem_elevation_r[i,j] == NODATA_value: nn += 1
 
                 if k == 0:
                     i1_0 = i 
-                    j1_0 = j 
+                    j1_0 = j
                 k += 1   
 
-            index1 = j1_0
-            index2 = j
-            index3 = i1_0
-            index4 = i
-
-
-    index2 += 1
-    nrows2 = index4 - index3
-    ncols2 = index2 - index1 + 1
+    index1 = j1_0
+    index2 = thisj
     
     # dimension definitions
@@ -1233 +1230 @@
     ncols_in_bounding_box = int(round((easting_max-easting_min)/cellsize))
     
-    clippednopoints = nrows_in_bounding_box*ncols_in_bounding_box
+    clippednopoints = (thisi+1-i1_0)*(thisj+1-j1_0) 
     nopoints = clippednopoints-nn
 
+    clipped_dem_elev = dem_elevation_r[i1_0:thisi+1,j1_0:thisj+1]
+    
     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
         
@@ -1253 +1252 @@
     elevation = outfile.variables['elevation']
 
-    
+    lenv = index2-index1+1
     #Store data
     global_index = 0
-    for i in range(nrows):
+    #for i in range(nrows):
+    for i in range(i1_0,thisi+1,1):
         if verbose and i%((nrows+10)/10)==0:
             print 'Processing row %d of %d' %(i, nrows)
@@ -1262 +1262 @@
         lower_index = global_index
 
-        v = dem_elevation_r[i,index1:index2]
+        v = dem_elevation_r[i,index1:index2+1]
         no_NODATA = sum(v == NODATA_value)
         if no_NODATA > 0:
-            newcols = len(v) - no_NODATA #ncols_in_bounding_box - no_NODATA
+            newcols = lenv - no_NODATA #ncols_in_bounding_box - no_NODATA
         else:
-            newcols = len(v) #ncols_in_bounding_box
-
-        #print 'here', len(v), no_NODATA, newcols, v
-        #print 'here again', dem_elevation_r[i,:]
+            newcols = lenv #ncols_in_bounding_box
+
         telev = zeros(newcols, Float)
         tpoints = zeros((newcols, 2), Float)
@@ -1276 +1274 @@
         local_index = 0
         
-        y = (nrows-i)*cellsize + yllcorner
-        for j in range(ncols):
+        y = (nrows-i-1)*cellsize + yllcorner
+        #for j in range(ncols):
+        for j in range(j1_0,index2+1,1):
 
             x = j*cellsize + xllcorner