Changeset 5123

Timestamp:

Mar 5, 2008, 9:50:16 AM (16 years ago)

Author:

nick

Message:

updates to circular island model. Now uses Numeric sqrt instead of a sqrt table.

Location:

anuga_validation/circular_island

Files:

• run_circular.py (modified) (10 diffs)
• ts2cnew1_input_20_80sec_new.txt (added)

anuga_validation/circular_island/run_circular.py

@@ -16 +16 @@
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
 from anuga.utilities.polygon import read_polygon#, plot_polygons
-from math import cos,pi,sin,tan,sqrt
-from Numeric import array, zeros, Float, allclose,resize
+from math import cos,pi,sin,tan#,sqrt
+from Numeric import array, zeros, Float, allclose,resize,sqrt
 from anuga.shallow_water.data_manager import csv2dict
 from time import localtime, strftime, gmtime
@@ -30 +30 @@
 time = strftime('%Y%m%d_%H%M%S',localtime())
 
-res=0.01
+res=0.0025
 
 dir_comment = time+'_res_'+str(res)+'_'+str(user)
@@ -36 +36 @@
 anuga_dir = home+'anuga_validation'+sep+'circular_island_tsunami_benchmark'+sep+'anuga'+sep
 output_dir = anuga_dir+'outputs'+sep+dir_comment+sep
+#output_dir = anuga_dir+'outputs'+sep+'20080222_062917_res_0.0025_nbartzis'+sep
 copy_code_files(output_dir,__file__)
 
@@ -169 +170 @@
 # Initial Conditions
 #-------------------------
-domain.set_quantity('friction', 0.0)
-water_height = 0.322
+#domain.set_quantity('friction', 0.0)
+domain.set_quantity('friction', 0.01)#for concrete
+#water_height = 0.322
+water_height = 0.0
+
 domain.set_quantity('stage', water_height)
 
 
-attribute_dic, title_index_dic = csv2dict('sqrt_table.csv')
+#attribute_dic, title_index_dic = csv2dict('sqrt_table.csv')
 #print attribute_dic
 #print attribute_dic['number'][10]
 
 def circular_island_elevation(x,y):
-
-    list_xy_square = (center_x-x)**2+(center_y-L-y)**2
+    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)
     print 'y',min(y),max(y)
     list_z=[]
-    for xy in list_xy_square:
-        # this finds the int that relates to the correct sqrt in the table
-        nn=int(round(xy,2)*100)
-        #the square root is to find the distance from the center to the current xy
-        distance = float(attribute_dic['sqrt'][nn])
-#        zz=-float(attribute_dic['sqrt'][nn])
-#        print nn,zz
-        
-        # slope of cone is 1/4 and has a radii of 3.6 therefore the cone is 0.9 high. 
-        # So to have the elevation positive 0.90 has been added
-#        z = zz*.25+0.90
-        z = -distance*.25+0.90
+#    for xy in list_xy_square:
+    for distance in list_xy:
+
+#        z = -distance*.25+0.9
+#        z = -distance*.25+0.578
+        z = -distance*.25+0.9-water_depth
 #        z = zz*.25+0.8975
 
-        if z <0:
-            z=0
-        if z > .625:
-            z=0.625
+        if z <0-water_depth:
+            z=0-water_depth
+        if z > .625-water_depth:
+            z=0.625-water_depth
 #        print 'hello',z
         list_z.append(z)
@@ -209 +208 @@
 
 
-#-------------------------
-# Set simulation parameters
-#-------------------------
+##-------------------------
+## Set simulation parameters
+##-------------------------
 model_name='wavetank_model'
 domain.set_name(model_name)  # Name of output sww file
 domain.set_datadir(output_dir)
-domain.set_default_order(1)               # Apply second order scheme 
+domain.set_default_order(2)               # Apply second order scheme 
 #domain.set_all_limiters(0.9)              # Max second order scheme (old lim)
 domain.set_minimum_storable_height(0.001) # Don't store w < 0.001m
