Changeset 4046 for anuga_work/production

Timestamp:

Dec 1, 2006, 2:46:11 PM (18 years ago)

Author:

sexton

Message:

slide updates

Location:

anuga_work/production

Files:

• newcastle_2006/project_slide.py (modified) (3 diffs)
• sydney_2006/project_slide.py (modified) (6 diffs)
• sydney_2006/run_sydney_slide.py (modified) (4 diffs)
• wollongong_2006/project_slide.py (modified) (2 diffs)

anuga_work/production/newcastle_2006/project_slide.py

@@ -62 +62 @@
 
 # bounding polygon for study area
-polyAll = read_polygon(polygondir+'extent.csv')
+polyAll = read_polygon(polygondir+'extentC.csv')
 
-# plot bounding polygon and make sure BC info surrounds it
-#plot_polygons([polyAll, poly_bc],'boundingpoly',verbose=False)
 print 'Area of bounding polygon', polygon_area(polyAll)/1000000.0
 
@@ -72 +70 @@
 ###############################
 
-# broome digitized polygons
+# newcastle digitized polygons
 poly_newcastle1 = read_polygon(polygondir+'.csv')
 poly_newcastle2 = read_polygon(polygondir+'.csv')
@@ -91 +89 @@
 northingmax = 
 
-#slump_origin = [,]
+###################################################################
+# Slide characteristics
+###################################################################
+
+slide_origin_a = [352928.37,6188303.94]
+slide_origin_b = [393301.80,6253255.08]
+slide_origin_c = [446025.35,6330307.46]
+
+bulli_depth = 2087.0
+bulli_length = 16840.0
+bulli_thickness = 424.0
+bulli_width = 8860.0
+bulli_density = 1.46
+bulli_slope = 4.0
+bulli_alpha = 126.0 + 90.0
+
+shovel_depth = 968.0
+shovel_length = 13500.0
+shovel_thickness = 165.0
+shovel_width = 4350.0
+shovel_density = 1.49
+shove_slope = 4.0
+shovel_alpha = 118.0 + 90.0
+
+yacaaba_depth = 1119.0
+yacaaba_length = 7050.0
+yacaaba_thickness = 144.0
+yacaaba_width = 3080.0
+yacaaba_density = 1.48
+yacaaba_slope = 3.0
+yacaaba_alpha = 133.0 + 90.0

anuga_work/production/sydney_2006/project_slide.py

@@ -66 +66 @@
 
 # bounding polygon for study area
-polyAll = read_polygon(polygondir+'extent.csv')
+polyAll = read_polygon(polygondir+'extent2.csv')
 
-# plot bounding polygon and make sure BC info surrounds it
-#plot_polygons([polyAll, poly_bc],'boundingpoly',verbose=False)
 print 'Area of bounding polygon', polygon_area(polyAll)/1000000.0
 
@@ -77 +75 @@
 
 # sydney digitized polygons
-interior_regions = []
-area = 0.
-coast_res = 500.
-for i in range(1,10):
-    poly = read_polygon(polygondir+'poly'+str(i)+'.csv')
-    area += polygon_area(poly)
-    #interior_regions.append([poly,coast_res])
-
+poly_coast = read_polygon(polygondir+'coast.csv')
 poly_syd1 = read_polygon(polygondir+'local.csv')
-local_res = 50000.
-interior_regions.append([poly_syd1,local_res])
 
 print 'Area of local polygon', polygon_area(poly_syd1)/1000000.0
-print 'Area of local polygon', area/1000000.0
+print 'Area of coastal polygon', polygon_area(poly_coast)/1000000.0
 
 ###################################################################
@@ -129 +118 @@
 ###################################################################
 
-#slide_origin = [,]
+slide_origin_a = [352928.37,6188303.94]
+slide_origin_b = [393301.80,6253255.08]
+slide_origin_c = [446025.35,6330307.46]
+
 bulli_depth = 2087.0
 bulli_length = 16840.0
@@ -135 +127 @@
 bulli_width = 8860.0
 bulli_density = 1.46
+bulli_slope = 4.0
 bulli_alpha = 126.0 + 90.0
 
@@ -142 +135 @@
 shovel_width = 4350.0
 shovel_density = 1.49
+shove_slope = 4.0
 shovel_alpha = 118.0 + 90.0
 
@@ -149 +143 @@
 yacaaba_width = 3080.0
 yacaaba_density = 1.48
+yacaaba_slope = 3.0
 yacaaba_alpha = 133.0 + 90.0

anuga_work/production/sydney_2006/run_sydney_slide.py

@@ -128 +128 @@
 
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
-remainder_res = 500000
-local_res = 25000
-#interior_regions = [[project_slide.poly_syd1, local_res]]
-#interior_regions.append(project_slide.poly_sydcoast)
+remainder_res = 1000000.
+local_res = 50000.
+coast_res = 10000.
+interior_regions = [[project_slide.poly_syd1, local_res],
+                    [project_slide.poly_coast, coast_res]]
 
 from caching import cache
@@ -140 +141 @@
            'maximum_triangle_area': remainder_res,
            'filename': meshname,
-           'interior_regions': project_slide.interior_regions},
+           'interior_regions': interior_regions},
           verbose = True, evaluate=False)
 print 'created mesh'
@@ -182 +183 @@
                                slope=project_slide.bulli_slope,
                                thickness=project_slide.bulli_thickness, 
-                               x0=project_slide.slide_origin[0], 
-                               y0=project_slide.slide_origin[1], 
+                               x0=project_slide.slide_origin_b[0], 
+                               y0=project_slide.slide_origin_b[1], 
                                alpha=project_slide.bulli_alpha, 
                                domain=domain)
@@ -202 +203 @@
 #-------------------------------------------------------------------------------
 import time
+from Numeric import allclose
+from anuga.abstract_2d_finite_volumes.quantity import Quantity
+
 t0 = time.time()
 

anuga_work/production/wollongong_2006/project_slide.py

@@ -62 +62 @@
 
 # bounding polygon for study area
-polyAll = read_polygon(polygondir+'extent.csv')
+polyAll = read_polygon(polygondir+'extentA.csv')
 
-# plot bounding polygon and make sure BC info surrounds it
-#plot_polygons([polyAll, poly_bc],'boundingpoly',verbose=False)
 print 'Area of bounding polygon', polygon_area(polyAll)/1000000.0
 
@@ -91 +89 @@
 northingmax = 
 
-#slump_origin = [,]
+###################################################################
+# Slide characteristics
+###################################################################
+
+slide_origin_a = [352928.37,6188303.94]
+slide_origin_b = [393301.80,6253255.08]
+slide_origin_c = [446025.35,6330307.46]
+
+bulli_depth = 2087.0
+bulli_length = 16840.0
+bulli_thickness = 424.0
+bulli_width = 8860.0
+bulli_density = 1.46
+bulli_slope = 4.0
+bulli_alpha = 126.0 + 90.0
+
+shovel_depth = 968.0
+shovel_length = 13500.0
+shovel_thickness = 165.0
+shovel_width = 4350.0
+shovel_density = 1.49
+shove_slope = 4.0
+shovel_alpha = 118.0 + 90.0
+
+yacaaba_depth = 1119.0
+yacaaba_length = 7050.0
+yacaaba_thickness = 144.0
+yacaaba_width = 3080.0
+yacaaba_density = 1.48
+yacaaba_slope = 3.0
+yacaaba_alpha = 133.0 + 90.0
+