Changeset 6133

Timestamp:

Jan 9, 2009, 4:35:04 PM (16 years ago)

Author:

ole

Message:

Work towards buildings in Patong simulation

Location:

anuga_work/production/patong

Files:

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

anuga_work/production/patong/project.py

@@ -48 +48 @@
 finaltime=15000         # final time for simulation 15000
 
-setup='final'  # Final can be replaced with trial or basic.
+setup='trial'  # Final can be replaced with trial or basic.
                # Either will result in a coarser mesh that will allow a
                # faster, but less accurate, simulation.
@@ -191 +191 @@
 trigs_min = number_mesh_triangles(interior_regions, poly_all, res_poly_all)
 print 'min estimated number of triangles', trigs_min
-   
+
+#------------------------------------------------------------------------------
+# Building polygons
+#------------------------------------------------------------------------------
+
+building_polygon_file = polygons_dir+'buildings.csv'
+
 #------------------------------------------------------------------------------
 # Clipping regions for export to asc and regions for clipping data

anuga_work/production/patong/run_patong.py

@@ -36 +36 @@
 from anuga.shallow_water import Field_boundary
 from Numeric import allclose
-from anuga.shallow_water.data_manager import export_grid, create_sts_boundary
+from anuga.shallow_water.data_manager import export_grid, create_sts_boundary, csv2building_polygons
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
 from anuga.shallow_water.data_manager import start_screen_catcher, copy_code_files,store_parameters
-from anuga_parallel.parallel_abstraction import get_processor_name
 from anuga.caching import myhash
 from anuga.damage_modelling.inundation_damage import add_depth_and_momentum2csv, inundation_damage
@@ -58 +57 @@
     # output to file
     #------------------------------------------------------------------------------
-    print "Processor Name:",get_processor_name()
 
     #copy script must be before screen_catcher
@@ -71 +69 @@
     start_screen_catcher(kwargs['output_dir'], myid, numprocs)
 
-    print "Processor Name:",get_processor_name()
     
     #-----------------------------------------------------------------------
@@ -105 +102 @@
 
     create_mesh_from_regions(bounding_polygon,
-                         boundary_tags=boundary_tags,
-                         maximum_triangle_area=project.res_poly_all,
-                         interior_regions=project.interior_regions,
-                         filename=project.meshes_dir_name,
-                         use_cache=True,
-                         verbose=True)
+                             boundary_tags=boundary_tags,
+                             maximum_triangle_area=project.res_poly_all,
+                             interior_regions=project.interior_regions,
+                             filename=project.meshes_dir_name,
+                             use_cache=True,
+                             verbose=True)
    
     #-------------------------------------------------------------------------
@@ -145 +142 @@
                         verbose = True,
                         alpha = kwargs['alpha'])
+
+    # Add buildings from file
+    building_polygons, building_heights = csv2building_polygons(project.building_polygon_file)
+
+    L = []
+    for key in building_polygons:
+        poly = building_polygons[key]
+        elev = building_heights[key]
+        L.append((poly, elev))
+        
+    #Q1 = domain.get_quantity('elevation')
+    #Q2 = Quantity(domain) # Temporary quantity for buildings
+    #Q2.set_values(Polygon_function(L, default=0.0))
+    domain.add_quantity('elevation', Polygon_function(L, default=0.0))
+    
     print 'Finished Set quantity'
 
@@ -217 +229 @@
     store_parameters(**kwargs)
      
-    print 'memory usage before del domain1',mem_usage()