Index: uga_core/compile_all
===================================================================
--- /anuga_core/compile_all	(revision 3513)
+++ 	(revision )
@@ -1,35 +1,0 @@
-import os
-
-buildroot = os.getcwd()
-
-os.chdir('inundation')
-
-#Complete horrible hack to decide which branch to take (Ole)
-#try:
-#    os.stat('inundation-numpy-branch')
-#except:
-#    os.chdir('inundation')
-#else:
-#    os.chdir('inundation-numpy-branch')    
-
-print 'Changing to', os.getcwd()        
-
-#entries = listdir('.')
-
-
-#Attempt to compile all extensions
-
-os.chdir('utilities')
-execfile('compile.py')
-
-os.chdir('..')
-os.chdir('pyvolution')
-execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
-
-os.chdir('..')
-os.chdir('mesh_engine')
-execfile('compile.py')
-
-os.chdir(buildroot)    
-#execfile('test_all.py')
-    
Index: /anuga_core/compile_all.py
===================================================================
--- /anuga_core/compile_all.py	(revision 3513)
+++ /anuga_core/compile_all.py	(revision 3514)
@@ -3,5 +3,7 @@
 buildroot = os.getcwd()
 
-os.chdir('inundation')
+os.chdir('source')
+
+os.chdir('anuga')
 
 #Complete horrible hack to decide which branch to take (Ole)
Index: /anuga_core/source/anuga/alpha_shape/alpha_shape.py
===================================================================
--- /anuga_core/source/anuga/alpha_shape/alpha_shape.py	(revision 3513)
+++ /anuga_core/source/anuga/alpha_shape/alpha_shape.py	(revision 3514)
@@ -179,5 +179,5 @@
 
         ## Build Delaunay triangulation
-        import mesh_engine.triang as triang
+        import anuga.mesh_engine.triang as triang
         points = []
         seglist = []
Index: /anuga_core/source/anuga/alpha_shape/test_alpha_shape.py
===================================================================
--- /anuga_core/source/anuga/alpha_shape/test_alpha_shape.py	(revision 3513)
+++ /anuga_core/source/anuga/alpha_shape/test_alpha_shape.py	(revision 3514)
@@ -7,5 +7,5 @@
 
 try:
-    from alpha_shape.alpha_shape import *
+    from anuga.alpha_shape.alpha_shape import *
 except ImportError:  
     from alpha_shape import *
Index: /anuga_core/source/anuga/caching/caching.py
===================================================================
--- /anuga_core/source/anuga/caching/caching.py	(revision 3513)
+++ /anuga_core/source/anuga/caching/caching.py	(revision 3514)
@@ -1265,8 +1265,6 @@
     except MemoryError:
       msg = '****WARNING (caching.py): Could not pickle data for compression.'
-      msg += ' Try using compression = False.'
-      msg += ' Note that nothing has been cached but I will continue anyway.'
-      #raise MemoryError, msg
-      print msg             # As per ticket:40
+      msg += ' Try using compression = False'
+      raise MemoryError, msg
     else:  
       #Compressed pickling      
Index: /anuga_core/source/anuga/coordinate_transforms/geo_reference.py
===================================================================
--- /anuga_core/source/anuga/coordinate_transforms/geo_reference.py	(revision 3513)
+++ /anuga_core/source/anuga/coordinate_transforms/geo_reference.py	(revision 3514)
@@ -8,6 +8,6 @@
 import types, sys
 from Numeric import array, Float, ArrayType, reshape, allclose
-from utilities.numerical_tools import ensure_numeric
-from utilities.anuga_exceptions import ANUGAError, TitleError, ParsingError, \
+from anuga.utilities.numerical_tools import ensure_numeric
+from anuga.utilities.anuga_exceptions import ANUGAError, TitleError, ParsingError, \
      ShapeError
 
Index: /anuga_core/source/anuga/coordinate_transforms/redfearn.py
===================================================================
--- /anuga_core/source/anuga/coordinate_transforms/redfearn.py	(revision 3513)
+++ /anuga_core/source/anuga/coordinate_transforms/redfearn.py	(revision 3514)
@@ -2,5 +2,5 @@
 
 """
-from coordinate_transforms.geo_reference import Geo_reference, DEFAULT_ZONE
+from anuga.coordinate_transforms.geo_reference import Geo_reference, DEFAULT_ZONE
 from Numeric import array
 
Index: /anuga_core/source/anuga/coordinate_transforms/test_redfearn.py
===================================================================
--- /anuga_core/source/anuga/coordinate_transforms/test_redfearn.py	(revision 3513)
+++ /anuga_core/source/anuga/coordinate_transforms/test_redfearn.py	(revision 3514)
@@ -10,5 +10,5 @@
 
 from redfearn import *
-from utilities.anuga_exceptions import ANUGAError
+from anuga.utilities.anuga_exceptions import ANUGAError
 
 #-------------------------------------------------------------
Index: /anuga_core/source/anuga/damage/inundation_damage.py
===================================================================
--- /anuga_core/source/anuga/damage/inundation_damage.py	(revision 3513)
+++ /anuga_core/source/anuga/damage/inundation_damage.py	(revision 3514)
@@ -27,9 +27,9 @@
     
 
-from utilities.numerical_tools import ensure_numeric
-from pyvolution.data_manager import Exposure_csv
-from pyvolution.util import file_function
-from geospatial_data.geospatial_data import ensure_absolute
-from utilities.numerical_tools import NAN
+from anuga.utilities.numerical_tools import ensure_numeric
+from anuga.pyvolution.data_manager import Exposure_csv
+from anuga.pyvolution.util import file_function
+from anuga.geospatial_data.geospatial_data import ensure_absolute
+from anuga.utilities.numerical_tools import NAN
 from anuga_config import epsilon
 depth_epsilon = epsilon
Index: /anuga_core/source/anuga/damage/test_inundation_damage.py
===================================================================
--- /anuga_core/source/anuga/damage/test_inundation_damage.py	(revision 3513)
+++ /anuga_core/source/anuga/damage/test_inundation_damage.py	(revision 3514)
@@ -8,12 +8,12 @@
 import csv
 
-#from damage.inundation_damage import _calc_collapse_structures
-from damage.inundation_damage import *
-from geospatial_data.geospatial_data import Geospatial_data
-from pmesh.mesh import Mesh
-from coordinate_transforms.geo_reference import Geo_reference
-from pyvolution.shallow_water import Domain, Transmissive_boundary
-from utilities.numerical_tools import mean
-from data_manager import get_dataobject
+#from anuga.damage.inundation_damage import _calc_collapse_structures
+from anuga.damage.inundation_damage import *
+from anuga.geospatial_data.geospatial_data import Geospatial_data
+from anuga.pmesh.mesh import Mesh
+from anuga.coordinate_transforms.geo_reference import Geo_reference
+from anuga.pyvolution.shallow_water import Domain, Transmissive_boundary
+from anuga.utilities.numerical_tools import mean
+from anuga.pyvolution.data_manager import get_dataobject
 
 from Numeric import zeros, Float, allclose
Index: /anuga_core/source/anuga/examples/beach.py
===================================================================
--- /anuga_core/source/anuga/examples/beach.py	(revision 3513)
+++ /anuga_core/source/anuga/examples/beach.py	(revision 3514)
@@ -15,10 +15,10 @@
 #sys.path.append('..'+sep+'pyvolution')
 
-from pyvolution.shallow_water import Domain, Reflective_boundary,\
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
      Dirichlet_boundary,\
      Transmissive_boundary, Time_boundary, Wind_stress
 
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
-from utilities.polygon import read_polygon, Polygon_function
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.utilities.polygon import read_polygon, Polygon_function
 from math import pi
 from Numeric import choose, greater, ones, sin, exp
Index: /anuga_core/source/anuga/examples/bedslope.py
===================================================================
--- /anuga_core/source/anuga/examples/bedslope.py	(revision 3513)
+++ /anuga_core/source/anuga/examples/bedslope.py	(revision 3514)
@@ -8,6 +8,6 @@
 ######################
 # Module imports 
-from pyvolution.mesh_factory import rectangular
-from pyvolution.shallow_water import Domain, Reflective_boundary,\
+from anuga.pyvolution.mesh_factory import rectangular
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
      Dirichlet_boundary, Time_boundary, Transmissive_boundary
 
Index: /anuga_core/source/anuga/examples/bedslope_bsod_test.py
===================================================================
--- /anuga_core/source/anuga/examples/bedslope_bsod_test.py	(revision 3513)
+++ /anuga_core/source/anuga/examples/bedslope_bsod_test.py	(revision 3514)
@@ -16,10 +16,10 @@
 # Module imports 
 #
-from pmesh.mesh_interface import create_mesh_from_regions
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.pmesh.mesh_interface import create_mesh_from_regions
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
 from caching import cache
-from pyvolution.shallow_water import Domain, Reflective_boundary,\
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
      Dirichlet_boundary, Time_boundary, Transmissive_boundary
-from geospatial_data import *
+from anuga.geospatial_data.geospatial_data import *
 
 
Index: /anuga_core/source/anuga/examples/island.py
===================================================================
--- /anuga_core/source/anuga/examples/island.py	(revision 3513)
+++ /anuga_core/source/anuga/examples/island.py	(revision 3514)
@@ -15,10 +15,10 @@
 
 # Application specific imports
-from pyvolution.mesh_factory import rectangular
-from pyvolution.shallow_water import Domain, Reflective_boundary, Dirichlet_boundary
-from pmesh.mesh_interface import create_mesh_from_regions
-from utilities.polygon import Polygon_function, read_polygon
+from anuga.pyvolution.mesh_factory import rectangular
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, Dirichlet_boundary
+from anuga.pmesh.mesh_interface import create_mesh_from_regions
+from anuga.utilities.polygon import Polygon_function, read_polygon
 
-from pyvolution.quantity import Quantity
+from anuga.pyvolution.quantity import Quantity
 from Numeric import allclose
 
Index: /anuga_core/source/anuga/examples/island_timeseries.py
===================================================================
--- /anuga_core/source/anuga/examples/island_timeseries.py	(revision 3513)
+++ /anuga_core/source/anuga/examples/island_timeseries.py	(revision 3514)
@@ -3,6 +3,6 @@
 """
 
-from pyvolution.util import file_function
-from coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
+from anuga.pyvolution.util import file_function
+from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
 from pylab import *
 from matplotlib.ticker import MultipleLocator, FormatStrFormatter
Index: /anuga_core/source/anuga/examples/run_gippsland.py
===================================================================
--- /anuga_core/source/anuga/examples/run_gippsland.py	(revision 3513)
+++ /anuga_core/source/anuga/examples/run_gippsland.py	(revision 3514)
@@ -1,3 +1,3 @@
-from pyvolution.data_manager import asc_csiro2sww
+from anuga.pyvolution.data_manager import asc_csiro2sww
 import time
 
Index: /anuga_core/source/anuga/examples/run_tsh.py
===================================================================
--- /anuga_core/source/anuga/examples/run_tsh.py	(revision 3513)
+++ /anuga_core/source/anuga/examples/run_tsh.py	(revision 3514)
@@ -27,5 +27,5 @@
 import time
 
-#from config import default_datadir 
+#from anuga.config import default_datadir 
 
 ######################
Index: /anuga_core/source/anuga/fit_interpolate/benchmark_least_squares.py
===================================================================
--- /anuga_core/source/anuga/fit_interpolate/benchmark_least_squares.py	(revision 3513)
+++ /anuga_core/source/anuga/fit_interpolate/benchmark_least_squares.py	(revision 3514)
@@ -21,8 +21,8 @@
 from random import seed, random
 
-from pyvolution.least_squares import Interpolation
-from fit_interpolate.interpolate import Interpolate
-from fit_interpolate.fit import Fit
-from pmesh.mesh import Mesh
+from anuga.pyvolution.least_squares import Interpolation
+from anuga.fit_interpolate.interpolate import Interpolate
+from anuga.fit_interpolate.fit import Fit
+from anuga.pmesh.mesh import Mesh
 
 def mem_usage():
Index: /anuga_core/source/anuga/fit_interpolate/fit.py
===================================================================
--- /anuga_core/source/anuga/fit_interpolate/fit.py	(revision 3513)
+++ /anuga_core/source/anuga/fit_interpolate/fit.py	(revision 3514)
@@ -28,11 +28,11 @@
 from Numeric import zeros, Float, ArrayType,take 
 
-from geospatial_data.geospatial_data import Geospatial_data, ensure_absolute
-from fit_interpolate.general_fit_interpolate import FitInterpolate
-from utilities.sparse import Sparse, Sparse_CSR
-from utilities.polygon import in_and_outside_polygon
-from fit_interpolate.search_functions import search_tree_of_vertices
-from utilities.cg_solve import conjugate_gradient
-from utilities.numerical_tools import ensure_numeric, gradient
+from anuga.geospatial_data.geospatial_data import Geospatial_data, ensure_absolute
+from anuga.fit_interpolate.general_fit_interpolate import FitInterpolate
+from anuga.utilities.sparse import Sparse, Sparse_CSR
+from anuga.utilities.polygon import in_and_outside_polygon
+from anuga.fit_interpolate.search_functions import search_tree_of_vertices
+from anuga.utilities.cg_solve import conjugate_gradient
+from anuga.utilities.numerical_tools import ensure_numeric, gradient
 
 import exceptions
@@ -358,5 +358,5 @@
 
         """
-        #Note: Don't get the z info from Geospatial_data.attributes yet.
+        #Note: Don't get the z info from anuga.geospatial_data.attributes yet.
         # If we did fit would have to handle attribute title info.
 
Index: /anuga_core/source/anuga/fit_interpolate/general_fit_interpolate.py
===================================================================
--- /anuga_core/source/anuga/fit_interpolate/general_fit_interpolate.py	(revision 3513)
+++ /anuga_core/source/anuga/fit_interpolate/general_fit_interpolate.py	(revision 3514)
@@ -24,13 +24,13 @@
      ArrayType, allclose, take, NewAxis, arange
 
-from caching.caching import cache
-from pyvolution.neighbour_mesh import Mesh
-from utilities.sparse import Sparse, Sparse_CSR
-from utilities.cg_solve import conjugate_gradient, VectorShapeError
-from coordinate_transforms.geo_reference import Geo_reference
-from pyvolution.quad import build_quadtree
-from utilities.numerical_tools import ensure_numeric
-from utilities.polygon import in_and_outside_polygon
-from geospatial_data.geospatial_data import Geospatial_data, \
+from anuga.caching.caching import cache
+from anuga.pyvolution.neighbour_mesh import Mesh
+from anuga.utilities.sparse import Sparse, Sparse_CSR
+from anuga.utilities.cg_solve import conjugate_gradient, VectorShapeError
+from anuga.coordinate_transforms.geo_reference import Geo_reference
+from anuga.pyvolution.quad import build_quadtree
+from anuga.utilities.numerical_tools import ensure_numeric
+from anuga.utilities.polygon import in_and_outside_polygon
+from anuga.geospatial_data.geospatial_data import Geospatial_data, \
      ensure_absolute
 from search_functions import search_tree_of_vertices
Index: /anuga_core/source/anuga/fit_interpolate/interpolate.py
===================================================================
--- /anuga_core/source/anuga/fit_interpolate/interpolate.py	(revision 3513)
+++ /anuga_core/source/anuga/fit_interpolate/interpolate.py	(revision 3514)
@@ -27,16 +27,16 @@
      ArrayType, allclose, take, NewAxis, arange
 
-from caching.caching import cache
-from pyvolution.neighbour_mesh import Mesh
-from utilities.sparse import Sparse, Sparse_CSR
-from utilities.cg_solve import conjugate_gradient, VectorShapeError
-from coordinate_transforms.geo_reference import Geo_reference
-from pyvolution.quad import build_quadtree
-from utilities.numerical_tools import ensure_numeric, mean, NAN
-from utilities.polygon import in_and_outside_polygon
-from geospatial_data.geospatial_data import Geospatial_data, ensure_absolute
-from fit_interpolate.search_functions import search_tree_of_vertices
-from fit_interpolate.general_fit_interpolate import FitInterpolate
-from pyvolution.util import file_function
+from anuga.caching.caching import cache
+from anuga.pyvolution.neighbour_mesh import Mesh
+from anuga.utilities.sparse import Sparse, Sparse_CSR
+from anuga.utilities.cg_solve import conjugate_gradient, VectorShapeError
+from anuga.coordinate_transforms.geo_reference import Geo_reference
+from anuga.pyvolution.quad import build_quadtree
+from anuga.utilities.numerical_tools import ensure_numeric, mean, NAN
+from anuga.utilities.polygon import in_and_outside_polygon
+from anuga.geospatial_data.geospatial_data import Geospatial_data, ensure_absolute
+from anuga.fit_interpolate.search_functions import search_tree_of_vertices
+from anuga.fit_interpolate.general_fit_interpolate import FitInterpolate
+from anuga.pyvolution.util import file_function
 
 
@@ -406,6 +406,6 @@
 
 
-        #from util import mean, ensure_numeric
-        from config import time_format
+        #from anuga.pyvolution.util import mean, ensure_numeric
+        from anuga.config import time_format
         import types
 
@@ -549,5 +549,5 @@
         from math import pi, cos, sin, sqrt
         from Numeric import zeros, Float
-        from util import mean        
+        from anuga.pyvolution.util import mean        
 
         if self.spatial is True:
Index: /anuga_core/source/anuga/fit_interpolate/test_fit.py
===================================================================
--- /anuga_core/source/anuga/fit_interpolate/test_fit.py	(revision 3513)
+++ /anuga_core/source/anuga/fit_interpolate/test_fit.py	(revision 3514)
@@ -10,9 +10,9 @@
 
 from fit import *
-from pyvolution.neighbour_mesh import Mesh
-from utilities.sparse import Sparse, Sparse_CSR
-from coordinate_transforms.geo_reference import Geo_reference
-from utilities.numerical_tools import ensure_numeric
-from geospatial_data.geospatial_data import Geospatial_data
+from anuga.pyvolution.neighbour_mesh import Mesh
+from anuga.utilities.sparse import Sparse, Sparse_CSR
+from anuga.coordinate_transforms.geo_reference import Geo_reference
+from anuga.utilities.numerical_tools import ensure_numeric
+from anuga.geospatial_data.geospatial_data import Geospatial_data
 
 def distance(x, y):
@@ -455,5 +455,5 @@
         """
         
-        from coordinate_transforms.geo_reference import Geo_reference
+        from anuga.coordinate_transforms.geo_reference import Geo_reference
 
         #Mesh
Index: /anuga_core/source/anuga/fit_interpolate/test_interpolate.py
===================================================================
--- /anuga_core/source/anuga/fit_interpolate/test_interpolate.py	(revision 3513)
+++ /anuga_core/source/anuga/fit_interpolate/test_interpolate.py	(revision 3514)
@@ -19,10 +19,10 @@
 # ANUGA code imports
 from interpolate import *
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 from shallow_water import Domain, Transmissive_boundary
-from utilities.numerical_tools import mean, NAN
-from data_manager import get_dataobject
-from geospatial_data.geospatial_data import Geospatial_data
-from pmesh.mesh import Mesh
+from anuga.utilities.numerical_tools import mean, NAN
+from anuga.pyvolution.data_manager import get_dataobject
+from anuga.geospatial_data.geospatial_data import Geospatial_data
+from anuga.pmesh.mesh import Mesh
 
 def distance(x, y):
Index: /anuga_core/source/anuga/geospatial_data/__init__.py
===================================================================
--- /anuga_core/source/anuga/geospatial_data/__init__.py	(revision 3513)
+++ /anuga_core/source/anuga/geospatial_data/__init__.py	(revision 3514)
@@ -2,5 +2,5 @@
 """
 
-from geospatial_data import *
+from anuga.geospatial_data.geospatial_data import *
 
 
Index: /anuga_core/source/anuga/geospatial_data/geospatial_data.py
===================================================================
--- /anuga_core/source/anuga/geospatial_data/geospatial_data.py	(revision 3513)
+++ /anuga_core/source/anuga/geospatial_data/geospatial_data.py	(revision 3514)
@@ -8,7 +8,7 @@
 
 
-from utilities.numerical_tools import ensure_numeric
-from coordinate_transforms.geo_reference import Geo_reference, TitleError
-from coordinate_transforms.redfearn import convert_lats_longs
+from anuga.utilities.numerical_tools import ensure_numeric
+from anuga.coordinate_transforms.geo_reference import Geo_reference, TitleError
+from anuga.coordinate_transforms.redfearn import convert_lats_longs
 
         
@@ -180,5 +180,5 @@
     def set_geo_reference(self, geo_reference):
 
-        from coordinate_transforms.geo_reference import Geo_reference
+        from anuga.coordinate_transforms.geo_reference import Geo_reference
 
         if geo_reference is None:
Index: /anuga_core/source/anuga/geospatial_data/test_geospatial_data.py
===================================================================
--- /anuga_core/source/anuga/geospatial_data/test_geospatial_data.py	(revision 3513)
+++ /anuga_core/source/anuga/geospatial_data/test_geospatial_data.py	(revision 3514)
@@ -8,7 +8,7 @@
 import tempfile
 
-from geospatial_data import *
-from coordinate_transforms.geo_reference import Geo_reference, TitleError
-from coordinate_transforms.redfearn import degminsec2decimal_degrees
+from anuga.geospatial_data.geospatial_data import *
+from anuga.coordinate_transforms.geo_reference import Geo_reference, TitleError
+from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
 
 
@@ -24,5 +24,5 @@
         """Basic points
         """
-        from coordinate_transforms.geo_reference import Geo_reference
+        from anuga.coordinate_transforms.geo_reference import Geo_reference
         
         points = [[1.0, 2.1], [3.0, 5.3]]
@@ -49,5 +49,5 @@
 
     def test_2(self):
-        from coordinate_transforms.geo_reference import Geo_reference
+        from anuga.coordinate_transforms.geo_reference import Geo_reference
         points = [[1.0, 2.1], [3.0, 5.3]]
         attributes = [2, 4]
@@ -61,5 +61,5 @@
 
     def test_get_attributes_1(self):
-        from coordinate_transforms.geo_reference import Geo_reference
+        from anuga.coordinate_transforms.geo_reference import Geo_reference
         points = [[1.0, 2.1], [3.0, 5.3]]
         attributes = [2, 4]
@@ -84,5 +84,5 @@
         """
         
-        from coordinate_transforms.geo_reference import Geo_reference
+        from anuga.coordinate_transforms.geo_reference import Geo_reference
         points = [[1.0, 2.1], [3.0, 5.3]]
         attributes = {'a0': [0, 0], 'a1': [2, 4], 'a2': [79.4, -7]}
@@ -162,5 +162,5 @@
         """
         
-        from coordinate_transforms.geo_reference import Geo_reference
+        from anuga.coordinate_transforms.geo_reference import Geo_reference
         points = [[1.0, 2.1], [3.0, 5.3]]
         attributes = {'a0': [0, 0], 'a1': [2, 4], 'a2': [79.4, -7]}
@@ -196,5 +196,5 @@
         """
 
-        from coordinate_transforms.geo_reference import Geo_reference
+        from anuga.coordinate_transforms.geo_reference import Geo_reference
         
         points = [[1.0, 2.1], [3.0, 5.3]]
