Changeset 7771

Timestamp:

Jun 2, 2010, 6:10:50 PM (14 years ago)

Author:

hudson

Message:

Created sww_interrogate module for higher-level sww functions.

Location:

trunk/anuga_core/source/anuga/shallow_water

Files:

• sww_interrogate.py (modified) (2 diffs)
• test_data_manager.py (modified) (1 diff)
• test_shallow_water_domain.py (modified) (3 diffs)
• test_sww_interrogate.py (added)

trunk/anuga_core/source/anuga/shallow_water/sww_interrogate.py

@@ -2 +2 @@
     Operations to extract information from an SWW file.
 '''
+
+import os
+import numpy as num
+
+from anuga.utilities.file_utils import get_all_swwfiles
+from anuga.coordinate_transforms.geo_reference import Geo_reference 
+from anuga.abstract_2d_finite_volumes.util import file_function
+from anuga.config import netcdf_mode_r, netcdf_mode_w, netcdf_mode_a
+from anuga.geometry.polygon import is_inside_polygon
+from anuga.file.sww import get_mesh_and_quantities_from_file
+from anuga.abstract_2d_finite_volumes.neighbour_mesh import segment_midpoints
+from anuga.config import g
 
 ##
@@ -364 +376 @@
     for file, swwfile in enumerate (iterate_over):
         # Read sww file
-        filename = join(dir, swwfile+'.sww')
+        filename = os.path.join(dir, swwfile+'.sww')
 
         if verbose: log.critical('Reading from %s' % filename)

trunk/anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -40 +40 @@
 # This is needed to run the tests of local functions
 import data_manager 
+from anuga.file_conversion.urs2sts import urs2sts
 from anuga.coordinate_transforms.redfearn import redfearn
 from anuga.coordinate_transforms.geo_reference import Geo_reference, \

trunk/anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

@@ -40 +40 @@
 
 import numpy as num
+from anuga.config import g
 
 # Get gateway to C implementation of flux function for direct testing
@@ -5602 +5603 @@
         from anuga.shallow_water import Domain
         from anuga.shallow_water.forcing import Inflow
-        from anuga.shallow_water.data_manager \
-                import get_flow_through_cross_section
 
         #----------------------------------------------------------------------
@@ -5692 +5691 @@
         from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular_cross
         from anuga.shallow_water import Domain
-        from anuga.shallow_water.data_manager import get_flow_through_cross_section
 
         #----------------------------------------------------------------------