Changeset 6192

Timestamp:

Jan 19, 2009, 6:49:40 AM (16 years ago)

Author:

ole

Message:

Work on Patong and some diagnostic output

Files:

• anuga_core/source/anuga/abstract_2d_finite_volumes/util.py (modified) (4 diffs)
• anuga_work/production/patong/project.py (modified) (4 diffs)
• anuga_work/production/patong/run_patong.py (modified) (3 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -392 +392 @@
 
         if boundary_polygon is not None:
-            #removes sts points that do not lie on boundary
+            # Remove sts points that do not lie on boundary
             # FIXME(Ole): Why don't we just remove such points from the list of points and associated data?
             # I am actually convinced we can get rid of neighbour_gauge_id altogether as the sts file is produced using the ordering file.
@@ -404 +404 @@
             for i in range(len(boundary_polygon)):
                 for j in range(len(x)):
-                    if num.allclose(vertex_coordinates[j],boundary_polygon[i],1e-4):
+                    if num.allclose(vertex_coordinates[j],
+                                    boundary_polygon[i], 1e-4):
                         #FIXME:
                         #currently gauges lat and long is stored as float and
@@ -475 +476 @@
         if boundary_polygon is not None:
             #removes sts points that do not lie on boundary
-            quantities[name] = num.take(quantities[name],gauge_id,1)
+            quantities[name] = num.take(quantities[name], gauge_id, 1)
             
     # Close sww, tms or sts netcdf file         
@@ -488 +489 @@
         #vertex coordinates is position of urs gauges
 
+    if verbose:
+        print 'Call interpolation function'
     # Return Interpolation_function instance as well as
     # starttime for use to possible modify that of domain

anuga_work/production/patong/project.py

@@ -48 +48 @@
 finaltime=15000         # final time for simulation 15000
 
-setup='trial'  # Final can be replaced with trial or basic.
+setup='final'  # Final can be replaced with trial or basic.
                # Either will result in a coarser mesh that will allow a
                # faster, but less accurate, simulation.
@@ -66 +66 @@
     res_factor=1
     time_thinning=4
+    #time_thinning=48    
     yieldstep=60
 
@@ -174 +175 @@
 # Area of Interest 1 elevation from -10m to 20m
 poly_aoi1 = read_polygon(polygons_dir+'aoi.csv')
-res_aoi1 = 500*res_factor
+res_aoi1 = 800*res_factor
 
 # Area of Significance 1 elevation from -20m to a 200m buffer of the 20m contour
@@ -184 +185 @@
 res_sw = 2000*res_factor
 
+
+# Area of buildings
+building_main = read_polygon(polygons_dir+'building_main.csv')
+building_main_small = read_polygon(polygons_dir+'building_main_small.csv')
+building_main_south = read_polygon(polygons_dir+'building_main_south.csv')
+building_saddle = read_polygon(polygons_dir+'building_saddle.csv')
+bld_res = 100*res_factor
+
+
+
+
 # Combined all regions, must check that all are included!
-interior_regions = [[poly_aoi1,res_aoi1],[poly_aos1,res_aos1]
-                    ,[poly_sw,res_sw]]
+interior_regions = [[poly_aoi1,res_aoi1],
+                    [poly_aos1,res_aos1],
+                    [poly_sw,res_sw],
+                    [building_main, bld_res],
+                    [building_main_small, bld_res],                    
+                    [building_main_south, bld_res],
+                    [building_saddle, bld_res]]
                  
     

anuga_work/production/patong/run_patong.py

@@ -59 +59 @@
 
 #copy_code_files(output_dir,__file__, 
-#         dirname(project.__file__)+sep+ project.__name__+'.py' )
+#                dirname(project.__file__)+sep+ project.__name__+'.py' )
 
 #start_screen_catcher(output_dir, myid, numprocs)
@@ -122 +122 @@
 
 # Add buildings from file
-print 'Creating building polygons'    
+print 'Reading building polygons'    
 building_polygons, building_heights = csv2building_polygons(project.building_polygon_file)
 
+print 'Creating building polygons'    
 L = []
 for key in building_polygons:
@@ -180 +181 @@
     print domain.timestepping_statistics()
     print domain.boundary_statistics(tags='ocean')
-
+    
 print 'Simulation took %.2f seconds' %(time.time()-t0)