Changeset 7801

Timestamp:

Jun 7, 2010, 2:47:25 PM (14 years ago)

Author:

hudson

Message:

Cairns demo uses new API.

Location:

trunk/anuga_core/documentation/user_manual/demos/cairns

Files:

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

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

@@ -1 +1 @@
 """Common filenames and locations for topographic data, meshes and outputs."""
 
-from anuga.utilities.polygon import read_polygon, plot_polygons, \
+from anuga.geometry.polygon import read_polygon, plot_polygons, \
                                     polygon_area, is_inside_polygon
 
@@ -45 +45 @@
 
 # Define resolutions (max area per triangle) for each polygon
-default_res = 10000000    # Background resolution
-islands_res = 100000
-cairns_res = 100000
-shallow_res = 500000
+default_res = 1000000000    # Background resolution
+islands_res = 10000000
+cairns_res = 10000000
+shallow_res = 50000000
 
 # Define list of interior regions with associated resolutions

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

@@ -21 +21 @@
 
 # Related major packages
-from anuga.interface import create_domain_from_regions
-from anuga.interface import Reflective_boundary
-from anuga.interface import Dirichlet_boundary
-from anuga.interface import Time_boundary
-from anuga.interface import File_boundary
-from anuga.interface import Transmissive_stage_zero_momentum_boundary
-
-from anuga.shallow_water.data_manager import convert_dem_from_ascii2netcdf
-from anuga.shallow_water.data_manager import dem2pts
-
-from anuga.shallow_water.smf import slide_tsunami  
+import anuga
 
 # Application specific imports
@@ -41 +31 @@
 #------------------------------------------------------------------------------
 # Create DEM from asc data
-convert_dem_from_ascii2netcdf(project.demname, use_cache=True, verbose=True)
+anuga.asc2dem(project.demname, use_cache=True, verbose=True)
 
 # Create pts file for onshore DEM
-dem2pts(project.demname, use_cache=True, verbose=True)
+anuga.dem2pts(project.demname, use_cache=True, verbose=True)
 
 #------------------------------------------------------------------------------
@@ -51 +41 @@
 # boundary and interior regions as defined in project.py
 #------------------------------------------------------------------------------
-domain = create_domain_from_regions(project.bounding_polygon,
+domain = anuga.create_domain_from_regions(project.bounding_polygon,
                                     boundary_tags={'top': [0],
                                                    'ocean_east': [1],
@@ -132 +122 @@
 
 from Numeric import allclose
-from anuga.abstract_2d_finite_volumes.quantity import Quantity
 
 if project.scenario == 'slide':