Changeset 4861 for anuga_work/development/cairns_demo

Timestamp:

Nov 28, 2007, 1:56:28 PM (17 years ago)

Author:

duncan

Message:

Fit speed up for when there is a lot of blocking

File:

• anuga_work/development/cairns_demo/runcairns.py (modified) (7 diffs)

anuga_work/development/cairns_demo/runcairns.py

@@ +1 @@
+
 """Script for running a tsunami inundation scenario for Cairns, QLD Australia.
 
@@ -31 +32 @@
 from anuga.shallow_water.data_manager import convert_dem_from_ascii2netcdf
 from anuga.shallow_water.data_manager import dem2pts
+from anuga.fit_interpolate.search_functions import search_times, \
+     reset_search_times
+from anuga.fit_interpolate.general_fit_interpolate import \
+     get_build_quadtree_time
 
 # Application specific imports
@@ -39 +44 @@
 # Define scenario as either slide or fixed_wave.
 #------------------------------------------------------------------------------
-#scenario = 'slide' 
-scenario = 'fixed_wave'
+scenario = 'slide' 
+#scenario = 'fixed_wave'
 
 if os.access(scenario, os.F_OK) == 0:
@@ -95 +100 @@
 # Setup computational domain
 #------------------------------------------------------------------------------
+
 from anuga.abstract_2d_finite_volumes.pmesh2domain import pmesh_to_domain_instance
 from anuga.caching import cache
@@ -127 +133 @@
 tide = 0.0
 domain.set_quantity('stage', tide)
-domain.set_quantity('friction', 0.0) 
+domain.set_quantity('friction', 0.0)
+
+
+t0 = time.time()
 domain.set_quantity('elevation', 
                     filename=dem_name + '.pts',
@@ -134 +143 @@
                     alpha=0.1)
 
-
-
+print 'Fitting the elevation data took %.2f seconds' %(time.time()-t0)
+
+search_one_cell_time, search_more_cells_time = search_times()
+reset_search_times()
+print "search_one_cell_time",search_one_cell_time
+print "search_more_cells_time", search_more_cells_time
+print "build_quadtree_time", get_build_quadtree_time()
+import sys; sys.exit() 
 #------------------------------------------------------------------------------
 # Setup information for slide scenario (to be applied 1 min into simulation
@@ -184 +199 @@
 #------------------------------------------------------------------------------
 
-import time
 t0 = time.time()