Changeset 7970

Timestamp:

Aug 24, 2010, 10:57:29 AM (14 years ago)

Author:

wilsonr

Message:

Fixed problem with imports referencing deleted modules. Now passes validation.

File:

• trunk/anuga_validation/automated_validation_tests/okushiri_tank_validation/compare_timeseries_with_measures.py (modified) (4 diffs)

trunk/anuga_validation/automated_validation_tests/okushiri_tank_validation/compare_timeseries_with_measures.py

@@ -6 +6 @@
 """
 
+import sys
+
 import numpy as num
 from Scientific.IO.NetCDF import NetCDFFile
 
+import project
 from anuga.abstract_2d_finite_volumes.util import file_function
 from anuga.utilities.numerical_tools import\
      ensure_numeric, cov, get_machine_precision
-
-import project
-import sys
+from anuga.shallow_water.sww_interrogate import get_maximum_inundation_elevation
+from anuga.shallow_water.sww_interrogate import get_maximum_inundation_location
+from anuga.geometry.polygon import is_inside_polygon
+from create_okushiri import gulleys
 
 if sys.platform == 'win32':
@@ -122 +126 @@
 #--------------------------------------------------
 
-import sys
 if len(sys.argv) > 1:
     sww_filename = sys.argv[1]
@@ -228 +231 @@
 # Check max runup
 
-from anuga.shallow_water.data_manager import get_maximum_inundation_elevation
-from anuga.shallow_water.data_manager import get_maximum_inundation_location
-from anuga.utilities.polygon import is_inside_polygon
-
 q = get_maximum_inundation_elevation(sww_filename)
 loc = get_maximum_inundation_location(sww_filename)
@@ -241 +240 @@
 
 
-from create_okushiri import gulleys
 assert is_inside_polygon(loc, gulleys)