Changeset 7808

Timestamp:

Jun 8, 2010, 10:47:10 AM (15 years ago)

Author:

James Hudson

Message:

Examples work with new API.

Location:

trunk/anuga_core/documentation/user_manual/examples

Files:

• bedslope.py (deleted)
• harbour.py (modified) (7 diffs)
• project.py (modified) (1 diff)
• runsydney.py (modified) (6 diffs)
• runuptest.py (modified) (6 diffs)

trunk/anuga_core/documentation/user_manual/examples/harbour.py

@@ -14 +14 @@
 # Import necessary modules
 #------------------------------------------------------------------------------
-
-from anuga.pmesh.mesh_interface import create_mesh_from_regions
-from anuga.shallow_water import Domain
-from anuga.shallow_water import Reflective_boundary
-from anuga.shallow_water import Dirichlet_boundary
-from anuga.shallow_water import Time_boundary
-from anuga.shallow_water import Transmissive_boundary
+import anuga
 
 waveheight = 1.0
@@ -41 +35 @@
 meshname = 'harbour_test.msh'
 
-create_mesh_from_regions(polygon,
+anuga.create_mesh_from_regions(polygon,
                          boundary_tags={'top': [0],
                                         'left': [1],
@@ -50 +44 @@
                          #interior_regions=interior_regions)
 
-domain = Domain(meshname,use_cache=True,verbose = True)
+domain = anuga.Domain(meshname,use_cache=True,verbose = True)
 domain.set_name('harbour')                  # Output to harbour.sww
 domain.set_datadir('.')                     # Use current directory for output
@@ -65 +59 @@
 
 def topography(x,y):
-    from Numeric import zeros, Float
-    z = zeros(len(x), Float)
+    from numpy import zeros, float
+    z = zeros(len(x), float)
     
     xcentre = (west+east)/2.
@@ -92 +86 @@
 
 from math import sin, pi
-Br = Reflective_boundary(domain)      # Solid reflective wall
-Bt = Transmissive_boundary(domain)    # Continue all values on boundary 
-Bd = Dirichlet_boundary([0.,0.,0.])   # Constant boundary values
-Bw = Time_boundary(domain=domain,     # Time dependent boundary  
+Br = anuga.Reflective_boundary(domain)      # Solid reflective wall
+Bt = anuga.Transmissive_boundary(domain)    # Continue all values on boundary 
+Bd = anuga.Dirichlet_boundary([0.,0.,0.])   # Constant boundary values
+Bw = anuga.Time_boundary(domain=domain,     # Time dependent boundary  
                    f=lambda t: [((10<t<20)*waveheight), 0.0, 0.0])
 
@@ -115 +109 @@
 # Gauge line
 def gauge_line(west,east,north,south):
-    from Numeric import arange
+    from numpy import arange
     gaugex = arange(east,west,-1000.)
     gauges = []
@@ -127 +121 @@
 gauges, gaugex, gaugey = gauge_line(west,east,north,south)
 
-from anuga.abstract_2d_finite_volumes.util import file_function
-
-f = file_function('harbour.sww',
+f = anuga.file_function('harbour.sww',
                   quantities = ['stage', 'elevation', 'xmomentum', 'ymomentum'],
                   interpolation_points = gauges,

trunk/anuga_core/documentation/user_manual/examples/project.py

@@ -56 +56 @@
 demopoly = [j0, j1, j2, j3, j31, j4, j5, j6, j7]
 
-from anuga.utilities.polygon import read_polygon, plot_polygons
+from anuga.geometry.polygon import read_polygon, plot_polygons
 #polygonptsfile4 = polygondir + 'poly1'
 #polygonptsfile0 = polygondir + 'poly2'

trunk/anuga_core/documentation/user_manual/examples/runsydney.py

@@ -20 +20 @@
 
 # Related major packages
-from anuga.shallow_water import Domain, Dirichlet_boundary
-from anuga.shallow_water.data_manager import convert_dem_from_ascii2netcdf, dem2pts
-from anuga.abstract_2d_finite_volumes.combine_pts import combine_rectangular_points_files 
-from anuga.pmesh.mesh_interface import create_mesh_from_regions
+import anuga
 
 # Application specific imports
 import project                           # Define file names and polygons
-from anuga.shallow_water.smf import slump_tsunami # Function for submarine mudslide 
 
 
@@ -41 +37 @@
 meshname = project.meshname+'.msh'
 
-convert_dem_from_ascii2netcdf(demname, use_cache=True, verbose=True)
+anuga.asc2dem(demname, use_cache=True, verbose=True)
 
 # creates pts file 
-dem2pts(demname, use_cache=True, verbose=True)
-
-# combining the coarse and fine data
-#combine_rectangular_points_files(finedemname,
-#                                 coarsedemname,
-#                                 combineddemname)
-
+anuga.dem2pts(demname, use_cache=True, verbose=True)
 
 
@@ -68 +58 @@
                     [project.shallow_polygon, shallow_res]]
 
-create_mesh_from_regions(project.demopoly,
+anuga.create_mesh_from_regions(project.demopoly,
                          boundary_tags= {'oceannorth': [0], 
                                          'onshorenorth1': [1],
@@ -85 +75 @@
 #Create shallow water domain
 
-domain = Domain(meshname,
+domain = anuga.Domain(meshname,
                 use_cache = True,
                 verbose = True)                                  
@@ -102 +92 @@
 #------------------------------------------------------------------------------
 
-tsunami_source = slump_tsunami(length=30000.0,
+tsunami_source = anuga.slump_tsunami(length=30000.0,
                                depth=400.0,
                                slope=6.0,
@@ -131 +121 @@
 print 'Available boundary tags', domain.get_boundary_tags()
 
-Bd = Dirichlet_boundary([0.0,0.0,0.0])
+Bd = anuga.Dirichlet_boundary([0.0,0.0,0.0])
 domain.set_boundary( {'oceannorth': Bd,
                       'onshorenorth1': Bd,

trunk/anuga_core/documentation/user_manual/examples/runuptest.py

@@ -10 +10 @@
 #------------------------------------------------------------------------------
 
-from anuga.pmesh.mesh_interface import create_mesh_from_regions
-from anuga.shallow_water import Domain
-from anuga.shallow_water import Reflective_boundary
-from anuga.shallow_water import Dirichlet_boundary
-from anuga.shallow_water import Time_boundary
-from anuga.shallow_water import Transmissive_boundary
+import anuga
 
 
@@ -32 +27 @@
 meshname = 'test.msh'
 
-create_mesh_from_regions(polygon,
+anuga.create_mesh_from_regions(polygon,
                          boundary_tags={'top': [0],
                                         'left': [1],
@@ -41 +36 @@
                          #interior_regions=interior_regions)
 
-domain = Domain(meshname,use_cache=True,verbose = True)
+domain = anuga.Domain(meshname,use_cache=True,verbose = True)
 domain.set_name('test')                     # Output to test.sww
 domain.set_datadir('.')                     # Use current directory for output
@@ -67 +62 @@
 
 from math import sin, pi
-Br = Reflective_boundary(domain)      # Solid reflective wall
-Bt = Transmissive_boundary(domain)    # Continue all values on boundary 
-Bd = Dirichlet_boundary([0.,0.,0.])   # Constant boundary values
-Bw = Time_boundary(domain=domain,     # Time dependent boundary  
+Br = anuga.Reflective_boundary(domain)      # Solid reflective wall
+Bt = anuga.Transmissive_boundary(domain)    # Continue all values on boundary 
+Bd = anuga.Dirichlet_boundary([0.,0.,0.])   # Constant boundary values
+Bw = anuga.Time_boundary(domain=domain,     # Time dependent boundary  
                    f=lambda t: [((10<t<20)*waveheight), 0.0, 0.0])
 
@@ -91 +86 @@
 # Gauge line
 def gauge_line(west,east,north,south):
-    from Numeric import arange
+    from numpy import arange
     gaugex = arange(west,(west+east)/2.,1000.)
     gauges = []
@@ -103 +98 @@
 gauges, gaugex, gaugey = gauge_line(west,east,north,south)
 
-from anuga.abstract_2d_finite_volumes.util import file_function
-
-f = file_function('test.sww',
+f = anuga.file_function('test.sww',
                   quantities = ['stage', 'elevation', 'xmomentum', 'ymomentum'],
                   interpolation_points = gauges,