Changeset 5147

Timestamp:

Mar 10, 2008, 3:43:22 PM (17 years ago)

Author:

nick

Message:

update run_circular.py

File:

• anuga_validation/circular_island/run_circular.py (modified) (9 diffs)

anuga_validation/circular_island/run_circular.py

@@ -30 +30 @@
 time = strftime('%Y%m%d_%H%M%S',localtime())
 
-res=0.0025
+res=0.05
 
 dir_comment = time+'_res_'+str(res)+'_'+str(user)
@@ -113 +113 @@
 center_y = 13.80
 
-#d=0.75
 #L=3.6 and therefore the gauges 1,2,3 and 4 are located 1.8 from the toe of the island
 # 13.8 - 3.6(radii of island) - 1.8 = 8.4
@@ -126 +125 @@
     angle = ((angle-180)/180.0)*pi
 
-    p = get_xy(center_x,center_y,4.0,angle)
+    p = get_xy(center_x,center_y,4.5,angle)
     poly1.append([p[0],p[1]])
 
@@ -136 +135 @@
     #convert Degs to Rads
     angle = ((angle-180)/180.0)*pi
-    p = get_xy(center_x,center_y,2.6,angle)
+    p = get_xy(center_x,center_y,3.2,angle)
     poly2.append([p[0],p[1]])
     
@@ -179 +178 @@
 
 #attribute_dic, title_index_dic = csv2dict('sqrt_table.csv')
-#print attribute_dic
-#print attribute_dic['number'][10]
 
 def circular_island_elevation(x,y):
     water_depth = 0.32
-#    list_xy_square = (center_x-x)**2+(center_y-L-y)**2
     list_xy = sqrt((center_x-x)**2+(center_y-L-y)**2)
     print 'x',min(x),max(x)
@@ -192 +188 @@
     for distance in list_xy:
 
-#        z = -distance*.25+0.9
-#        z = -distance*.25+0.578
+#    The cone has a 1/4 slope and a 7.2 diameter this make the height 0.9m
+#    to get the stage at 0 elevation + cone height and - water depth
         z = -distance*.25+0.9-water_depth
-#        z = zz*.25+0.8975
 
         if z <0-water_depth:
@@ -201 +196 @@
         if z > .625-water_depth:
             z=0.625-water_depth
-#        print 'hello',z
         list_z.append(z)
     return list_z
@@ -286 +280 @@
 #    print p1,p2,p3,p4,angle
     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, location = get_maximum_inundation_data(filename=sww_file,polygon=poly_segment, verbose=False)
@@ -297 +289 @@
 sww2csv_gauges(sww_file=sww_file,
                    gauge_file=anuga_dir+'gauges'+sep+'gauges.csv',
-                   gauge_file='gauges.csv',
+#                   gauge_file='gauges.csv',
                    quantities = ['stage','depth', 'elevation', 'xmomentum', 'ymomentum'],
                    verbose=True,