Changeset 8832 for trunk/anuga_core/source/anuga/file_conversion/dem2pts.py

Timestamp:

Apr 16, 2013, 8:04:09 PM (12 years ago)

Author:

steve

Message:

Fixed some problems with dem2pts which turned up in merewether case study

File:

• trunk/anuga_core/source/anuga/file_conversion/dem2pts.py (modified) (3 diffs)

trunk/anuga_core/source/anuga/file_conversion/dem2pts.py

@@ -155 +155 @@
     dem_elevation_r = num.reshape(dem_elevation, (nrows, ncols))
     totalnopoints = nrows*ncols
+
+
 
 
@@ -282 +284 @@
     # Do the preceeding with numpy
     #========================================
-
-    start = (nrows-1)*cellsize+yllcorner
-    stop = yllcorner-cellsize
-    step = -cellsize
-    y = num.arange(start, stop,step)
-
-    start = xllcorner
-    stop = (ncols)*cellsize + xllcorner
-    step = cellsize
-    x = num.arange(start, stop,step)
-
-    #print nrows,ncols
+    y = num.arange(nrows,dtype=num.float)
+    y = yllcorner + (nrows-1)*cellsize - y*cellsize
+
+    x = num.arange(ncols,dtype=num.float)
+    x = xllcorner + x*cellsize
 
     xx,yy = num.meshgrid(x,y)
-
-    #print xx
-    #print yy
 
     xx = xx.flatten()
     yy = yy.flatten()
 
+    
     flag = num.logical_and(num.logical_and((xx <= easting_max),(xx >= easting_min)),
                            num.logical_and((yy <= northing_max),(yy >= northing_min)))
 
-
-    #print flag
-
-    #print xx
-    #print yy
-    #print easting_min, easting_max, northing_min, northing_max
-
+    
     dem = dem_elevation[:].flatten()
 
@@ -321 +308 @@
     yy = yy[id]
     dem = dem[id]
+
 
     clippednopoints = len(dem)