Changeset 7807

Timestamp:

Jun 8, 2010, 9:48:54 AM (15 years ago)

Author:

hudson

Message:

Cairns demo works with new API.

Location:

trunk/anuga_core/documentation/user_manual/demos/cairns

Files:

• project.py (modified) (2 diffs)
• runcairns.py (modified) (3 diffs)

trunk/anuga_core/documentation/user_manual/demos/cairns/project.py

@@ -1 @@
-"""Common filenames and locations for topographic data, meshes and outputs."""
+""" Common filenames and locations for topographic data, meshes and outputs.
+    This file defines the parameters of the scenario you wish to run.
+"""
 
 from anuga.geometry.polygon import read_polygon, plot_polygons, \
@@ -45 +47 @@
 
 # Define resolutions (max area per triangle) for each polygon
-default_res = 1000000000    # Background resolution
-islands_res = 10000000
-cairns_res = 10000000
-shallow_res = 50000000
+# Make these numbers larger to reduce the number of triangles in the model,
+# and hence speed up the simulation
+default_res = 10000000    # Background resolution
+islands_res = 100000
+cairns_res = 100000
+shallow_res = 500000
 
 # Define list of interior regions with associated resolutions

trunk/anuga_core/documentation/user_manual/demos/cairns/runcairns.py

@@ -81 +81 @@
 if project.scenario == 'slide':
     # Function for submarine slide
-    tsunami_source = slide_tsunami(length=35000.0,
+    tsunami_source = anuga.slide_tsunami(length=35000.0,
                                    depth=project.slide_depth,
                                    slope=6.0,
@@ -96 +96 @@
 print 'Available boundary tags', domain.get_boundary_tags()
 
-Bd = Dirichlet_boundary([tide, 0, 0]) # Mean water level
-Bs = Transmissive_stage_zero_momentum_boundary(domain) # Neutral boundary
+Bd = anuga.Dirichlet_boundary([tide, 0, 0]) # Mean water level
+Bs = anuga.Transmissive_stage_zero_momentum_boundary(domain) # Neutral boundary
 
 if project.scenario == 'fixed_wave':
     # Huge 50m wave starting after 60 seconds and lasting 1 hour.
-    Bw = Time_boundary(domain=domain,
+    Bw = anuga.Time_boundary(domain=domain,
                        function=lambda t: [(60<t<3660)*50, 0, 0])
     domain.set_boundary({'ocean_east': Bw,
@@ -121 +121 @@
 t0 = time.time()
 
-from Numeric import allclose
+from numpy import allclose
 
 if project.scenario == 'slide':