Changeset 1145

Timestamp:

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

Author:

ole

Message:

Improved optimisation in sww2asc (happy Easter everyone!)

Location:

inundation/ga/storm_surge/pyvolution

Files:

• data_manager.py (modified) (3 diffs)
• test_data_manager.py (modified) (1 diff)

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:

inundation/ga/storm_surge/pyvolution/test_data_manager.py

@@ -1496 +1496 @@
 if __name__ == "__main__":
     suite = unittest.makeSuite(Test_Data_Manager,'test')    
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_sww2asc_stage')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_sww2asc_mis')
     runner = unittest.TextTestRunner()
     runner.run(suite)