Index: /anuga_core/source/anuga/load_mesh/loadASCII.py
===================================================================
--- /anuga_core/source/anuga/load_mesh/loadASCII.py	(revision 3513)
+++ /anuga_core/source/anuga/load_mesh/loadASCII.py	(revision 3514)
@@ -82,5 +82,5 @@
 from os.path import splitext
 
-from coordinate_transforms.geo_reference import Geo_reference,TITLE, TitleError
+from anuga.coordinate_transforms.geo_reference import Geo_reference,TITLE, TitleError
 
 from Scientific.IO.NetCDF import NetCDFFile
Index: /anuga_core/source/anuga/load_mesh/test_loadASCII.py
===================================================================
--- /anuga_core/source/anuga/load_mesh/test_loadASCII.py	(revision 3513)
+++ /anuga_core/source/anuga/load_mesh/test_loadASCII.py	(revision 3514)
@@ -13,5 +13,5 @@
     
 from loadASCII import *
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 import loadASCII
 
Index: /anuga_core/source/anuga/mesh_engine/compile.py
===================================================================
--- /anuga_core/source/anuga/mesh_engine/compile.py	(revision 3513)
+++ /anuga_core/source/anuga/mesh_engine/compile.py	(revision 3514)
@@ -237,5 +237,5 @@
     """
 
-    from config import use_extensions
+    from anuga.config import use_extensions
 
     from os.path import splitext
Index: /anuga_core/source/anuga/mesh_engine/test_triangmodule.py
===================================================================
--- /anuga_core/source/anuga/mesh_engine/test_triangmodule.py	(revision 3513)
+++ /anuga_core/source/anuga/mesh_engine/test_triangmodule.py	(revision 3514)
@@ -5,5 +5,5 @@
 
 import unittest
-import mesh_engine.triang as triang
+import anuga.mesh_engine.triang as triang
 
 
Index: /anuga_core/source/anuga/mesh_engine/test_triangmoduleII.py
===================================================================
--- /anuga_core/source/anuga/mesh_engine/test_triangmoduleII.py	(revision 3513)
+++ /anuga_core/source/anuga/mesh_engine/test_triangmoduleII.py	(revision 3514)
@@ -5,5 +5,5 @@
 
 import unittest
-import mesh_engine.triang as triang
+import anuga.mesh_engine.triang as triang
 
 """
Index: /anuga_core/source/anuga/pmesh/graphical_mesh_generator.py
===================================================================
--- /anuga_core/source/anuga/pmesh/graphical_mesh_generator.py	(revision 3513)
+++ /anuga_core/source/anuga/pmesh/graphical_mesh_generator.py	(revision 3514)
@@ -13,5 +13,5 @@
 import profile
 import load_mesh.loadASCII
-from alpha_shape.alpha_shape import AlphaError
+from anuga.alpha_shape.alpha_shape import AlphaError
 
 # CONSTANTS 
@@ -500,5 +500,5 @@
         
         
-        from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
+        from anuga.coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
         offset_x = 30
         offset_y = 40
Index: /anuga_core/source/anuga/pmesh/mesh.py
===================================================================
--- /anuga_core/source/anuga/pmesh/mesh.py	(revision 3513)
+++ /anuga_core/source/anuga/pmesh/mesh.py	(revision 3514)
@@ -16,5 +16,5 @@
 import sys
 import math
-import mesh_engine.triang as triang
+import anuga.mesh_engine.triang as triang
 import re
 import os
@@ -25,9 +25,9 @@
 
 import load_mesh
-from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
-from utilities.polygon import point_in_polygon 
+from anuga.coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
+from anuga.utilities.polygon import point_in_polygon 
 import load_mesh.loadASCII
-import alpha_shape.alpha_shape
-from geospatial_data.geospatial_data import Geospatial_data, ensure_geospatial
+import anuga.alpha_shape.alpha_shape
+from anuga.geospatial_data.geospatial_data import Geospatial_data, ensure_geospatial
 
 try:  
@@ -50,5 +50,5 @@
 
 #FIXME: this is not tested.
-from utilities.numerical_tools import gradient
+from anuga.utilities.numerical_tools import gradient
 
 
@@ -1564,5 +1564,5 @@
         for vertex in self.getUserVertices():
             points.append((vertex.x,vertex.y))
-        self.shape = alpha_shape.alpha_shape.Alpha_Shape(points, alpha = alpha)
+        self.shape = anuga.alpha_shape.alpha_shape.Alpha_Shape(points, alpha = alpha)
 
 
Index: /anuga_core/source/anuga/pmesh/mesh_interface.py
===================================================================
--- /anuga_core/source/anuga/pmesh/mesh_interface.py	(revision 3513)
+++ /anuga_core/source/anuga/pmesh/mesh_interface.py	(revision 3514)
@@ -4,14 +4,14 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
-from utilities.polygon import  point_in_polygon ,populate_polygon
-from utilities.numerical_tools import ensure_numeric
+from anuga.coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
+from anuga.utilities.polygon import  point_in_polygon ,populate_polygon
+from anuga.utilities.numerical_tools import ensure_numeric
 from Numeric import Float
-from utilities.polygon import inside_polygon
+from anuga.utilities.polygon import inside_polygon
 
 # This is due to pmesh being a package and a module and
 # the current dir being unknown 
 try:
-    from pmesh.mesh import Mesh
+    from anuga.pmesh.mesh import Mesh
 except ImportError:  
     from mesh import Mesh
Index: /anuga_core/source/anuga/pmesh/scripts/create_gong.py
===================================================================
--- /anuga_core/source/anuga/pmesh/scripts/create_gong.py	(revision 3513)
+++ /anuga_core/source/anuga/pmesh/scripts/create_gong.py	(revision 3514)
@@ -5,5 +5,5 @@
 #problem, it's loading pyvolution mesh 1st!
 from mesh import *
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 #-------------------------------------------------------------
Index: /anuga_core/source/anuga/pmesh/test_mesh.py
===================================================================
--- /anuga_core/source/anuga/pmesh/test_mesh.py	(revision 3513)
+++ /anuga_core/source/anuga/pmesh/test_mesh.py	(revision 3514)
@@ -5,12 +5,12 @@
 
 #try:
-from pmesh.mesh import *
+from anuga.pmesh.mesh import *
 #except ImportError:  
 #    from mesh import *
     
 from load_mesh.loadASCII import *
-from coordinate_transforms.geo_reference import Geo_reference
-from geospatial_data.geospatial_data import Geospatial_data
-from utilities.polygon import  is_inside_polygon ### inside_polygon
+from anuga.coordinate_transforms.geo_reference import Geo_reference
+from anuga.geospatial_data.geospatial_data import Geospatial_data
+from anuga.utilities.polygon import  is_inside_polygon ### inside_polygon
 
 class meshTestCase(unittest.TestCase):
Index: /anuga_core/source/anuga/pmesh/test_mesh_interface.py
===================================================================
--- /anuga_core/source/anuga/pmesh/test_mesh_interface.py	(revision 3513)
+++ /anuga_core/source/anuga/pmesh/test_mesh_interface.py	(revision 3514)
@@ -4,9 +4,9 @@
 import unittest
 import os
-from pmesh.mesh import importMeshFromFile
+from anuga.pmesh.mesh import importMeshFromFile
 from mesh_interface import *
 from load_mesh.loadASCII import *
-from utilities.polygon import is_inside_polygon
-from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
+from anuga.utilities.polygon import is_inside_polygon
+from anuga.coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
 
 class TestCase(unittest.TestCase):
Index: /anuga_core/source/anuga/pyvolution/_test_sww2domain.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/_test_sww2domain.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/_test_sww2domain.py	(revision 3514)
@@ -61,5 +61,5 @@
 ##NOW TEST IT!!!
 
-from data_manager import sww2domain
+from anuga.pyvolution.data_manager import sww2domain
 from Numeric import allclose
 
Index: /anuga_core/source/anuga/pyvolution/_test_sww2domain2.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/_test_sww2domain2.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/_test_sww2domain2.py	(revision 3514)
@@ -59,5 +59,5 @@
 ##NOW TEST IT!!!
 
-from data_manager import sww2domain
+from anuga.pyvolution.data_manager import sww2domain
 from Numeric import allclose
 
Index: /anuga_core/source/anuga/pyvolution/advection.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/advection.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/advection.py	(revision 3514)
@@ -167,5 +167,5 @@
         import sys
         from Numeric import zeros, Float
-        from config import max_timestep
+        from anuga.config import max_timestep
 
         N = self.number_of_elements
@@ -255,5 +255,5 @@
         import sys
         from Numeric import zeros, Float
-        from config import max_timestep
+        from anuga.config import max_timestep
 
         import weave
Index: /anuga_core/source/anuga/pyvolution/bed_w_eden_boundary.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/bed_w_eden_boundary.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/bed_w_eden_boundary.py	(revision 3514)
@@ -37,5 +37,5 @@
 #Write file
 import os, time
-from config import time_format
+from anuga.config import time_format
 from math import sin, pi
 
Index: /anuga_core/source/anuga/pyvolution/bed_w_file_boundary.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/bed_w_file_boundary.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/bed_w_file_boundary.py	(revision 3514)
@@ -38,5 +38,5 @@
 #Write file
 import os, time
-from config import time_format
+from anuga.config import time_format
 from math import sin, pi
 
@@ -57,5 +57,5 @@
 
 #Convert ASCII file to NetCDF (Which is what we really like!)
-from data_manager import timefile2swww        
+from anuga.pyvolution.data_manager import timefile2swww        
 timefile2swww(filename, quantity_names = domain.conserved_quantities)
 
Index: /anuga_core/source/anuga/pyvolution/check_sww_tsh.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/check_sww_tsh.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/check_sww_tsh.py	(revision 3514)
@@ -5,5 +5,5 @@
 from os import sep, path
 
-import data_manager
+import anuga.pyvolution.data_manager
 from load_mesh.loadASCII import import_mesh_file
 from shallow_water import Domain
Index: /anuga_core/source/anuga/pyvolution/combine_pts.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/combine_pts.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/combine_pts.py	(revision 3514)
@@ -5,5 +5,5 @@
 """
 
-from utilities.polygon import outside_polygon, inside_polygon
+from anuga.utilities.polygon import outside_polygon, inside_polygon
 from Numeric import take, concatenate
 import time
Index: /anuga_core/source/anuga/pyvolution/cornell_room.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/cornell_room.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/cornell_room.py	(revision 3514)
@@ -16,5 +16,5 @@
 from math import sqrt
 #from least_squares import Interpolation
-from fit_interpolate.interpolate import Interpolate
+from anuga.fit_interpolate.interpolate import Interpolate
     
 
Index: /anuga_core/source/anuga/pyvolution/data_manager.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/data_manager.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/data_manager.py	(revision 3514)
@@ -65,6 +65,6 @@
 
 
-from coordinate_transforms.geo_reference import Geo_reference
-from geospatial_data.geospatial_data import Geospatial_data
+from anuga.coordinate_transforms.geo_reference import Geo_reference
+from anuga.geospatial_data.geospatial_data import Geospatial_data
 
 
@@ -163,5 +163,5 @@
 
     import os
-    #from config import data_dir
+    #from anuga.config import data_dir
 
     FN = check_dir(datadir) + filename
@@ -184,5 +184,5 @@
 
     import os
-    #from config import data_dir
+    #from anuga.config import data_dir
 
     dir = check_dir(datadir)
@@ -260,5 +260,5 @@
             #Create new file
             fid.institution = 'Geoscience Australia'
-            fid.description = 'Output from pyvolution suitable for plotting'
+            fid.description = 'Output from anuga.pyvolution suitable for plotting'
 
             if domain.smooth:
@@ -1057,5 +1057,5 @@
 
     import glob, os
-    from config import data_dir
+    from anuga.config import data_dir
 
 
@@ -1294,5 +1294,5 @@
 
     #Georeferencing
-    from coordinate_transforms.geo_reference import Geo_reference
+    from anuga.coordinate_transforms.geo_reference import Geo_reference
     if zone is None:
         assert xllcorner is None, 'xllcorner must be None'
@@ -1818,6 +1818,6 @@
     from Numeric import array2string
 
-    from utilities.polygon import inside_polygon, outside_polygon, separate_points_by_polygon
-    from util import apply_expression_to_dictionary
+    from anuga.utilities.polygon import inside_polygon, outside_polygon, separate_points_by_polygon
+    from anuga.pyvolution.util import apply_expression_to_dictionary
 
     msg = 'Format must be either asc or ers'
@@ -1998,5 +1998,5 @@
     #Interpolate
     #from least_squares import Interpolation
-    from fit_interpolate.interpolate import Interpolate
+    from anuga.fit_interpolate.interpolate import Interpolate
 
 
@@ -2183,8 +2183,8 @@
     from Numeric import array2string
 
-    from utilities.polygon import inside_polygon, outside_polygon, separate_points_by_polygon
-    from util import apply_expression_to_dictionary
-
-    from geospatial_data import Geospatial_data
+    from anuga.utilities.polygon import inside_polygon, outside_polygon, separate_points_by_polygon
+    from anuga.pyvolution.util import apply_expression_to_dictionary
+
+    from anuga.geospatial_data.geospatial_data import Geospatial_data
 
     if quantity is None:
@@ -2298,5 +2298,5 @@
 
     # Interpolate
-    from fit_interpolate.interpolate import Interpolate
+    from anuga.fit_interpolate.interpolate import Interpolate
     interp = Interpolate(vertex_points, volumes, verbose = verbose)
 
@@ -2870,5 +2870,5 @@
 
     #Store
-    from coordinate_transforms.redfearn import redfearn
+    from anuga.coordinate_transforms.redfearn import redfearn
     x = zeros(number_of_points, Float)  #Easting
     y = zeros(number_of_points, Float)  #Northing
@@ -3020,6 +3020,6 @@
     import time, calendar
     from Numeric import array
-    from config import time_format
-    from utilities.numerical_tools import ensure_numeric
+    from anuga.config import time_format
+    from anuga.utilities.numerical_tools import ensure_numeric
 
 
@@ -3056,5 +3056,5 @@
     #Read times proper
     from Numeric import zeros, Float, alltrue
-    from config import time_format
+    from anuga.config import time_format
     import time, calendar
 
@@ -3542,7 +3542,7 @@
     from pmesh2domain import pmesh_to_domain_instance
     import time, os
-    from data_manager import get_dataobject
+    from anuga.pyvolution.data_manager import get_dataobject
     from os import sep, path
-    from utilities.numerical_tools import mean
+    from anuga.utilities.numerical_tools import mean
 
     if verbose == True:print 'Creating domain from', filename
@@ -3605,5 +3605,5 @@
     from Scientific.IO.NetCDF import NetCDFFile
 
-    from coordinate_transforms.redfearn import redfearn
+    from anuga.coordinate_transforms.redfearn import redfearn
 
     precision = Float # So if we want to change the precision its done here
@@ -3757,5 +3757,5 @@
 
     #Store
-    from coordinate_transforms.redfearn import redfearn
+    from anuga.coordinate_transforms.redfearn import redfearn
     x = zeros(number_of_points, Float)  #Easting
     y = zeros(number_of_points, Float)  #Northing
Index: /anuga_core/source/anuga/pyvolution/data_manager_obsolete_stuff.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/data_manager_obsolete_stuff.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/data_manager_obsolete_stuff.py	(revision 3514)
@@ -221,5 +221,5 @@
     from Numeric import array, Float, concatenate, NewAxis, zeros,\
          sometrue
-    from utilities.polygon import inside_polygon
+    from anuga.utilities.polygon import inside_polygon
 
     #FIXME: Should be variable
Index: /anuga_core/source/anuga/pyvolution/domain.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/domain.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/domain.py	(revision 3514)
@@ -8,12 +8,12 @@
 """
 
-from pyvolution.neighbour_mesh import Mesh
-from pyvolution.generic_boundary_conditions import Boundary
-from pyvolution.generic_boundary_conditions import File_boundary
-from pyvolution.generic_boundary_conditions import Dirichlet_boundary
-from pyvolution.generic_boundary_conditions import Time_boundary
-from pyvolution.generic_boundary_conditions import Transmissive_boundary
-from pyvolution.pmesh2domain import pmesh_to_domain
-from pyvolution.region import Set_region as region_set_region
+from anuga.pyvolution.neighbour_mesh import Mesh
+from anuga.pyvolution.generic_boundary_conditions import Boundary
+from anuga.pyvolution.generic_boundary_conditions import File_boundary
+from anuga.pyvolution.generic_boundary_conditions import Dirichlet_boundary
+from anuga.pyvolution.generic_boundary_conditions import Time_boundary
+from anuga.pyvolution.generic_boundary_conditions import Transmissive_boundary
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain
+from anuga.pyvolution.region import Set_region as region_set_region
 
 import types
@@ -150,5 +150,5 @@
 
         #Defaults
-        from config import max_smallsteps, beta_w, beta_h, epsilon, CFL
+        from anuga.config import max_smallsteps, beta_w, beta_h, epsilon, CFL
         self.beta_w = beta_w
         self.beta_h = beta_h
@@ -182,5 +182,5 @@
 
         #Checkpointing and storage
-        from config import default_datadir
+        from anuga.config import default_datadir
         self.datadir = default_datadir
         self.filename = 'domain'
@@ -340,5 +340,5 @@
         """
 
-        from util import apply_expression_to_dictionary
+        from anuga.pyvolution.util import apply_expression_to_dictionary
         return apply_expression_to_dictionary(expression, self.quantities)
 
@@ -653,5 +653,5 @@
         """
 
-        from config import min_timestep, max_timestep, epsilon
+        from anuga.config import min_timestep, max_timestep, epsilon
 
         #FIXME: Maybe lump into a larger check prior to evolving
@@ -801,5 +801,5 @@
     def update_timestep(self, yieldstep, finaltime):
 
-        from config import min_timestep, max_timestep
+        from anuga.config import min_timestep, max_timestep
 
         # self.timestep is calculated from speed of characteristics
@@ -933,5 +933,5 @@
 
 #Optimisation with psyco
-from config import use_psyco
+from anuga.config import use_psyco
 if use_psyco:
     try:
Index: /anuga_core/source/anuga/pyvolution/flatbed.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/flatbed.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/flatbed.py	(revision 3514)
@@ -13,5 +13,5 @@
      Constant_height
 from Numeric import array
-from util import Polygon_function, read_polygon
+from anuga.pyvolution.util import Polygon_function, read_polygon
 
 
Index: /anuga_core/source/anuga/pyvolution/general_mesh.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/general_mesh.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/general_mesh.py	(revision 3514)
@@ -3,5 +3,5 @@
 from Numeric import array, zeros, Int, Float, sqrt, sum
 
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 class General_mesh:
@@ -50,5 +50,5 @@
 
 
-        This is a cut down version of mesh from pyvolution mesh.py
+        This is a cut down version of mesh from anuga.pyvolution mesh.py
     """
 
Index: /anuga_core/source/anuga/pyvolution/generic_boundary_conditions.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/generic_boundary_conditions.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/generic_boundary_conditions.py	(revision 3514)
@@ -130,6 +130,6 @@
         import time
         from Numeric import array
-        from config import time_format
-        from util import File_function
+        from anuga.config import time_format
+        from anuga.pyvolution.util import File_function
 
         Boundary.__init__(self)
@@ -180,6 +180,6 @@
         import time
         from Numeric import array, zeros, Float
-        from config import time_format
-        from util import file_function
+        from anuga.config import time_format
+        from anuga.pyvolution.util import file_function
 
         Boundary.__init__(self)
Index: /anuga_core/source/anuga/pyvolution/interpolate_sww.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/interpolate_sww.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/interpolate_sww.py	(revision 3514)
@@ -24,5 +24,5 @@
 
 from Numeric import transpose
-from fit_interpolate.interpolate import Interpolate 
+from anuga.fit_interpolate.interpolate import Interpolate 
 
 DEFAULT_QUANTITY = "depth"
Index: /anuga_core/source/anuga/pyvolution/least_squares.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/least_squares.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/least_squares.py	(revision 3514)
@@ -25,13 +25,13 @@
 #from general_mesh import General_mesh
 from Numeric import zeros, array, Float, Int, transpose, concatenate, ArrayType, NewAxis
-from pyvolution.neighbour_mesh import Mesh
+from anuga.pyvolution.neighbour_mesh import Mesh
 
 from Numeric import dot, zeros, take, compress, array, Float, Int, transpose, concatenate, ArrayType
-from utilities.sparse import Sparse, Sparse_CSR
-from utilities.cg_solve import conjugate_gradient, VectorShapeError
-from utilities.numerical_tools import ensure_numeric, mean, gradient
-
-
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.utilities.sparse import Sparse, Sparse_CSR
+from anuga.utilities.cg_solve import conjugate_gradient, VectorShapeError
+from anuga.utilities.numerical_tools import ensure_numeric, mean, gradient
+
+
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 import time
@@ -194,5 +194,5 @@
     """
     if use_cache is True:
