Changeset 7624

Timestamp:

Feb 16, 2010, 9:33:23 AM (14 years ago)

Author:

steve

Message:

Cleaning up directory

Location:

anuga_validation/analytical solutions

Files:

• Analytical_solution_Yoon_cross_mesh.py (modified) (7 diffs)
• Analytical_solution_oblique_shock_01.py (moved) (moved from anuga_validation/analytical solutions/Analytical solution_oblique_shock_01.py)
• Analytical_solution_wave_runup.py (moved) (moved from anuga_validation/analytical solutions/Analytical solution_wave_runup.py)

anuga_validation/analytical solutions/Analytical_solution_Yoon_cross_mesh.py

@@ -1 +1 @@
 """Example of shallow water wave equation analytical solution
 consists of a parabolic profile in a parabolic basin. Analytical
-solutiuon to this problem was derived by Carrier and Greenspan
+solutiuon to this problem was derived by Thacker
 and used by Yoon and Chou.
 
@@ -14 +14 @@
 #from os import sep
 #sys.path.append('..'+sep+'pyvolution')
-from anuga.pyvolution.shallow_water import Domain, Transmissive_boundary, Reflective_boundary,\
+from anuga.shallow_water_balanced.swb_domain import Domain, Transmissive_boundary, Reflective_boundary,\
      Dirichlet_boundary
+
+#from anuga.interface import Domain, Transmissive_boundary, Reflective_boundary,\
+#     Dirichlet_boundary
 from math import sqrt, cos, sin, pi
-from anuga.pyvolution.mesh_factory import rectangular_cross
-from anuga.utilities.polygon import inside_polygon
-from Numeric import asarray
-from anuga.pyvolution.least_squares import Interpolation
+from anuga.interface import rectangular_cross
+from anuga.utilities.polygon import inside_polygon, is_inside_triangle
+from numpy import asarray
+
 
 #-------------------------------
 # Domain
-n = 100
-m = 100
-delta_x = 80.0
-delta_y = 80.0
-lenx = delta_x*n
-leny = delta_y*m
+n = 200
+m = 200
+lenx = 8000.0
+leny = 8000.0
 origin = (-4000.0, -4000.0)
 
@@ -37 +38 @@
 #----------------
 # Order of scheme
-domain.default_order = 1
+# Good compromise between
+# limiting and CFL
+#---------------
+domain.set_default_order(2)
+domain.set_timestepping_method(2)
+domain.set_beta(0.7)
+domain.set_CFL(0.6)
 
 domain.smooth = True
@@ -54 +61 @@
 #------------------------------------------
 # Reduction operation for get_vertex_values
-from anuga.pyvolution.util import mean
+from anuga.utilities.numerical_tools import mean
 domain.reduction = mean #domain.reduction = min  #Looks better near steep slopes
 
@@ -107 +114 @@
 # Find triangle that contains the point points
 # and print to file
-points = [0.,0.]
+
+
+
+points = (0.0, 0.0)
 for n in range(len(domain.triangles)):
-    t = domain.triangles[n]
-    tri = [domain.coordinates[t[0]],domain.coordinates[t[1]],domain.coordinates[t[2]]]
+    tri = domain.get_vertex_coordinates(n)
 
-    if inside_polygon(points,tri):
-        print 'Point is within triangle with vertices '+'%s'%tri
+    if is_inside_triangle(points,tri):
+        #print 'Point is within triangle with vertices '+'%s'%tri
         n_point = n
 
 print 'n_point = ',n_point
 t = domain.triangles[n_point]
-tri = [domain.coordinates[t[0]],domain.coordinates[t[1]],domain.coordinates[t[2]]]
+print 't = ', t
+tri = domain.get_vertex_coordinates(n)
 
 filename=domain.get_name()
@@ -137 +147 @@
     domain.write_time()
 
-    tri_array = asarray(tri)
-    t_array = asarray([[0,1,2]])
-    interp = Interpolation(tri_array,t_array,[points])
+    #tri_array = asarray(tri)
+    #t_array = asarray([[0,1,2]])
+    #interp = Interpolation(tri_array,t_array,[points])
 
 
-    stage     = Stage.get_values(location='centroids',indices=[n_point])[0]
-    xmomentum = Xmomentum.get_values(location='centroids',indices=[n_point])[0]
-    ymomentum = Ymomentum.get_values(location='centroids',indices=[n_point])[0]
+    stage     = Stage.get_values(location='centroids',indices=[n_point])
+    xmomentum = Xmomentum.get_values(location='centroids',indices=[n_point])
+    ymomentum = Ymomentum.get_values(location='centroids',indices=[n_point])
+    #print '%10.6f   %10.6f  %10.6f   %10.6f\n'%(t,stage,xmomentum,ymomentum)
     file.write( '%10.6f   %10.6f  %10.6f   %10.6f\n'%(t,stage,xmomentum,ymomentum) )
 
@@ -161 +172 @@
 xlabel('time(s)')
 ylabel('stage (m)')
-legend(('Observed', 'Modelled'), shadow=True, loc='upper left')
+#legend(('Observed', 'Modelled'), shadow=True, loc='upper left')
 #savefig(name, dpi = 300)