Changeset 1145 for inundation/ga/storm_surge/pyvolution/data_manager.py

Timestamp:

Mar 24, 2005, 4:48:33 PM (20 years ago)

Author:

ole

Message:

Improved optimisation in sww2asc (happy Easter everyone!)

File:

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

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -1068 +1068 @@
     
     """
-    from Numeric import array, Float, concatenate, NewAxis, zeros 
+    from Numeric import array, Float, concatenate, NewAxis, zeros,\
+         sometrue
+    
 
     #FIXME: Should be variable
@@ -1209 +1211 @@
     #Get bounding polygon from mesh
     P = interp.mesh.get_boundary_polygon()
-
-    #print grid_points
-    #print grid_values
-
     inside_indices = inside_polygon(grid_points, P)
     
@@ -1222 +1220 @@
             index = (nrows-i-1)*ncols+j
             
-            #if inside_polygon(grid_points[index], P):
-            if index in inside_indices:
+            if sometrue(inside_indices == index):
                 ascid.write('%f ' %grid_values[index])                
             else: