Changeset 7838 for trunk/anuga_core/documentation/user_manual/demos/cairns/project.py

Timestamp:

Jun 15, 2010, 9:11:59 AM (14 years ago)

Author:

hudson

Message:

Got all demos running with new API.

File:

• trunk/anuga_core/documentation/user_manual/demos/cairns/project.py (modified) (3 diffs)

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

@@ -3 +3 @@
 """
 
-from anuga.geometry.polygon import read_polygon, plot_polygons, \
-                                    polygon_area, is_inside_polygon
+import anuga
 
 #------------------------------------------------------------------------------
 # Define scenario as either slide or fixed_wave. Choose one.
 #------------------------------------------------------------------------------
-#scenario = 'fixed_wave' # Huge wave applied at the boundary
-scenario = 'slide'       # Slide wave form applied inside the domain
+scenario = 'fixed_wave' # Huge wave applied at the boundary
+#scenario = 'slide'       # Slide wave form applied inside the domain
 
 #------------------------------------------------------------------------------
 # Filenames
 #------------------------------------------------------------------------------
-demname_stem = 'cairns'
-meshname = demname + '.msh'
+name_stem = 'cairns'
+meshname = name_stem + '.msh'
 
 # Filename for locations where timeseries are to be produced
@@ -25 +24 @@
 #------------------------------------------------------------------------------
 # bounding polygon for study area
-bounding_polygon = read_polygon('extent.csv')
+bounding_polygon = anuga.read_polygon('extent.csv')
 
-A = polygon_area(bounding_polygon) / 1000000.0
+A = anuga.polygon_area(bounding_polygon) / 1000000.0
 print 'Area of bounding polygon = %.2f km^2' % A
 
@@ -34 +33 @@
 #------------------------------------------------------------------------------
 # Read interior polygons
-poly_cairns = read_polygon('cairns.csv')
-poly_island0 = read_polygon('islands.csv')
-poly_island1 = read_polygon('islands1.csv')
-poly_island2 = read_polygon('islands2.csv')
-poly_island3 = read_polygon('islands3.csv')
-poly_shallow = read_polygon('shallow.csv')
+poly_cairns = anuga.read_polygon('cairns.csv')
+poly_island0 = anuga.read_polygon('islands.csv')
+poly_island1 = anuga.read_polygon('islands1.csv')
+poly_island2 = anuga.read_polygon('islands2.csv')
+poly_island3 = anuga.read_polygon('islands3.csv')
+poly_shallow = anuga.read_polygon('shallow.csv')
 
 # Optionally plot points making up these polygons