Changeset 3275 for documentation/user_manual/examples

Timestamp:

Jul 4, 2006, 2:34:21 PM (19 years ago)

Author:

sexton

Message:

updates on sydney demo for user manual

Location:

documentation/user_manual/examples

Files:

• harbour.py (modified) (1 diff)
• project.py (modified) (5 diffs)
• runup.py (modified) (1 diff)

documentation/user_manual/examples/harbour.py

@@ -34 +34 @@
 #------------------------------------------------------------------------------
 
-west = 10000.+harbour_length+shelf_length+bottom_length
-east = 0.
+east = 10000.+harbour_length+shelf_length+bottom_length
+west = 0.
 south = 0.
 north = 5000.

documentation/user_manual/examples/project.py

@@ -5 +5 @@
 from os import sep, environ
 from os.path import expanduser
-from utilities.polygon import read_polygon
 import sys
-
-from pmesh.create_mesh import convert_points_from_latlon_to_utm
 
 # We'll do this for the final thing 
@@ -23 +20 @@
 scenario_dir_name = 'sydney_tsunami_example_2006'
 # revised 100m data
-coarsename = 'bathyland100' # get from Neil/Ingo (DEM or topo data)
+coarsename = 'bathyland100' 
 # revised 25m data
-finename = 'bathy_dem25' # get from Neil/Ingo (DEM or topo data) Wed 25 Jan
+finename = 'bathy_dem25'
 
 #Derive subdirectories and filenames
@@ -38 +35 @@
 combineddemname = datadir + 'sydneytopo'
 
-#Georeferencing
-from coordinate_transforms.redfearn import degminsec2decimal_degrees
-
 refzone = 56
 print 'refzone', refzone
 
-dsouth = degminsec2decimal_degrees(-34,05,0)
-dnorth = degminsec2decimal_degrees(-33,33,0)
-dnorth1 = degminsec2decimal_degrees(-33,40,0)
-dnorth2 = degminsec2decimal_degrees(-33,58,30)
-dnorth3 = degminsec2decimal_degrees(-33,46,0)
-dwest = degminsec2decimal_degrees(151,2,20)
-deast1 = degminsec2decimal_degrees(151,20,0)
-deast2 = degminsec2decimal_degrees(151,48,0)
-deast3 = degminsec2decimal_degrees(151,10,0)
-deast4 = degminsec2decimal_degrees(151,9,0)
-
-dp0 = [dsouth, dwest]
-dp1 = [dsouth, deast1]
-dp2 = [dnorth2, deast2]
-dp3 = [dnorth1, deast2]
-dp4 = [dnorth, deast1]
-dp5 = [dnorth, deast4]
-dp6 = [dnorth3, deast3]
-dp7 = [dnorth3, dwest]
-dp8 = [dnorth, dwest]
-    
-diffpolygonall, zone = convert_points_from_latlon_to_utm([dp0, dp1, dp2, dp3, dp4, dp5, dp6, dp7])
-
-qp0 = [343494.0, 6270650.0]
-qp1 = [343337.0, 6270303.0]
-qp2 = [343466.0, 6270228.0]
-qp3 = [343139.0, 6269901.0]
-qp4 = [342472.0, 6268573.0]
-qp5 = [342111.0, 6267115.0]
-qp6 = [342479.0, 6266121.0]
-qp7 = [342860.0, 6266386.0]
-qp8 = [342635.0, 6267438.0]
-qp9 = [343105.0, 6269070.0]
-qp10 = [343548.0, 6269567.0]
-qp11 = [343487.0, 6269928.0]
-qp12 = [343991.0, 6270269.0]
-
-# demo poly which isn't rectangular
+# demo poly 
 j0 = [385000, 6280000]
 j1 = [360000, 6272500]
@@ -94 +51 @@
 demopoly = [j0, j1, j2, j3, j31, j4, j5, j6, j7]
 
+from utilities.polygon import read_polygon
 polygonptsfile4 = polygondir + 'poly1'
 polygonptsfile0 = polygondir + 'poly2'
@@ -105 +63 @@
 top_polygon = read_polygon(polygonptsfile4 + '.csv')
 