-        from caching.caching import cache
+        from anuga.caching.caching import cache
         interp = cache(_interpolation,
                        (vertex_coordinates,
@@ -541,6 +541,6 @@
         #Maybe we need some sort of blocking
 
-        from pyvolution.quad import build_quadtree
-        from utilities.polygon import inside_polygon
+        from anuga.pyvolution.quad import build_quadtree
+        from anuga.utilities.polygon import inside_polygon
 	
 
@@ -1089,5 +1089,5 @@
 
 
-        from config import time_format
+        from anuga.config import time_format
         import types
 
@@ -1237,5 +1237,5 @@
         from math import pi, cos, sin, sqrt
         from Numeric import zeros, Float
-        from utilities.numerical_tools import mean        
+        from anuga.utilities.numerical_tools import mean        
 
         if self.spatial is True:
Index: /anuga_core/source/anuga/pyvolution/mesh_factory.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/mesh_factory.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/mesh_factory.py	(revision 3514)
@@ -18,5 +18,5 @@
     """
 
-    from config import epsilon
+    from anuga.config import epsilon
 
     deltax = float(len1)/m
@@ -72,5 +72,5 @@
     """
 
-    from config import epsilon
+    from anuga.config import epsilon
     from Numeric import zeros, Float, Int
 
@@ -148,5 +148,5 @@
     """
 
-    from config import epsilon
+    from anuga.config import epsilon
     from Numeric import zeros, Float, Int
 
@@ -211,5 +211,5 @@
     import math
 
-    from config import epsilon
+    from anuga.config import epsilon
 
 
@@ -334,5 +334,5 @@
     """
 
-    from util import anglediff
+    from anuga.pyvolution.util import anglediff
     from math import pi
     import os.path
@@ -449,5 +449,5 @@
 
     from math import pi
-    from util import anglediff
+    from anuga.pyvolution.util import anglediff
 
 
@@ -513,5 +513,5 @@
     import math
 
-    from config import epsilon
+    from anuga.config import epsilon
 
 
@@ -595,5 +595,5 @@
     import math
 
-    from config import epsilon
+    from anuga.config import epsilon
 
 
@@ -689,5 +689,5 @@
     import math
 
-    from config import epsilon
+    from anuga.config import epsilon
 
 
Index: /anuga_core/source/anuga/pyvolution/mesh_factory_all.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/mesh_factory_all.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/mesh_factory_all.py	(revision 3514)
@@ -18,5 +18,5 @@
     """
 
-    from config import epsilon
+    from anuga.config import epsilon
 
     #E = m*n*2        #Number of triangular elements
@@ -76,5 +76,5 @@
     """
 
-    from config import epsilon
+    from anuga.config import epsilon
     from Numeric import zeros, Float, Int
 
@@ -145,5 +145,5 @@
     import math
 
-    from config import epsilon
+    from anuga.config import epsilon
 
 
@@ -215,5 +215,5 @@
     import math
 
-    from config import epsilon
+    from anuga.config import epsilon
 
 
@@ -351,5 +351,5 @@
     """
 
-    from util import anglediff
+    from anuga.pyvolution.util import anglediff
     from math import pi
     import os.path
@@ -466,5 +466,5 @@
 
     from math import pi
-    from util import anglediff
+    from anuga.pyvolution.util import anglediff
 
 
Index: /anuga_core/source/anuga/pyvolution/neighbour_mesh.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/neighbour_mesh.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/neighbour_mesh.py	(revision 3514)
@@ -310,5 +310,5 @@
         """
 
-        from config import default_boundary_tag
+        from anuga.config import default_boundary_tag
 
         if boundary is None:
@@ -440,5 +440,5 @@
         
         from Numeric import allclose, sqrt, array, minimum, maximum
-        from utilities.numerical_tools import angle, ensure_numeric        
+        from anuga.utilities.numerical_tools import angle, ensure_numeric        
 
 
@@ -574,6 +574,6 @@
         """
 
-        from config import epsilon
-        from utilities.numerical_tools import anglediff
+        from anuga.config import epsilon
+        from anuga.utilities.numerical_tools import anglediff
 
         N = self.number_of_elements
@@ -710,5 +710,5 @@
 
         from Numeric import arange
-        from utilities.numerical_tools import histogram, create_bins
+        from anuga.utilities.numerical_tools import histogram, create_bins
 
         vertex_coordinates = self.vertex_coordinates # Relative coordinates
Index: /anuga_core/source/anuga/pyvolution/pressure_force.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/pressure_force.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/pressure_force.py	(revision 3514)
@@ -48,6 +48,6 @@
 
 def cyclone(domain):
-    from config import rho_w 
-    from util import gradient
+    from anuga.config import rho_w 
+    from anuga.pyvolution.util import gradient
 
     xmom = domain.quantities['xmomentum'].explicit_update
Index: /anuga_core/source/anuga/pyvolution/quantity.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/quantity.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/quantity.py	(revision 3514)
@@ -20,5 +20,5 @@
     def __init__(self, domain, vertex_values=None):
 
-        from pyvolution.neighbour_mesh import Mesh
+        from anuga.pyvolution.neighbour_mesh import Mesh
         from Numeric import array, zeros, Float
 
@@ -265,5 +265,5 @@
         """
 
-        from geospatial_data.geospatial_data import Geospatial_data
+        from anuga.geospatial_data.geospatial_data import Geospatial_data
         from types import FloatType, IntType, LongType, ListType, NoneType
         from Numeric import ArrayType
@@ -620,8 +620,8 @@
 
         from Numeric import Float
-        from utilities.numerical_tools import ensure_numeric
-        #from pyvolution.least_squares import fit_to_mesh
-        from fit_interpolate.fit import fit_to_mesh
-        from coordinate_transforms.geo_reference import Geo_reference
+        from anuga.utilities.numerical_tools import ensure_numeric
+        #from anuga.pyvolution.least_squares import fit_to_mesh
+        from anuga.fit_interpolate.fit import fit_to_mesh
+        from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 
@@ -693,5 +693,5 @@
 
         from load_mesh.loadASCII import import_points_file
-        from geospatial_data.geospatial_data import points_dictionary2geospatial_data
+        from anuga.geospatial_data.geospatial_data import points_dictionary2geospatial_data
 
         from types import StringType
@@ -1322,5 +1322,5 @@
 
 
-from utilities import compile
+from anuga.utilities import compile
 if compile.can_use_C_extension('quantity_ext.c'):
     #Replace python version with c implementations
Index: /anuga_core/source/anuga/pyvolution/realtime_visualisation.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/realtime_visualisation.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/realtime_visualisation.py	(revision 3514)
@@ -66,5 +66,5 @@
         from Numeric import zeros, Float
 
-        from config import minimum_allowed_height as hmin
+        from anuga.config import minimum_allowed_height as hmin
         if floor_heights is None:
             floor_heights = zeros(heights.shape, Float)
@@ -200,5 +200,5 @@
 
     #print scene.forward
-    #FIXME: Use smoother from pyvolution instead
+    #FIXME: Use smoother from anuga.pyvolution instead
     if domain.smooth:
         #Get all average point values
Index: /anuga_core/source/anuga/pyvolution/shallow_water.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/shallow_water.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/shallow_water.py	(revision 3514)
@@ -62,5 +62,5 @@
 from generic_boundary_conditions import Transmissive_boundary
 
-from utilities.numerical_tools import gradient, mean
+from anuga.utilities.numerical_tools import gradient, mean
 
 
@@ -105,5 +105,5 @@
 
 
-        from config import minimum_allowed_height, maximum_allowed_speed, g
+        from anuga.config import minimum_allowed_height, maximum_allowed_speed, g
         self.minimum_allowed_height = minimum_allowed_height
         self.maximum_allowed_speed = maximum_allowed_speed
@@ -324,8 +324,8 @@
         """
 
-        import data_manager
+        from anuga.pyvolution.data_manager import get_dataobject
 
         #Initialise writer
-        self.writer = data_manager.get_dataobject(self, mode = 'w')
+        self.writer = get_dataobject(self, mode = 'w')
 
         #Store vertices and connectivity
@@ -407,5 +407,5 @@
     """
 
-    from config import g, epsilon
+    from anuga.config import g, epsilon
     from math import sqrt
     from Numeric import array
@@ -656,5 +656,5 @@
     """
 
-    from config import optimised_gradient_limiter
+    from anuga.config import optimised_gradient_limiter
 
     #Remove very thin layers of water
@@ -1059,22 +1059,5 @@
         q = self.domain.get_conserved_quantities(vol_id, edge = edge_id)
         value = self.function(self.domain.time)
-
-   
-        try:
-            # In case function returns a list of values
-            val = value[0]
-        except TypeError:
-            val = value
-
-        # Assign value to first component of q (stage)
-        try:
-            q[0] = float(val)
-        except:
-            msg = 'Supplied value could not be converted to float: val=', val     
-            raise Exception, msg    
-            
-            
-            
-        
+        q[0] = value[0]
         return q
 
@@ -1418,5 +1401,5 @@
         """
 
-        from config import rho_a, rho_w, eta_w
+        from anuga.config import rho_a, rho_w, eta_w
         from Numeric import array, Float
 
@@ -1868,5 +1851,5 @@
 
 
-from utilities import compile
+from anuga.utilities import compile
 if compile.can_use_C_extension('shallow_water_ext.c'):
     #Replace python version with c implementations
@@ -1887,5 +1870,5 @@
 
 #Optimisation with psyco
-from config import use_psyco
+from anuga.config import use_psyco
 if use_psyco:
     try:
Index: /anuga_core/source/anuga/pyvolution/shallow_water_kinetic.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/shallow_water_kinetic.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/shallow_water_kinetic.py	(revision 3514)
@@ -73,5 +73,5 @@
                                 tagged_elements, geo_reference, use_inscribed_circle)
 
-        from config import minimum_allowed_height, g
+        from anuga.config import minimum_allowed_height, g
         self.minimum_allowed_height = minimum_allowed_height
         self.g = g
@@ -94,5 +94,5 @@
 
         #Reduction operation for get_vertex_values
-        from util import mean
+        from anuga.pyvolution.util import mean
         self.reduction = mean
         #self.reduction = min  #Looks better near steep slopes
@@ -245,5 +245,5 @@
         """
 
-        import data_manager
+        import anuga.pyvolution.data_manager
 
         #Initialise writer
@@ -328,5 +328,5 @@
     """
 
-    from config import g, epsilon
+    from anuga.config import g, epsilon
     from math import sqrt
     from Numeric import array
@@ -425,5 +425,5 @@
     """
 
-    from config import g, epsilon
+    from anuga.config import g, epsilon
     from math import sqrt
     from Numeric import array
@@ -684,5 +684,5 @@
     """
 
-    from config import optimised_gradient_limiter
+    from anuga.config import optimised_gradient_limiter
 
     #Remove very thin layers of water
@@ -1169,5 +1169,5 @@
     """
 
-    from util import gradient
+    from anuga.pyvolution.util import gradient
     from Numeric import zeros, Float, array, sum
 
@@ -1399,5 +1399,5 @@
         """
 
-        from config import rho_a, rho_w, eta_w
+        from anuga.config import rho_a, rho_w, eta_w
         from Numeric import array, Float
 
@@ -1772,5 +1772,5 @@
 
 
-from utilities import compile
+from anuga.utilities import compile
 if compile.can_use_C_extension('shallow_water_kinetic_ext.c'):
     #Replace python version with c implementations
@@ -1791,5 +1791,5 @@
 
 #Optimisation with psyco
-from config import use_psyco
+from anuga.config import use_psyco
 if use_psyco:
     try:
Index: /anuga_core/source/anuga/pyvolution/test_advection.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/test_advection.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/test_advection.py	(revision 3514)
@@ -6,5 +6,5 @@
 from math import sqrt, pi
 
-from config import g, epsilon
+from anuga.config import g, epsilon
 from Numeric import allclose, array, zeros, ones, Float
 from advection import *
Index: /anuga_core/source/anuga/pyvolution/test_combine_pts.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/test_combine_pts.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/test_combine_pts.py	(revision 3514)
@@ -10,8 +10,8 @@
 from Numeric import allclose, array, transpose
 
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 from combine_pts import *
 from load_mesh.loadASCII import import_points_file
-#from geospatial_data.geospatial_data import import_points_file
+#from anuga.geospatial_data.geospatial_data import import_points_file
 
 class Test_combine_pts(unittest.TestCase):
Index: /anuga_core/source/anuga/pyvolution/test_data_manager.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/test_data_manager.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/test_data_manager.py	(revision 3514)
@@ -5,15 +5,17 @@
 import copy
 from Numeric import zeros, array, allclose, Float
-from utilities.numerical_tools import mean
+from anuga.utilities.numerical_tools import mean
 import tempfile
 import os
 from Scientific.IO.NetCDF import NetCDFFile
 
-from pyvolution.data_manager import *
-from pyvolution.shallow_water import *
-from config import epsilon
-import pyvolution.data_manager
-
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.pyvolution.data_manager import *
+from anuga.pyvolution.shallow_water import *
+from anuga.config import epsilon
+
+# This is needed to run the tests of local functions
+import anuga.pyvolution.data_manager
+
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 class Test_Data_Manager(unittest.TestCase):
@@ -2055,5 +2057,5 @@
         from Numeric import array, zeros, allclose, Float, concatenate, NewAxis
         from Scientific.IO.NetCDF import NetCDFFile
-        from geospatial_data import Geospatial_data
+        from anuga.geospatial_data.geospatial_data import Geospatial_data
 
         # Used for points that lie outside mesh
@@ -2153,5 +2155,5 @@
 
         #Read
-        from coordinate_transforms.redfearn import redfearn
+        from anuga.coordinate_transforms.redfearn import redfearn
         #fid = NetCDFFile(self.test_MOST_file)
         fid = NetCDFFile(self.test_MOST_file + '_ha.nc')
@@ -2216,5 +2218,5 @@
 
 
-        from coordinate_transforms.redfearn import redfearn
+        from anuga.coordinate_transforms.redfearn import redfearn
 
         #fid = NetCDFFile('small_ha.nc')
@@ -2284,5 +2286,5 @@
         # Fourth value (index==3) is -6.50198 cm
 
-        from coordinate_transforms.redfearn import redfearn
+        from anuga.coordinate_transforms.redfearn import redfearn
         import os
         fid1 = NetCDFFile('test_ha.nc','w')
@@ -2444,5 +2446,5 @@
         # Fourth value (index==3) is -6.50198 cm
 
-        from coordinate_transforms.redfearn import redfearn
+        from anuga.coordinate_transforms.redfearn import redfearn
         import os
         fid1 = NetCDFFile('test_ha.nc','w')
@@ -2591,5 +2593,5 @@
     def test_ferret2sww_nz_origin(self):
         from Scientific.IO.NetCDF import NetCDFFile
-        from coordinate_transforms.redfearn import redfearn
+        from anuga.coordinate_transforms.redfearn import redfearn
 
         #Call conversion (with nonzero origin)
@@ -2714,5 +2716,5 @@
         #Import the example's file as a new domain
         ##########################################
-        from data_manager import sww2domain
+        from anuga.pyvolution.data_manager import sww2domain
         from Numeric import allclose
         import os
@@ -2858,5 +2860,5 @@
 	#Import the file as a new domain
         ##################################
-	from data_manager import sww2domain
+	from anuga.pyvolution.data_manager import sww2domain
 	from Numeric import allclose
         import os
@@ -2896,5 +2898,5 @@
 
     #def test_weed(self):
-	from data_manager import weed
+	from anuga.pyvolution.data_manager import weed
 
         coordinates1 = [[0.,0.],[1.,0.],[1.,1.],[1.,0.],[2.,0.],[1.,1.]]
@@ -2969,5 +2971,5 @@
 	#Import the example's file as a new domain
 	##########################################
-	from data_manager import sww2domain
+	from anuga.pyvolution.data_manager import sww2domain
 	from Numeric import allclose
         import os
@@ -3270,5 +3272,5 @@
         from Scientific.IO.NetCDF import NetCDFFile
 
-        import data_manager
+        from anuga.pyvolution.data_manager import _read_asc
         #Write test asc file
         filename = tempfile.mktemp(".000")
@@ -3286,6 +3288,5 @@
 """)
         fid.close()
-        bath_metadata, grid = \
-                   data_manager._read_asc(filename, verbose=False)
+        bath_metadata, grid = _read_asc(filename, verbose=False)
         self.failUnless(bath_metadata['xllcorner']  == 2000.5,  'Failed')
         self.failUnless(bath_metadata['yllcorner']  == 3000.5,  'Failed')
@@ -3986,5 +3987,5 @@
         # k - lat
         # l - lon
-        kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
+        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
             latitudes,longitudes,
             -10,4,-10,31)
@@ -4001,5 +4002,5 @@
 
         ## 2nd test
-        kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
+        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
             latitudes,longitudes,
             0.5,2.5,5,25)
@@ -4016,5 +4017,5 @@
 
         ## 3rd test
-        kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(\
+        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(\
             latitudes,
             longitudes,
@@ -4033,5 +4034,5 @@
 
         ## 4th test
-        kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
+        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
             latitudes,longitudes,
                                                       -0.1,1.9,-2,17)
@@ -4047,5 +4048,5 @@
                          'failed')
         ## 5th test
-        kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
+        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
             latitudes,longitudes,
             0.1,1.9,2,17)
@@ -4063,5 +4064,5 @@
         ## 6th test
 
-        kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
+        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
             latitudes,longitudes,
             1.5,4,18,32)
@@ -4080,5 +4081,5 @@
         ## 7th test
         m2d = array([[0,1,2,3],[4,5,6,7],[8,9,10,11],[12,13,14,15]])
-        kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
+        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
             latitudes,longitudes,
             1.5,1.5,15,15)
@@ -4107,5 +4108,5 @@
         # k - lat
         # l - lon
-        kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
+        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
             latitudes,longitudes,
             -37,-27,147,149.5)
@@ -4136,5 +4137,5 @@
         # k - lat
         # l - lon
-        kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
+        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
             latitudes,longitudes,
             -43,-37,148.5,149.5)
@@ -4160,5 +4161,5 @@
         # k - lat
         # l - lon
-        kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
+        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
             latitudes,longitudes)
 
Index: /anuga_core/source/anuga/pyvolution/test_domain.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/test_domain.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/test_domain.py	(revision 3514)
@@ -5,5 +5,5 @@
 
 from domain import *
-from config import epsilon
+from anuga.config import epsilon
 from Numeric import allclose, array, ones, Float
 
@@ -254,5 +254,5 @@
     def test_boundary_indices(self):
 
-        from config import default_boundary_tag
+        from anuga.config import default_boundary_tag
 
 
Index: /anuga_core/source/anuga/pyvolution/test_general_mesh.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/test_general_mesh.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/test_general_mesh.py	(revision 3514)
@@ -9,5 +9,5 @@
 
 from quantity import *
-from config import epsilon
+from anuga.config import epsilon
 from Numeric import allclose, array, ones, Float
 
Index: /anuga_core/source/anuga/pyvolution/test_generic_boundary_conditions.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/test_generic_boundary_conditions.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/test_generic_boundary_conditions.py	(revision 3514)
@@ -5,5 +5,5 @@
 
 from generic_boundary_conditions import *
-from config import epsilon
+from anuga.config import epsilon
 from Numeric import allclose, array
 
@@ -88,5 +88,5 @@
         T = Transmissive_boundary(domain)
 
-        from config import default_boundary_tag
+        from anuga.config import default_boundary_tag
         domain.set_boundary( {default_boundary_tag: T} )
 
@@ -110,5 +110,5 @@
         import time, os
         from math import sin, pi
-        from config import time_format
+        from anuga.config import time_format
 
         a = [0.0, 0.0]
@@ -152,5 +152,5 @@
         #Convert ASCII file to NetCDF (Which is what we really like!)
         
-        from data_manager import timefile2netcdf                
+        from anuga.pyvolution.data_manager import timefile2netcdf                
         timefile2netcdf(filename, quantity_names = ['stage', 'ymomentum'])
         
@@ -180,5 +180,5 @@
 
         #Check time interpolation
-        from config import default_boundary_tag
+        from anuga.config import default_boundary_tag
         domain.set_boundary( {default_boundary_tag: F} )
 
@@ -203,5 +203,5 @@
         import time, os
         from math import sin, pi
-        from config import time_format
+        from anuga.config import time_format
 
         a = [0.0, 0.0]
@@ -246,5 +246,5 @@
 
         #Convert ASCII file to NetCDF (Which is what we really like!)
-        from data_manager import timefile2netcdf               
+        from anuga.pyvolution.data_manager import timefile2netcdf               
         timefile2netcdf(filename, quantity_names = ['stage', 'xmomentum'])
 
Index: /anuga_core/source/anuga/pyvolution/test_ghost.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/test_ghost.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/test_ghost.py	(revision 3514)
@@ -5,5 +5,5 @@
 
 from domain import *
-from config import epsilon
+from anuga.config import epsilon
 from Numeric import allclose, array, ones, Float
 
Index: /anuga_core/source/anuga/pyvolution/test_interpolate_sww.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/test_interpolate_sww.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/test_interpolate_sww.py	(revision 3514)
@@ -8,9 +8,9 @@
 import unittest
 from Numeric import zeros, array, allclose, Float
-from utilities.numerical_tools import mean
+from anuga.utilities.numerical_tools import mean
 
 from interpolate_sww import *
-from pyvolution.shallow_water import Domain, Transmissive_boundary
-from pyvolution.data_manager import get_dataobject
+from anuga.pyvolution.shallow_water import Domain, Transmissive_boundary
+from anuga.pyvolution.data_manager import get_dataobject
 
 
Index: /anuga_core/source/anuga/pyvolution/test_least_squares.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/test_least_squares.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/test_least_squares.py	(revision 3514)
@@ -7,10 +7,10 @@
 
 
-from pyvolution.least_squares import *
-from pyvolution.neighbour_mesh import Mesh
+from anuga.pyvolution.least_squares import *
+from anuga.pyvolution.neighbour_mesh import Mesh
 
 from Numeric import allclose, array, transpose
 
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 def distance(x, y):
@@ -1083,5 +1083,5 @@
         #Check basic interpolation of one quantity using averaging
         #(no interpolation points or spatial info)
-        from utilities.numerical_tools import mean        
+        from anuga.utilities.numerical_tools import mean        
         I = Interpolation_function(time, [mean(Q[0,:]),
                                           mean(Q[1,:]),
@@ -1410,5 +1410,5 @@
         """
         
-        from coordinate_transforms.geo_reference import Geo_reference
+        from anuga.coordinate_transforms.geo_reference import Geo_reference
 
         #Mesh
Index: /anuga_core/source/anuga/pyvolution/test_neighbour_mesh.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/test_neighbour_mesh.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/test_neighbour_mesh.py	(revision 3514)
@@ -12,9 +12,9 @@
 from neighbour_mesh import *
 from mesh_factory import rectangular
-from config import epsilon
+from anuga.config import epsilon
 from Numeric import allclose, array
 
-from coordinate_transforms.geo_reference import Geo_reference
-from utilities.polygon import is_inside_polygon
+from anuga.coordinate_transforms.geo_reference import Geo_reference
+from anuga.utilities.polygon import is_inside_polygon
 
 def distance(x, y):
@@ -567,5 +567,5 @@
         mesh.check_integrity()
 
-        from config import default_boundary_tag
+        from anuga.config import default_boundary_tag
         assert mesh.boundary[ (3, 1) ] == default_boundary_tag
 
@@ -600,5 +600,5 @@
         mesh.check_integrity()
 
-        from config import default_boundary_tag
+        from anuga.config import default_boundary_tag
         assert mesh.boundary[ (0, 0) ] == default_boundary_tag
         assert mesh.boundary[ (0, 2) ] == default_boundary_tag
Index: /anuga_core/source/anuga/pyvolution/test_pmesh2domain.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/test_pmesh2domain.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/test_pmesh2domain.py	(revision 3514)
@@ -13,9 +13,9 @@
      Transmissive_boundary
 
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 #This is making pyvolution dependent on pmesh.
 # not good.  this should be in a seperate package.(directory)
-from pmesh.mesh import importMeshFromFile
+from anuga.pmesh.mesh import importMeshFromFile
 
 class Test_pmesh2domain(unittest.TestCase):
Index: /anuga_core/source/anuga/pyvolution/test_quantity.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/test_quantity.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/test_quantity.py	(revision 3514)
@@ -6,12 +6,12 @@
 
 from quantity import *
-from config import epsilon
+from anuga.config import epsilon
 from Numeric import allclose, array, ones, Float
 
-from fit_interpolate.fit import fit_to_mesh
-#from pyvolution.least_squares import fit_to_mesh		
+from anuga.fit_interpolate.fit import fit_to_mesh
+#from anuga.pyvolution.least_squares import fit_to_mesh		
 from domain import Domain
-from geospatial_data.geospatial_data import Geospatial_data
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.geospatial_data.geospatial_data import Geospatial_data
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 #Aux for fit_interpolate.fit example
@@ -1061,5 +1061,5 @@
         from shallow_water import Domain, Transmissive_boundary
         from Numeric import zeros, Float
-        from utilities.numerical_tools import mean
+        from anuga.utilities.numerical_tools import mean
 
         #Create basic mesh
@@ -1151,5 +1151,5 @@
         from shallow_water import Domain, Transmissive_boundary
         from Numeric import zeros, Float
-        from utilities.numerical_tools import mean
+        from anuga.utilities.numerical_tools import mean
 
 
Index: /anuga_core/source/anuga/pyvolution/test_region.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/test_region.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/test_region.py	(revision 3514)
@@ -6,5 +6,5 @@
 from domain import *
 from region import *
-#from config import epsilon
+#from anuga.config import epsilon
 from Numeric import allclose #, array, ones, Float
 
Index: /anuga_core/source/anuga/pyvolution/test_shallow_water.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/test_shallow_water.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/test_shallow_water.py	(revision 3514)
@@ -4,7 +4,7 @@
 from math import sqrt, pi
 
-from config import g, epsilon
+from anuga.config import g, epsilon
 from Numeric import allclose, array, zeros, ones, Float, take
-from utilities.numerical_tools import mean
+from anuga.utilities.numerical_tools import mean
 
 from shallow_water import *
@@ -703,5 +703,5 @@
         """
 
-        from config import g
+        from anuga.config import g
         import copy
 
@@ -751,5 +751,5 @@
         #Assuming no friction
 
-        from config import g
+        from anuga.config import g
 
         a = [0.0, 0.0]
@@ -789,5 +789,5 @@
 
     def test_manning_friction(self):
-        from config import g
+        from anuga.config import g
 
         a = [0.0, 0.0]
@@ -858,5 +858,5 @@
 
     def test_constant_wind_stress(self):
-        from config import rho_a, rho_w, eta_w
+        from anuga.config import rho_a, rho_w, eta_w
         from math import pi, cos, sin, sqrt
 
@@ -910,5 +910,5 @@
 
     def test_variable_wind_stress(self):
-        from config import rho_a, rho_w, eta_w
+        from anuga.config import rho_a, rho_w, eta_w
         from math import pi, cos, sin, sqrt
 
@@ -979,8 +979,8 @@
 
     def test_windfield_from_file(self):
-        from config import rho_a, rho_w, eta_w
+        from anuga.config import rho_a, rho_w, eta_w
         from math import pi, cos, sin, sqrt
-        from config import time_format
-        from util import file_function
+        from anuga.config import time_format
+        from anuga.pyvolution.util import file_function
         import time
 
@@ -1029,5 +1029,5 @@
 
         #Convert ASCII file to NetCDF (Which is what we really like!)
-        from data_manager import timefile2netcdf        
+        from anuga.pyvolution.data_manager import timefile2netcdf        
         timefile2netcdf(filename)
         os.remove(filename + '.txt')
@@ -1095,5 +1095,5 @@
         """
 
-        from config import rho_a, rho_w, eta_w
+        from anuga.config import rho_a, rho_w, eta_w
         from math import pi, cos, sin, sqrt
 
@@ -1195,5 +1195,5 @@
         #Check that first order limiter follows bed_slope
         from Numeric import alltrue, greater_equal
-        from config import epsilon
+        from anuga.config import epsilon
 
         a = [0.0, 0.0]
@@ -2238,5 +2238,5 @@
 
     def test_flatbed_second_order_distribute(self):
-        #Use real data from pyvolution 2
+        #Use real data from anuga.pyvolution 2
         #painfully setup and extracted.
         from mesh_factory import rectangular
Index: /anuga_core/source/anuga/pyvolution/test_util.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/test_util.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/test_util.py	(revision 3514)
@@ -7,9 +7,9 @@
 import tempfile
 
-from util import *
-from config import epsilon
-from data_manager import timefile2netcdf
-
-from utilities.numerical_tools import NAN
+from anuga.pyvolution.util import *
+from anuga.config import epsilon
+from anuga.pyvolution.data_manager import timefile2netcdf
+
+from anuga.utilities.numerical_tools import NAN
 
 def test_function(x, y):
@@ -28,5 +28,5 @@
     #Geometric
     #def test_distance(self):
-    #    from util import distance#
+    #    from anuga.pyvolution.util import distance#
     #
     #    self.failUnless( distance([4,2],[7,6]) == 5.0,
@@ -48,5 +48,5 @@
         #Write file
         import os, time
-        from config import time_format
+        from anuga.config import time_format
         from math import sin, pi
 
@@ -121,5 +121,5 @@
         domain1 = Domain(points, vertices, boundary)
 
-        from utilities.numerical_tools import mean
+        from anuga.utilities.numerical_tools import mean
         domain1.reduction = mean
         domain1.smooth = True #NOTE: Mimic sww output where each vertex has
@@ -319,5 +319,5 @@
 
 
-        from coordinate_transforms.geo_reference import Geo_reference
+        from anuga.coordinate_transforms.geo_reference import Geo_reference
         xllcorner = 2048
         yllcorner = 11000
@@ -331,5 +331,5 @@
         
 
-        from utilities.numerical_tools import mean	
+        from anuga.utilities.numerical_tools import mean	
         domain1.reduction = mean
         domain1.smooth = True #NOTE: Mimic sww output where each vertex has
@@ -531,9 +531,9 @@
 
         import os, time
-        from config import time_format
+        from anuga.config import time_format
         from Numeric import sin, pi, exp
         from mesh_factory import rectangular
         from shallow_water import Domain
-        import data_manager
+        import anuga.pyvolution.data_manager
 
         finaltime = 1200
@@ -691,10 +691,10 @@
 
         import os, time
-        from config import time_format
+        from anuga.config import time_format
         from Numeric import sin, pi, exp
         from mesh_factory import rectangular
         from shallow_water import Domain
-        import data_manager 
-        from pmesh.mesh_interface import create_mesh_from_regions
+        import anuga.pyvolution.data_manager 
+        from anuga.pmesh.mesh_interface import create_mesh_from_regions
         finaltime = 1200
         
@@ -909,5 +909,5 @@
         #Write file
         import os, time, calendar
-        from config import time_format
+        from anuga.config import time_format
         from math import sin, pi
         from domain import Domain
@@ -1001,5 +1001,5 @@
         #Write file
         import os, time, calendar
-        from config import time_format
+        from anuga.config import time_format
         from math import sin, pi
         from domain import Domain
Index: /anuga_core/source/anuga/pyvolution/tsh2sww.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/tsh2sww.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/tsh2sww.py	(revision 3514)
@@ -13,6 +13,6 @@
 from pmesh2domain import pmesh_to_domain_instance
 import time, os 
-from data_manager import get_dataobject   
-from utilities.numerical_tools import mean
+from anuga.pyvolution.data_manager import get_dataobject   
+from anuga.utilities.numerical_tools import mean
 
 def tsh2sww(infilename, sww_file_name = None, verbose = False):
Index: /anuga_core/source/anuga/pyvolution/twolevels.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/twolevels.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/twolevels.py	(revision 3514)
@@ -13,5 +13,5 @@
      Constant_height
 from Numeric import array
-from util import Polygon_function, read_polygon
+from anuga.pyvolution.util import Polygon_function, read_polygon
 
 
Index: /anuga_core/source/anuga/pyvolution/util.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/util.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/util.py	(revision 3514)
@@ -5,8 +5,8 @@
 """
 
-import utilities.polygon
+import anuga.utilities.polygon
 from warnings import warn
 
-from geospatial_data.geospatial_data import ensure_absolute
+from anuga.geospatial_data.geospatial_data import ensure_absolute
 
 
@@ -169,5 +169,5 @@
 
     import time, calendar, types
-    from config import time_format
+    from anuga.config import time_format
     from Scientific.IO.NetCDF import NetCDFFile
     from Numeric import array, zeros, Float, alltrue, concatenate, reshape
@@ -306,5 +306,5 @@
 
     #from least_squares import Interpolation_function
-    from fit_interpolate.interpolate import Interpolation_function
+    from anuga.fit_interpolate.interpolate import Interpolation_function
 
     if not spatial:
@@ -401,8 +401,8 @@
     """Temporary Interface to new location"""
 
-    import utilities.numerical_tools as NT	
+    import anuga.utilities.numerical_tools as NT	
     
     msg = 'angle has moved from util.py.  '
-    msg += 'Please use "from utilities.numerical_tools import angle"'
+    msg += 'Please use "from anuga.utilities.numerical_tools import angle"'
     warn(msg, DeprecationWarning) 
 
@@ -412,8 +412,8 @@
     """Temporary Interface to new location"""
 
-    import utilities.numerical_tools as NT
+    import anuga.utilities.numerical_tools as NT
     
     msg = 'anglediff has moved from util.py.  '
-    msg += 'Please use "from utilities.numerical_tools import anglediff"'
+    msg += 'Please use "from anuga.utilities.numerical_tools import anglediff"'
     warn(msg, DeprecationWarning) 
 
@@ -424,8 +424,8 @@
     """Temporary Interface to new location"""
 
-    import utilities.numerical_tools as NT    
+    import anuga.utilities.numerical_tools as NT    
     
     msg = 'mean has moved from util.py.  '
-    msg += 'Please use "from utilities.numerical_tools import mean"'
+    msg += 'Please use "from anuga.utilities.numerical_tools import mean"'
     warn(msg, DeprecationWarning) 
 
@@ -436,5 +436,5 @@
 
     msg = 'point_on_line has moved from util.py.  '
-    msg += 'Please use "from utilities.polygon import point_on_line"'
+    msg += 'Please use "from anuga.utilities.polygon import point_on_line"'
     warn(msg, DeprecationWarning) 
 
@@ -445,5 +445,5 @@
 
     print 'inside_polygon has moved from util.py.  ',
-    print 'Please use "from utilities.polygon import inside_polygon"'
+    print 'Please use "from anuga.utilities.polygon import inside_polygon"'
 
     return utilities.polygon.inside_polygon(*args, **kwargs)    
@@ -453,5 +453,5 @@
 
     print 'outside_polygon has moved from util.py.  ',
-    print 'Please use "from utilities.polygon import outside_polygon"'
+    print 'Please use "from anuga.utilities.polygon import outside_polygon"'
 
     return utilities.polygon.outside_polygon(*args, **kwargs)    
@@ -462,5 +462,5 @@
 
     print 'separate_points_by_polygon has moved from util.py.  ',
-    print 'Please use "from utilities.polygon import separate_points_by_polygon"'
+    print 'Please use "from anuga.utilities.polygon import separate_points_by_polygon"'
 
     return utilities.polygon.separate_points_by_polygon(*args, **kwargs)    
@@ -472,5 +472,5 @@
 
     print 'read_polygon has moved from util.py.  ',
-    print 'Please use "from utilities.polygon import read_polygon"'
+    print 'Please use "from anuga.utilities.polygon import read_polygon"'
 
     return utilities.polygon.read_polygon(*args, **kwargs)    
@@ -481,5 +481,5 @@
 
     print 'populate_polygon has moved from util.py.  ',
-    print 'Please use "from utilities.polygon import populate_polygon"'
+    print 'Please use "from anuga.utilities.polygon import populate_polygon"'
 
     return utilities.polygon.populate_polygon(*args, **kwargs)    
Index: /anuga_core/source/anuga/pyvolution/view_tsh.py
===================================================================
--- /anuga_core/source/anuga/pyvolution/view_tsh.py	(revision 3513)
+++ /anuga_core/source/anuga/pyvolution/view_tsh.py	(revision 3514)
@@ -9,6 +9,6 @@
 from shallow_water import Domain
 from pmesh2domain import pmesh_to_domain_instance
-from pyvolution.util import file_function
-from utilities.polygon import Polygon_function, read_polygon
+from anuga.pyvolution.util import file_function
+from anuga.utilities.polygon import Polygon_function, read_polygon
 from Numeric import zeros, Float, maximum, minimum
 from realtime_visualisation_new import *
Index: /anuga_core/source/anuga/utilities/compile.py
===================================================================
--- /anuga_core/source/anuga/utilities/compile.py	(revision 3513)
+++ /anuga_core/source/anuga/utilities/compile.py	(revision 3514)
@@ -176,5 +176,5 @@
   #Add Python path + utilities to includelist (see ticket:31)
   #Assume there is only one 'utilities' dir under path dirs
-
+  
   utilities_include_dir = None
   for pathdir in sys.path:
@@ -190,7 +190,8 @@
       #print 'Found %s to be used as include dir' %utilities_include_dir
       break
-     
-
-      
+
+  utilities_include_dir = buildroot + os.sep + "source" + os.sep + "anuga" \
+                          + os.sep + 'utilities'
+ 
 
   
Index: /anuga_core/source/anuga/utilities/numerical_tools.py
===================================================================
--- /anuga_core/source/anuga/utilities/numerical_tools.py	(revision 3513)
+++ /anuga_core/source/anuga/utilities/numerical_tools.py	(revision 3514)
@@ -290,5 +290,5 @@
 #Initialise module
 
-from utilities import compile
+from anuga.utilities import compile
 if compile.can_use_C_extension('util_ext.c'):
     from util_ext import gradient, gradient2
Index: /anuga_core/source/anuga/utilities/polygon.py
===================================================================
--- /anuga_core/source/anuga/utilities/polygon.py	(revision 3513)
+++ /anuga_core/source/anuga/utilities/polygon.py	(revision 3514)
@@ -13,6 +13,6 @@
 
 from math import sqrt
-from utilities.numerical_tools import ensure_numeric
-from geospatial_data.geospatial_data import ensure_absolute
+from anuga.utilities.numerical_tools import ensure_numeric
+from anuga.geospatial_data.geospatial_data import ensure_absolute
 
 def point_on_line(x, y, x0, y0, x1, y1):
@@ -563,5 +563,5 @@
 
         if geo_reference is None:
-            from coordinate_transforms.geo_reference import Geo_reference
+            from anuga.coordinate_transforms.geo_reference import Geo_reference
             geo_reference = Geo_reference()
 
Index: /anuga_core/source/anuga/utilities/sparse.py
===================================================================
--- /anuga_core/source/anuga/utilities/sparse.py	(revision 3513)
+++ /anuga_core/source/anuga/utilities/sparse.py	(revision 3514)
@@ -370,5 +370,5 @@
 
 #Setup for C extensions
-from utilities import compile
+from anuga.utilities import compile
 if compile.can_use_C_extension('sparse_ext.c'):
     #Replace python version with c implementation
Index: /anuga_core/source/anuga/utilities/test_cg_solve.py
===================================================================
--- /anuga_core/source/anuga/utilities/test_cg_solve.py	(revision 3513)
+++ /anuga_core/source/anuga/utilities/test_cg_solve.py	(revision 3514)
@@ -7,7 +7,7 @@
 
 from Numeric import dot, allclose, array, transpose, arange, ones, Float
-from utilities.cg_solve import *
-from utilities.cg_solve import _conjugate_gradient
-from utilities.sparse import Sparse, Sparse_CSR
+from anuga.utilities.cg_solve import *
+from anuga.utilities.cg_solve import _conjugate_gradient
+from anuga.utilities.sparse import Sparse, Sparse_CSR
 
 
Index: /anuga_core/source/anuga/utilities/test_numerical_tools.py
===================================================================
--- /anuga_core/source/anuga/utilities/test_numerical_tools.py	(revision 3513)
+++ /anuga_core/source/anuga/utilities/test_numerical_tools.py	(revision 3514)
@@ -5,5 +5,5 @@
 from Numeric import zeros, array, allclose
 from math import sqrt, pi
-from config import epsilon
+from anuga.config import epsilon
 
 from numerical_tools import *
Index: /anuga_core/source/anuga/utilities/test_polygon.py
===================================================================
--- /anuga_core/source/anuga/utilities/test_polygon.py	(revision 3513)
+++ /anuga_core/source/anuga/utilities/test_polygon.py	(revision 3514)
@@ -5,9 +5,9 @@
 from Numeric import zeros, array, allclose
 from math import sqrt, pi
-from utilities.numerical_tools import ensure_numeric
+from anuga.utilities.numerical_tools import ensure_numeric
 
 from polygon import *
-from coordinate_transforms.geo_reference import Geo_reference
-from geospatial_data.geospatial_data import Geospatial_data
+from anuga.coordinate_transforms.geo_reference import Geo_reference
+from anuga.geospatial_data.geospatial_data import Geospatial_data
 
 def test_function(x, y):
@@ -62,5 +62,5 @@
         """
 
-        from coordinate_transforms.geo_reference import Geo_reference
+        from anuga.coordinate_transforms.geo_reference import Geo_reference
 
         geo = Geo_reference(56, 200, 1000)
Index: /development/LWRU1/lwru1.py
===================================================================
--- /development/LWRU1/lwru1.py	(revision 3513)
+++ /development/LWRU1/lwru1.py	(revision 3514)
@@ -13,8 +13,8 @@
 # Module imports
 
-from pyvolution.shallow_water import Domain, Reflective_boundary,\
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
      Dirichlet_boundary,Transmissive_boundary, Constant_height, Constant_stage
 
-from pyvolution.mesh_factory import rectangular_cross
+from anuga.pyvolution.mesh_factory import rectangular_cross
 from Numeric import array, zeros, Float, allclose
 
@@ -177,5 +177,5 @@
 
 from pylab import *
-from pyvolution.least_squares import Interpolation
+from anuga.pyvolution.least_squares import Interpolation
 
 
Index: /development/analytical solutions/Analytical solution_wave_runup.py
===================================================================
--- /development/analytical solutions/Analytical solution_wave_runup.py	(revision 3513)
+++ /development/analytical solutions/Analytical solution_wave_runup.py	(revision 3514)
@@ -63,5 +63,5 @@
 
 #Reduction operation for get_vertex_values
-from util import mean
+from anuga.pyvolution.util import mean
 domain.reduction = mean
 #domain.reduction = min  #Looks better near steep slopes
Index: /development/analytical solutions/Analytical_solution_MacDonald_import_mesh.py
===================================================================
--- /development/analytical solutions/Analytical_solution_MacDonald_import_mesh.py	(revision 3513)
+++ /development/analytical solutions/Analytical_solution_MacDonald_import_mesh.py	(revision 3514)
@@ -78,5 +78,5 @@
 
 #Reduction operation for get_vertex_values              
-from util import mean
+from anuga.pyvolution.util import mean
 domain.reduction = mean 
 
Index: /development/analytical solutions/Analytical_solution_MacDonald_import_mesh_wall.py
===================================================================
--- /development/analytical solutions/Analytical_solution_MacDonald_import_mesh_wall.py	(revision 3513)
+++ /development/analytical solutions/Analytical_solution_MacDonald_import_mesh_wall.py	(revision 3514)
@@ -82,5 +82,5 @@
 
 #Reduction operation for get_vertex_values              
-from util import mean
+from anuga.pyvolution.util import mean
 domain.reduction = mean 
 
Index: /development/analytical solutions/Analytical_solution_MacDonald_import_mesh_wall0.py
===================================================================
--- /development/analytical solutions/Analytical_solution_MacDonald_import_mesh_wall0.py	(revision 3513)
+++ /development/analytical solutions/Analytical_solution_MacDonald_import_mesh_wall0.py	(revision 3514)
@@ -89,5 +89,5 @@
 #------------------------------------------
 # Reduction operation for get_vertex_values              
-from util import mean
+from anuga.pyvolution.util import mean
 domain.reduction = mean 
 
Index: /development/analytical solutions/Analytical_solution_Sampson_cross_mesh.py
===================================================================
--- /development/analytical solutions/Analytical_solution_Sampson_cross_mesh.py	(revision 3513)
+++ /development/analytical solutions/Analytical_solution_Sampson_cross_mesh.py	(revision 3514)
@@ -22,10 +22,10 @@
 from os import sep
 sys.path.append('..'+sep+'pyvolution')
-from pyvolution.shallow_water import Domain, Transmissive_boundary, Reflective_boundary,\
+from anuga.pyvolution.shallow_water import Domain, Transmissive_boundary, Reflective_boundary,\
      Dirichlet_boundary, gravity, linear_friction
 from math import sqrt, cos, sin, pi, exp
-from pyvolution.mesh_factory import rectangular_cross
-from pyvolution.quantity import Quantity
-from utilities.polygon import inside_polygon
+from anuga.pyvolution.mesh_factory import rectangular_cross
+from anuga.pyvolution.quantity import Quantity
+from anuga.utilities.polygon import inside_polygon
 from Numeric import asarray
 from least_squares import Interpolation
@@ -67,5 +67,5 @@
 #-----------------------------------------
 #Reduction operation for get_vertex_values
-from utilities.numerical_tools import mean
+from anuga.utilities.numerical_tools import mean
 domain.reduction = mean
 #domain.reduction = min  #Looks better near steep slopes
Index: /development/analytical solutions/Analytical_solution_Sampson_import_mesh.py
===================================================================
--- /development/analytical solutions/Analytical_solution_Sampson_import_mesh.py	(revision 3513)
+++ /development/analytical solutions/Analytical_solution_Sampson_import_mesh.py	(revision 3514)
@@ -59,5 +59,5 @@
 
 #Reduction operation for get_vertex_values              
-from util import mean
+from anuga.pyvolution.util import mean
 domain.reduction = mean 
 #domain.reduction = min  #Looks better near steep slopes
Index: /development/analytical solutions/Analytical_solution_Yoon_cross_mesh.py
===================================================================
--- /development/analytical solutions/Analytical_solution_Yoon_cross_mesh.py	(revision 3513)
+++ /development/analytical solutions/Analytical_solution_Yoon_cross_mesh.py	(revision 3514)
@@ -14,11 +14,11 @@
 #from os import sep
 #sys.path.append('..'+sep+'pyvolution')
-from pyvolution.shallow_water import Domain, Transmissive_boundary, Reflective_boundary,\
+from anuga.pyvolution.shallow_water import Domain, Transmissive_boundary, Reflective_boundary,\
      Dirichlet_boundary
 from math import sqrt, cos, sin, pi
-from pyvolution.mesh_factory import rectangular_cross
-from utilities.polygon import inside_polygon
+from anuga.pyvolution.mesh_factory import rectangular_cross
+from anuga.utilities.polygon import inside_polygon
 from Numeric import asarray
-from pyvolution.least_squares import Interpolation
+from anuga.pyvolution.least_squares import Interpolation
 
 #-------------------------------
@@ -54,5 +54,5 @@
 #------------------------------------------
 # Reduction operation for get_vertex_values
-from util import mean
+from anuga.pyvolution.util import mean
 domain.reduction = mean #domain.reduction = min  #Looks better near steep slopes
 
Index: /development/analytical solutions/Analytical_solution_Yoon_import_mesh.py
===================================================================
--- /development/analytical solutions/Analytical_solution_Yoon_import_mesh.py	(revision 3513)
+++ /development/analytical solutions/Analytical_solution_Yoon_import_mesh.py	(revision 3514)
@@ -18,5 +18,5 @@
 from math import sqrt, cos, sin, pi
 from mesh_factory import strang_mesh
-from util import inside_polygon
+from anuga.pyvolution.util import inside_polygon
 from Numeric import asarray
 from least_squares import Interpolation
@@ -51,5 +51,5 @@
 #------------------------------------------
 # Reduction operation for get_vertex_values
-from util import mean
+from anuga.pyvolution.util import mean
 domain.reduction = mean #domain.reduction = min  #Looks better near steep slopes
 
Index: /development/analytical solutions/Analytical_solution_circular_hydraulic_jump.py
===================================================================
--- /development/analytical solutions/Analytical_solution_circular_hydraulic_jump.py	(revision 3513)
+++ /development/analytical solutions/Analytical_solution_circular_hydraulic_jump.py	(revision 3514)
@@ -66,5 +66,5 @@
 #------------------------------------------
 # Reduction operation for get_vertex_values
-from util import mean
+from anuga.pyvolution.util import mean
 domain.reduction = mean
 #domain.reduction = min  #Looks better near steep slopes
Index: /development/analytical solutions/Analytical_solution_contracting_channel.py
===================================================================
--- /development/analytical solutions/Analytical_solution_contracting_channel.py	(revision 3513)
+++ /development/analytical solutions/Analytical_solution_contracting_channel.py	(revision 3514)
@@ -77,5 +77,5 @@
 #------------------------------------------
 # Reduction operation for get_vertex_values
-#from util import mean
+#from anuga.pyvolution.util import mean
 #domain.reduction = mean
 
Index: /development/analytical solutions/Analytical_solution_contracting_channel_import_mesh.py
===================================================================
--- /development/analytical solutions/Analytical_solution_contracting_channel_import_mesh.py	(revision 3513)
+++ /development/analytical solutions/Analytical_solution_contracting_channel_import_mesh.py	(revision 3514)
@@ -53,5 +53,5 @@
 #------------------------------------------
 # Reduction operation for get_vertex_values              
-#from util import mean
+#from anuga.pyvolution.util import mean
 #domain.reduction = mean 
 
Index: /development/analytical solutions/Non_symmetrical_dam_break.py
===================================================================
--- /development/analytical solutions/Non_symmetrical_dam_break.py	(revision 3513)
+++ /development/analytical solutions/Non_symmetrical_dam_break.py	(revision 3514)
@@ -16,5 +16,5 @@
      Dirichlet_boundary
 #from pmesh2domain import pmesh_to_domain_instance
-from util import Polygon_function
+from anuga.pyvolution.util import Polygon_function
 from mesh_factory import rectangular_cross
 
Index: /development/analytical solutions/Sydney.py
===================================================================
--- /development/analytical solutions/Sydney.py	(revision 3513)
+++ /development/analytical solutions/Sydney.py	(revision 3514)
@@ -17,5 +17,5 @@
      Dirichlet_boundary, Transmissive_boundary
 from pmesh2domain import pmesh_to_domain_instance
-from util import Polygon_function,read_polygon
+from anuga.pyvolution.util import Polygon_function,read_polygon
 
 
@@ -37,5 +37,5 @@
 
 #Reduction operation for get_vertex_values
-from util import mean
+from anuga.pyvolution.util import mean
 domain.reduction = mean 
 #domain.reduction = min  #Looks better near steep slopes
Index: /development/cairns_2006/run_cairns.py
===================================================================
--- /development/cairns_2006/run_cairns.py	(revision 3513)
+++ /development/cairns_2006/run_cairns.py	(revision 3514)
@@ -9,14 +9,14 @@
 #-------------------------------
 import sys, os
-from pyvolution.shallow_water import Domain, Reflective_boundary,\
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
      File_boundary, Transmissive_Momentum_Set_Stage_boundary,\
      Transmissive_boundary, Dirichlet_boundary
-from pyvolution.mesh_factory import rectangular_cross
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.pyvolution.mesh_factory import rectangular_cross
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
 from Numeric import array, zeros, Float, allclose
 import cairns_project as project
 #import project
 from caching import cache
-from utilities.polygon import read_polygon, Polygon_function
+from anuga.utilities.polygon import read_polygon, Polygon_function
 
 from conversion import convert_latlon_to_xycoords
Index: /development/dam_2006/run_dam.py
===================================================================
--- /development/dam_2006/run_dam.py	(revision 3513)
+++ /development/dam_2006/run_dam.py	(revision 3514)
@@ -23,9 +23,9 @@
 
 # Related major packages
-from pyvolution.shallow_water import Domain, Reflective_boundary, \
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, \
                             Dirichlet_boundary, Time_boundary, File_boundary
-from pyvolution.util import Screen_Catcher
-from pyvolution.region import Set_region 
-from fit_interpolate.interpolate import interpolate_sww2csv
+from anuga.pyvolution.util import Screen_Catcher
+from anuga.pyvolution.region import Set_region 
+from anuga.fit_interpolate.interpolate import interpolate_sww2csv
 import create_mesh
 
Index: /development/euler/euler.py
===================================================================
--- /development/euler/euler.py	(revision 3513)
+++ /development/euler/euler.py	(revision 3514)
@@ -88,5 +88,5 @@
 
         #Reduction operation for get_vertex_values
-        from util import mean
+        from anuga.pyvolution.util import mean
         self.reduction = mean
         #self.reduction = min  #Looks better near steep slopes
@@ -204,5 +204,5 @@
         """
 
-        import data_manager
+        import anuga.pyvolution.data_manager
 
         #Initialise writer
@@ -305,5 +305,5 @@
     """
 
-    from pyvolution.config import g, epsilon
+    from anuga.pyvolution.config import g, epsilon
     from math import sqrt
     from Numeric import array
@@ -1036,5 +1036,5 @@
     """
 
-    from util import gradient
+    from anuga.pyvolution.util import gradient
     from Numeric import zeros, Float, array, sum
 
@@ -1716,5 +1716,5 @@
 
 
-from utilities import compile
+from anuga.utilities import compile
 if compile.can_use_C_extension('shallow_water_ext.c'):
     #Replace python version with c implementations
Index: /development/euler/test_euler.py
===================================================================
--- /development/euler/test_euler.py	(revision 3513)
+++ /development/euler/test_euler.py	(revision 3514)
@@ -4,5 +4,5 @@
 from math import sqrt, pi
 
-from pyvolution.config import g, epsilon
+from anuga.pyvolution.config import g, epsilon
 from Numeric import allclose, array, zeros, ones, Float, take
 from shallow_water import *
@@ -964,5 +964,5 @@
         from math import pi, cos, sin, sqrt
         from config import time_format
-        from util import file_function
+        from anuga.pyvolution.util import file_function
         import time
 
@@ -1011,5 +1011,5 @@
 
         #Convert ASCII file to NetCDF (Which is what we really like!)
-        from data_manager import timefile2netcdf        
+        from anuga.pyvolution.data_manager import timefile2netcdf        
         timefile2netcdf(filename)
 
@@ -2151,5 +2151,5 @@
 
     def test_flatbed_second_order_distribute(self):
-        #Use real data from pyvolution 2
+        #Use real data from anuga.pyvolution 2
         #painfully setup and extracted.
         from mesh_factory import rectangular
@@ -2924,5 +2924,5 @@
         domain1 = Domain(points, vertices, boundary)
 
-        from util import mean
+        from anuga.pyvolution.util import mean
         domain1.reduction = mean
         domain1.smooth = False  #Exact result
@@ -3042,5 +3042,5 @@
         domain1 = Domain(points, vertices, boundary)
 
-        from util import mean
+        from anuga.pyvolution.util import mean
         domain1.reduction = mean
         domain1.smooth = True #To mimic MOST output
Index: /development/momentum_sink/scripts/CCS.py
===================================================================
--- /development/momentum_sink/scripts/CCS.py	(revision 3513)
+++ /development/momentum_sink/scripts/CCS.py	(revision 3514)
@@ -16,5 +16,5 @@
 import project
 import string
-from pyvolution.util import file_function
+from anuga.pyvolution.util import file_function
 from numerical_tools import norm, corr, err  
 
Index: /development/momentum_sink/scripts/PCS.py
===================================================================
--- /development/momentum_sink/scripts/PCS.py	(revision 3513)
+++ /development/momentum_sink/scripts/PCS.py	(revision 3514)
@@ -6,5 +6,5 @@
 import Numeric
 import project
-from pyvolution.util import file_function
+from anuga.pyvolution.util import file_function
 from create_buildings import  WidtH
 # from run_friction import fric
Index: /development/momentum_sink/scripts/compare_sww.py
===================================================================
--- /development/momentum_sink/scripts/compare_sww.py	(revision 3513)
+++ /development/momentum_sink/scripts/compare_sww.py	(revision 3514)
@@ -4,5 +4,5 @@
 from os import sep
 import project
-from pyvolution.util import file_function
+from anuga.pyvolution.util import file_function
 import Numeric
 
Index: /development/momentum_sink/scripts/loop_buildings.py
===================================================================
--- /development/momentum_sink/scripts/loop_buildings.py	(revision 3513)
+++ /development/momentum_sink/scripts/loop_buildings.py	(revision 3514)
@@ -8,9 +8,9 @@
 
 import time
-from pyvolution.pmesh2domain import pmesh_to_domain_instance 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance 
 from caching import cache
-from pyvolution.shallow_water import Domain, Reflective_boundary,\
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
 File_boundary, Dirichlet_boundary, Time_boundary, Transmissive_boundary
-from pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA 
+from anuga.pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA 
 import project
 from create_buildings import create_mesh
Index: /development/momentum_sink/scripts/loop_friction.py
===================================================================
--- /development/momentum_sink/scripts/loop_friction.py	(revision 3513)
+++ /development/momentum_sink/scripts/loop_friction.py	(revision 3514)
@@ -11,10 +11,10 @@
 import project_friction
 import Numeric
-from pyvolution.pmesh2domain import pmesh_to_domain_instance 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance 
 from caching import cache
-from pyvolution.shallow_water import Domain, Reflective_boundary,\
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
      File_boundary, Dirichlet_boundary, Time_boundary, Transmissive_boundary
 from region import Set_region
-from pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA 
+from anuga.pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA 
 from friction_block import create_mesh
 from pmesh.mesh import importMeshFromFile
Index: /development/momentum_sink/scripts/plot_cross_section.py
===================================================================
--- /development/momentum_sink/scripts/plot_cross_section.py	(revision 3513)
+++ /development/momentum_sink/scripts/plot_cross_section.py	(revision 3514)
@@ -5,6 +5,6 @@
 import Numeric
 import project
-from pyvolution.util import file_function
-#from pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
+from anuga.pyvolution.util import file_function
+#from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
 #from coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
 from pylab import *
Index: /development/momentum_sink/scripts/plot_gauges.py
===================================================================
--- /development/momentum_sink/scripts/plot_gauges.py	(revision 3513)
+++ /development/momentum_sink/scripts/plot_gauges.py	(revision 3514)
@@ -5,6 +5,6 @@
 from os import sep
 import project
-from pyvolution.util import file_function
-#from pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
+from anuga.pyvolution.util import file_function
+#from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
 from pylab import *
 from compare_sww import gauge_locations
Index: /development/momentum_sink/scripts/plot_velocity_CS.py
===================================================================
--- /development/momentum_sink/scripts/plot_velocity_CS.py	(revision 3513)
+++ /development/momentum_sink/scripts/plot_velocity_CS.py	(revision 3514)
@@ -6,5 +6,5 @@
 import Numeric
 import project
-from pyvolution.util import file_function
+from anuga.pyvolution.util import file_function
 from create_buildings import  WidtH
 # from run_friction import fric
Index: /development/momentum_sink/scripts/process_gauges.py
===================================================================
--- /development/momentum_sink/scripts/process_gauges.py	(revision 3513)
+++ /development/momentum_sink/scripts/process_gauges.py	(revision 3514)
@@ -4,6 +4,6 @@
 
 import project
-from pyvolution.util import file_function
-from pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
+from anuga.pyvolution.util import file_function
+from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
 from pylab import *
 
Index: /development/momentum_sink/scripts/run_buildings.py
===================================================================
--- /development/momentum_sink/scripts/run_buildings.py	(revision 3513)
+++ /development/momentum_sink/scripts/run_buildings.py	(revision 3514)
@@ -8,9 +8,9 @@
 import project
 
-from pyvolution.pmesh2domain import pmesh_to_domain_instance 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance 
 from caching import cache
-from pyvolution.shallow_water import Domain, Reflective_boundary,\
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
      File_boundary, Dirichlet_boundary, Time_boundary, Transmissive_boundary
-from pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA 
+from anuga.pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA 
 
 
Index: /development/momentum_sink/scripts/run_friction.py
===================================================================
--- /development/momentum_sink/scripts/run_friction.py	(revision 3513)
+++ /development/momentum_sink/scripts/run_friction.py	(revision 3514)
@@ -14,10 +14,10 @@
 import project_friction
 
-from pyvolution.pmesh2domain import pmesh_to_domain_instance 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance 
 from caching import cache
-from pyvolution.shallow_water import Domain, Reflective_boundary,\
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
      File_boundary, Dirichlet_boundary, Time_boundary, Transmissive_boundary,\
      Set_region
-from pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA 
+from anuga.pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA 
 
 
Index: /development/okushiri_2005/extract_timeseries.py
===================================================================
--- /development/okushiri_2005/extract_timeseries.py	(revision 3513)
+++ /development/okushiri_2005/extract_timeseries.py	(revision 3514)
@@ -51,6 +51,6 @@
 
 
-from pyvolution.util import file_function
-from utilities.numerical_tools import ensure_numeric
+from anuga.pyvolution.util import file_function
+from anuga.utilities.numerical_tools import ensure_numeric
 gauge_values = [ensure_numeric(input_stage),
                 ensure_numeric(ch5),
Index: /development/okushiri_2005/lwru2.py
===================================================================
--- /development/okushiri_2005/lwru2.py	(revision 3513)
+++ /development/okushiri_2005/lwru2.py	(revision 3514)
@@ -76,8 +76,8 @@
 
 # Module imports
-from pyvolution.shallow_water import Domain, Reflective_boundary,\
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
      File_boundary, Transmissive_Momentum_Set_Stage_boundary
-from pyvolution.mesh_factory import rectangular_cross
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.pyvolution.mesh_factory import rectangular_cross
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
 from Numeric import array, zeros, Float, allclose
 import project
@@ -88,5 +88,5 @@
 
 #Preparing points (Only when using original Benchmark_2_Bathymetry.txt file)
-#from pyvolution.data_manager import xya2pts
+#from anuga.pyvolution.data_manager import xya2pts
 #xya2pts(project.bathymetry_filename, verbose = True,
 #        z_func = lambda z: -z)
@@ -148,5 +148,5 @@
 Br = Reflective_boundary(domain)
 
-from pyvolution.util import file_function
+from anuga.pyvolution.util import file_function
 function = file_function(project.boundary_filename[:-4] + '.tms',
                          domain,
Index: /development/parallel/build_submesh.py
===================================================================
--- /development/parallel/build_submesh.py	(revision 3513)
+++ /development/parallel/build_submesh.py	(revision 3514)
@@ -17,5 +17,5 @@
      reshape, arrayrange, take, nonzero
 
-from pyvolution.neighbour_mesh import Mesh
+from anuga.pyvolution.neighbour_mesh import Mesh
 
 
Index: /development/parallel/documentation/code/RunParallelMerimbulaMetis.py
===================================================================
--- /development/parallel/documentation/code/RunParallelMerimbulaMetis.py	(revision 3513)
+++ /development/parallel/documentation/code/RunParallelMerimbulaMetis.py	(revision 3514)
@@ -40,9 +40,9 @@
 # pmesh
 
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
-from pyvolution.advection import Domain as Advection_Domain
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.pyvolution.advection import Domain as Advection_Domain
 from parallel.parallel_advection import Parallel_Domain
 
-from pyvolution.generic_boundary_conditions import Transmissive_boundary
+from anuga.pyvolution.generic_boundary_conditions import Transmissive_boundary
 
 # Mesh partition routines
Index: /development/parallel/documentation/code/RunParallelSwMerimbulaMetis.py
===================================================================
--- /development/parallel/documentation/code/RunParallelSwMerimbulaMetis.py	(revision 3513)
+++ /development/parallel/documentation/code/RunParallelSwMerimbulaMetis.py	(revision 3514)
@@ -40,7 +40,7 @@
 # pmesh
 
-from pyvolution.shallow_water import Domain
+from anuga.pyvolution.shallow_water import Domain
 from parallel.parallel_shallow_water import Parallel_Domain
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
 
 # Mesh partition routines
Index: /development/parallel/parallel_advection.py
===================================================================
--- /development/parallel/parallel_advection.py	(revision 3513)
+++ /development/parallel/parallel_advection.py	(revision 3514)
@@ -23,5 +23,5 @@
     pass
 
-from pyvolution.advection_vtk import *
+from anuga.pyvolution.advection_vtk import *
 from Numeric import zeros, Float, Int, ones, allclose, array
 import pypar
Index: /development/parallel/parallel_shallow_water.py
===================================================================
--- /development/parallel/parallel_shallow_water.py	(revision 3513)
+++ /development/parallel/parallel_shallow_water.py	(revision 3514)
@@ -27,5 +27,5 @@
     pass
 
-from pyvolution.shallow_water import *
+from anuga.pyvolution.shallow_water import *
 from Numeric import zeros, Float, Int, ones, allclose, array
 
Index: /development/parallel/print_stats.py
===================================================================
--- /development/parallel/print_stats.py	(revision 3513)
+++ /development/parallel/print_stats.py	(revision 3514)
@@ -22,5 +22,5 @@
 
 from Numeric import array, Int8, zeros, ones, take, nonzero, Float
-from utilities.norms import l1_norm, l2_norm, linf_norm
+from anuga.utilities.norms import l1_norm, l2_norm, linf_norm
 
 #########################################################
Index: /development/parallel/test_parallel_sw.py
===================================================================
--- /development/parallel/test_parallel_sw.py	(revision 3513)
+++ /development/parallel/test_parallel_sw.py	(revision 3514)
@@ -19,13 +19,13 @@
 
 from Numeric import array, zeros, Float, take, nonzero
-from pyvolution.shallow_water import Domain
-from pyvolution.shallow_water import Reflective_boundary as sw_reflective_boundary
-from pyvolution.shallow_water import Transmissive_boundary as sw_transmissive_boundary
+from anuga.pyvolution.shallow_water import Domain
+from anuga.pyvolution.shallow_water import Reflective_boundary as sw_reflective_boundary
+from anuga.pyvolution.shallow_water import Transmissive_boundary as sw_transmissive_boundary
 from parallel_shallow_water import Parallel_Domain
 from parallel_shallow_water import Reflective_boundary as par_reflective_boundary
 from parallel_shallow_water import Transmissive_boundary as par_transmissive_boundary
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
-from utilities.norms import *
-from utilities.util_ext import double_precision
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.utilities.norms import *
+from anuga.utilities.util_ext import double_precision
 from print_stats import print_test_stats, build_full_flag
 from pmesh_divide import pmesh_divide_metis
Index: /development/pyvolution-1d/data_manager.py
===================================================================
--- /development/pyvolution-1d/data_manager.py	(revision 3513)
+++ /development/pyvolution-1d/data_manager.py	(revision 3514)
@@ -249,5 +249,5 @@
             #Create new file
             fid.institution = 'Geoscience Australia'
-            fid.description = 'Output from pyvolution suitable for plotting'
+            fid.description = 'Output from anuga.pyvolution suitable for plotting'
 
             if domain.smooth:
@@ -1499,6 +1499,6 @@
     from Numeric import array2string
 
-    from utilities.polygon import inside_polygon, outside_polygon, separate_points_by_polygon
-    from util import apply_expression_to_dictionary
+    from anuga.utilities.polygon import inside_polygon, outside_polygon, separate_points_by_polygon
+    from anuga.pyvolution.util import apply_expression_to_dictionary
 
     msg = 'Format must be either asc or ers'
@@ -2460,5 +2460,5 @@
     from Numeric import array
     from config import time_format
-    from util import ensure_numeric
+    from anuga.pyvolution.util import ensure_numeric
 
 
@@ -3192,5 +3192,5 @@
     from Numeric import array, Float, concatenate, NewAxis, zeros,\
          sometrue
-    from utilities.polygon import inside_polygon
+    from anuga.utilities.polygon import inside_polygon
 
     #FIXME: Should be variable
@@ -3376,7 +3376,7 @@
     from pmesh2domain import pmesh_to_domain_instance
     import time, os
-    from data_manager import get_dataobject
+    from anuga.pyvolution.data_manager import get_dataobject
     from os import sep, path
-    from util import mean
+    from anuga.pyvolution.util import mean
 
     if verbose == True:print 'Creating domain from', filename
Index: /development/pyvolution-1d/generic_boundary_conditions.py
===================================================================
--- /development/pyvolution-1d/generic_boundary_conditions.py	(revision 3513)
+++ /development/pyvolution-1d/generic_boundary_conditions.py	(revision 3514)
@@ -131,5 +131,5 @@
         from Numeric import array
         from config import time_format
-        from util import File_function
+        from anuga.pyvolution.util import File_function
 
         Boundary.__init__(self)
@@ -181,5 +181,5 @@
         from Numeric import array, zeros, Float
         from config import time_format
-        from util import file_function
+        from anuga.pyvolution.util import file_function
 
         Boundary.__init__(self)
Index: /development/pyvolution-1d/shallow_water_1d.py
===================================================================
--- /development/pyvolution-1d/shallow_water_1d.py	(revision 3513)
+++ /development/pyvolution-1d/shallow_water_1d.py	(revision 3514)
@@ -84,5 +84,5 @@
         
         #Reduction operation for get_vertex_values
-        from util import mean
+        from anuga.pyvolution.util import mean
         self.reduction = mean
         #self.reduction = min  #Looks better near steep slopes
@@ -221,5 +221,5 @@
         """
 
-        import data_manager
+        import anuga.pyvolution.data_manager
 
         #Initialise writer
@@ -1056,5 +1056,5 @@
     """
 
-    from util import gradient
+    from anuga.pyvolution.util import gradient
     from Numeric import zeros, Float, array, sum
 
Index: /development/pyvolution-1d/shallow_water_minmod.py
===================================================================
--- /development/pyvolution-1d/shallow_water_minmod.py	(revision 3513)
+++ /development/pyvolution-1d/shallow_water_minmod.py	(revision 3514)
@@ -84,5 +84,5 @@
         
         #Reduction operation for get_vertex_values
-        from util import mean
+        from anuga.pyvolution.util import mean
         self.reduction = mean
         #self.reduction = min  #Looks better near steep slopes
@@ -221,5 +221,5 @@
         """
 
-        import data_manager
+        import anuga.pyvolution.data_manager
 
         #Initialise writer
@@ -991,5 +991,5 @@
     """
 
-    from util import gradient
+    from anuga.pyvolution.util import gradient
     from Numeric import zeros, Float, array, sum
 
Index: /development/steve/get_triangle_data.py
===================================================================
--- /development/steve/get_triangle_data.py	(revision 3513)
+++ /development/steve/get_triangle_data.py	(revision 3514)
@@ -15,5 +15,5 @@
 from shallow_water import Domain
 from pmesh2domain import pmesh_to_domain_instance
-from util import file_function, Polygon_function, read_polygon
+from anuga.pyvolution.util import file_function, Polygon_function, read_polygon
 from Numeric import zeros, Float, maximum, minimum
 
Index: /development/steve/get_triangle_data_new.py
===================================================================
--- /development/steve/get_triangle_data_new.py	(revision 3513)
+++ /development/steve/get_triangle_data_new.py	(revision 3514)
@@ -15,5 +15,5 @@
 from shallow_water import Domain
 from pmesh2domain import pmesh_to_domain_instance
-from util import file_function, Polygon_function, read_polygon
+from anuga.pyvolution.util import file_function, Polygon_function, read_polygon
 from Numeric import zeros, Float, maximum, minimum
 
Index: /development/steve/sww_viewer_vtk.py
===================================================================
--- /development/steve/sww_viewer_vtk.py	(revision 3513)
+++ /development/steve/sww_viewer_vtk.py	(revision 3514)
@@ -26,5 +26,5 @@
 
 import project
-from pyvolution.data_manager import get_time_interp, interpolated_quantity
+from anuga.pyvolution.data_manager import get_time_interp, interpolated_quantity
 from caching import cache
 filename = project.filename[:-3] + '.sww' #filename is of form filename.py
@@ -40,5 +40,5 @@
 
 """
-The following is borrowed from data_manager.sww2domain
+The following is borrowed from anuga.pyvolution.data_manager.sww2domain
 """
 NaN=9.969209968386869e+036
@@ -46,5 +46,5 @@
 
 from Scientific.IO.NetCDF import NetCDFFile
-from pyvolution.shallow_water_vtk import Domain
+from anuga.pyvolution.shallow_water_vtk import Domain
 from Numeric import asarray, transpose, resize
 
Index: /development/stochastic_study/create_realisations.py
===================================================================
--- /development/stochastic_study/create_realisations.py	(revision 3513)
+++ /development/stochastic_study/create_realisations.py	(revision 3514)
@@ -11,5 +11,5 @@
 import cPickle
 from load_mesh.loadASCII import import_points_file, import_mesh_file
-from pyvolution.least_squares import fit_to_mesh
+from anuga.pyvolution.least_squares import fit_to_mesh
 import project
 
Index: /development/stochastic_study/extract_timeseries.py
===================================================================
--- /development/stochastic_study/extract_timeseries.py	(revision 3513)
+++ /development/stochastic_study/extract_timeseries.py	(revision 3514)
@@ -52,6 +52,6 @@
 
 
-from pyvolution.util import file_function
-from utilities.numerical_tools import ensure_numeric
+from anuga.pyvolution.util import file_function
+from anuga.utilities.numerical_tools import ensure_numeric
 gauge_values = [ensure_numeric(input_stage),
                 ensure_numeric(ch5),
Index: /development/stochastic_study/plot_spread.py
===================================================================
--- /development/stochastic_study/plot_spread.py	(revision 3513)
+++ /development/stochastic_study/plot_spread.py	(revision 3514)
@@ -9,5 +9,5 @@
 
 # Application specific imports
-from utilities.numerical_tools import histogram, create_bins
+from anuga.utilities.numerical_tools import histogram, create_bins
 from read_realisations import read_realisations
 import project
Index: /development/stochastic_study/run_model.py
===================================================================
--- /development/stochastic_study/run_model.py	(revision 3513)
+++ /development/stochastic_study/run_model.py	(revision 3514)
@@ -25,10 +25,10 @@
 
 # Related major packages
-from pyvolution.shallow_water import Domain
-from pyvolution.shallow_water import Reflective_boundary
-from pyvolution.shallow_water import Transmissive_Momentum_Set_Stage_boundary
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
-from pyvolution.data_manager import xya2pts
-from pyvolution.util import file_function
+from anuga.pyvolution.shallow_water import Domain
+from anuga.pyvolution.shallow_water import Reflective_boundary
+from anuga.pyvolution.shallow_water import Transmissive_Momentum_Set_Stage_boundary
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.pyvolution.data_manager import xya2pts
+from anuga.pyvolution.util import file_function
 from caching.caching import cache
 
Index: /development/stochastic_study/run_simple_model.py
===================================================================
--- /development/stochastic_study/run_simple_model.py	(revision 3513)
+++ /development/stochastic_study/run_simple_model.py	(revision 3514)
@@ -26,9 +26,9 @@
 
 # Application specific imports
-from pyvolution.mesh_factory import rectangular
-from pyvolution.shallow_water import Domain
-from pyvolution.shallow_water import Reflective_boundary
-from pyvolution.shallow_water import Dirichlet_boundary
-from pyvolution.util import file_function
+from anuga.pyvolution.mesh_factory import rectangular
+from anuga.pyvolution.shallow_water import Domain
+from anuga.pyvolution.shallow_water import Reflective_boundary
+from anuga.pyvolution.shallow_water import Dirichlet_boundary
+from anuga.pyvolution.util import file_function
 from caching.caching import cache
 import project                 # Definition of file names and polygons
Index: /inundation-numpy-branch/debug/mesh_error_reporting/create_mesh.py
===================================================================
--- /inundation-numpy-branch/debug/mesh_error_reporting/create_mesh.py	(revision 3513)
+++ /inundation-numpy-branch/debug/mesh_error_reporting/create_mesh.py	(revision 3514)
@@ -7,5 +7,5 @@
 
 from pmesh.mesh import *
-from pyvolution.coordinate_transforms.geo_reference import Geo_reference
+from anuga.pyvolution.coordinate_transforms.geo_reference import Geo_reference
 
 #-------------------------------------------------------------
Index: /inundation-numpy-branch/debug/mesh_error_reporting/show_bad_mesh.py
===================================================================
--- /inundation-numpy-branch/debug/mesh_error_reporting/show_bad_mesh.py	(revision 3513)
+++ /inundation-numpy-branch/debug/mesh_error_reporting/show_bad_mesh.py	(revision 3514)
@@ -14,5 +14,5 @@
 
 
-from pyvolution.least_squares import Interpolation
+from anuga.pyvolution.least_squares import Interpolation
 from Numeric import allclose, array, transpose
 
Index: /inundation-numpy-branch/debug/mesh_error_reporting/show_mesh_bug.py
===================================================================
--- /inundation-numpy-branch/debug/mesh_error_reporting/show_mesh_bug.py	(revision 3513)
+++ /inundation-numpy-branch/debug/mesh_error_reporting/show_mesh_bug.py	(revision 3514)
@@ -68,8 +68,8 @@
 
 # Module imports
-from pyvolution.shallow_water import Domain, Reflective_boundary,\
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
             File_boundary, Transmissive_Momentum_Set_Stage_boundary
-from pyvolution.mesh_factory import rectangular
-from pyvolution.pmesh2domain import pmesh_to_domain_instance 
+from anuga.pyvolution.mesh_factory import rectangular
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance 
 from Numeric import array, zeros, Float, allclose
 import filenames
@@ -85,5 +85,5 @@
 
 #Preparing points
-from pyvolution.data_manager import xya2pts
+from anuga.pyvolution.data_manager import xya2pts
 xya2pts(filenames.bathymetry_filename, verbose = True,
         stride = 16,
@@ -112,5 +112,5 @@
 
 #LS code to be included in set_quantity
-from pyvolution import util, least_squares
+from anuga.pyvolution import util, least_squares
 points, attributes = util.read_xya(filenames.bathymetry_filename[:-4] + '.pts')
 
Index: /inundation-numpy-branch/examples/beach.py
===================================================================
--- /inundation-numpy-branch/examples/beach.py	(revision 3513)
+++ /inundation-numpy-branch/examples/beach.py	(revision 3514)
@@ -15,9 +15,9 @@
 #sys.path.append('..'+sep+'pyvolution')
 
-from pyvolution.shallow_water import Domain, Reflective_boundary, Dirichlet_boundary,\
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, Dirichlet_boundary,\
      Transmissive_boundary, Time_boundary, Wind_stress
 
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
-from utilities.polygon import read_polygon, Polygon_function
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.utilities.polygon import read_polygon, Polygon_function
 from math import pi
 from Numeric import choose, greater, ones, sin, exp
Index: /inundation-numpy-branch/examples/bedslope.py
===================================================================
--- /inundation-numpy-branch/examples/bedslope.py	(revision 3513)
+++ /inundation-numpy-branch/examples/bedslope.py	(revision 3514)
@@ -8,6 +8,6 @@
 # Module imports 
 #
-from pyvolution.mesh_factory import rectangular
-from pyvolution.shallow_water import Domain, Reflective_boundary,\
+from anuga.pyvolution.mesh_factory import rectangular
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
      Dirichlet_boundary, Time_boundary, Transmissive_boundary
 
Index: /inundation-numpy-branch/examples/run_gippsland.py
===================================================================
--- /inundation-numpy-branch/examples/run_gippsland.py	(revision 3513)
+++ /inundation-numpy-branch/examples/run_gippsland.py	(revision 3514)
@@ -1,3 +1,3 @@
-from pyvolution.data_manager import asc_csiro2sww
+from anuga.pyvolution.data_manager import asc_csiro2sww
 import time
 
Index: /inundation-numpy-branch/fit_interpolate/benchmark_least_squares.py
===================================================================
--- /inundation-numpy-branch/fit_interpolate/benchmark_least_squares.py	(revision 3513)
+++ /inundation-numpy-branch/fit_interpolate/benchmark_least_squares.py	(revision 3514)
@@ -21,5 +21,5 @@
 from random import seed, random
 
-from pyvolution.least_squares import Interpolation
+from anuga.pyvolution.least_squares import Interpolation
 from pmesh.mesh import Mesh
 
Index: /inundation-numpy-branch/fit_interpolate/interpolate.py
===================================================================
--- /inundation-numpy-branch/fit_interpolate/interpolate.py	(revision 3513)
+++ /inundation-numpy-branch/fit_interpolate/interpolate.py	(revision 3514)
@@ -23,11 +23,11 @@
      ArrayType, allclose, take, NewAxis
 
-from pyvolution.mesh import Mesh
-from utilities.sparse import Sparse, Sparse_CSR
-from utilities.cg_solve import conjugate_gradient, VectorShapeError
+from anuga.pyvolution.mesh import Mesh
+from anuga.utilities.sparse import Sparse, Sparse_CSR
+from anuga.utilities.cg_solve import conjugate_gradient, VectorShapeError
 from coordinate_transforms.geo_reference import Geo_reference
-from pyvolution.quad import build_quadtree
-from utilities.numerical_tools import ensure_numeric
-from utilities.polygon import inside_polygon
+from anuga.pyvolution.quad import build_quadtree
+from anuga.utilities.numerical_tools import ensure_numeric
+from anuga.utilities.polygon import inside_polygon
 
 from search_functions import search_tree_of_vertices
@@ -394,5 +394,5 @@
 
 
-        from util import mean, ensure_numeric
+        from anuga.pyvolution.util import mean, ensure_numeric
         from config import time_format
         import types
@@ -526,5 +526,5 @@
         from math import pi, cos, sin, sqrt
         from Numeric import zeros, Float
-        from util import mean        
+        from anuga.pyvolution.util import mean        
 
         if self.spatial is True:
Index: /inundation-numpy-branch/fit_interpolate/test_interpolate.py
===================================================================
--- /inundation-numpy-branch/fit_interpolate/test_interpolate.py	(revision 3513)
+++ /inundation-numpy-branch/fit_interpolate/test_interpolate.py	(revision 3514)
@@ -20,6 +20,6 @@
 from coordinate_transforms.geo_reference import Geo_reference
 from shallow_water import Domain, Transmissive_boundary #, mean
-from util import mean
-from data_manager import get_dataobject
+from anuga.pyvolution.util import mean
+from anuga.pyvolution.data_manager import get_dataobject
 
 def distance(x, y):
@@ -623,5 +623,5 @@
         #Check basic interpolation of one quantity using averaging
         #(no interpolation points or spatial info)
-        from util import mean        
+        from anuga.pyvolution.util import mean        
         I = Interpolation_interface(time, [mean(Q[0,:]),
                                           mean(Q[1,:]),
Index: /inundation-numpy-branch/geospatial_data/__init__.py
===================================================================
--- /inundation-numpy-branch/geospatial_data/__init__.py	(revision 3513)
+++ /inundation-numpy-branch/geospatial_data/__init__.py	(revision 3514)
@@ -2,5 +2,5 @@
 """
 
-from geospatial_data import *
+from anuga.geospatial_data.geospatial_data import *
 
 
Index: /inundation-numpy-branch/geospatial_data/geospatial_data.py
===================================================================
--- /inundation-numpy-branch/geospatial_data/geospatial_data.py	(revision 3513)
+++ /inundation-numpy-branch/geospatial_data/geospatial_data.py	(revision 3514)
@@ -5,5 +5,5 @@
 
 
-from utilities.numerical_tools import ensure_numeric
+from anuga.utilities.numerical_tools import ensure_numeric
 
 from numpy import concatenate
Index: /inundation-numpy-branch/geospatial_data/test_geospatial_data.py
===================================================================
--- /inundation-numpy-branch/geospatial_data/test_geospatial_data.py	(revision 3513)
+++ /inundation-numpy-branch/geospatial_data/test_geospatial_data.py	(revision 3514)
@@ -7,5 +7,5 @@
 from math import sqrt, pi
 
-from geospatial_data import *
+from anuga.geospatial_data.geospatial_data import *
 
 from coordinate_transforms.geo_reference import Geo_reference
Index: /inundation-numpy-branch/pmesh/create_mesh.py
===================================================================
--- /inundation-numpy-branch/pmesh/create_mesh.py	(revision 3513)
+++ /inundation-numpy-branch/pmesh/create_mesh.py	(revision 3514)
@@ -100,6 +100,6 @@
     from mesh import Mesh
     from coordinate_transforms.redfearn import redfearn
-    from utilities.polygon import populate_polygon
-    from utilities.numerical_tools import ensure_numeric
+    from anuga.utilities.polygon import populate_polygon
+    from anuga.utilities.numerical_tools import ensure_numeric
     from coordinate_transforms.geo_reference import Geo_reference
 
Index: /inundation-numpy-branch/pmesh/mesh.py
===================================================================
--- /inundation-numpy-branch/pmesh/mesh.py	(revision 3513)
+++ /inundation-numpy-branch/pmesh/mesh.py	(revision 3514)
@@ -28,10 +28,10 @@
 import load_mesh
 from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
-from utilities.polygon import point_in_polygon 
+from anuga.utilities.polygon import point_in_polygon 
 
 SET_COLOUR='red'
 
 #FIXME: this is not tested.
-from utilities.numerical_tools import gradient
+from anuga.utilities.numerical_tools import gradient
 
 
Index: /inundation-numpy-branch/pmesh/mesh_interface.py
===================================================================
--- /inundation-numpy-branch/pmesh/mesh_interface.py	(revision 3513)
+++ /inundation-numpy-branch/pmesh/mesh_interface.py	(revision 3514)
@@ -5,6 +5,6 @@
 
 from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
-from utilities.polygon import populate_polygon
-from utilities.numerical_tools import ensure_numeric
+from anuga.utilities.polygon import populate_polygon
+from anuga.utilities.numerical_tools import ensure_numeric
 from Numeric import Float
 
Index: /inundation-numpy-branch/pmesh/test_mesh.py
===================================================================
--- /inundation-numpy-branch/pmesh/test_mesh.py	(revision 3513)
+++ /inundation-numpy-branch/pmesh/test_mesh.py	(revision 3514)
@@ -12,5 +12,5 @@
 from load_mesh.loadASCII import *
 from coordinate_transforms.geo_reference import Geo_reference
-from utilities.polygon import inside_polygon
+from anuga.utilities.polygon import inside_polygon
 
 class meshTestCase(unittest.TestCase):
Index: /inundation-numpy-branch/pmesh/test_mesh_interface.py
===================================================================
--- /inundation-numpy-branch/pmesh/test_mesh_interface.py	(revision 3513)
+++ /inundation-numpy-branch/pmesh/test_mesh_interface.py	(revision 3514)
@@ -5,5 +5,5 @@
 from mesh_interface import *
 from load_mesh.loadASCII import *
-from utilities.polygon import inside_polygon
+from anuga.utilities.polygon import inside_polygon
 from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
 
Index: /inundation-numpy-branch/pyvolution/_test_sww2domain.py
===================================================================
--- /inundation-numpy-branch/pyvolution/_test_sww2domain.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/_test_sww2domain.py	(revision 3514)
@@ -61,5 +61,5 @@
 ##NOW TEST IT!!!
 
-from data_manager import sww2domain
+from anuga.pyvolution.data_manager import sww2domain
 from Numeric import allclose
 
Index: /inundation-numpy-branch/pyvolution/_test_sww2domain2.py
===================================================================
--- /inundation-numpy-branch/pyvolution/_test_sww2domain2.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/_test_sww2domain2.py	(revision 3514)
@@ -59,5 +59,5 @@
 ##NOW TEST IT!!!
 
-from data_manager import sww2domain
+from anuga.pyvolution.data_manager import sww2domain
 from Numeric import allclose
 
Index: /inundation-numpy-branch/pyvolution/bed_w_file_boundary.py
===================================================================
--- /inundation-numpy-branch/pyvolution/bed_w_file_boundary.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/bed_w_file_boundary.py	(revision 3514)
@@ -57,5 +57,5 @@
 
 #Convert ASCII file to NetCDF (Which is what we really like!)
-from data_manager import timefile2swww        
+from anuga.pyvolution.data_manager import timefile2swww        
 timefile2swww(filename, quantity_names = domain.conserved_quantities)
 
Index: /inundation-numpy-branch/pyvolution/check_sww_tsh.py
===================================================================
--- /inundation-numpy-branch/pyvolution/check_sww_tsh.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/check_sww_tsh.py	(revision 3514)
@@ -5,5 +5,5 @@
 from os import sep, path
 
-import data_manager
+import anuga.pyvolution.data_manager
 from load_mesh.loadASCII import import_mesh_file
 from shallow_water import Domain
Index: /inundation-numpy-branch/pyvolution/combine_pts.py
===================================================================
--- /inundation-numpy-branch/pyvolution/combine_pts.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/combine_pts.py	(revision 3514)
@@ -5,5 +5,5 @@
 """
 
-from utilities.polygon import outside_polygon, inside_polygon
+from anuga.utilities.polygon import outside_polygon, inside_polygon
 from Numeric import take, concatenate
 import time
Index: /inundation-numpy-branch/pyvolution/data_manager.py
===================================================================
--- /inundation-numpy-branch/pyvolution/data_manager.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/data_manager.py	(revision 3514)
@@ -248,5 +248,5 @@
             #Create new file
             fid.institution = 'Geoscience Australia'
-            fid.description = 'Output from pyvolution suitable for plotting'
+            fid.description = 'Output from anuga.pyvolution suitable for plotting'
 
             if domain.smooth:
@@ -1572,6 +1572,6 @@
     from Numeric import array2string
 
-    from utilities.polygon import inside_polygon, outside_polygon, separate_points_by_polygon
-    from util import apply_expression_to_dictionary
+    from anuga.utilities.polygon import inside_polygon, outside_polygon, separate_points_by_polygon
+    from anuga.pyvolution.util import apply_expression_to_dictionary
 
     msg = 'Format must be either asc or ers'
@@ -2571,5 +2571,5 @@
     from Numeric import array
     from config import time_format
-    from utilities.numerical_tools import ensure_numeric    
+    from anuga.utilities.numerical_tools import ensure_numeric    
 
 
@@ -3093,7 +3093,7 @@
     from pmesh2domain import pmesh_to_domain_instance
     import time, os
-    from data_manager import get_dataobject
+    from anuga.pyvolution.data_manager import get_dataobject
     from os import sep, path
-    from utilities.numerical_tools import mean
+    from anuga.utilities.numerical_tools import mean
 
     if verbose == True:print 'Creating domain from', filename
Index: /inundation-numpy-branch/pyvolution/data_manager_obsolete_stuff.py
===================================================================
--- /inundation-numpy-branch/pyvolution/data_manager_obsolete_stuff.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/data_manager_obsolete_stuff.py	(revision 3514)
@@ -221,5 +221,5 @@
     from Numeric import array, Float, concatenate, NewAxis, zeros,\
          sometrue
-    from utilities.polygon import inside_polygon
+    from anuga.utilities.polygon import inside_polygon
 
     #FIXME: Should be variable
Index: /inundation-numpy-branch/pyvolution/domain.py
===================================================================
--- /inundation-numpy-branch/pyvolution/domain.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/domain.py	(revision 3514)
@@ -238,5 +238,5 @@
         """
 
-        from util import apply_expression_to_dictionary
+        from anuga.pyvolution.util import apply_expression_to_dictionary
         return apply_expression_to_dictionary(expression, self.quantities)
 
Index: /inundation-numpy-branch/pyvolution/flatbed.py
===================================================================
--- /inundation-numpy-branch/pyvolution/flatbed.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/flatbed.py	(revision 3514)
@@ -13,5 +13,5 @@
      Constant_height
 from Numeric import array
-from util import Polygon_function, read_polygon
+from anuga.pyvolution.util import Polygon_function, read_polygon
 
 
Index: /inundation-numpy-branch/pyvolution/general_mesh.py
===================================================================
--- /inundation-numpy-branch/pyvolution/general_mesh.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/general_mesh.py	(revision 3514)
@@ -50,5 +50,5 @@
 
 
-        This is a cut down version of mesh from pyvolution mesh.py
+        This is a cut down version of mesh from anuga.pyvolution mesh.py
     """
 
Index: /inundation-numpy-branch/pyvolution/generic_boundary_conditions.py
===================================================================
--- /inundation-numpy-branch/pyvolution/generic_boundary_conditions.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/generic_boundary_conditions.py	(revision 3514)
@@ -131,5 +131,5 @@
         from Numeric import array
         from config import time_format
-        from util import File_function
+        from anuga.pyvolution.util import File_function
 
         Boundary.__init__(self)
@@ -181,5 +181,5 @@
         from Numeric import array, zeros, Float
         from config import time_format
-        from util import file_function
+        from anuga.pyvolution.util import file_function
 
         Boundary.__init__(self)
Index: /inundation-numpy-branch/pyvolution/island.py
===================================================================
--- /inundation-numpy-branch/pyvolution/island.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/island.py	(revision 3514)
@@ -13,5 +13,5 @@
      Constant_height
 from Numeric import array
-from util import Polygon_function, read_polygon
+from anuga.pyvolution.util import Polygon_function, read_polygon
 from math import exp
 
Index: /inundation-numpy-branch/pyvolution/least_squares.py
===================================================================
--- /inundation-numpy-branch/pyvolution/least_squares.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/least_squares.py	(revision 3514)
@@ -25,8 +25,8 @@
 
 #FIXME (Ole): Meshes to move somewhere else
-from pyvolution.mesh import Mesh
-from utilities.sparse import Sparse, Sparse_CSR
-from utilities.cg_solve import conjugate_gradient, VectorShapeError
-from utilities.numerical_tools import ensure_numeric, mean, gradient
+from anuga.pyvolution.mesh import Mesh
+from anuga.utilities.sparse import Sparse, Sparse_CSR
+from anuga.utilities.cg_solve import conjugate_gradient, VectorShapeError
+from anuga.utilities.numerical_tools import ensure_numeric, mean, gradient
 
 
@@ -441,6 +441,6 @@
         #Maybe we need some sort of blocking
 
-        from pyvolution.quad import build_quadtree
-	from utilities.polygon import inside_polygon
+        from anuga.pyvolution.quad import build_quadtree
+	from anuga.utilities.polygon import inside_polygon
 	
 
@@ -1134,5 +1134,5 @@
         from math import pi, cos, sin, sqrt
         from Numeric import zeros, Float
-        from utilities.numerical_tools import mean        
+        from anuga.utilities.numerical_tools import mean        
 
         if self.spatial is True:
Index: /inundation-numpy-branch/pyvolution/mesh.py
===================================================================
--- /inundation-numpy-branch/pyvolution/mesh.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/mesh.py	(revision 3514)
@@ -492,5 +492,5 @@
         from config import epsilon
         from math import pi
-        from utilities.numerical_tools import anglediff
+        from anuga.utilities.numerical_tools import anglediff
 
         N = self.number_of_elements
@@ -616,5 +616,5 @@
         """
 
-        from utilities.numerical_tools import histogram
+        from anuga.utilities.numerical_tools import histogram
 
         vertex_coordinates = self.vertex_coordinates
Index: /inundation-numpy-branch/pyvolution/mesh_factory.py
===================================================================
--- /inundation-numpy-branch/pyvolution/mesh_factory.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/mesh_factory.py	(revision 3514)
@@ -334,5 +334,5 @@
     """
 
-    from util import anglediff
+    from anuga.pyvolution.util import anglediff
     from math import pi
     import os.path
@@ -449,5 +449,5 @@
 
     from math import pi
-    from util import anglediff
+    from anuga.pyvolution.util import anglediff
 
 
Index: /inundation-numpy-branch/pyvolution/mesh_factory_all.py
===================================================================
--- /inundation-numpy-branch/pyvolution/mesh_factory_all.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/mesh_factory_all.py	(revision 3514)
@@ -351,5 +351,5 @@
     """
 
-    from util import anglediff
+    from anuga.pyvolution.util import anglediff
     from math import pi
     import os.path
@@ -466,5 +466,5 @@
 
     from math import pi
-    from util import anglediff
+    from anuga.pyvolution.util import anglediff
 
 
Index: /inundation-numpy-branch/pyvolution/pressure_force.py
===================================================================
--- /inundation-numpy-branch/pyvolution/pressure_force.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/pressure_force.py	(revision 3514)
@@ -49,5 +49,5 @@
 def cyclone(domain):
     from config import rho_w 
-    from util import gradient
+    from anuga.pyvolution.util import gradient
 
     xmom = domain.quantities['xmomentum'].explicit_update
Index: /inundation-numpy-branch/pyvolution/quantity.py
===================================================================
--- /inundation-numpy-branch/pyvolution/quantity.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/quantity.py	(revision 3514)
@@ -267,5 +267,5 @@
         """
 
-        from geospatial_data.geospatial_data import Geospatial_data
+        from anuga.geospatial_data.geospatial_data import Geospatial_data
         from types import FloatType, IntType, LongType, ListType, NoneType
 
@@ -613,5 +613,5 @@
 
 
-        from utilities.numerical_tools import ensure_numeric
+        from anuga.utilities.numerical_tools import ensure_numeric
         from least_squares import fit_to_mesh
         from coordinate_transforms.geo_reference import Geo_reference
@@ -685,5 +685,5 @@
 
         from load_mesh.loadASCII import import_points_file
-        from geospatial_data.geospatial_data import points_dictionary2geospatial_data
+        from anuga.geospatial_data.geospatial_data import points_dictionary2geospatial_data
 
         from types import StringType
@@ -1296,5 +1296,5 @@
 
 
-from utilities import compile
+from anuga.utilities import compile
 if compile.can_use_C_extension('quantity_ext.c'):
     #Replace python version with c implementations
Index: /inundation-numpy-branch/pyvolution/realtime_visualisation.py
===================================================================
--- /inundation-numpy-branch/pyvolution/realtime_visualisation.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/realtime_visualisation.py	(revision 3514)
@@ -200,5 +200,5 @@
 
     #print scene.forward
-    #FIXME: Use smoother from pyvolution instead
+    #FIXME: Use smoother from anuga.pyvolution instead
     if domain.smooth:
         #Get all average point values
Index: /inundation-numpy-branch/pyvolution/shallow_water.py
===================================================================
--- /inundation-numpy-branch/pyvolution/shallow_water.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/shallow_water.py	(revision 3514)
@@ -62,5 +62,5 @@
 from generic_boundary_conditions import Transmissive_boundary
 
-from utilities.numerical_tools import gradient, mean
+from anuga.utilities.numerical_tools import gradient, mean
 
 
@@ -285,5 +285,5 @@
         """
 
-        import data_manager
+        import anuga.pyvolution.data_manager
 
         #Initialise writer
@@ -1779,5 +1779,5 @@
 
 
-from utilities import compile
+from anuga.utilities import compile
 if compile.can_use_C_extension('shallow_water_ext.c'):
     #Replace python version with c implementations
Index: /inundation-numpy-branch/pyvolution/shallow_water_kinetic.py
===================================================================
--- /inundation-numpy-branch/pyvolution/shallow_water_kinetic.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/shallow_water_kinetic.py	(revision 3514)
@@ -94,5 +94,5 @@
 
         #Reduction operation for get_vertex_values
-        from util import mean
+        from anuga.pyvolution.util import mean
         self.reduction = mean
         #self.reduction = min  #Looks better near steep slopes
@@ -245,5 +245,5 @@
         """
 
-        import data_manager
+        import anuga.pyvolution.data_manager
 
         #Initialise writer
@@ -1169,5 +1169,5 @@
     """
 
-    from util import gradient
+    from anuga.pyvolution.util import gradient
     from Numeric import zeros, Float, array, sum
 
@@ -1772,5 +1772,5 @@
 
 
-from utilities import compile
+from anuga.utilities import compile
 if compile.can_use_C_extension('shallow_water_kinetic_ext.c'):
     #Replace python version with c implementations
Index: /inundation-numpy-branch/pyvolution/test_data_manager.py
===================================================================
--- /inundation-numpy-branch/pyvolution/test_data_manager.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/test_data_manager.py	(revision 3514)
@@ -5,13 +5,13 @@
 import copy
 from Numeric import zeros, array, allclose, Float
-from utilities.numerical_tools import mean
+from anuga.utilities.numerical_tools import mean
 import tempfile
 import os
 from Scientific.IO.NetCDF import NetCDFFile
 
-from data_manager import *
+from anuga.pyvolution.data_manager import *
 from shallow_water import *
 from config import epsilon
-import data_manager
+import anuga.pyvolution.data_manager
 
 from coordinate_transforms.geo_reference import Geo_reference
@@ -2528,5 +2528,5 @@
 	#Import the example's file as a new domain
 	##########################################
-	from data_manager import sww2domain
+	from anuga.pyvolution.data_manager import sww2domain
 	from Numeric import allclose
         import os
@@ -2665,5 +2665,5 @@
 	#Import the file as a new domain
         ##################################
-	from data_manager import sww2domain
+	from anuga.pyvolution.data_manager import sww2domain
 	from Numeric import allclose
         import os
@@ -2703,5 +2703,5 @@
 
     #def test_weed(self):
-	from data_manager import weed
+	from anuga.pyvolution.data_manager import weed
 
         coordinates1 = [[0.,0.],[1.,0.],[1.,1.],[1.,0.],[2.,0.],[1.,1.]]
@@ -2776,5 +2776,5 @@
 	#Import the example's file as a new domain
 	##########################################
-	from data_manager import sww2domain
+	from anuga.pyvolution.data_manager import sww2domain
 	from Numeric import allclose
         import os
@@ -3077,5 +3077,5 @@
         from Scientific.IO.NetCDF import NetCDFFile
 
-        import data_manager
+        import anuga.pyvolution.data_manager
         #Write test asc file
         filename = tempfile.mktemp(".000")
Index: /inundation-numpy-branch/pyvolution/test_generic_boundary_conditions.py
===================================================================
--- /inundation-numpy-branch/pyvolution/test_generic_boundary_conditions.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/test_generic_boundary_conditions.py	(revision 3514)
@@ -152,5 +152,5 @@
         #Convert ASCII file to NetCDF (Which is what we really like!)
         
-        from data_manager import timefile2netcdf                
+        from anuga.pyvolution.data_manager import timefile2netcdf                
         timefile2netcdf(filename, quantity_names = ['stage', 'ymomentum'])
         
@@ -246,5 +246,5 @@
 
         #Convert ASCII file to NetCDF (Which is what we really like!)
-        from data_manager import timefile2netcdf               
+        from anuga.pyvolution.data_manager import timefile2netcdf               
         timefile2netcdf(filename, quantity_names = ['stage', 'xmomentum'])
 
Index: /inundation-numpy-branch/pyvolution/test_interpolate_sww.py
===================================================================
--- /inundation-numpy-branch/pyvolution/test_interpolate_sww.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/test_interpolate_sww.py	(revision 3514)
@@ -8,9 +8,9 @@
 import unittest
 from Numeric import zeros, array, allclose, Float
-from util import mean
+from anuga.pyvolution.util import mean
 
 from interpolate_sww import *
 from shallow_water import *
-from data_manager import *
+from anuga.pyvolution.data_manager import *
 #from config import epsilon
 
Index: /inundation-numpy-branch/pyvolution/test_least_squares.py
===================================================================
--- /inundation-numpy-branch/pyvolution/test_least_squares.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/test_least_squares.py	(revision 3514)
@@ -1085,5 +1085,5 @@
         #Check basic interpolation of one quantity using averaging
         #(no interpolation points or spatial info)
-        from utilities.numerical_tools import mean        
+        from anuga.utilities.numerical_tools import mean        
         I = Interpolation_function(time, [mean(Q[0,:]),
                                           mean(Q[1,:]),
Index: /inundation-numpy-branch/pyvolution/test_mesh.py
===================================================================
--- /inundation-numpy-branch/pyvolution/test_mesh.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/test_mesh.py	(revision 3514)
@@ -15,5 +15,5 @@
 from numpy import allclose, array, zeros, Float
 
-from utilities.polygon import inside_polygon
+from anuga.utilities.polygon import inside_polygon
 
 def distance(x, y):
Index: /inundation-numpy-branch/pyvolution/test_quantity.py
===================================================================
--- /inundation-numpy-branch/pyvolution/test_quantity.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/test_quantity.py	(revision 3514)
@@ -280,5 +280,5 @@
     def test_set_values_using_least_squares(self):
 
-        from geospatial_data.geospatial_data import Geospatial_data
+        from anuga.geospatial_data.geospatial_data import Geospatial_data
         
         quantity = Quantity(self.mesh4)
@@ -331,5 +331,5 @@
 
         from domain import Domain
-        from geospatial_data.geospatial_data import Geospatial_data        
+        from anuga.geospatial_data.geospatial_data import Geospatial_data        
         from coordinate_transforms.geo_reference import Geo_reference
         from least_squares import fit_to_mesh
@@ -389,5 +389,5 @@
         quantity.vertex_values[:] = 0.0
         
-        from geospatial_data.geospatial_data import Geospatial_data
+        from anuga.geospatial_data.geospatial_data import Geospatial_data
         geo = Geospatial_data(data_points, z, data_georef)
 
@@ -1062,5 +1062,5 @@
         from mesh_factory import rectangular
         from shallow_water import Domain, Transmissive_boundary
-        from utilities.numerical_tools import mean
+        from anuga.utilities.numerical_tools import mean
 
         #Create basic mesh
@@ -1151,5 +1151,5 @@
         from mesh_factory import rectangular
         from shallow_water import Domain, Transmissive_boundary
-        from utilities.numerical_tools import mean
+        from anuga.utilities.numerical_tools import mean
 
 
Index: /inundation-numpy-branch/pyvolution/test_shallow_water.py
===================================================================
--- /inundation-numpy-branch/pyvolution/test_shallow_water.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/test_shallow_water.py	(revision 3514)
@@ -6,5 +6,5 @@
 from config import g, epsilon
 from Numeric import allclose, array, zeros, ones, Float, take
-from utilities.numerical_tools import mean
+from anuga.utilities.numerical_tools import mean
 
 from shallow_water import *
@@ -967,5 +967,5 @@
         from math import pi, cos, sin, sqrt
         from config import time_format
-        from util import file_function
+        from anuga.pyvolution.util import file_function
         import time
 
@@ -1014,5 +1014,5 @@
 
         #Convert ASCII file to NetCDF (Which is what we really like!)
-        from data_manager import timefile2netcdf        
+        from anuga.pyvolution.data_manager import timefile2netcdf        
         timefile2netcdf(filename)
         os.remove(filename + '.txt')
@@ -2169,5 +2169,5 @@
 
     def test_flatbed_second_order_distribute(self):
-        #Use real data from pyvolution 2
+        #Use real data from anuga.pyvolution 2
         #painfully setup and extracted.
         from mesh_factory import rectangular
Index: /inundation-numpy-branch/pyvolution/test_util.py
===================================================================
--- /inundation-numpy-branch/pyvolution/test_util.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/test_util.py	(revision 3514)
@@ -6,7 +6,7 @@
 from math import sqrt, pi
 
-from util import *
+from anuga.pyvolution.util import *
 from config import epsilon
-from data_manager import timefile2netcdf
+from anuga.pyvolution.data_manager import timefile2netcdf
 
 
@@ -26,5 +26,5 @@
     #Geometric
     #def test_distance(self):
-    #    from util import distance#
+    #    from anuga.pyvolution.util import distance#
     #
     #    self.failUnless( distance([4,2],[7,6]) == 5.0,
@@ -119,5 +119,5 @@
         domain1 = Domain(points, vertices, boundary)
 
-        from utilities.numerical_tools import mean
+        from anuga.utilities.numerical_tools import mean
         domain1.reduction = mean
         domain1.smooth = True #NOTE: Mimic sww output where each vertex has
@@ -319,5 +319,5 @@
         
 
-        from utilities.numerical_tools import mean	
+        from anuga.utilities.numerical_tools import mean	
         domain1.reduction = mean
         domain1.smooth = True #NOTE: Mimic sww output where each vertex has
@@ -522,5 +522,5 @@
         from mesh_factory import rectangular
         from shallow_water import Domain
-        import data_manager
+        import anuga.pyvolution.data_manager
 
         finaltime = 1200
Index: /inundation-numpy-branch/pyvolution/tsh2sww.py
===================================================================
--- /inundation-numpy-branch/pyvolution/tsh2sww.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/tsh2sww.py	(revision 3514)
@@ -13,6 +13,6 @@
 from pmesh2domain import pmesh_to_domain_instance
 import time, os 
-from data_manager import get_dataobject   
-from util import mean
+from anuga.pyvolution.data_manager import get_dataobject   
+from anuga.pyvolution.util import mean
 
 def tsh2sww(infilename, sww_file_name = None, verbose = False):
Index: /inundation-numpy-branch/pyvolution/twolevels.py
===================================================================
--- /inundation-numpy-branch/pyvolution/twolevels.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/twolevels.py	(revision 3514)
@@ -13,5 +13,5 @@
      Constant_height
 from Numeric import array
-from util import Polygon_function, read_polygon
+from anuga.pyvolution.util import Polygon_function, read_polygon
 
 
Index: /inundation-numpy-branch/pyvolution/util.py
===================================================================
--- /inundation-numpy-branch/pyvolution/util.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/util.py	(revision 3514)
@@ -6,5 +6,5 @@
 
 
-import utilities.polygon
+import anuga.utilities.polygon
 from warnings import warn
 
@@ -173,5 +173,5 @@
     from Scientific.IO.NetCDF import NetCDFFile
     from Numeric import array, zeros, Float, alltrue, concatenate, reshape
-    from utilities.numerical_tools import ensure_numeric    
+    from anuga.utilities.numerical_tools import ensure_numeric    
 
     #Open NetCDF file
@@ -401,8 +401,8 @@
     """Temporary Interface to new location"""
 
-    import utilities.numerical_tools as NT	
+    import anuga.utilities.numerical_tools as NT	
     
     msg = 'angle has moved from util.py.  '
-    msg += 'Please use "from utilities.numerical_tools import angle"'
+    msg += 'Please use "from anuga.utilities.numerical_tools import angle"'
     warn(msg, DeprecationWarning) 
 
@@ -412,8 +412,8 @@
     """Temporary Interface to new location"""
 
-    import utilities.numerical_tools as NT
+    import anuga.utilities.numerical_tools as NT
     
     msg = 'anglediff has moved from util.py.  '
-    msg += 'Please use "from utilities.numerical_tools import anglediff"'
+    msg += 'Please use "from anuga.utilities.numerical_tools import anglediff"'
     warn(msg, DeprecationWarning) 
 
@@ -424,8 +424,8 @@
     """Temporary Interface to new location"""
 
-    import utilities.numerical_tools as NT    
+    import anuga.utilities.numerical_tools as NT    
     
     msg = 'mean has moved from util.py.  '
-    msg += 'Please use "from utilities.numerical_tools import mean"'
+    msg += 'Please use "from anuga.utilities.numerical_tools import mean"'
     warn(msg, DeprecationWarning) 
 
@@ -436,5 +436,5 @@
 
     msg = 'point_on_line has moved from util.py.  '
-    msg += 'Please use "from utilities.polygon import point_on_line"'
+    msg += 'Please use "from anuga.utilities.polygon import point_on_line"'
     warn(msg, DeprecationWarning) 
 
@@ -445,5 +445,5 @@
 
     print 'inside_polygon has moved from util.py.  ',
-    print 'Please use "from utilities.polygon import inside_polygon"'
+    print 'Please use "from anuga.utilities.polygon import inside_polygon"'
 
     return utilities.polygon.inside_polygon(*args, **kwargs)    
@@ -453,5 +453,5 @@
 
     print 'outside_polygon has moved from util.py.  ',
-    print 'Please use "from utilities.polygon import outside_polygon"'
+    print 'Please use "from anuga.utilities.polygon import outside_polygon"'
 
     return utilities.polygon.outside_polygon(*args, **kwargs)    
@@ -462,5 +462,5 @@
 
     print 'separate_points_by_polygon has moved from util.py.  ',
-    print 'Please use "from utilities.polygon import separate_points_by_polygon"'
+    print 'Please use "from anuga.utilities.polygon import separate_points_by_polygon"'
 
     return utilities.polygon.separate_points_by_polygon(*args, **kwargs)    
@@ -472,5 +472,5 @@
 
     print 'read_polygon has moved from util.py.  ',
-    print 'Please use "from utilities.polygon import read_polygon"'
+    print 'Please use "from anuga.utilities.polygon import read_polygon"'
 
     return utilities.polygon.read_polygon(*args, **kwargs)    
@@ -481,5 +481,5 @@
 
     print 'populate_polygon has moved from util.py.  ',
-    print 'Please use "from utilities.polygon import populate_polygon"'
+    print 'Please use "from anuga.utilities.polygon import populate_polygon"'
 
     return utilities.polygon.populate_polygon(*args, **kwargs)    
Index: /inundation-numpy-branch/pyvolution/view_tsh.py
===================================================================
--- /inundation-numpy-branch/pyvolution/view_tsh.py	(revision 3513)
+++ /inundation-numpy-branch/pyvolution/view_tsh.py	(revision 3514)
@@ -9,5 +9,5 @@
 from shallow_water import Domain
 from pmesh2domain import pmesh_to_domain_instance
-from util import file_function, Polygon_function, read_polygon
+from anuga.pyvolution.util import file_function, Polygon_function, read_polygon
 from Numeric import zeros, Float, maximum, minimum
 from realtime_visualisation_new import *
Index: /inundation-numpy-branch/utilities/numerical_tools.py
===================================================================
--- /inundation-numpy-branch/utilities/numerical_tools.py	(revision 3513)
+++ /inundation-numpy-branch/utilities/numerical_tools.py	(revision 3514)
@@ -236,5 +236,5 @@
 #Initialise module
 
-#from utilities import compile
+#from anuga.utilities import compile
 import compile
 if compile.can_use_C_extension('util_ext.c'):
Index: /inundation-numpy-branch/utilities/polygon.py
===================================================================
--- /inundation-numpy-branch/utilities/polygon.py	(revision 3513)
+++ /inundation-numpy-branch/utilities/polygon.py	(revision 3514)
@@ -7,5 +7,5 @@
 from math import sqrt
 
-from utilities.numerical_tools import ensure_numeric
+from anuga.utilities.numerical_tools import ensure_numeric
 
 
Index: /inundation-numpy-branch/utilities/test_numerical_tools.py
===================================================================
--- /inundation-numpy-branch/utilities/test_numerical_tools.py	(revision 3513)
+++ /inundation-numpy-branch/utilities/test_numerical_tools.py	(revision 3514)
@@ -5,5 +5,5 @@
 from numpy import zeros, array, allclose
 from math import sqrt, pi
-from pyvolution.config import epsilon
+from anuga.pyvolution.config import epsilon
 
 from numerical_tools import *
Index: /production/broome_2006/project.py
===================================================================
--- /production/broome_2006/project.py	(revision 3513)
+++ /production/broome_2006/project.py	(revision 3514)
@@ -4,10 +4,10 @@
 from os import sep, environ, getenv, getcwd
 from os.path import expanduser, basename
-#from utilities.polygon import read_polygon
+#from anuga.utilities.polygon import read_polygon
 import sys
 from pmesh.create_mesh import convert_points_from_latlon_to_utm
 from coordinate_transforms.redfearn import degminsec2decimal_degrees
 from time import localtime, strftime
-from geospatial_data import *
+from anuga.geospatial_data.geospatial_data import *
 
 #Making assumptions about the location of scenario data
Index: /production/broome_2006/run_broome.py
===================================================================
--- /production/broome_2006/run_broome.py	(revision 3513)
+++ /production/broome_2006/run_broome.py	(revision 3514)
@@ -19,14 +19,14 @@
 
 # Related major packages
-from pyvolution.shallow_water import Domain, Reflective_boundary, \
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, \
                             Dirichlet_boundary, Time_boundary, File_boundary
-from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
-from pyvolution.combine_pts import combine_rectangular_points_files 
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
+from anuga.pyvolution.combine_pts import combine_rectangular_points_files 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
 from shutil import copy
 from os import mkdir, access, F_OK
-from geospatial_data import *
+from anuga.geospatial_data.geospatial_data import *
 import sys
-from pyvolution.util import Screen_Catcher
+from anuga.pyvolution.util import Screen_Catcher
 
 # Application specific imports
@@ -107,5 +107,5 @@
 print 'number of interior regions', len(interior_regions)
 
-from utilities.polygon import plot_polygons
+from anuga.utilities.polygon import plot_polygons
 if sys.platform == 'win32':
     #figname = project.outputtimedir + 'pt_hedland_polys'
@@ -169,5 +169,5 @@
 # skipped as results in file SU-AU_clipped is correct for all WA
 
-from pyvolution.data_manager import ferret2sww
+from anuga.pyvolution.data_manager import ferret2sww
 
 south = project.south 
Index: /production/gippsland_2005/get_timeseries.py
===================================================================
--- /production/gippsland_2005/get_timeseries.py	(revision 3513)
+++ /production/gippsland_2005/get_timeseries.py	(revision 3514)
@@ -4,6 +4,6 @@
 
 import project
-from pyvolution.util import file_function
-#from pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
+from anuga.pyvolution.util import file_function
+#from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
 from coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
 from pylab import *
Index: /production/gippsland_2005/run_gippsland2.py
===================================================================
--- /production/gippsland_2005/run_gippsland2.py	(revision 3513)
+++ /production/gippsland_2005/run_gippsland2.py	(revision 3514)
@@ -6,12 +6,12 @@
 import time
 
-from pyvolution.data_manager import convert_dem_from_ascii2netcdf,\
+from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf,\
      dem2pts, asc_csiro2sww
-from pyvolution.pmesh2domain import pmesh_to_domain_instance 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance 
 from caching import cache
 from create_mesh2 import create_mesh
-from pyvolution.shallow_water import Domain, Reflective_boundary,\
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
      File_boundary, Dirichlet_boundary, Time_boundary, Transmissive_boundary
-from pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA 
+from anuga.pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA 
 
 # Import this last!  It stuffs up the loading of c extensions otherwise.
Index: /production/karratha_2005/export_results.py
===================================================================
--- /production/karratha_2005/export_results.py	(revision 3513)
+++ /production/karratha_2005/export_results.py	(revision 3514)
@@ -1,6 +1,6 @@
 import project, os
 
-from pyvolution.data_manager import sww2dem
-from pyvolution.ermapper_grids import read_ermapper_grid
+from anuga.pyvolution.data_manager import sww2dem
+from anuga.pyvolution.ermapper_grids import read_ermapper_grid
 
 
Index: /production/karratha_2005/get_cross_section.py
===================================================================
--- /production/karratha_2005/get_cross_section.py	(revision 3513)
+++ /production/karratha_2005/get_cross_section.py	(revision 3514)
@@ -3,6 +3,6 @@
 
 import project
-from pyvolution.util import file_function
-from pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
+from anuga.pyvolution.util import file_function
+from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
 
 
Index: /production/karratha_2005/get_timeseries.py
===================================================================
--- /production/karratha_2005/get_timeseries.py	(revision 3513)
+++ /production/karratha_2005/get_timeseries.py	(revision 3514)
@@ -4,6 +4,6 @@
 
 import project
-from pyvolution.util import file_function
-from pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
+from anuga.pyvolution.util import file_function
+from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
 from pylab import *
 
Index: /production/karratha_2005/process_buildings.py
===================================================================
--- /production/karratha_2005/process_buildings.py	(revision 3513)
+++ /production/karratha_2005/process_buildings.py	(revision 3514)
@@ -4,6 +4,6 @@
 
 import project
-from pyvolution.util import file_function
-from pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
+from anuga.pyvolution.util import file_function
+from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
 from pylab import *
 
Index: /production/karratha_2005/run_karratha.py
===================================================================
--- /production/karratha_2005/run_karratha.py	(revision 3513)
+++ /production/karratha_2005/run_karratha.py	(revision 3514)
@@ -19,9 +19,9 @@
 
 
-from pyvolution.shallow_water import Domain, Reflective_boundary, File_boundary,\
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, File_boundary,\
      Dirichlet_boundary, Time_boundary, Transmissive_boundary
-from pyvolution.data_manager import convert_dem_from_ascii2netcdf,\
+from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf,\
      dem2pts, ferret2sww
-from pyvolution.pmesh2domain import pmesh_to_domain_instance 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance 
 from caching import cache
 import project
@@ -44,5 +44,5 @@
 source_dir = project.boundarydir
 
-from pyvolution.data_manager import ferret2sww
+from anuga.pyvolution.data_manager import ferret2sww
 
 south = project.south 
Index: /production/onslow_2006/MOST_timeseries.py
===================================================================
--- /production/onslow_2006/MOST_timeseries.py	(revision 3513)
+++ /production/onslow_2006/MOST_timeseries.py	(revision 3514)
@@ -21,5 +21,5 @@
 from os import sep, getcwd, F_OK, access, mkdir
 import project
-from pyvolution.util import sww2timeseries, get_gauges_from_file
+from anuga.pyvolution.util import sww2timeseries, get_gauges_from_file
 
 # User defined inputs
Index: /production/onslow_2006/compare_timeseries_data.py
===================================================================
--- /production/onslow_2006/compare_timeseries_data.py	(revision 3513)
+++ /production/onslow_2006/compare_timeseries_data.py	(revision 3514)
@@ -19,5 +19,5 @@
 from os import sep
 import project
-from pyvolution.util import sww2timeseries, get_gauges_from_file
+from anuga.pyvolution.util import sww2timeseries, get_gauges_from_file
 
 # User defined inputs
Index: /production/onslow_2006/export_results.py
===================================================================
--- /production/onslow_2006/export_results.py	(revision 3513)
+++ /production/onslow_2006/export_results.py	(revision 3514)
@@ -2,7 +2,7 @@
 import sys
 
-from pyvolution.data_manager import sww2dem
-from pyvolution.ermapper_grids import read_ermapper_grid
-from pyvolution.util import Screen_Catcher
+from anuga.pyvolution.data_manager import sww2dem
+from anuga.pyvolution.ermapper_grids import read_ermapper_grid
+from anuga.pyvolution.util import Screen_Catcher
 from os import sep
 
Index: /production/onslow_2006/get_timeseries.py
===================================================================
--- /production/onslow_2006/get_timeseries.py	(revision 3513)
+++ /production/onslow_2006/get_timeseries.py	(revision 3514)
@@ -4,5 +4,5 @@
 
 import project
-from pyvolution.util import file_function
+from anuga.pyvolution.util import file_function
 from coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
 from pylab import *
Index: /production/onslow_2006/make_gauges.py
===================================================================
--- /production/onslow_2006/make_gauges.py	(revision 3513)
+++ /production/onslow_2006/make_gauges.py	(revision 3514)
@@ -5,5 +5,5 @@
 import project
 from pylab import plot, xlabel, ylabel, title, ion, axis, savefig, close, text
-from utilities.polygon import poly_xy, is_inside_polygon
+from anuga.utilities.polygon import poly_xy, is_inside_polygon
 from Numeric import arange
 from pmesh.create_mesh import convert_points_from_latlon_to_utm
Index: /production/onslow_2006/make_report.py
===================================================================
--- /production/onslow_2006/make_report.py	(revision 3513)
+++ /production/onslow_2006/make_report.py	(revision 3514)
@@ -53,5 +53,5 @@
 from os import getcwd, sep, altsep, mkdir, access, F_OK
 import project
-from pyvolution.util import sww2timeseries, get_gauges_from_file
+from anuga.pyvolution.util import sww2timeseries, get_gauges_from_file
 
 # Derive scenario name
Index: /production/onslow_2006/plot_data_extent.py
===================================================================
--- /production/onslow_2006/plot_data_extent.py	(revision 3513)
+++ /production/onslow_2006/plot_data_extent.py	(revision 3514)
@@ -1,10 +1,10 @@
 from pylab import *
-from geospatial_data import *
+from anuga.geospatial_data.geospatial_data import *
 from pmesh.create_mesh import convert_points_from_latlon_to_utm
 from coordinate_transforms.redfearn import degminsec2decimal_degrees
 from os import sep
-from utilities.polygon import inside_polygon
+from anuga.utilities.polygon import inside_polygon
 import project
-from utilities.polygon import plot_polygons, poly_xy, polygon_area
+from anuga.utilities.polygon import plot_polygons, poly_xy, polygon_area
 
 datadir = project.datadir
@@ -18,5 +18,5 @@
 def read_community_file(filename1, filename2, polygon):
     from coordinate_transforms.redfearn import redfearn
-    from utilities.polygon import inside_polygon
+    from anuga.utilities.polygon import inside_polygon
     fid1 = open(filename1)
     lines = fid1.readlines()
Index: /production/onslow_2006/project.py
===================================================================
--- /production/onslow_2006/project.py	(revision 3513)
+++ /production/onslow_2006/project.py	(revision 3514)
@@ -5,5 +5,5 @@
 from os import sep, environ, getenv, getcwd
 from os.path import expanduser
-#from utilities.polygon import read_polygon
+#from anuga.utilities.polygon import read_polygon
 import sys
 
Index: /production/onslow_2006/project_new.py
===================================================================
--- /production/onslow_2006/project_new.py	(revision 3513)
+++ /production/onslow_2006/project_new.py	(revision 3514)
@@ -5,5 +5,5 @@
 from os import sep, environ
 from os.path import expanduser
-from utilities.polygon import read_polygon
+from anuga.utilities.polygon import read_polygon
 import sys
 
Index: /production/onslow_2006/project_old.py
===================================================================
--- /production/onslow_2006/project_old.py	(revision 3513)
+++ /production/onslow_2006/project_old.py	(revision 3514)
@@ -5,5 +5,5 @@
 from os import sep, environ
 from os.path import expanduser
-from utilities.polygon import read_polygon
+from anuga.utilities.polygon import read_polygon
 import sys
 
Index: /production/onslow_2006/run_onslow.py
===================================================================
--- /production/onslow_2006/run_onslow.py	(revision 3513)
+++ /production/onslow_2006/run_onslow.py	(revision 3514)
@@ -23,11 +23,11 @@
 
 # Related major packages
-from pyvolution.shallow_water import Domain, Reflective_boundary, \
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, \
                             Dirichlet_boundary, Time_boundary, File_boundary
-from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
-from pyvolution.combine_pts import combine_rectangular_points_files 
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
-from geospatial_data import *
-from pyvolution.util import Screen_Catcher
+from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
+from anuga.pyvolution.combine_pts import combine_rectangular_points_files 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.geospatial_data.geospatial_data import *
+from anuga.pyvolution.util import Screen_Catcher
 
 # Application specific imports
@@ -183,5 +183,5 @@
 #-------------------------------------------------------------------------------
 print 'start ferret2sww'
-from pyvolution.data_manager import ferret2sww
+from anuga.pyvolution.data_manager import ferret2sww
 
 south = project.south 
Index: /production/onslow_2006/run_onslow_new.py
===================================================================
--- /production/onslow_2006/run_onslow_new.py	(revision 3513)
+++ /production/onslow_2006/run_onslow_new.py	(revision 3514)
@@ -20,10 +20,10 @@
 
 # Related major packages
-from pyvolution.shallow_water import Domain, Reflective_boundary, \
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, \
                             Dirichlet_boundary, Time_boundary, File_boundary
-from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
-from pyvolution.combine_pts import combine_rectangular_points_files 
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
-from geospatial_data import add_points_files
+from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
+from anuga.pyvolution.combine_pts import combine_rectangular_points_files 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.geospatial_data.geospatial_data import add_points_files
 
 # Application specific imports
@@ -34,5 +34,5 @@
 from os import mkdir, access, F_OK
 
-from geospatial_data import *
+from anuga.geospatial_data.geospatial_data import *
 
 #-------------------------------------------------------------------------------
@@ -182,5 +182,5 @@
 #-------------------------------------------------------------------------------
 
-from pyvolution.data_manager import ferret2sww
+from anuga.pyvolution.data_manager import ferret2sww
 
 south = project.south 
Index: /production/onslow_2006/run_onslow_old.py
===================================================================
--- /production/onslow_2006/run_onslow_old.py	(revision 3513)
+++ /production/onslow_2006/run_onslow_old.py	(revision 3514)
@@ -21,10 +21,10 @@
 
 # Related major packages
-from pyvolution.shallow_water import Domain, Reflective_boundary, \
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, \
                             Dirichlet_boundary, Time_boundary, File_boundary
-from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
-from pyvolution.combine_pts import combine_rectangular_points_files 
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
-#from geospatial_data import *
+from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
+from anuga.pyvolution.combine_pts import combine_rectangular_points_files 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
+#from anuga.geospatial_data.geospatial_data import *
 
 # Application specific imports
@@ -206,5 +206,5 @@
 #------------------------------------------------------------------------------
 '''
-from pyvolution.data_manager import ferret2sww
+from anuga.pyvolution.data_manager import ferret2sww
 
 south = project.south 
Index: /production/onslow_2006/run_timeseries.py
===================================================================
--- /production/onslow_2006/run_timeseries.py	(revision 3513)
+++ /production/onslow_2006/run_timeseries.py	(revision 3514)
@@ -1,5 +1,5 @@
 """ Script for generating figures, see sww2timeseries for documentation"""
 
-from pyvolution.util import sww2timeseries
+from anuga.pyvolution.util import sww2timeseries
 import project
 from os import sep
Index: /production/pt_hedland_2006/compare_timeseries.py
===================================================================
--- /production/pt_hedland_2006/compare_timeseries.py	(revision 3513)
+++ /production/pt_hedland_2006/compare_timeseries.py	(revision 3514)
@@ -19,5 +19,5 @@
 from os import sep
 import project
-from pyvolution.util import sww2timeseries, get_gauges_from_file
+from anuga.pyvolution.util import sww2timeseries, get_gauges_from_file
 
 # User defined inputs
Index: /production/pt_hedland_2006/export_results.py
===================================================================
--- /production/pt_hedland_2006/export_results.py	(revision 3513)
+++ /production/pt_hedland_2006/export_results.py	(revision 3514)
@@ -2,7 +2,7 @@
 import sys
 
-from pyvolution.data_manager import sww2dem
-from pyvolution.ermapper_grids import read_ermapper_grid
-from pyvolution.util import Screen_Catcher
+from anuga.pyvolution.data_manager import sww2dem
+from anuga.pyvolution.ermapper_grids import read_ermapper_grid
+from anuga.pyvolution.util import Screen_Catcher
 from os import sep
 
Index: /production/pt_hedland_2006/make_report.py
===================================================================
--- /production/pt_hedland_2006/make_report.py	(revision 3513)
+++ /production/pt_hedland_2006/make_report.py	(revision 3514)
@@ -52,5 +52,5 @@
 from os import getcwd, sep, altsep, mkdir, access, F_OK
 import project
-from pyvolution.util import sww2timeseries, get_gauges_from_file
+from anuga.pyvolution.util import sww2timeseries, get_gauges_from_file
 
 # Derive scenario name
Index: /production/pt_hedland_2006/project.py
===================================================================
--- /production/pt_hedland_2006/project.py	(revision 3513)
+++ /production/pt_hedland_2006/project.py	(revision 3514)
@@ -5,10 +5,10 @@
 from os import sep, environ, getenv, getcwd
 from os.path import expanduser, basename
-#from utilities.polygon import read_polygon
+#from anuga.utilities.polygon import read_polygon
 import sys
 from pmesh.create_mesh import convert_points_from_latlon_to_utm
 from coordinate_transforms.redfearn import degminsec2decimal_degrees
 from time import localtime, strftime
-from geospatial_data import *
+from anuga.geospatial_data.geospatial_data import *
 
 #Making assumptions about the location of scenario data
Index: /production/pt_hedland_2006/run_pt_hedland.py
===================================================================
--- /production/pt_hedland_2006/run_pt_hedland.py	(revision 3513)
+++ /production/pt_hedland_2006/run_pt_hedland.py	(revision 3514)
@@ -19,14 +19,15 @@
 
 # Related major packages
-from pyvolution.shallow_water import Domain, Reflective_boundary, \
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, \
                             Dirichlet_boundary, Time_boundary, File_boundary
-from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
-from pyvolution.combine_pts import combine_rectangular_points_files 
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, \
+     dem2pts
+from anuga.pyvolution.combine_pts import combine_rectangular_points_files 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
 from shutil import copy
 from os import mkdir, access, F_OK
-from geospatial_data import *
+from anuga.geospatial_data.geospatial_data import *
 import sys
-from pyvolution.util import Screen_Catcher
+from anuga.pyvolution.util import Screen_Catcher
 
 # Application specific imports
@@ -108,5 +109,5 @@
 print 'number of interior regions', len(interior_regions)
 
-from utilities.polygon import plot_polygons
+from anuga.utilities.polygon import plot_polygons
 if sys.platform == 'win32':
     #figname = project.outputtimedir + 'pt_hedland_polys'
@@ -170,5 +171,5 @@
 # skipped as results in file SU-AU_clipped is correct for all WA
 
-from pyvolution.data_manager import ferret2sww
+from anuga.pyvolution.data_manager import ferret2sww
 
 south = project.south 
Index: /production/pt_hedland_2006/run_timeseries.py
===================================================================
--- /production/pt_hedland_2006/run_timeseries.py	(revision 3513)
+++ /production/pt_hedland_2006/run_timeseries.py	(revision 3514)
@@ -1,5 +1,5 @@
 """ Script for generating figures, see sww2timeseries for documentation"""
 
-from pyvolution.util import sww2timeseries
+from anuga.pyvolution.util import sww2timeseries
 import project
 from os import sep
Index: /production/swan_river_tin_2005/generate_tin.py
===================================================================
--- /production/swan_river_tin_2005/generate_tin.py	(revision 3513)
+++ /production/swan_river_tin_2005/generate_tin.py	(revision 3514)
@@ -4,5 +4,5 @@
 """
 
-from pyvolution.data_manager import hecras_cross_sections2pts
+from anuga.pyvolution.data_manager import hecras_cross_sections2pts
 
 filename = 'cross_sections'
Index: /production/swan_river_tin_2005/populate_mesh.py
===================================================================
--- /production/swan_river_tin_2005/populate_mesh.py	(revision 3513)
+++ /production/swan_river_tin_2005/populate_mesh.py	(revision 3514)
@@ -2,7 +2,7 @@
 """
 
-from pyvolution.pmesh2domain import pmesh_to_domain_instance 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance 
 from caching import cache
-from pyvolution.shallow_water import Domain, Reflective_boundary
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary
 
 
Index: /production/swan_river_tin_2005/thin_generate_alpha.py
===================================================================
--- /production/swan_river_tin_2005/thin_generate_alpha.py	(revision 3513)
+++ /production/swan_river_tin_2005/thin_generate_alpha.py	(revision 3514)
@@ -3,5 +3,5 @@
 
 
-from pyvolution.load_mesh.loadASCII import reduce_pts
+from anuga.pyvolution.load_mesh.loadASCII import reduce_pts
 from pmesh.mesh import importMeshFromFile
 
Index: /production/sydney_2006/export_results.py
===================================================================
--- /production/sydney_2006/export_results.py	(revision 3513)
+++ /production/sydney_2006/export_results.py	(revision 3514)
@@ -1,6 +1,6 @@
 import project, os
 
-from pyvolution.data_manager import sww2dem
-from pyvolution.ermapper_grids import read_ermapper_grid
+from anuga.pyvolution.data_manager import sww2dem
+from anuga.pyvolution.ermapper_grids import read_ermapper_grid
 
 name = project.outputname
Index: /production/sydney_2006/get_timeseries.py
===================================================================
--- /production/sydney_2006/get_timeseries.py	(revision 3513)
+++ /production/sydney_2006/get_timeseries.py	(revision 3514)
@@ -4,5 +4,5 @@
 
 import project
-from pyvolution.util import file_function
+from anuga.pyvolution.util import file_function
 #from coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
 from pylab import *
Index: /production/sydney_2006/plot_integral.py
===================================================================
--- /production/sydney_2006/plot_integral.py	(revision 3513)
+++ /production/sydney_2006/plot_integral.py	(revision 3514)
@@ -6,5 +6,5 @@
 
 import project
-from pyvolution.util import file_function
+from anuga.pyvolution.util import file_function
 from pylab import *
 
Index: /production/sydney_2006/process_gauges.py
===================================================================
--- /production/sydney_2006/process_gauges.py	(revision 3513)
+++ /production/sydney_2006/process_gauges.py	(revision 3514)
@@ -4,6 +4,6 @@
 
 import project
-from pyvolution.util import file_function
-#from pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
+from anuga.pyvolution.util import file_function
+#from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
 from pylab import *
 
Index: /production/sydney_2006/project.py
===================================================================
--- /production/sydney_2006/project.py	(revision 3513)
+++ /production/sydney_2006/project.py	(revision 3514)
@@ -5,5 +5,5 @@
 from os import sep, environ
 from os.path import expanduser
-from utilities.polygon import read_polygon
+from anuga.utilities.polygon import read_polygon
 import sys
 
Index: /production/sydney_2006/run_sydney.py
===================================================================
--- /production/sydney_2006/run_sydney.py	(revision 3513)
+++ /production/sydney_2006/run_sydney.py	(revision 3514)
@@ -17,9 +17,9 @@
 
 
-from pyvolution.shallow_water import Domain, Reflective_boundary, File_boundary,\
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, File_boundary,\
      Dirichlet_boundary, Time_boundary, Transmissive_boundary
-from pyvolution.data_manager import convert_dem_from_ascii2netcdf,\
+from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf,\
      dem2pts
-from pyvolution.pmesh2domain import pmesh_to_domain_instance 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance 
 from caching import cache
 import project
Index: /production/sydney_2006/run_sydney_smf.py
===================================================================
--- /production/sydney_2006/run_sydney_smf.py	(revision 3513)
+++ /production/sydney_2006/run_sydney_smf.py	(revision 3514)
@@ -20,16 +20,16 @@
 
 # Related major packages
-from pyvolution.shallow_water import Domain, Reflective_boundary, Dirichlet_boundary
-from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
-#from pyvolution.data_manager_old import convert_dem_from_ascii2netcdf, dem2pts
-from pyvolution.combine_pts import combine_rectangular_points_files 
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
-from pyvolution.quantity import Quantity
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, Dirichlet_boundary
+from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
+#from anuga.pyvolution.data_manager_old import convert_dem_from_ascii2netcdf, dem2pts
+from anuga.pyvolution.combine_pts import combine_rectangular_points_files 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.pyvolution.quantity import Quantity
 from Numeric import allclose
-from utilities.polygon import inside_polygon
+from anuga.utilities.polygon import inside_polygon
 
 # Application specific imports
 import project                 # Definition of file names and polygons
-from pyvolution.smf import slump_tsunami  # Function for submarine mudslide 
+from anuga.pyvolution.smf import slump_tsunami  # Function for submarine mudslide 
 
 
Index: /production/sydney_2006/run_sydney_smf_polyingo.py
===================================================================
--- /production/sydney_2006/run_sydney_smf_polyingo.py	(revision 3513)
+++ /production/sydney_2006/run_sydney_smf_polyingo.py	(revision 3514)
@@ -20,11 +20,11 @@
 
 # Related major packages
-from pyvolution.shallow_water import Domain, Reflective_boundary, Time_boundary, Dirichlet_boundary
-from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
-from pyvolution.combine_pts import combine_rectangular_points_files 
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
-from pyvolution.quantity import Quantity
-from geospatial_data import *
-from utilities.polygon import inside_polygon
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, Time_boundary, Dirichlet_boundary
+from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
+from anuga.pyvolution.combine_pts import combine_rectangular_points_files 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.pyvolution.quantity import Quantity
+from anuga.geospatial_data.geospatial_data import *
+from anuga.utilities.polygon import inside_polygon
 from Numeric import allclose
 
@@ -211,5 +211,5 @@
                     verbose = True)
 
-from pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA 
+from anuga.pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA 
 
 #Add elevation data to the mesh
Index: /production/sydney_2006/run_timeseries.py
===================================================================
--- /production/sydney_2006/run_timeseries.py	(revision 3513)
+++ /production/sydney_2006/run_timeseries.py	(revision 3514)
@@ -1,4 +1,4 @@
 #from get_timeseries_test import sww2timeseries
-from pyvolution.util import sww2timeseries
+from anuga.pyvolution.util import sww2timeseries
 import project
 from os import sep
Index: /production/wollongong_2006/run_flagstaff.py
===================================================================
--- /production/wollongong_2006/run_flagstaff.py	(revision 3513)
+++ /production/wollongong_2006/run_flagstaff.py	(revision 3514)
@@ -24,9 +24,9 @@
 
 # Related major packages
-from pyvolution.shallow_water import Domain
-from pyvolution.shallow_water import Dirichlet_boundary
-from pyvolution.shallow_water import Time_boundary
-from pyvolution.shallow_water import Reflective_boundary
-from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
+from anuga.pyvolution.shallow_water import Domain
+from anuga.pyvolution.shallow_water import Dirichlet_boundary
+from anuga.pyvolution.shallow_water import Time_boundary
+from anuga.pyvolution.shallow_water import Reflective_boundary
+from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
 from pmesh.mesh_interface import create_mesh_from_regions
 from pmesh.mesh import importUngenerateFile, Segment
