Changeset 7804 for anuga_work

Timestamp:

Jun 7, 2010, 4:19:31 PM (14 years ago)

Author:

hudson

Message:

Fixed up failing tests, updated user guide with new API (first few chapters only).

File:

• anuga_work/development/classroom/ripcurrent.py (modified) (8 diffs)

anuga_work/development/classroom/ripcurrent.py

@@ -16 +16 @@
 # Import necessary modules
 #------------------------------------------------------------------------------
-from anuga.interface import create_domain_from_regions
-from anuga.shallow_water.shallow_water_domain import Dirichlet_boundary
-from anuga.shallow_water.shallow_water_domain import Reflective_boundary
-from anuga.shallow_water.shallow_water_domain import Time_boundary
-from anuga.shallow_water.data_manager import get_mesh_and_quantities_from_file
+import anuga
 from pylab import figure, plot, axis, quiver, quiverkey, show, title, axhline
 from pylab import cos, sin, pi
@@ -41 +37 @@
 halfchannelwidth = 5
 bank_slope = 0.1
-simulation_length = 1
+simulation_length = 60
 timestep = 1
 
@@ -50 +46 @@
 length = 120
 width = 170
-seafloor_resolution = 60.0 # Resolution: Max area of triangles in the mesh
+seafloor_resolution = 20.0 # Resolution: Max area of triangles in the mesh
 feature_resolution = 1.0
 beach_resolution = 10.0
 
 sea_boundary_polygon = [[0,0],[length,0],[length,width],[0,width]]
-feature_boundary_polygon = [[0,100],[length,100],[length,150],[0,150]]
+feature_boundary_polygon = [[19,99],[length/2+1,99],[length/2+1,151],[0,151]]
+hole_boundary_polygon = [[20,100],[length/2,100],[length/2,150],[20,150]]
 beach_interior_polygon = [[0,150],[length,150],[length,width],[0,width]]
 
@@ -64 +61 @@
                    [beach_interior_polygon, beach_resolution]]
 
-domain = create_domain_from_regions(sea_boundary_polygon,
+domain = anuga.create_domain_from_regions(sea_boundary_polygon,
                                     boundary_tags={'bottom': [0],
                                                    'right' : [1],
@@ -72 +69 @@
                                     mesh_filename=meshname,
                                     interior_regions=feature_regions,
+                                    interior_holes=[hole_boundary_polygon],
                                     use_cache=True,
                                     verbose=True)
@@ -149 +147 @@
 # Setup boundary conditions
 #------------------------------------------------------------------------------
-Bi = Dirichlet_boundary([0.4, 0, 0])          # Inflow
-Br = Reflective_boundary(domain)              # Solid reflective wall
-Bo = Dirichlet_boundary([-5, 0, 0])           # Outflow
+Bi = anuga.Dirichlet_boundary([0.4, 0, 0])          # Inflow
+Br = anuga.Reflective_boundary(domain)              # Solid reflective wall
+Bo = anuga.Dirichlet_boundary([-5, 0, 0])           # Outflow
 
 def wave(t):
@@ -158 +156 @@
     
     A = 0.4  # Amplitude of wave [m] (wave height)
-    T = 5    # Wave period [s]
+    T = 1    # Wave period [s]
 
     if t < 30000000000:
@@ -165 +163 @@
         return [0.0, 0, 0]
 
-Bt = Time_boundary(domain, f=wave)
-
-
-domain.set_boundary({'left': Br, 'right': Br, 'top': Bo, 'bottom': Bt})
+Bt = anuga.Time_boundary(domain, f=wave)
+
+
+domain.set_boundary({'left': Br, 'right': Br, 'top': Bo, 'bottom': Bt, 'exterior': Br})