Changeset 6225

Timestamp:

Jan 21, 2009, 4:57:58 PM (16 years ago)

Author:

ole

Message:

Work on Patong w buildings

Location:

anuga_work/production/patong

Files:

• project.py (modified) (6 diffs)
• run_patong.py (modified) (2 diffs)

anuga_work/production/patong/project.py

@@ -60 +60 @@
     print'basic'
     res_factor=4
-    time_thinning=12
+    time_thinning=24
     yieldstep=120
 if setup =='final': 
     print'final'
     res_factor=1
-    time_thinning=1
+    time_thinning=4
     #time_thinning=48    
     yieldstep=10
@@ -74 +74 @@
 # Important to distinguish each run - ensure str(user) is included!
 # Note, the user is free to include as many parameters as desired
-dir_comment='_'+setup+'_'+str(tide)+'_poly_'+str(user)
+dir_comment='_'+setup+'_'+str(tide)+'_buildings_'+str(user)
 
 #------------------------------------------------------------------------------
@@ -171 +171 @@
 # Initial bounding polygon for data clipping 
 poly_all = read_polygon(polygons_dir+'poly_all.csv')
-res_poly_all = 10000*res_factor
+res_poly_all = 100000*res_factor
 
 # Area of Interest 1 elevation from -10m to 20m
@@ -179 +179 @@
 # 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 = 2000*res_factor
+res_aos1 = 700*res_factor
 
 # Area of Shallow water and coastal land that needs a finer res than 1000000
+# This is a rectangle.
 poly_sw = read_polygon(polygons_dir+'sw.csv')
-res_sw = 3000*res_factor
+res_sw = 6000*res_factor
 
 
@@ -191 +192 @@
 building_main_south = read_polygon(polygons_dir+'building_main_south.csv')
 building_saddle = read_polygon(polygons_dir+'building_saddle.csv')
+building_area_polygons = [building_main, building_main_small, building_main_south, building_saddle]
 bld_res = 25*res_factor
 
@@ -220 +222 @@
 #------------------------------------------------------------------------------
 
-#CBD extract ascii grid - cooridnates from patong_1s extent
+#CBD extract ascii grid - coordinates from patong_1s extent
 xminCBD = 417445.1119
 xmaxCBD = 425601.7881

anuga_work/production/patong/run_patong.py

@@ -116 +116 @@
 domain.set_quantity('friction', project.friction)
 print 'elevation'
-domain.set_quantity('elevation', 
+domain.set_quantity('elevation',
                     filename=project.combined_dir_name+'.pts',
+                    alpha=project.alpha,                    
                     use_cache=True,
-                    verbose=True,
-                    alpha=project.alpha)
+                    verbose=True)
+
 
 # Add buildings from file
 print 'Reading building polygons'    
 building_polygons, building_heights = csv2building_polygons(project.building_polygon_file)
+                                                            #clipping_polygons=project.building_area_polygons)
 
 print 'Creating %d building polygons' % len(building_polygons)
-def create_polygon_function(building_polygons):
+def create_polygon_function(building_polygons, geo_reference=None):
     L = []
     for i, key in enumerate(building_polygons):
@@ -133 +135 @@
         poly = building_polygons[key]
         elev = building_heights[key]
-        L.append((poly, elev))#
+        L.append((poly, elev))
 
         buildings = Polygon_function(L, default=0.0,
-                                     geo_reference=domain.geo_reference)
+                                     geo_reference=geo_reference)
     return buildings
 
 buildings = cache(create_polygon_function,
                   building_polygons,
+                  {'geo_reference': domain.geo_reference},
                   verbose=True)
 
-print 'Add buildings'
-domain.add_quantity('elevation', buildings)
+print 'Adding buildings'
+domain.add_quantity('elevation',
+                    buildings,
+                    use_cache=False, # FIXME(OLE): This seems to pickup the stage IC??
+                    verbose=True)
+