Changeset 9103

Timestamp:

May 2, 2014, 1:41:53 PM (11 years ago)

Author:

davies

Message:

Allowing buildings in patong,
and commenting out some print statements in distribute_mesh

Location:

trunk/anuga_core/source

Files:

• anuga_parallel/distribute_mesh.py (modified) (1 diff)
• anuga_validation_tests/case_studies/patong/project.py (modified) (1 diff)
• anuga_validation_tests/case_studies/patong/run_model.py (modified) (3 diffs)

trunk/anuga_core/source/anuga_parallel/distribute_mesh.py

@@ -209 +209 @@
 
 
-        from pprint import pprint
-        print 'epart'
-        pprint(epart)
-        print 'new_tri_index'
-        pprint(new_tri_index)
+        #from pprint import pprint
+        #print 'epart'
+        #pprint(epart)
+        #print 'new_tri_index'
+        #pprint(new_tri_index)
 
         #print 50*'='

trunk/anuga_core/source/anuga_validation_tests/case_studies/patong/project.py

@@ -37 +37 @@
 nameFlag='xxNameFlagxx'
 
-use_buildings = False   # FIXME: 6/6/2013 -- Code needs to be edited to support 'True'
+use_buildings = False   # Add buildings to the DEM? This is slow initially 
 setup = 'basic'         # This can be one of three values
                         #    trial - coarsest mesh, fast

trunk/anuga_core/source/anuga_validation_tests/case_studies/patong/run_model.py

@@ -33 +33 @@
 # Application specific imports
 import build_urs_boundary as bub
+
+from anuga.file.csv_file import load_csv_as_building_polygons
 
 #-------------------------------------------------------------------------------
@@ -147 +149 @@
         log.critical('Reading building polygons')
         
-        err_mess='ERROR: csv2building_polygons no longer exists (6/6/2013).\
-                  This needs to be fixed before buildings can be ran'
-        raise Exception(err_mess)
-        
-        
-        #building_polygons, building_heights = csv2building_polygons(project.building_polygon)
+        building_polygons, building_heights = load_csv_as_building_polygons(project.building_polygon, floor_height=3.)
         #clipping_polygons=project.building_area_polygons)
 
@@ -169 +166 @@
 
         log.critical('Creating %d building polygons' % len(building_polygons))
-        buildings = cache(create_polygon_function,
+        #buildings = create_polygon_function(building_polygons)
+        buildings = anuga.cache(create_polygon_function,
                           building_polygons,
                           {'geo_reference': domain.geo_reference},