Changeset 5489 for anuga_work/production/perth/project.py

Timestamp:

Jul 11, 2008, 3:38:03 PM (16 years ago)

Author:

kristy

Message:

changed data input

File:

• anuga_work/production/perth/project.py (modified) (6 diffs)

anuga_work/production/perth/project.py

@@ -67 +67 @@
 island_name = 'rott_dli_ext' # original
 island_name1 = 'gard_dli_ext'
-island_name2 = 'carnac_island_dted'
-island_name3 = 'penguin_dted'
+island_name2 = 'carnac_dli_ext'
+island_name3 = 'penguin_dli_ext'
 
 # AHO + DPI data + colin French coastline
-coast_name = 'coastline'
-offshore_name = 'perth_bathymetry'
+coast_name = 'coastline_perthP'
+offshore_name = 'Perth_clip'
 
 
@@ -158 +158 @@
 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
 
-poly_all = read_polygon(polygons_dir+'bounding_area.csv')
+poly_all = read_polygon(polygons_dir+'poly_all.csv')
 res_poly_all = 100000*res_factor
 
@@ -171 +171 @@
 res_internal_20_3 = 25000*res_factor
 
+#Polygon designed to cut out the rottnest island land.
+poly_rottnest_in = read_polygon(polygons_dir+'rottnest_internal.csv')
+res_rottnest_in = 25000*res_factor
+
 #Polygon designed to incorporate Garden Island and sand bank infront of Rockingham
 poly_garden_rockingham = read_polygon(polygons_dir+'garden_rockingham.csv')
-res_garden_rockingham = 1500*res_factor
+res_garden_rockingham = 2500*res_factor
 
 #Polygon designed to incorporate coastline of rottnest
@@ -179 +183 @@
 res_rottnest_ex = 1000*res_factor
 
-#Polygon designed to cut out the rottnest island land.
-poly_rottnest_in = read_polygon(polygons_dir+'rottnest_internal.csv')
-res_rottnest_in = 25000*res_factor
-
 #Polygon designed to incorporate perth and Fremantle CBD
 poly_cbd = read_polygon(polygons_dir+'CBD_coastal.csv')
@@ -188 +188 @@
 
 #Polygon designed to incorporate rockingham and penguin island
-poly_penguin = read_polygon(polygons_dir+'rockingham_penguin.csv')
-res_penguin = 500*res_factor
-
-poly_geordie_bay = read_polygon(polygons_dir+'Geordie_Bay.csv')
+poly_rockingham = read_polygon(polygons_dir+'rockingham_penguin.csv')
+res_rockingham = 500*res_factor
+
+#Polygon designed to incorporate bottom of Garden Island for image verification
+poly_garden = read_polygon(polygons_dir+'garden.csv')
+res_garden = 500*res_factor
+
+poly_geordie_bay = read_polygon(polygons_dir+'geordie_bay.csv')
 res_geordie_bay = 500*res_factor
 
-poly_sorrento_gauge = read_polygon(polygons_dir+'Sorrento_gauge.csv')
+poly_sorrento_gauge = read_polygon(polygons_dir+'sorrento_gauge.csv')
 res_sorrento_gauge = 500*res_factor
+
+
 #assert zone == refzone
 
 interior_regions = [[poly_internal_20_3,res_internal_20_3],[poly_cbd,res_cbd]
                      ,[poly_garden_rockingham,res_garden_rockingham]
-                     ,[poly_penguin,res_penguin],[poly_geordie_bay,res_geordie_bay]
+                     ,[poly_rockingham,res_rockingham],[poly_geordie_bay,res_geordie_bay]
                      ,[poly_sorrento_gauge,res_sorrento_gauge],[poly_rottnest_in, res_rottnest_in]
-                     ,[poly_rottnest_ex, res_rottnest_ex]]
+                     ,[poly_rottnest_ex, res_rottnest_ex], [poly_garden, res_garden]]
 
 boundary_tags={'back': [0,1,2], 'side': [3,7],'ocean': [4, 5, 6]}
@@ -210 +216 @@
 print 'min number triangles', trigs_min
 
-poly_mainland = read_polygon(polygons_dir+'Initial_Condition.csv')
+poly_mainland = read_polygon(polygons_dir+'initial_condition.csv')
 
 ###################################################################