Changeset 1144

Timestamp:

Mar 24, 2005, 4:22:35 PM (20 years ago)

Author:

ole

Message:

Optimisation of sww2asc

File:

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

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -1102 +1102 @@
     volumes = fid.variables['volumes'][:]
 
-    vertex_points = concatenate ((x[:, NewAxis] ,y[:, NewAxis]), axis = 1)
-    assert len(vertex_points.shape) == 2
-
     ymin = min(y); ymax = max(y)
     xmin = min(x); xmax = max(x)
@@ -1151 +1148 @@
     prjid.close()
 
-    #Create grid and update xll/yll corner
+    #Create grid and update xll/yll corner and x,y
     if verbose: print 'Creating grid'
     ncols = int((xmax-xmin)/cellsize)+1
     nrows = int((ymax-ymin)/cellsize)+1
 
-    xllcorner = xmin+xllcorner
-    yllcorner = ymin+yllcorner    
-
+    newxllcorner = xmin+xllcorner
+    newyllcorner = ymin+yllcorner
+    
+    x = x+xllcorner-newxllcorner
+    y = y+yllcorner-newyllcorner
+
+    vertex_points = concatenate ((x[:, NewAxis] ,y[:, NewAxis]), axis = 1)
+    assert len(vertex_points.shape) == 2
+    
 
     from Numeric import zeros, Float 
@@ -1198 +1201 @@
     ascid.write('ncols         %d\n' %ncols)
     ascid.write('nrows         %d\n' %nrows)
-    ascid.write('xllcorner     %d\n' %xllcorner)
-    ascid.write('yllcorner     %d\n' %yllcorner)
+    ascid.write('xllcorner     %d\n' %newxllcorner)
+    ascid.write('yllcorner     %d\n' %newyllcorner)
     ascid.write('cellsize      %f\n' %cellsize)
     ascid.write('NODATA_value  %d\n' %NODATA_value)                    
@@ -1209 +1212 @@
     #print grid_points
     #print grid_values
+
+    inside_indices = inside_polygon(grid_points, P)
     
     for i in range(nrows):
-        if verbose and i%((i+10)/10)==0:
+        if verbose and i%((nrows+1)/10)==0:
             print 'Doing row %d of %d' %(i, nrows)
             
@@ -1217 +1222 @@
             index = (nrows-i-1)*ncols+j
             
-            if inside_polygon(grid_points[index], P):
+            #if inside_polygon(grid_points[index], P):
+            if index in inside_indices:
                 ascid.write('%f ' %grid_values[index])                
             else: