Changeset 4979

Timestamp:

Jan 29, 2008, 2:54:11 PM (17 years ago)

Author:

nick

Message:

updated the script, it works nicely... but is still being developed

File:

• anuga_validation/conical_island/run_circular.py (modified) (7 diffs)

anuga_validation/conical_island/run_circular.py

@@ -11 +11 @@
 from anuga.shallow_water import Dirichlet_boundary, Time_boundary
 from anuga.shallow_water.data_manager import get_maximum_inundation_data
-from anuga.abstract_2d_finite_volumes.util import file_function, gauges_sww2csv
+from anuga.abstract_2d_finite_volumes.util import file_function, sww2csv_gauges
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
 from anuga.utilities.polygon import read_polygon, plot_polygons
@@ -89 +89 @@
 
 
-angles = (0.0, 22.5, 45.0, 67.5, 75.0, 80.0, 85.0, 87.5, 90.0, 92.5,
-          95.0, 100.0, 105.0, 112.5, 135.0, 157.5, 180.0, 202.5, 225.0,
-          247.5, 270.0, 292.5, 315.0, 337.5)
 angles1 = (0.0, 22.5, 45.0, 67.5, 90.0, 112.5, 135.0, 157.5, 180.0, 202.5, 225.0,
           247.5, 270.0, 292.5, 315.0, 337.5)
@@ -100 +97 @@
 r2 = 2.5
 d=0.75
-res=5.
-
+res=.05
+
+#create polygons (circles) to have higher resolution
 poly = []
 poly1 = []
@@ -108 +106 @@
     #convert Degs to Rads
     angle = ((angle-180)/180.0)*pi
-#    p1 = get_xy(x,y,r1,angle-0.01745*d)
-#    p2 = get_xy(x,y,r2,angle-0.01745*d)
-#    p3 = get_xy(x,y,r2,angle+0.01745*d)
-#    p4 = get_xy(x,y,r1,angle+0.01745*d)
-#    poly[i] = [[p1[0],p1[1]],[p2[0],p2[1]],[p3[0],p3[1]],[p4[0],p4[1]]]
 
     p = get_xy(x,y,3.6,angle)
@@ -242 +235 @@
 Bd = Dirichlet_boundary([water_height,0,0])
 domain.set_boundary({'wave': Bts, 'wall': Br, 'buffer':Bd})
-
+domain.starttime = 10
 #-------------------------
 # Evolve through time
@@ -253 +246 @@
 #    domain.write_time(track_speeds=False)
 
-for t in domain.evolve(yieldstep = 0.1, finaltime = 36
+#for t in domain.evolve(yieldstep = 0.1, finaltime = 36
+for t in domain.evolve(yieldstep = 0.5, finaltime = 36
                        ,skip_initial_step = True): 
     domain.write_time()
@@ -265 +259 @@
 
 
-#angles = (0.0, 22.5, 45.0, 67.5, 75.0, 80.0, 85.0, 87.5, 90.0, 92.5,
-#          95.0, 100.0, 105.0, 112.5, 135.0, 157.5, 180.0, 202.5, 225.0,
-#          247.5, 270.0, 292.5, 315.0, 337.5)
+#define the segments to find the run-up height to compare to wave tank study
+angles = (0.0, 22.5, 45.0, 67.5, 75.0, 80.0, 85.0, 87.5, 90.0, 92.5,
+          95.0, 100.0, 105.0, 112.5, 135.0, 157.5, 180.0, 202.5, 225.0,
+          247.5, 270.0, 292.5, 315.0, 337.5)
 #x = 12.96
 #y = 13.80
-#r1 = 1.1
-#r2 = 3.6
-#d=2
-#poly = {}
+r1 = 1.1
+r2 = 3.6
+d=2
+
+poly_segment = []
 
 for i,angle in enumerate(angles):
-#    angle = ((angle-180)/180.0)*pi
-##    angle = angle1*3.14157
-#    p1 = get_xy(x,y,r1,angle-0.01745*d)
-#    p2 = get_xy(x,y,r2,angle-0.01745*d)
-#    p3 = get_xy(x,y,r2,angle+0.01745*d)
-#    p4 = get_xy(x,y,r1,angle+0.01745*d)
-#    poly[i] = [[p1[0],p1[1]],[p2[0],p2[1]],[p3[0],p3[1]],[p4[0],p4[1]]]
-##    print i,poly[i]
-#    
-    
-    run_up, x_y = get_maximum_inundation_data(filename='test.sww',polygon=poly[i], verbose=False)
-    
-    print 'maximum_inundation_data',angle, run_up, x_y 
-
-
-
-
-
-
-
+    angle = ((angle-180)/180.0)*pi
+#    angle = angle1*3.14157
+    p1 = get_xy(x,y,r1,angle-0.01745*d)
+    p2 = get_xy(x,y,r2,angle-0.01745*d)
+    p3 = get_xy(x,y,r2,angle+0.01745*d)
+    p4 = get_xy(x,y,r1,angle+0.01745*d)
+#    print p1,p2,p3,p4,angle
+#    poly_segment.append([[p1[0],p1[1]],[p2[0],p2[1]],[p3[0],p3[1]],[p4[0],p4[1]]])
+    poly_segment =[[p1[0],p1[1]],[p2[0],p2[1]],[p3[0],p3[1]],[p4[0],p4[1]]]
+#    print i, poly_segment, angle
+    #print i,poly[i]
+    
+    
+#    run_up, x_y = get_maximum_inundation_data(filename='test.sww',polygon=poly[i], verbose=False)
+    run_up, x_y = get_maximum_inundation_data(filename='test.sww',polygon=poly_segment, verbose=False)
+    
+    print 'maximum_inundation_data',((angle/pi)*180)+180, run_up, x_y 
+
+
+
+
+
+
+