Changeset 8073 for trunk/anuga_work

Timestamp:

Nov 19, 2010, 2:53:46 PM (14 years ago)

Author:

steve

Message:

Added in a unit test for inlet operator

Location:

trunk/anuga_work/development/2010-projects

Files:

• anuga_1d/sww/run_dry_dam.py (modified) (1 diff)
• anuga_1d/sww/run_parabolic_canal.py (modified) (1 diff)
• kv/kv_profile.dat (modified) (previous)
• kv/profiling.py (modified) (3 diffs)

trunk/anuga_work/development/2010-projects/anuga_1d/sww/run_dry_dam.py

@@ -75 +75 @@
 
 
-finaltime = 4.0
-yieldstep = 0.1
+finaltime = 20.0
+yieldstep = 1.0
 L = 2000.0     # Length of channel (m)
 
 k = 0
 
-N = 3200
+N = 10000
 print "Evaluating domain with %d cells" %N
 domain = Domain(*uniform_mesh(N,x_1=L))

trunk/anuga_work/development/2010-projects/anuga_1d/sww/run_parabolic_canal.py

@@ -28 +28 @@
 
 L_x = 2500.0     # Length of channel (m)
-N = 400         # Number of compuational cells
+N = 1000         # Number of compuational cells
 cell_len = 4*L_x/N   # Origin = 0.0
 

trunk/anuga_work/development/2010-projects/kv/profiling.py

@@ -1 @@
-from anuga.abstract_2d_finite_volumes.domain import Domain
+from anuga.abstract_2d_finite_volumes.generic_domain import Generic_Domain
 import anuga.abstract_2d_finite_volumes.mesh_factory as mesh_factory
 import anuga.abstract_2d_finite_volumes.neighbour_mesh as neighbour_mesh
@@ -7 +7 @@
 import anuga.utilities.log as log
 
-def evolve():
-    print "Setting up"
-    grid_rows = 40
-    grid_cols = 40
-    #Set up a rectangular grid
-    points,elements,boundary = mesh_factory.rectangular_cross(grid_rows,grid_cols)
-    mesh = neighbour_mesh.Mesh(points,elements)
-    n = len(mesh)
-    print "n =",n
-    boundary_map = {}
-    for (vol_id,edge) in boundary.keys():
-        x = mesh.get_edge_midpoint_coordinate(vol_id,edge)[0]
-        y = mesh.get_edge_midpoint_coordinate(vol_id,edge)[1]
-        #Define boundary conditions: u=x^2-y^2, v=x-y+2
-        boundary_map[(vol_id,edge)] = Dirichlet_boundary([1,x*x-y*y,x-y+2])
-    #Now define an operator
-    domain = Domain(source=points,triangles=elements,boundary=boundary_map)
-    KV_Operator = Kinematic_Viscosity_Operator(domain)
-    print "Applying stage heights"
-    #Set up the operator and RHS
-    h = num.ones((n,),num.float)
+
+print "Setting up"
+grid_rows = 40
+grid_cols = 40
+#Set up a rectangular grid
+points,elements,boundary = mesh_factory.rectangular_cross(grid_rows,grid_cols)
+mesh = neighbour_mesh.Mesh(points,elements)
+n = len(mesh)
+print "n =",n
+boundary_map = {}
+for (vol_id,edge) in boundary.keys():
+    x = mesh.get_edge_midpoint_coordinate(vol_id,edge)[0]
+    y = mesh.get_edge_midpoint_coordinate(vol_id,edge)[1]
+    #Define boundary conditions: u=x^2-y^2, v=x-y+2
+    boundary_map[(vol_id,edge)] = Dirichlet_boundary([1,x*x-y*y,x-y+2])
+#Now define an operator
+domain = Generic_Domain(source=points,triangles=elements,boundary=boundary_map)
+KV_Operator = Kinematic_Viscosity_Operator(domain)
+print "Applying stage heights"
+#Set up the operator and RHS
+h = num.ones((n,),num.float)
+    
+def solve():   
     KV_Operator.apply_stage_heights(h)
     rhs = num.zeros((n,2),num.float) #we will solve for u and v
@@ -38 +40 @@
 import profile, pstats
 FN = 'kv_profile.dat'
-print "Starting..."
-profile.run('evolve()', FN)
+print "Starting solve..."
+profile.run('solve()', FN)
 S = pstats.Stats(FN)
 s = S.sort_stats('cumulative').print_stats(30)