Changeset 2541 for inundation/pyvolution

Timestamp:

Mar 13, 2006, 6:20:26 PM (19 years ago)

Author:

sexton

Message:

fixed dem2pts AGAIN!!!

File:

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

inundation/pyvolution/data_manager.py

@@ -1204 +1204 @@
     nn = 0
     k = 0
+    i1_0 = 0
+    j1_0 = 0
     for i in range(nrows):
         y = (nrows-i)*cellsize + yllcorner
@@ -1216 +1218 @@
                     j1_0 = j 
                 k += 1   
-          
-
-    index1 = j1_0
-    index2 = i + 1 
-        
+
+            index1 = j1_0
+            index2 = j
+            index3 = i1_0
+            index4 = i
+
+
+    index2 += 1
+    nrows2 = index4 - index3
+    ncols2 = index2 - index1 + 1
+    
     # dimension definitions
     nrows_in_bounding_box = int(round((northing_max-northing_min)/cellsize))
@@ -1257 +1265 @@
         no_NODATA = sum(v == NODATA_value)
         if no_NODATA > 0:
-            newcols = ncols_in_bounding_box - no_NODATA
+            newcols = len(v) - no_NODATA #ncols_in_bounding_box - no_NODATA
         else:
-            newcols = ncols_in_bounding_box
-
+            newcols = len(v) #ncols_in_bounding_box
+
+        #print 'here', len(v), no_NODATA, newcols, v
+        #print 'here again', dem_elevation_r[i,:]
         telev = zeros(newcols, Float)
         tpoints = zeros((newcols, 2), Float)
-            
 
         local_index = 0