Changeset 7795 for anuga_validation/automated_validation_tests/okushiri_tank_validation

Timestamp:

Jun 7, 2010, 10:19:51 AM (15 years ago)

Author:

James Hudson

Message:

Adapted validation tests to use new API.

Location:

anuga_validation/automated_validation_tests/okushiri_tank_validation

Files:

• run_okushiri.py (modified) (3 diffs)
• test_caching_of_set_quantity.py (modified) (1 diff)

anuga_validation/automated_validation_tests/okushiri_tank_validation/run_okushiri.py

@@ -22 +22 @@
 
 # Module imports
-from anuga.shallow_water import Domain
-from anuga.shallow_water import Reflective_boundary
-from anuga.shallow_water import Transmissive_momentum_set_stage_boundary
-from anuga.abstract_2d_finite_volumes.util import file_function
+import anuga
 
 import project
@@ -33 +30 @@
     # Create Domain from mesh
     #-------------------------
-    domain = Domain(project.mesh_filename, use_cache=False, verbose=True)
+    domain = anuga.Domain(project.mesh_filename, use_cache=False, verbose=True)
     print domain.statistics()
 
@@ -63 +60 @@
 
     # Create boundary function from timeseries provided in file
-    function = file_function(project.boundary_filename,
+    function = anuga.file_function(project.boundary_filename,
                              domain, verbose=True)
 
     # Create and assign boundary objects
-    Bts = Transmissive_momentum_set_stage_boundary(domain, function)
-    Br = Reflective_boundary(domain)
+    Bts = anuga.Transmissive_momentum_set_stage_boundary(domain, function)
+    Br = anuga.Reflective_boundary(domain)
     domain.set_boundary({'wave': Bts, 'wall': Br})
 

anuga_validation/automated_validation_tests/okushiri_tank_validation/test_caching_of_set_quantity.py

@@ -9 +9 @@
 
 # Module imports
-from anuga.shallow_water import Domain
+from anuga.shallow_water.shallow_water_domain import Domain
 from anuga.caching import cache
 from anuga.fit_interpolate.fit import _fit_to_mesh