Changeset 5035

Timestamp:

Feb 14, 2008, 2:17:55 PM (16 years ago)

Author:

nick

Message:

update to run_circular

File:

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

anuga_validation/circular_island/run_circular.py

@@ -104 +104 @@
 r2 = 2.5
 d=0.75
-res=.05
-#res=1.
+#res=.05
+res=1.
 L=4.11
 
@@ -178 +178 @@
 attribute_dic, title_index_dic = csv2dict('sqrt_table.csv')
 #print attribute_dic
-print attribute_dic['number'][10]
+#print attribute_dic['number'][10]
 
 def test(x,y):
@@ -185 +185 @@
 #    center_y = 6.80
 
-    du = (center_x-x)**2+(center_y-L-y)**2
-#    print 'x',min(x),max(x)
-#    print 'y',min(y),max(y)
+    list_xy = (center_x-x)**2+(center_y-L-y)**2
+    print 'x',min(x),max(x)
+    print 'y',min(y),max(y)
     z1=[]
-    for d in du:
+    for xy in list_xy:
         # this finds the int that relates to the correct sqrt in the table
         nn=int(round(d,2)*100)
@@ -293 +293 @@
     #print i,poly[i]
     
-    run_up, x_y = get_maximum_inundation_data(filename=model_name+'.sww',polygon=poly_segment, verbose=False)
-    
-    print 'maxd %.3f, %.6f, %.6f, %.5s, %.5s '%(((angle/pi)*180)+180, run_up*100, run_up-water_height*100, x_y[0],x_y[1]) 
-
-
-
-
-
-
-
+    run_up, location = get_maximum_inundation_data(filename=model_name+'.sww',polygon=poly_segment, verbose=False)
+    
+    print 'maxd %.3f, %.6f, %.6f, %.5s, %.5s '%(((angle/pi)*180)+180, run_up*100, run_up-water_height*100, location[0],location[1]) 
+
+
+
+
+
+
+