Changeset 6219

Timestamp:

Jan 20, 2009, 6:20:24 PM (16 years ago)

Author:

ole

Message:

Work on Patong - finer resolution at community and more cleanup.

Location:

anuga_work/production/patong

Files:

• project.py (modified) (3 diffs)
• run_patong.py (modified) (4 diffs)

anuga_work/production/patong/project.py

@@ -65 +65 @@
     print'final'
     res_factor=1
-    time_thinning=4
+    time_thinning=1
     #time_thinning=48    
-    yieldstep=60
+    yieldstep=10
 
 #------------------------------------------------------------------------------
@@ -175 +175 @@
 # Area of Interest 1 elevation from -10m to 20m
 poly_aoi1 = read_polygon(polygons_dir+'aoi.csv')
-res_aoi1 = 800*res_factor
+res_aoi1 = 200*res_factor
 
 # Area of Significance 1 elevation from -20m to a 200m buffer of the 20m contour
 poly_aos1 = read_polygon(polygons_dir+'aos.csv')
-res_aos1 = 1000*res_factor
+res_aos1 = 2000*res_factor
 
 # Area of Shallow water and coastal land that needs a finer res than 1000000
 poly_sw = read_polygon(polygons_dir+'sw.csv')
-res_sw = 2000*res_factor
+res_sw = 3000*res_factor
 
 
@@ -191 +191 @@
 building_main_south = read_polygon(polygons_dir+'building_main_south.csv')
 building_saddle = read_polygon(polygons_dir+'building_saddle.csv')
-bld_res = 50*res_factor
+bld_res = 25*res_factor
 
 

anuga_work/production/patong/run_patong.py

@@ -27 +27 @@
 # Related major packages
 from anuga.interface import create_domain_from_regions
-from anuga.interface import Domain
 from anuga.interface import Dirichlet_boundary
-from anuga.interface import File_boundary
 from anuga.interface import Reflective_boundary
 from anuga.interface import Field_boundary
-from anuga.interface import export_grid, create_sts_boundary
+from anuga.interface import create_sts_boundary
 from anuga.interface import csv2building_polygons
 
 from anuga.caching import cache
 from anuga.shallow_water.data_manager import start_screen_catcher, copy_code_files,store_parameters
-from anuga.fit_interpolate.benchmark_least_squares import mem_usage 
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
-from anuga.geospatial_data.geospatial_data import find_optimal_smoothing_parameter
+from anuga.utilities.polygon import read_polygon
 from polygon import Polygon_function
     
@@ -113 +109 @@
                       default=project.tide,
                       geo_reference=domain.geo_reference)
-domain.set_quantity('stage', IC)
-domain.set_quantity('friction', project.friction) 
+print 'stage'
+domain.set_quantity('stage', IC,
+                    use_cache=True,
+                    verbose=True)
+print 'friction'
+domain.set_quantity('friction', project.friction)
+print 'elevation'
 domain.set_quantity('elevation', 
                     filename=project.combined_dir_name+'.pts',
@@ -125 +126 @@
 building_polygons, building_heights = csv2building_polygons(project.building_polygon_file)
 
-print 'Creating building polygons'
+print 'Creating %d building polygons' % len(building_polygons)
 def create_polygon_function(building_polygons):
     L = []
-    for key in building_polygons:
+    for i, key in enumerate(building_polygons):
+        if i%100==0: print i
         poly = building_polygons[key]
         elev = building_heights[key]
         L.append((poly, elev))#
 
-        buildings = Polygon_function(L, default=0.0)
+        buildings = Polygon_function(L, default=0.0,
+                                     geo_reference=domain.geo_reference)
     return buildings
 
@@ -139 +142 @@
                   building_polygons,
                   verbose=True)
-        
+
+print 'Add buildings'
 domain.add_quantity('elevation', buildings)