-#Interior regions - the Harbour
-harbour_1x = degminsec2decimal_degrees(-33,51,0)
-harbour_1y = degminsec2decimal_degrees(151,2,30)
-harbour_12x = degminsec2decimal_degrees(-33,51,0)
-harbour_12y = degminsec2decimal_degrees(151,5,0)
-harbour_13x = degminsec2decimal_degrees(-33,52,15)
-harbour_13y = degminsec2decimal_degrees(151,5,0)
-harbour_2x = degminsec2decimal_degrees(-33,53,0)
-harbour_2y = degminsec2decimal_degrees(151,17,20)
-harbour_3x = degminsec2decimal_degrees(-33,47,0)
-harbour_3y = degminsec2decimal_degrees(151,20,30)
-harbour_4x = degminsec2decimal_degrees(-33,47,50)
-harbour_4y = degminsec2decimal_degrees(151,8,10)
-harbour_5x = degminsec2decimal_degrees(-33,48,10)
-harbour_5y = degminsec2decimal_degrees(151,8,0)
-harbour_6x = degminsec2decimal_degrees(-33,49,0)
-harbour_6y = degminsec2decimal_degrees(151,2,30)
-harbour_7x = degminsec2decimal_degrees(-33,34,30)
-harbour_7y = degminsec2decimal_degrees(151,20,20)
-harbour_8x = degminsec2decimal_degrees(-33,33,30)
-harbour_8y = degminsec2decimal_degrees(151,17,0)
-harbour_9x = degminsec2decimal_degrees(-33,45,30)
-harbour_9y = degminsec2decimal_degrees(151,17,0)
-harbour_10x = degminsec2decimal_degrees(-33,45,10)
-harbour_10y = degminsec2decimal_degrees(151,11,40)
-harbour_11x = degminsec2decimal_degrees(-33,45,10)
-harbour_11y = degminsec2decimal_degrees(151,11,40)
-harbour_14x = degminsec2decimal_degrees(-33,49,10)
-harbour_14y = degminsec2decimal_degrees(151,11,40)
-harbour_15x = degminsec2decimal_degrees(-33,48,55)
-harbour_15y = degminsec2decimal_degrees(151,2,30)
-
-k02 = [harbour_1x, harbour_1y]
-k12 = [harbour_2x, harbour_2y]
-k22 = [harbour_3x, harbour_3y]
-k32 = [harbour_4x, harbour_4y]
-k42 = [harbour_5x, harbour_5y]
-k52 = [harbour_6x, harbour_6y]
-k62 = [harbour_7x, harbour_7y]
-k72 = [harbour_8x, harbour_8y]
-k82 = [harbour_9x, harbour_9y]
-k92 = [harbour_10x, harbour_10y]
-k102 = [harbour_11x, harbour_11y]
-k112 = [harbour_12x, harbour_12y]
-k122 = [harbour_13x, harbour_13y]
-k132 = [harbour_14x, harbour_14y]
-k142 = [harbour_15x, harbour_15y]
-
-harbour_polygon_2, zone = convert_points_from_latlon_to_utm([k02, k112, k122, k12, k22, k62, k72, k82, k102, k42, k52]) 
-assert zone == refzone
-
-
-#Interior region - Botany Bay
-bb_1x = degminsec2decimal_degrees(-34,3,0)
-bb_1y = degminsec2decimal_degrees(151,2,30)
-bb_10x = degminsec2decimal_degrees(-34,3,0)
-bb_10y = degminsec2decimal_degrees(151,8,0)
-bb_2x = degminsec2decimal_degrees(-34,3,0)
-bb_2y = degminsec2decimal_degrees(151,14,0)
-bb_3x = degminsec2decimal_degrees(-33,53,30)
-bb_3y = degminsec2decimal_degrees(151,17,20)
-bb_4x = degminsec2decimal_degrees(-33,53,0)
-bb_4y = degminsec2decimal_degrees(151,8,0)
-bb_5x = degminsec2decimal_degrees(-33,57,30)
-bb_5y = degminsec2decimal_degrees(151,8,0)
-bb_6x = degminsec2decimal_degrees(-33,57,30)
-bb_6y = degminsec2decimal_degrees(151,2,30)  
-bb_7x = degminsec2decimal_degrees(-33,53,30)
-bb_7y = degminsec2decimal_degrees(151,12,30)  
-bb_8x = degminsec2decimal_degrees(-33,55,20)
-bb_8y = degminsec2decimal_degrees(151,8,0)  
-bb_9x = degminsec2decimal_degrees(-33,55,20)
-bb_9y = degminsec2decimal_degrees(151,12,30)  
-
-j02 = [bb_1x, bb_1y]
-j12 = [bb_2x, bb_2y]
-j22 = [bb_3x, bb_3y]
-j32 = [bb_4x, bb_4y]
-j42 = [bb_5x, bb_5y]
-j52 = [bb_6x, bb_6y]
-j62 = [bb_7x, bb_7y]
-j72 = [bb_8x, bb_8y]
-j82 = [bb_9x, bb_9y]
-j92 = [bb_10x, bb_10y]
-
-botanybay_polygon_2, zone = convert_points_from_latlon_to_utm([j92, j12, j22, j62, j82, j72, j42]) 
-
 slump_origin = [372500.0, 6255000.0] #Absolute UTM

documentation/user_manual/examples/runup.py

@@ -37 +37 @@
 
 def topography(x,y):
-    return -x/3                             # linear bed slope
+    return -x/2                             # linear bed slope
     #return x*(-(2.0-x)*.5)                  # curved bed slope