Changeset 4056

Timestamp:

Dec 5, 2006, 3:54:51 PM (18 years ago)

Author:

sexton

Message:

update sydney script based on survey data

Location:

anuga_work/production/sydney_2006

Files:

• convert_survey_data.py (added)
• project_slide.py (modified) (4 diffs)
• run_sydney_slide.py (modified) (3 diffs)

anuga_work/production/sydney_2006/project_slide.py

@@ -32 +32 @@
 
 # AHO
-offshore_name1 = 'XY100011610'
+offshore_name1 = 'surveyAreaA'
+offshore_name2 = 'surveyAreaB'
+offshore_name3 = 'surveyAreaC'
 
 #swollen/ all data output
@@ -59 +61 @@
 nsw_dem_name = datadir + nsw100
 offshore_dem_name1 = datadir + offshore_name1
+offshore_dem_name2 = datadir + offshore_name2
+offshore_dem_name3 = datadir + offshore_name3
 combined_dem_name   = datadir + 'sydney_combined_elevation'
 
@@ -66 +70 @@
 
 # bounding polygon for study area
-polyAll = read_polygon(polygondir+'extent2.csv')
+polyAll = read_polygon(polygondir+'extent3.csv')
 
 print 'Area of bounding polygon', polygon_area(polyAll)/1000000.0
@@ -98 +102 @@
 northingmin100 = 6227588
 northingmax100 = 6285975
+
+poly_surveyclip = read_polygon(polygondir+'surveyclip.csv')
 
 # clipping for nsw grid for conversion

anuga_work/production/sydney_2006/run_sydney_slide.py

@@ -82 +82 @@
         use_cache=True, verbose=True)
 
-'''
 print 'create offshore'
 G1 = Geospatial_data(file_name = project_slide.offshore_dem_name1 + '.xya')+\
      Geospatial_data(file_name = project_slide.offshore_dem_name2 + '.xya')+\
      Geospatial_data(file_name = project_slide.offshore_dem_name3 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name4 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name5 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name6 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name7 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name8 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name9 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name10 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name11 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name12 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name13 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name14 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name15 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name16 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name17 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name18 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name19 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name20 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name21 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_dem_name22 + '.xya')+\
-     Geospatial_data(file_name = project_slide.offshore_interp_dem_name + '.pts')
-'''
 print 'create onshore'
 G2 = Geospatial_data(file_name = project_slide.on_offshore25_dem_name + '.pts')
@@ -113 +91 @@
 G4 = Geospatial_data(file_name = project_slide.nsw_dem_name + '.pts')
 print 'add'
-#G5
-G = G2.clip(Geospatial_data(project_slide.poly_25mclip)) +\
+G = G1.clip(Geospatial(project_slide.poly_surveyclip)) +\
+    G2.clip(Geospatial_data(project_slide.poly_25mclip)) +\
     G3.clip(Geospatial_data(project_slide.poly_origsyd)) +\
-    (G4.clip(Geospatial_data(project_slide.polyAll))).clip_outside(Geospatial_data(project_slide.poly_origsyd))
+    (G4.clip(Geospatial_data(project_slide.polyAll))).clip_outside(Geospatial_data(project_slide.poly_surveyclip))
 print 'export points'
 G.export_points_file(project_slide.combined_dem_name + '.pts')
-G.export_points_file(project_slide.combined_dem_name + '.xya')
+#G.export_points_file(project_slide.combined_dem_name + '.xya')
 
 #----------------------------------------------------------------------------
@@ -128 +106 @@
 
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
-remainder_res = 1000000.
-local_res = 50000.
-coast_res = 10000.
+remainder_res = 125000.
+local_res = 30000.
+coast_res = 500.
 interior_regions = [[project_slide.poly_syd1, local_res],
                     [project_slide.poly_coast, coast_res]]