Changeset 4058 for anuga_work/production/sydney_2006

Timestamp:

Dec 5, 2006, 5:30:41 PM (18 years ago)

Author:

sexton

Message:

updates for all slide scenarios

Location:

anuga_work/production/sydney_2006

Files:

• project_slide.py (modified) (5 diffs)
• run_sydney_slide.py (modified) (2 diffs)

anuga_work/production/sydney_2006/project_slide.py

@@ -31 +31 @@
 nsw100 = 'dem_utm'
 
-# AHO
+# survey data
 offshore_name1 = 'surveyAreaA'
 offshore_name2 = 'surveyAreaB'
 offshore_name3 = 'surveyAreaC'
+
+# AHO data
+offshore_name4 = '1000003611export'
+offshore_name5 = '1000003613export'
+offshore_name6 = '1000003614export'
+offshore_name7 = '1000003627export'
+offshore_name8 = '1000003628export'
+offshore_name9 = 'AHDexport'
 
 #swollen/ all data output
@@ -63 +71 @@
 offshore_dem_name2 = datadir + offshore_name2
 offshore_dem_name3 = datadir + offshore_name3
+offshore_dem_name4 = datadir + offshore_name4
+offshore_dem_name5 = datadir + offshore_name5
+offshore_dem_name6 = datadir + offshore_name6
+offshore_dem_name7 = datadir + offshore_name7
+offshore_dem_name8 = datadir + offshore_name8
+offshore_dem_name9 = datadir + offshore_name9
 combined_dem_name   = datadir + 'sydney_combined_elevation'
 
@@ -134 +148 @@
 bulli_density = 1.46
 bulli_slope = 4.0
-bulli_alpha = 126.0 + 90.0
+bulli_alpha = 126.0 - 90.0
 
 shovel_depth = 968.0
@@ -142 +156 @@
 shovel_density = 1.49
 shove_slope = 4.0
-shovel_alpha = 118.0 + 90.0
+shovel_alpha = 118.0 - 90.0
 
 yacaaba_depth = 1119.0
@@ -150 +164 @@
 yacaaba_density = 1.48
 yacaaba_slope = 3.0
-yacaaba_alpha = 133.0 + 90.0
+yacaaba_alpha = 133.0 - 90.0

anuga_work/production/sydney_2006/run_sydney_slide.py

@@ -83 +83 @@
 
 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')+\
+G11 = 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')
+G12 = 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')
 print 'create onshore'
 G2 = Geospatial_data(file_name = project_slide.on_offshore25_dem_name + '.pts')
@@ -91 +97 @@
 G4 = Geospatial_data(file_name = project_slide.nsw_dem_name + '.pts')
 print 'add'
-G = G1.clip(Geospatial(project_slide.poly_surveyclip)) +\
+G = G11.clip(Geospatial_data(project_slide.poly_surveyclip)) +\
+    G12.clip(Geospatial_data(project_slide.polyAll))
     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_surveyclip))
+    (G4.clip(Geospatial_data(project_slide.polyAll))).clip_outside(Geospatial_data(project_slide.poly_surveyclip)).clip_outside(Geospatial_data(project_slide.poly_origsyd))
 print 'export points'
 G.export_points_file(project_slide.combined_dem_name + '.pts')