-domain.set_maximum_allowed_speed(0.1)     # Allow a little runoff (0.1 is OK)
+#domain.set_maximum_allowed_speed(0.1)     # Allow a little runoff (0.1 is OK)
 domain.tight_slope_limiters = 1
 domain.beta_h = 0.0
+
 sww_file=output_dir+sep+model_name+'.sww'
 
@@ -230 +230 @@
 # Create boundary function from timeseries provided in file
 
-boundary_filename="ts2cnew1_input"
+boundary_filename="ts2cnew1_input_20_80sec_new"
 prepare_timeboundary(boundary_filename+'.txt')
 
@@ -239 +239 @@
 Bts = Transmissive_Momentum_Set_Stage_boundary(domain, function)
 
-Bw = Time_boundary(domain=domain,
-                   f=lambda t: [(0.1*sin(t*2*pi)), 0.0, 0.0])
 Br = Reflective_boundary(domain)
 Bd = Dirichlet_boundary([water_height,0,0])
-domain.set_boundary({'wave': Bts, 'wall': Br, 'buffer':Bd})
+#domain.set_boundary({'wave': Bts, 'wall': Br, 'buffer':Bd})
+domain.set_boundary({'wave': Bts, 'wall': Bd, 'buffer':Bd})
 #domain.set_time(20.0)
 #-------------------------
@@ -251 +250 @@
 t0 = time.time()
 
-for t in domain.evolve(yieldstep = 1, finaltime = 30):
+for t in domain.evolve(yieldstep = 1, finaltime = 28):
     domain.write_time()
 #    domain.write_time(track_speeds=False)
@@ -294 +293 @@
     print 'maxd %.3f, %.6f, %.6f, %.5s, %.5s '%(((angle/pi)*180)+180, run_up*100, (run_up-water_height)*100, location[0],location[1]) 
 
-sww_file=anuga_dir+'outputs'+sep+'20080220_010628_res_0.05_nbartzis'+sep+'wavetank_model.sww'
-sww_file=anuga_dir+'outputs'+sep+'20080219_233611_res_0.05_nbartzis'+sep+'wavetank_model.sww'
+#sww_file=anuga_dir+'outputs'+sep+'20080220_010628_res_0.05_nbartzis'+sep+'wavetank_model.sww'
+#sww_file=anuga_dir+'outputs'+sep+'20080219_233611_res_0.05_nbartzis'+sep+'wavetank_model.sww'
 sww2csv_gauges(sww_file=sww_file,
+                   gauge_file=anuga_dir+'gauges'+sep+'gauges.csv',
                    gauge_file='gauges.csv',
                    quantities = ['stage','depth', 'elevation', 'xmomentum', 'ymomentum'],
@@ -302 +302 @@
                    use_cache = True)
 
-csv2timeseries_graphs(directories_dic={anuga_dir+sep+'boundaries'+sep:['wavetank',0, 0],
-                                       anuga_dir+'outputs'+sep+'20080219_233611_res_0.05_nbartzis'+sep:['Fixed Wave',0,0]},
-                            output_dir=anuga_dir+'outputs'+sep+'20080219_233611_res_0.05_nbartzis'+sep,
-                            base_name='gauge_',
-                            plot_numbers='',
-                            quantities=['stage'],
-                            extra_plot_name='',
-                            assess_all_csv_files=True,                            
-                            create_latex=False,
-                            verbose=True)
-
-
-
-
-
+#csv2timeseries_graphs(directories_dic={anuga_dir+sep+'boundaries'+sep:['wavetank',0, 0],
+#                                       anuga_dir+'outputs'+sep+'20080219_233611_res_0.05_nbartzis'+sep:['Fixed Wave',0,0]},
+#                            output_dir=anuga_dir+'outputs'+sep+'20080219_233611_res_0.05_nbartzis'+sep,
+#                            base_name='gauge_',
+#                            plot_numbers='',
+#                            quantities=['stage'],
+#                            extra_plot_name='',
+#                            assess_all_csv_files=True,                            
+#                            create_latex=False,
+#                            verbose=True)
+
+
+
+
+