Changeset 4985

Timestamp:

Jan 30, 2008, 11:39:28 AM (17 years ago)

Author:

nick

Message:

 

Location:

anuga_validation/conical_island

Files:

• run_circular.py (modified) (10 diffs)
• sqrt_table.csv (added)
• sqrt_table_new.csv (added)

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, sww2csv_gauges,square_root
+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
@@ -19 +19 @@
 from anuga.shallow_water.data_manager import csv2dict
 
-#import project
-
 #-------------------------
 # Create Domain from mesh
@@ -99 +97 @@
 d=0.75
 res=.05
-res=1.
+#res=1.
 
 #create polygons (circles) to have higher resolution
@@ -166 +164 @@
 domain.set_quantity('stage', water_height)
 
-#def square_root():
-#    fileName1 = "square_root_table.csv"
-#    file1 = open(fileName1,"w")
-##    file1.write("number,square_root \n")
-#    for i in range (0,37):
-#        for j in range (0,10):
-#            number = i+(j/10.)
-#            print "%s,%s, %s, %s" %(i,j, number, sqrt(number))
-#            
-#            file1.write("%s, %s\n" %(i, sqrt(number)))
-#    file1.close()
-#
-##    return sqrt(s)
-#
-#def test():                
-#    fileName = "test.csv"
-#    file = open(fileName,"w")
-#    file.write("easting,northing,elevation \n")
-#    
-#   # csv2dict()
-#    
-#    x = 12.96
-#    y = 13.80
-#    res=1
-#    for i in range(0,30*res):
-#        for j in range(0,25*res):
-##            a = (x-i)**2
-##            b = (y-j)**2
-#
-#          #  z = -sqrt((x-(i/res))**2+(y-(j/res))**2)
-#            du = (x-(i/res))**2+(y-(j/res))**2
-#            z = -sqrt(du)*.25+(0.8975)
-#            if z <0:
-#                z=0
-#            if z > .625:
-#                z=0.625
-#
-#            #print 'x,y,f',du,i,j,z
-#            file.write("%s, %s, %s\n" %(i/res, j/res, z))
-#    file.close()
-#
-##square_root()
-##test()
-#
-#square_root_data=array([],typecode=Float)
-#
-#square_root_data=resize(square_root_data,(400,2))
-#
-#
-#for i in range (0,37):
-#    for j in range (0,10):
-#        number = i+(j/10.)
-#        print "%s,%s, %s, %s" %(i,j, number, sqrt(number))
-#        
-#        square_root_data[i*10+j]= number, sqrt(number)
-#            
-##        file1.write("%s, %s\n" %(i, sqrt(number)))
-
-attribute_dic, title_index_dic = csv2dict('sqrt_table.csv')
+
+#attribute_dic, title_index_dic = csv2dict('sqrt_table.csv')
+attribute_dic, title_index_dic = csv2dict('sqrt_table_new.csv')
 #print attribute_dic
 print attribute_dic['number'][10]
@@ -243 +185 @@
     z1=[]
     for d in du:
-        n1a = round(d,0)
-        n1=int(n1a)*10
-        n2=int(round(d - int(round(d,0)),1)*10)
-        nn=n1+n2
-        #print d,n1a,n1,n2,nn
+#        n1=int(round(d,0))*10
+#        n2=int(round(d - int(round(d,0)),1)*10)
+##        n3=int(round(d - int(round(d,1)),2)*100)
+#        nn=n1+n2#+n3
+
+      
+#        n1=int(round(d,0))*100
+#        n2=int(round(d - n1,1)*10)*10
+#        n3=int(round(d - n2,2)*100)
+#        nn=n1+n2+n3
+        nn=int(round(d,2)*100)
+#        print d,n1,n2,n3,nn
 #    zz=square_root_data[nn]
         zz=-float(attribute_dic['sqrt'][nn])
-        print nn,zz
+#        print nn,zz
 
 #    z = -square_root((center_x-x)**2+(center_y-y)**2)
@@ -259 +208 @@
         if z > .625:
             z=0.625
-        print 'hello',z
+        print 'hello',d,nn,zz,z
+#        print 'hello',d,n1,n2,n3,nn,zz,z
         z1.append(z)
     return z1
@@ -265 +215 @@
 #domain.set_quantity('elevation',filename = "test.csv", alpha=0.1)
 #domain.set_quantity('elevation',filename = "test.csv", alpha=1.,verbose=True)
-domain.set_quantity('elevation',test, verbose=True)
+domain.set_quantity('elevation',test, alpha=1., verbose=True)
 
 
@@ -272 +222 @@
 #-------------------------
 domain.set_name('test1')  # Name of output sww file
-domain.set_default_order(1)               # Apply second order scheme 
-domain.set_all_limiters(0.9)              # Max second order scheme (old lim)
-domain.set_minimum_storable_height(0.01) # Don't store w < 0.001m
-domain.set_maximum_allowed_speed(0.1)     # Allow a little runoff (0.1 is OK)
+#domain.set_default_order(1)               # Apply second order scheme 
+#domain.set_all_limiters(0.9)              # Max second order scheme (old lim)
+#domain.set_minimum_storable_height(0.01) # Don't store w < 0.001m
+#domain.set_maximum_allowed_speed(0.1)     # Allow a little runoff (0.1 is OK)
+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(1)     # Allow a little runoff (0.1 is OK)
 domain.tight_slope_limiters = 1
 domain.beta_h = 0.0
@@ -320 +274 @@
 t0 = time.time()
 
-for t in domain.evolve(yieldstep = 1, finaltime = 32):
+for t in domain.evolve(yieldstep = 1, finaltime = 30):
     domain.write_time()
 #    domain.write_time(track_speeds=False)
@@ -329 +283 @@
     domain.write_time()
    
-for t in domain.evolve(yieldstep = 1, finaltime = 50
+for t in domain.evolve(yieldstep = 1, finaltime = 45
                        ,skip_initial_step = True): 
     domain.write_time()