Changeset 1142

Timestamp:

Mar 24, 2005, 3:25:34 PM (20 years ago)

Author:

ole

Message:

updated xll/yll corner in sww2asc

File:

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

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -1151 +1151 @@
     prjid.close()
 
-    #Create grid
+    #Create grid and update xll/yll corner
     if verbose: print 'Creating grid'
     ncols = int((xmax-xmin)/cellsize)+1
     nrows = int((ymax-ymin)/cellsize)+1
+
+    xllcorner = xmin+xllcorner
+    yllcorner = ymin+yllcorner    
+
 
     from Numeric import zeros, Float 
@@ -1169 +1173 @@
             grid_points[k,0] = xg
             grid_points[k,1] = yg
+            
 
     #Interpolate
@@ -1174 +1179 @@
     from least_squares import Interpolation
     from util import inside_polygon
+
+    #FIXME: This should be done with precrop = True, otherwsie it'll
+    #take forever. With expand_search  set to False, some grid points might
+    #miss out....
     
     interp = Interpolation(vertex_points, volumes, grid_points, alpha=0.0,
-                           precrop = False, verbose = verbose)
+                           precrop = False, expand_search = False,
+                           verbose = verbose)
 
     #Interpolate using quantity values