Changeset 4132

Timestamp:

Jan 5, 2007, 2:32:42 PM (18 years ago)

Author:

nick

Message:

update with new version

Location:

anuga_work/production/busselton_2006

Files:

• build_busselton.py (added)
• project.py (modified) (5 diffs)
• run_busselton.py (added)

anuga_work/production/busselton_2006/project.py

@@ -7 +7 @@
 import sys
 from time import localtime, strftime, gmtime
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
+from anuga.utilities.polygon import read_polygon, plot_polygons, is_inside_polygon, number_mesh_triangles
 #from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, convert_points_from_latlon_to_utm
 from anuga.utilities.system_tools import get_user_name
@@ -26 +26 @@
 build_time = time+'_build'
 run_time = time+'_run'
-print 'gtime: ', gtime
+#print 'gtime: ', gtime
 
 tide = 0.6
@@ -105 +105 @@
 # bounding polygon for study area
 poly_all = read_polygon(polygons_dir+'poly_all.csv')
-res_poly_all = 100000
+res_poly_all = 1000000
 
-
-'''
 ###################################################################
 # Clipping regions for export to asc and regions for clipping data
@@ -123 +121 @@
 ###############################
 
-# broome digitized polygons
-poly_busselton1 = read_polygon(polygons_dir+'buss_Local_Polygon_update.csv')
-res_busselton1 = 500000
-poly_busselton2 = read_polygon(polygons_dir+'buss_Close2_update.csv')
-res_busselton2 = 500000
-poly_busselton3 = read_polygon(polygons_dir+'buss_Coast_update.csv')
-res_busselton3 = 500000
+#digitized polygons
+poly_busselton1 = read_polygon(polygons_dir+'neg20_pos10_polygon.csv')
+res_busselton1 = 100000
+poly_busselton2 = read_polygon(polygons_dir+'neg5_pos5_poly_.csv')
+res_busselton2 = 10000
 
 #plot_polygons([polyAll,poly_broome1,poly_broome2,poly_broome3],'boundingpoly2',verbose=False)
 
-interior_regions = [[poly_busselton1,res_busselton1],[poly_busselton2,res_busselton2],
-                    [poly_busselton3,res_busselton3]]
-#trigs_all = polygon_area(poly_all)/res_poly_all
-#trigs_bus1 = polygon_area(poly_busselton1)/res_busselton1
-#trigs_bus2 = polygon_area(poly_busselton2)/res_busselton2
-#trigs_bus3 = polygon_area(poly_busselton3)/res_busselton3
-#trigs_min = trigs_bound + trigs_pos + trigs_cbd + trigs_penguin
-
-#print 'Area of bounding poly', trigs_all
-#print 'Area of busselton1', trigs_bus1
-#print 'Area of busselton2', trigs_bus2
-#print 'Area of busselton3', trigs_bus3
-#print 'min number triangles', trigs_min
+interior_regions = [[poly_busselton1,res_busselton1],[poly_busselton2,res_busselton2]]
 
 trigs_min = number_mesh_triangles(interior_regions, poly_all, res_poly_all)
@@ -151 +135 @@
 print 'min number triangles', trigs_min
 
-def number_mesh_triangles(interior_regions, bounding_poly, remainder_res):
-    from anuga.utilities.polygon import polygon_area
-    
-    # TO DO check if any of the regions fall inside one another
-    no_triangles = 0.0
-    area = polygon_area(bounding_poly)
-    for i,j in interior_regions:
-        this_area = polygon_area(i)
-        no_triangles += this_area/j
-        area -= this_area
-        print j, this_area/1000000., area/1000000.
-    no_triangles += area/remainder_res
-    return int(no_triangles/0.7)
-'''