Changeset 4133

Timestamp:

Jan 5, 2007, 2:33:15 PM (18 years ago)

Author:

nick

Message:

updated

File:

• anuga_work/production/perth_2006/project.py (modified) (3 diffs)

anuga_work/production/perth_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
@@ -118 +118 @@
 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
 
-bounding_polygon = read_polygon(polygons_dir+'bounding_poly.csv')
-res_bounding = 1000000
+poly_all = read_polygon(polygons_dir+'bounding_poly.csv')
+res_poly_all = 100000
 
 refzone = 50 
@@ -128 +128 @@
 ###############################
 
-poly_pos20_neg20 = read_polygon(polygons_dir+'pos20_neg20pts.csv')
-res_pos20_neg20 = 500000
+#poly_pos20_neg20 = read_polygon(polygons_dir+'pos20_neg20pts.csv')
+poly_pos20_neg20 = read_polygon(polygons_dir+'pos20_neg20_new_pts.csv')
+res_pos20_neg20 = 20000
 
-poly_cbd = read_polygon(polygons_dir+'cbd_pts.csv')
-res_cbd = 50000
+#poly_cbd = read_polygon(polygons_dir+'cbd_pts.csv')
+poly_cbd = read_polygon(polygons_dir+'cbd_new_pts.csv')
+res_cbd = 1000
 
 poly_penguin = read_polygon(polygons_dir+'penguin_pts.csv')
-res_penguin = 50000
+res_penguin = 1000
 #assert zone == refzone
 
-trigs_bound = polygon_area(bounding_polygon)/res_bounding
-trigs_pos = polygon_area(poly_pos20_neg20)/res_pos20_neg20
-trigs_cbd = polygon_area(poly_cbd)/res_cbd
-trigs_penguin = polygon_area(poly_penguin)/res_penguin
-trigs_min = trigs_bound + trigs_pos + trigs_cbd + trigs_penguin
+interior_regions = [[poly_pos20_neg20,res_pos20_neg20],[poly_cbd,res_cbd]
+                     ,[poly_penguin,res_penguin]]
 
-print 'Area of bounding poly', trigs_bound
-print 'Area of pos20_neg20pts', trigs_pos
-print 'Area of poly_cbd', trigs_cbd
-print 'Area of poly_penguin', trigs_penguin
+trigs_min = number_mesh_triangles(interior_regions, poly_all, res_poly_all)
+
 print 'min number triangles', trigs_min
-
 
 ###################################################################