Changeset 4358

Timestamp:

Apr 4, 2007, 12:44:04 PM (18 years ago)

Author:

nick

Message:

update to broome

Location:

anuga_work/production/broome_2006

Files:

• build_broome.py (modified) (3 diffs)
• project.py (modified) (2 diffs)

anuga_work/production/broome_2006/build_broome.py

@@ -81 +81 @@
 
 #creates pts file for island DEM
-dem2pts(offshore_in_dir_name1, use_cache=True, verbose=True)
-dem2pts(offshore_in_dir_name2, use_cache=True, verbose=True)
+dem2pts(offshore_dir_name1, use_cache=True, verbose=True)
+dem2pts(offshore_dir_name2, use_cache=True, verbose=True)
 
 print'create Geospatial data1 objects from topographies'
@@ -93 +93 @@
 G_off = Geospatial_data(file_name = offshore_in_dir_name + '.txt')
 print'create Geospatial data4 objects from offshore1'
-G_off1 = Geospatial_data(file_name = offshore_in_dir_name1 + '.pts')
+G_off1 = Geospatial_data(file_name = offshore_dir_name1 + '.pts')
 print'create Geospatial data4 objects from offshore2'
-G_off2 = Geospatial_data(file_name = offshore_in_dir_name2 + '.pts')
+G_off2 = Geospatial_data(file_name = offshore_dir_name2 + '.pts')
 
 print'add all geospatial objects'
@@ -101 +101 @@
 
 print'clip combined geospatial object by bounding polygon'
-G_clipped = G.clip(project.bounding_polygon)
+G_clipped = G.clip(project.poly_all)
 #FIXME: add a clip function to pts
 #print'shape of clipped data', G_clipped.get_data_points().shape
 
 print'split'
-G_main, G_small = G_clipped.split(.10)
+G_small, G_other = G_clipped.split(.10,verbose=True)
 
 print'export combined DEM file'

anuga_work/production/broome_2006/project.py

@@ -119 +119 @@
 
 poly_all = read_polygon(polygons_dir+'extent.csv')
-res_poly_all = 500000
+res_poly_all = 150000
 
 ###############################
@@ -125 +125 @@
 ###############################
 
-poly_1 = read_polygon(polygons_dir+'broome_north_coast.csv')
-res_1 = 50000
+poly_0 = read_polygon(polygons_dir+'neg20_coast_contour_pts.csv')
+res_0 = 10000
+poly_1 = read_polygon(polygons_dir+'broome_north_coast_inside_extent.csv')
+res_1 = 5000
 
-poly_2 = read_polygon(polygons_dir+'broome_south_coast.csv')
-res_2 = 50000
+poly_2 = read_polygon(polygons_dir+'broome_south_coast_inside_extent.csv')
+res_2 = 5000
 
 poly_3 = read_polygon(polygons_dir+'Broome_town_pts.csv')
-res_3 = 10000
+res_3 = 2000
 
 poly_4 = read_polygon(polygons_dir+'Broome_inner_town_pts.csv')
-res_4 = 1000
+res_4 = 500
 #assert zone == refzone
 
-interior_regions = [[poly_1,res_1],[poly_2,res_2]
+interior_regions = [[poly_0,res_0],[poly_1,res_1],[poly_2,res_2]
                      ,[poly_3,res_3],[poly_4,res_4]]