Changeset 4058 for anuga_work/production/sydney_2006/run_sydney_slide.py

Timestamp:

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

Author:

sexton

Message:

updates for all slide scenarios

File:

• anuga_work/production/sydney_2006/run_sydney_slide.py (modified) (2 diffs)

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')