Changeset 3514


Ignore:
Timestamp:
Aug 21, 2006, 4:10:14 PM (18 years ago)
Author:
duncan
Message:

Hi all,
I'm doing a change in the anuga structure, moving the code to

\anuga_core\source\anuga

After you have done an svn update, the PYTHONPATH has to be changed to;
PYTHONPATH = anuga_core/source/

This is part of changes required to make installation of anuga quicker and reducing the size of our sandpits.

If any imports are broken, try fixing them. With adding anuga. to them for example. If this seems to have really broken things, email/phone me.

Cheers
Duncan

Files:
1 deleted
231 edited

Legend:

Unmodified
Added
Removed

  • anuga_core/compile_all.py

    r3513 r3514  
    33buildroot = os.getcwd()
    44
    5 os.chdir('inundation')
     5os.chdir('source')
     6
     7os.chdir('anuga')
    68
    79#Complete horrible hack to decide which branch to take (Ole)

  • anuga_core/source/anuga/alpha_shape/alpha_shape.py

    r3027 r3514  
    179179
    180180        ## Build Delaunay triangulation
    181         import mesh_engine.triang as triang
     181        import anuga.mesh_engine.triang as triang
    182182        points = []
    183183        seglist = []

  • anuga_core/source/anuga/alpha_shape/test_alpha_shape.py

    r2281 r3514  
    77
    88try:
    9     from alpha_shape.alpha_shape import *
     9    from anuga.alpha_shape.alpha_shape import *
    1010except ImportError: 
    1111    from alpha_shape import *

  • anuga_core/source/anuga/caching/caching.py

    r3509 r3514  
    12651265    except MemoryError:
    12661266      msg = '****WARNING (caching.py): Could not pickle data for compression.'
    1267       msg += ' Try using compression = False.'
    1268       msg += ' Note that nothing has been cached but I will continue anyway.'
    1269       #raise MemoryError, msg
    1270       print msg             # As per ticket:40
     1267      msg += ' Try using compression = False'
     1268      raise MemoryError, msg
    12711269    else: 
    12721270      #Compressed pickling     

  • anuga_core/source/anuga/coordinate_transforms/geo_reference.py

    r3134 r3514  
    88import types, sys
    99from Numeric import array, Float, ArrayType, reshape, allclose
    10 from utilities.numerical_tools import ensure_numeric
    11 from utilities.anuga_exceptions import ANUGAError, TitleError, ParsingError, \
     10from anuga.utilities.numerical_tools import ensure_numeric
     11from anuga.utilities.anuga_exceptions import ANUGAError, TitleError, ParsingError, \
    1212     ShapeError
    1313

  • anuga_core/source/anuga/coordinate_transforms/redfearn.py

    r3312 r3514  
    22
    33"""
    4 from coordinate_transforms.geo_reference import Geo_reference, DEFAULT_ZONE
     4from anuga.coordinate_transforms.geo_reference import Geo_reference, DEFAULT_ZONE
    55from Numeric import array
    66

  • anuga_core/source/anuga/coordinate_transforms/test_redfearn.py

    r3292 r3514  
    1010
    1111from redfearn import *
    12 from utilities.anuga_exceptions import ANUGAError
     12from anuga.utilities.anuga_exceptions import ANUGAError
    1313
    1414#-------------------------------------------------------------

  • anuga_core/source/anuga/damage/inundation_damage.py

    r3452 r3514  
    2727   
    2828
    29 from utilities.numerical_tools import ensure_numeric
    30 from pyvolution.data_manager import Exposure_csv
    31 from pyvolution.util import file_function
    32 from geospatial_data.geospatial_data import ensure_absolute
    33 from utilities.numerical_tools import NAN
     29from anuga.utilities.numerical_tools import ensure_numeric
     30from anuga.pyvolution.data_manager import Exposure_csv
     31from anuga.pyvolution.util import file_function
     32from anuga.geospatial_data.geospatial_data import ensure_absolute
     33from anuga.utilities.numerical_tools import NAN
    3434from anuga_config import epsilon
    3535depth_epsilon = epsilon

  • anuga_core/source/anuga/damage/test_inundation_damage.py

    r3437 r3514  
    88import csv
    99
    10 #from damage.inundation_damage import _calc_collapse_structures
    11 from damage.inundation_damage import *
    12 from geospatial_data.geospatial_data import Geospatial_data
    13 from pmesh.mesh import Mesh
    14 from coordinate_transforms.geo_reference import Geo_reference
    15 from pyvolution.shallow_water import Domain, Transmissive_boundary
    16 from utilities.numerical_tools import mean
    17 from data_manager import get_dataobject
     10#from anuga.damage.inundation_damage import _calc_collapse_structures
     11from anuga.damage.inundation_damage import *
     12from anuga.geospatial_data.geospatial_data import Geospatial_data
     13from anuga.pmesh.mesh import Mesh
     14from anuga.coordinate_transforms.geo_reference import Geo_reference
     15from anuga.pyvolution.shallow_water import Domain, Transmissive_boundary
     16from anuga.utilities.numerical_tools import mean
     17from anuga.pyvolution.data_manager import get_dataobject
    1818
    1919from Numeric import zeros, Float, allclose

  • anuga_core/source/anuga/examples/beach.py

    r2932 r3514  
    1515#sys.path.append('..'+sep+'pyvolution')
    1616
    17 from pyvolution.shallow_water import Domain, Reflective_boundary,\
     17from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
    1818     Dirichlet_boundary,\
    1919     Transmissive_boundary, Time_boundary, Wind_stress
    2020
    21 from pyvolution.pmesh2domain import pmesh_to_domain_instance
    22 from utilities.polygon import read_polygon, Polygon_function
     21from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
     22from anuga.utilities.polygon import read_polygon, Polygon_function
    2323from math import pi
    2424from Numeric import choose, greater, ones, sin, exp

  • anuga_core/source/anuga/examples/bedslope.py

    r2772 r3514  
    88######################
    99# Module imports
    10 from pyvolution.mesh_factory import rectangular
    11 from pyvolution.shallow_water import Domain, Reflective_boundary,\
     10from anuga.pyvolution.mesh_factory import rectangular
     11from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
    1212     Dirichlet_boundary, Time_boundary, Transmissive_boundary
    1313

  • anuga_core/source/anuga/examples/bedslope_bsod_test.py

    r3012 r3514  
    1616# Module imports
    1717#
    18 from pmesh.mesh_interface import create_mesh_from_regions
    19 from pyvolution.pmesh2domain import pmesh_to_domain_instance
     18from anuga.pmesh.mesh_interface import create_mesh_from_regions
     19from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
    2020from caching import cache
    21 from pyvolution.shallow_water import Domain, Reflective_boundary,\
     21from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
    2222     Dirichlet_boundary, Time_boundary, Transmissive_boundary
    23 from geospatial_data import *
     23from anuga.geospatial_data.geospatial_data import *
    2424
    2525

  • anuga_core/source/anuga/examples/island.py

    r2731 r3514  
    1515
    1616# Application specific imports
    17 from pyvolution.mesh_factory import rectangular
    18 from pyvolution.shallow_water import Domain, Reflective_boundary, Dirichlet_boundary
    19 from pmesh.mesh_interface import create_mesh_from_regions
    20 from utilities.polygon import Polygon_function, read_polygon
     17from anuga.pyvolution.mesh_factory import rectangular
     18from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, Dirichlet_boundary
     19from anuga.pmesh.mesh_interface import create_mesh_from_regions
     20from anuga.utilities.polygon import Polygon_function, read_polygon
    2121
    22 from pyvolution.quantity import Quantity
     22from anuga.pyvolution.quantity import Quantity
    2323from Numeric import allclose
    2424

  • anuga_core/source/anuga/examples/island_timeseries.py

    r2884 r3514  
    33"""
    44
    5 from pyvolution.util import file_function
    6 from coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
     5from anuga.pyvolution.util import file_function
     6from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
    77from pylab import *
    88from matplotlib.ticker import MultipleLocator, FormatStrFormatter

  • anuga_core/source/anuga/examples/run_gippsland.py

    r2056 r3514  
    1 from pyvolution.data_manager import asc_csiro2sww
     1from anuga.pyvolution.data_manager import asc_csiro2sww
    22import time
    33

  • anuga_core/source/anuga/examples/run_tsh.py

    r2603 r3514  
    2727import time
    2828
    29 #from config import default_datadir
     29#from anuga.config import default_datadir
    3030
    3131######################

  • anuga_core/source/anuga/fit_interpolate/benchmark_least_squares.py

    r3437 r3514  
    2121from random import seed, random
    2222
    23 from pyvolution.least_squares import Interpolation
    24 from fit_interpolate.interpolate import Interpolate
    25 from fit_interpolate.fit import Fit
    26 from pmesh.mesh import Mesh
     23from anuga.pyvolution.least_squares import Interpolation
     24from anuga.fit_interpolate.interpolate import Interpolate
     25from anuga.fit_interpolate.fit import Fit
     26from anuga.pmesh.mesh import Mesh
    2727
    2828def mem_usage():

  • anuga_core/source/anuga/fit_interpolate/fit.py

    r3455 r3514  
    2828from Numeric import zeros, Float, ArrayType,take
    2929
    30 from geospatial_data.geospatial_data import Geospatial_data, ensure_absolute
    31 from fit_interpolate.general_fit_interpolate import FitInterpolate
    32 from utilities.sparse import Sparse, Sparse_CSR
    33 from utilities.polygon import in_and_outside_polygon
    34 from fit_interpolate.search_functions import search_tree_of_vertices
    35 from utilities.cg_solve import conjugate_gradient
    36 from utilities.numerical_tools import ensure_numeric, gradient
     30from anuga.geospatial_data.geospatial_data import Geospatial_data, ensure_absolute
     31from anuga.fit_interpolate.general_fit_interpolate import FitInterpolate
     32from anuga.utilities.sparse import Sparse, Sparse_CSR
     33from anuga.utilities.polygon import in_and_outside_polygon
     34from anuga.fit_interpolate.search_functions import search_tree_of_vertices
     35from anuga.utilities.cg_solve import conjugate_gradient
     36from anuga.utilities.numerical_tools import ensure_numeric, gradient
    3737
    3838import exceptions
    … …  
    358358
    359359        """
    360         #Note: Don't get the z info from Geospatial_data.attributes yet.
     360        #Note: Don't get the z info from anuga.geospatial_data.attributes yet.
    361361        # If we did fit would have to handle attribute title info.
    362362

  • anuga_core/source/anuga/fit_interpolate/general_fit_interpolate.py

    r3452 r3514  
    2424     ArrayType, allclose, take, NewAxis, arange
    2525
    26 from caching.caching import cache
    27 from pyvolution.neighbour_mesh import Mesh
    28 from utilities.sparse import Sparse, Sparse_CSR
    29 from utilities.cg_solve import conjugate_gradient, VectorShapeError
    30 from coordinate_transforms.geo_reference import Geo_reference
    31 from pyvolution.quad import build_quadtree
    32 from utilities.numerical_tools import ensure_numeric
    33 from utilities.polygon import in_and_outside_polygon
    34 from geospatial_data.geospatial_data import Geospatial_data, \
     26from anuga.caching.caching import cache
     27from anuga.pyvolution.neighbour_mesh import Mesh
     28from anuga.utilities.sparse import Sparse, Sparse_CSR
     29from anuga.utilities.cg_solve import conjugate_gradient, VectorShapeError
     30from anuga.coordinate_transforms.geo_reference import Geo_reference
     31from anuga.pyvolution.quad import build_quadtree
     32from anuga.utilities.numerical_tools import ensure_numeric
     33from anuga.utilities.polygon import in_and_outside_polygon
     34from anuga.geospatial_data.geospatial_data import Geospatial_data, \
    3535     ensure_absolute
    3636from search_functions import search_tree_of_vertices

  • anuga_core/source/anuga/fit_interpolate/interpolate.py

    r3456 r3514  
    2727     ArrayType, allclose, take, NewAxis, arange
    2828
    29 from caching.caching import cache
    30 from pyvolution.neighbour_mesh import Mesh
    31 from utilities.sparse import Sparse, Sparse_CSR
    32 from utilities.cg_solve import conjugate_gradient, VectorShapeError
    33 from coordinate_transforms.geo_reference import Geo_reference
    34 from pyvolution.quad import build_quadtree
    35 from utilities.numerical_tools import ensure_numeric, mean, NAN
    36 from utilities.polygon import in_and_outside_polygon
    37 from geospatial_data.geospatial_data import Geospatial_data, ensure_absolute
    38 from fit_interpolate.search_functions import search_tree_of_vertices
    39 from fit_interpolate.general_fit_interpolate import FitInterpolate
    40 from pyvolution.util import file_function
     29from anuga.caching.caching import cache
     30from anuga.pyvolution.neighbour_mesh import Mesh
     31from anuga.utilities.sparse import Sparse, Sparse_CSR
     32from anuga.utilities.cg_solve import conjugate_gradient, VectorShapeError
     33from anuga.coordinate_transforms.geo_reference import Geo_reference
     34from anuga.pyvolution.quad import build_quadtree
     35from anuga.utilities.numerical_tools import ensure_numeric, mean, NAN
     36from anuga.utilities.polygon import in_and_outside_polygon
     37from anuga.geospatial_data.geospatial_data import Geospatial_data, ensure_absolute
     38from anuga.fit_interpolate.search_functions import search_tree_of_vertices
     39from anuga.fit_interpolate.general_fit_interpolate import FitInterpolate
     40from anuga.pyvolution.util import file_function
    4141
    4242
    … …  
    406406
    407407
    408         #from util import mean, ensure_numeric
    409         from config import time_format
     408        #from anuga.pyvolution.util import mean, ensure_numeric
     409        from anuga.config import time_format
    410410        import types
    411411
    … …  
    549549        from math import pi, cos, sin, sqrt
    550550        from Numeric import zeros, Float
    551         from util import mean       
     551        from anuga.pyvolution.util import mean       
    552552
    553553        if self.spatial is True:

  • anuga_core/source/anuga/fit_interpolate/test_fit.py

    r3085 r3514  
    1010
    1111from fit import *
    12 from pyvolution.neighbour_mesh import Mesh
    13 from utilities.sparse import Sparse, Sparse_CSR
    14 from coordinate_transforms.geo_reference import Geo_reference
    15 from utilities.numerical_tools import ensure_numeric
    16 from geospatial_data.geospatial_data import Geospatial_data
     12from anuga.pyvolution.neighbour_mesh import Mesh
     13from anuga.utilities.sparse import Sparse, Sparse_CSR
     14from anuga.coordinate_transforms.geo_reference import Geo_reference
     15from anuga.utilities.numerical_tools import ensure_numeric
     16from anuga.geospatial_data.geospatial_data import Geospatial_data
    1717
    1818def distance(x, y):
    … …  
    455455        """
    456456       
    457         from coordinate_transforms.geo_reference import Geo_reference
     457        from anuga.coordinate_transforms.geo_reference import Geo_reference
    458458
    459459        #Mesh

  • anuga_core/source/anuga/fit_interpolate/test_interpolate.py

    r3456 r3514  
    1919# ANUGA code imports
    2020from interpolate import *
    21 from coordinate_transforms.geo_reference import Geo_reference
     21from anuga.coordinate_transforms.geo_reference import Geo_reference
    2222from shallow_water import Domain, Transmissive_boundary
    23 from utilities.numerical_tools import mean, NAN
    24 from data_manager import get_dataobject
    25 from geospatial_data.geospatial_data import Geospatial_data
    26 from pmesh.mesh import Mesh
     23from anuga.utilities.numerical_tools import mean, NAN
     24from anuga.pyvolution.data_manager import get_dataobject
     25from anuga.geospatial_data.geospatial_data import Geospatial_data
     26from anuga.pmesh.mesh import Mesh
    2727
    2828def distance(x, y):

  • anuga_core/source/anuga/geospatial_data/__init__.py

    r2309 r3514  
    22"""
    33
    4 from geospatial_data import *
     4from anuga.geospatial_data.geospatial_data import *
    55
    66

  • anuga_core/source/anuga/geospatial_data/geospatial_data.py

    r3451 r3514  
    88
    99
    10 from utilities.numerical_tools import ensure_numeric
    11 from coordinate_transforms.geo_reference import Geo_reference, TitleError
    12 from coordinate_transforms.redfearn import convert_lats_longs
     10from anuga.utilities.numerical_tools import ensure_numeric
     11from anuga.coordinate_transforms.geo_reference import Geo_reference, TitleError
     12from anuga.coordinate_transforms.redfearn import convert_lats_longs
    1313
    1414       
    … …  
    180180    def set_geo_reference(self, geo_reference):
    181181
    182         from coordinate_transforms.geo_reference import Geo_reference
     182        from anuga.coordinate_transforms.geo_reference import Geo_reference
    183183
    184184        if geo_reference is None:

  • anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

    r3351 r3514  
    88import tempfile
    99
    10 from geospatial_data import *
    11 from coordinate_transforms.geo_reference import Geo_reference, TitleError
    12 from coordinate_transforms.redfearn import degminsec2decimal_degrees
     10from anuga.geospatial_data.geospatial_data import *
     11from anuga.coordinate_transforms.geo_reference import Geo_reference, TitleError
     12from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
    1313
    1414
    … …  
    2424        """Basic points
    2525        """
    26         from coordinate_transforms.geo_reference import Geo_reference
     26        from anuga.coordinate_transforms.geo_reference import Geo_reference
    2727       
    2828        points = [[1.0, 2.1], [3.0, 5.3]]
    … …  
    4949
    5050    def test_2(self):
    51         from coordinate_transforms.geo_reference import Geo_reference
     51        from anuga.coordinate_transforms.geo_reference import Geo_reference
    5252        points = [[1.0, 2.1], [3.0, 5.3]]
    5353        attributes = [2, 4]
    … …  
    6161
    6262    def test_get_attributes_1(self):
    63         from coordinate_transforms.geo_reference import Geo_reference
     63        from anuga.coordinate_transforms.geo_reference import Geo_reference
    6464        points = [[1.0, 2.1], [3.0, 5.3]]
    6565        attributes = [2, 4]
    … …  
    8484        """
    8585       
    86         from coordinate_transforms.geo_reference import Geo_reference
     86        from anuga.coordinate_transforms.geo_reference import Geo_reference
    8787        points = [[1.0, 2.1], [3.0, 5.3]]
    8888        attributes = {'a0': [0, 0], 'a1': [2, 4], 'a2': [79.4, -7]}
    … …  
    162162        """
    163163       
    164         from coordinate_transforms.geo_reference import Geo_reference
     164        from anuga.coordinate_transforms.geo_reference import Geo_reference
    165165        points = [[1.0, 2.1], [3.0, 5.3]]
    166166        attributes = {'a0': [0, 0], 'a1': [2, 4], 'a2': [79.4, -7]}
    … …  
    196196        """
    197197
    198         from coordinate_transforms.geo_reference import Geo_reference
     198        from anuga.coordinate_transforms.geo_reference import Geo_reference
    199199       
    200200        points = [[1.0, 2.1], [3.0, 5.3]]

  • anuga_core/source/anuga/load_mesh/loadASCII.py

    r3133 r3514  
    8282from os.path import splitext
    8383
    84 from coordinate_transforms.geo_reference import Geo_reference,TITLE, TitleError
     84from anuga.coordinate_transforms.geo_reference import Geo_reference,TITLE, TitleError
    8585
    8686from Scientific.IO.NetCDF import NetCDFFile

  • anuga_core/source/anuga/load_mesh/test_loadASCII.py

    r2253 r3514  
    1313   
    1414from loadASCII import *
    15 from coordinate_transforms.geo_reference import Geo_reference
     15from anuga.coordinate_transforms.geo_reference import Geo_reference
    1616import loadASCII
    1717

  • anuga_core/source/anuga/mesh_engine/compile.py

    r2511 r3514  
    237237    """
    238238
    239     from config import use_extensions
     239    from anuga.config import use_extensions
    240240
    241241    from os.path import splitext

  • anuga_core/source/anuga/mesh_engine/test_triangmodule.py

    r3047 r3514  
    55
    66import unittest
    7 import mesh_engine.triang as triang
     7import anuga.mesh_engine.triang as triang
    88
    99

  • anuga_core/source/anuga/mesh_engine/test_triangmoduleII.py

    r3032 r3514  
    55
    66import unittest
    7 import mesh_engine.triang as triang
     7import anuga.mesh_engine.triang as triang
    88
    99"""

  • anuga_core/source/anuga/pmesh/graphical_mesh_generator.py

    r3499 r3514  
    1313import profile
    1414import load_mesh.loadASCII
    15 from alpha_shape.alpha_shape import AlphaError
     15from anuga.alpha_shape.alpha_shape import AlphaError
    1616
    1717# CONSTANTS
    … …  
    500500       
    501501       
    502         from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
     502        from anuga.coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
    503503        offset_x = 30
    504504        offset_y = 40

  • anuga_core/source/anuga/pmesh/mesh.py

    r3492 r3514  
    1616import sys
    1717import math
    18 import mesh_engine.triang as triang
     18import anuga.mesh_engine.triang as triang
    1919import re
    2020import os
    … …  
    2525
    2626import load_mesh
    27 from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
    28 from utilities.polygon import point_in_polygon
     27from anuga.coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
     28from anuga.utilities.polygon import point_in_polygon
    2929import load_mesh.loadASCII
    30 import alpha_shape.alpha_shape
    31 from geospatial_data.geospatial_data import Geospatial_data, ensure_geospatial
     30import anuga.alpha_shape.alpha_shape
     31from anuga.geospatial_data.geospatial_data import Geospatial_data, ensure_geospatial
    3232
    3333try: 
    … …  
    5050
    5151#FIXME: this is not tested.
    52 from utilities.numerical_tools import gradient
     52from anuga.utilities.numerical_tools import gradient
    5353
    5454
    … …  
    15641564        for vertex in self.getUserVertices():
    15651565            points.append((vertex.x,vertex.y))
    1566         self.shape = alpha_shape.alpha_shape.Alpha_Shape(points, alpha = alpha)
     1566        self.shape = anuga.alpha_shape.alpha_shape.Alpha_Shape(points, alpha = alpha)
    15671567
    15681568

  • anuga_core/source/anuga/pmesh/mesh_interface.py

    r3196 r3514  
    44#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    55
    6 from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
    7 from utilities.polygon import  point_in_polygon ,populate_polygon
    8 from utilities.numerical_tools import ensure_numeric
     6from anuga.coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
     7from anuga.utilities.polygon import  point_in_polygon ,populate_polygon
     8from anuga.utilities.numerical_tools import ensure_numeric
    99from Numeric import Float
    10 from utilities.polygon import inside_polygon
     10from anuga.utilities.polygon import inside_polygon
    1111
    1212# This is due to pmesh being a package and a module and
    1313# the current dir being unknown
    1414try:
    15     from pmesh.mesh import Mesh
     15    from anuga.pmesh.mesh import Mesh
    1616except ImportError: 
    1717    from mesh import Mesh

  • anuga_core/source/anuga/pmesh/scripts/create_gong.py

    r1074 r3514  
    55#problem, it's loading pyvolution mesh 1st!
    66from mesh import *
    7 from coordinate_transforms.geo_reference import Geo_reference
     7from anuga.coordinate_transforms.geo_reference import Geo_reference
    88
    99#-------------------------------------------------------------

  • anuga_core/source/anuga/pmesh/test_mesh.py

    r3440 r3514  
    55
    66#try:
    7 from pmesh.mesh import *
     7from anuga.pmesh.mesh import *
    88#except ImportError: 
    99#    from mesh import *
    1010   
    1111from load_mesh.loadASCII import *
    12 from coordinate_transforms.geo_reference import Geo_reference
    13 from geospatial_data.geospatial_data import Geospatial_data
    14 from utilities.polygon import  is_inside_polygon ### inside_polygon
     12from anuga.coordinate_transforms.geo_reference import Geo_reference
     13from anuga.geospatial_data.geospatial_data import Geospatial_data
     14from anuga.utilities.polygon import  is_inside_polygon ### inside_polygon
    1515
    1616class meshTestCase(unittest.TestCase):

  • anuga_core/source/anuga/pmesh/test_mesh_interface.py

    r3213 r3514  
    44import unittest
    55import os
    6 from pmesh.mesh import importMeshFromFile
     6from anuga.pmesh.mesh import importMeshFromFile
    77from mesh_interface import *
    88from load_mesh.loadASCII import *
    9 from utilities.polygon import is_inside_polygon
    10 from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
     9from anuga.utilities.polygon import is_inside_polygon
     10from anuga.coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
    1111
    1212class TestCase(unittest.TestCase):

  • anuga_core/source/anuga/pyvolution/_test_sww2domain.py

    r1133 r3514  
    6161##NOW TEST IT!!!
    6262
    63 from data_manager import sww2domain
     63from anuga.pyvolution.data_manager import sww2domain
    6464from Numeric import allclose
    6565

  • anuga_core/source/anuga/pyvolution/_test_sww2domain2.py

    r1133 r3514  
    5959##NOW TEST IT!!!
    6060
    61 from data_manager import sww2domain
     61from anuga.pyvolution.data_manager import sww2domain
    6262from Numeric import allclose
    6363

  • anuga_core/source/anuga/pyvolution/advection.py

    r3167 r3514  
    167167        import sys
    168168        from Numeric import zeros, Float
    169         from config import max_timestep
     169        from anuga.config import max_timestep
    170170
    171171        N = self.number_of_elements
    … …  
    255255        import sys
    256256        from Numeric import zeros, Float
    257         from config import max_timestep
     257        from anuga.config import max_timestep
    258258
    259259        import weave

  • anuga_core/source/anuga/pyvolution/bed_w_eden_boundary.py

    r773 r3514  
    3737#Write file
    3838import os, time
    39 from config import time_format
     39from anuga.config import time_format
    4040from math import sin, pi
    4141

  • anuga_core/source/anuga/pyvolution/bed_w_file_boundary.py

    r1673 r3514  
    3838#Write file
    3939import os, time
    40 from config import time_format
     40from anuga.config import time_format
    4141from math import sin, pi
    4242
    … …  
    5757
    5858#Convert ASCII file to NetCDF (Which is what we really like!)
    59 from data_manager import timefile2swww       
     59from anuga.pyvolution.data_manager import timefile2swww       
    6060timefile2swww(filename, quantity_names = domain.conserved_quantities)
    6161

  • anuga_core/source/anuga/pyvolution/check_sww_tsh.py

    r1379 r3514  
    55from os import sep, path
    66
    7 import data_manager
     7import anuga.pyvolution.data_manager
    88from load_mesh.loadASCII import import_mesh_file
    99from shallow_water import Domain

  • anuga_core/source/anuga/pyvolution/combine_pts.py

    r2252 r3514  
    55"""
    66
    7 from utilities.polygon import outside_polygon, inside_polygon
     7from anuga.utilities.polygon import outside_polygon, inside_polygon
    88from Numeric import take, concatenate
    99import time

  • anuga_core/source/anuga/pyvolution/cornell_room.py

    r2941 r3514  
    1616from math import sqrt
    1717#from least_squares import Interpolation
    18 from fit_interpolate.interpolate import Interpolate
     18from anuga.fit_interpolate.interpolate import Interpolate
    1919   
    2020

  • anuga_core/source/anuga/pyvolution/data_manager.py

    r3437 r3514  
    6565
    6666
    67 from coordinate_transforms.geo_reference import Geo_reference
    68 from geospatial_data.geospatial_data import Geospatial_data
     67from anuga.coordinate_transforms.geo_reference import Geo_reference
     68from anuga.geospatial_data.geospatial_data import Geospatial_data
    6969
    7070
    … …  
    163163
    164164    import os
    165     #from config import data_dir
     165    #from anuga.config import data_dir
    166166
    167167    FN = check_dir(datadir) + filename
    … …  
    184184
    185185    import os
    186     #from config import data_dir
     186    #from anuga.config import data_dir
    187187
    188188    dir = check_dir(datadir)
    … …  
    260260            #Create new file
    261261            fid.institution = 'Geoscience Australia'
    262             fid.description = 'Output from pyvolution suitable for plotting'
     262            fid.description = 'Output from anuga.pyvolution suitable for plotting'
    263263
    264264            if domain.smooth:
    … …  
    10571057
    10581058    import glob, os
    1059     from config import data_dir
     1059    from anuga.config import data_dir
    10601060
    10611061
    … …  
    12941294
    12951295    #Georeferencing
    1296     from coordinate_transforms.geo_reference import Geo_reference
     1296    from anuga.coordinate_transforms.geo_reference import Geo_reference
    12971297    if zone is None:
    12981298        assert xllcorner is None, 'xllcorner must be None'
    … …  
    18181818    from Numeric import array2string
    18191819
    1820     from utilities.polygon import inside_polygon, outside_polygon, separate_points_by_polygon
    1821     from util import apply_expression_to_dictionary
     1820    from anuga.utilities.polygon import inside_polygon, outside_polygon, separate_points_by_polygon
     1821    from anuga.pyvolution.util import apply_expression_to_dictionary
    18221822
    18231823    msg = 'Format must be either asc or ers'
    … …  
    19981998    #Interpolate
    19991999    #from least_squares import Interpolation
    2000     from fit_interpolate.interpolate import Interpolate
     2000    from anuga.fit_interpolate.interpolate import Interpolate
    20012001
    20022002
    … …  
    21832183    from Numeric import array2string
    21842184
    2185     from utilities.polygon import inside_polygon, outside_polygon, separate_points_by_polygon
    2186     from util import apply_expression_to_dictionary
    2187 
    2188     from geospatial_data import Geospatial_data
     2185    from anuga.utilities.polygon import inside_polygon, outside_polygon, separate_points_by_polygon
     2186    from anuga.pyvolution.util import apply_expression_to_dictionary
     2187
     2188    from anuga.geospatial_data.geospatial_data import Geospatial_data
    21892189
    21902190    if quantity is None:
    … …  
    22982298
    22992299    # Interpolate
    2300     from fit_interpolate.interpolate import Interpolate
     2300    from anuga.fit_interpolate.interpolate import Interpolate
    23012301    interp = Interpolate(vertex_points, volumes, verbose = verbose)
    23022302
    … …  
    28702870
    28712871    #Store
    2872     from coordinate_transforms.redfearn import redfearn
     2872    from anuga.coordinate_transforms.redfearn import redfearn
    28732873    x = zeros(number_of_points, Float)  #Easting
    28742874    y = zeros(number_of_points, Float)  #Northing
    … …  
    30203020    import time, calendar
    30213021    from Numeric import array
    3022     from config import time_format
    3023     from utilities.numerical_tools import ensure_numeric
     3022    from anuga.config import time_format
     3023    from anuga.utilities.numerical_tools import ensure_numeric
    30243024
    30253025
    … …  
    30563056    #Read times proper
    30573057    from Numeric import zeros, Float, alltrue
    3058     from config import time_format
     3058    from anuga.config import time_format
    30593059    import time, calendar
    30603060
    … …  
    35423542    from pmesh2domain import pmesh_to_domain_instance
    35433543    import time, os
    3544     from data_manager import get_dataobject
     3544    from anuga.pyvolution.data_manager import get_dataobject
    35453545    from os import sep, path
    3546     from utilities.numerical_tools import mean
     3546    from anuga.utilities.numerical_tools import mean
    35473547
    35483548    if verbose == True:print 'Creating domain from', filename
    … …  
    36053605    from Scientific.IO.NetCDF import NetCDFFile
    36063606
    3607     from coordinate_transforms.redfearn import redfearn
     3607    from anuga.coordinate_transforms.redfearn import redfearn
    36083608
    36093609    precision = Float # So if we want to change the precision its done here
    … …  
    37573757
    37583758    #Store
    3759     from coordinate_transforms.redfearn import redfearn
     3759    from anuga.coordinate_transforms.redfearn import redfearn
    37603760    x = zeros(number_of_points, Float)  #Easting
    37613761    y = zeros(number_of_points, Float)  #Northing

  • anuga_core/source/anuga/pyvolution/data_manager_obsolete_stuff.py

    r2344 r3514  
    221221    from Numeric import array, Float, concatenate, NewAxis, zeros,\
    222222         sometrue
    223     from utilities.polygon import inside_polygon
     223    from anuga.utilities.polygon import inside_polygon
    224224
    225225    #FIXME: Should be variable

  • anuga_core/source/anuga/pyvolution/domain.py

    r3447 r3514  
    88"""
    99
    10 from pyvolution.neighbour_mesh import Mesh
    11 from pyvolution.generic_boundary_conditions import Boundary
    12 from pyvolution.generic_boundary_conditions import File_boundary
    13 from pyvolution.generic_boundary_conditions import Dirichlet_boundary
    14 from pyvolution.generic_boundary_conditions import Time_boundary
    15 from pyvolution.generic_boundary_conditions import Transmissive_boundary
    16 from pyvolution.pmesh2domain import pmesh_to_domain
    17 from pyvolution.region import Set_region as region_set_region
     10from anuga.pyvolution.neighbour_mesh import Mesh
     11from anuga.pyvolution.generic_boundary_conditions import Boundary
     12from anuga.pyvolution.generic_boundary_conditions import File_boundary
     13from anuga.pyvolution.generic_boundary_conditions import Dirichlet_boundary
     14from anuga.pyvolution.generic_boundary_conditions import Time_boundary
     15from anuga.pyvolution.generic_boundary_conditions import Transmissive_boundary
     16from anuga.pyvolution.pmesh2domain import pmesh_to_domain
     17from anuga.pyvolution.region import Set_region as region_set_region
    1818
    1919import types
    … …  
    150150
    151151        #Defaults
    152         from config import max_smallsteps, beta_w, beta_h, epsilon, CFL
     152        from anuga.config import max_smallsteps, beta_w, beta_h, epsilon, CFL
    153153        self.beta_w = beta_w
    154154        self.beta_h = beta_h
    … …  
    182182
    183183        #Checkpointing and storage
    184         from config import default_datadir
     184        from anuga.config import default_datadir
    185185        self.datadir = default_datadir
    186186        self.filename = 'domain'
    … …  
    340340        """
    341341
    342         from util import apply_expression_to_dictionary
     342        from anuga.pyvolution.util import apply_expression_to_dictionary
    343343        return apply_expression_to_dictionary(expression, self.quantities)
    344344
    … …  
    653653        """
    654654
    655         from config import min_timestep, max_timestep, epsilon
     655        from anuga.config import min_timestep, max_timestep, epsilon
    656656
    657657        #FIXME: Maybe lump into a larger check prior to evolving
    … …  
    801801    def update_timestep(self, yieldstep, finaltime):
    802802
    803         from config import min_timestep, max_timestep
     803        from anuga.config import min_timestep, max_timestep
    804804
    805805        # self.timestep is calculated from speed of characteristics
    … …  
    933933
    934934#Optimisation with psyco
    935 from config import use_psyco
     935from anuga.config import use_psyco
    936936if use_psyco:
    937937    try:

  • anuga_core/source/anuga/pyvolution/flatbed.py

    r901 r3514  
    1313     Constant_height
    1414from Numeric import array
    15 from util import Polygon_function, read_polygon
     15from anuga.pyvolution.util import Polygon_function, read_polygon
    1616
    1717

  • anuga_core/source/anuga/pyvolution/general_mesh.py

    r3129 r3514  
    33from Numeric import array, zeros, Int, Float, sqrt, sum
    44
    5 from coordinate_transforms.geo_reference import Geo_reference
     5from anuga.coordinate_transforms.geo_reference import Geo_reference
    66
    77class General_mesh:
    … …  
    5050
    5151
    52         This is a cut down version of mesh from pyvolution mesh.py
     52        This is a cut down version of mesh from anuga.pyvolution mesh.py
    5353    """
    5454

  • anuga_core/source/anuga/pyvolution/generic_boundary_conditions.py

    r3095 r3514  
    130130        import time
    131131        from Numeric import array
    132         from config import time_format
    133         from util import File_function
     132        from anuga.config import time_format
     133        from anuga.pyvolution.util import File_function
    134134
    135135        Boundary.__init__(self)
    … …  
    180180        import time
    181181        from Numeric import array, zeros, Float
    182         from config import time_format
    183         from util import file_function
     182        from anuga.config import time_format
     183        from anuga.pyvolution.util import file_function
    184184
    185185        Boundary.__init__(self)

  • anuga_core/source/anuga/pyvolution/interpolate_sww.py

    r3260 r3514  
    2424
    2525from Numeric import transpose
    26 from fit_interpolate.interpolate import Interpolate
     26from anuga.fit_interpolate.interpolate import Interpolate
    2727
    2828DEFAULT_QUANTITY = "depth"

  • anuga_core/source/anuga/pyvolution/least_squares.py

    r3085 r3514  
    2525#from general_mesh import General_mesh
    2626from Numeric import zeros, array, Float, Int, transpose, concatenate, ArrayType, NewAxis
    27 from pyvolution.neighbour_mesh import Mesh
     27from anuga.pyvolution.neighbour_mesh import Mesh
    2828
    2929from Numeric import dot, zeros, take, compress, array, Float, Int, transpose, concatenate, ArrayType
    30 from utilities.sparse import Sparse, Sparse_CSR
    31 from utilities.cg_solve import conjugate_gradient, VectorShapeError
    32 from utilities.numerical_tools import ensure_numeric, mean, gradient
    33 
    34 
    35 from coordinate_transforms.geo_reference import Geo_reference
     30from anuga.utilities.sparse import Sparse, Sparse_CSR
     31from anuga.utilities.cg_solve import conjugate_gradient, VectorShapeError
     32from anuga.utilities.numerical_tools import ensure_numeric, mean, gradient
     33
     34
     35from anuga.coordinate_transforms.geo_reference import Geo_reference
    3636
    3737import time
    … …  
    194194    """
    195195    if use_cache is True:
    196         from caching.caching import cache
     196        from anuga.caching.caching import cache
    197197        interp = cache(_interpolation,
    198198                       (vertex_coordinates,
    … …  
    541541        #Maybe we need some sort of blocking
    542542
    543         from pyvolution.quad import build_quadtree
    544         from utilities.polygon import inside_polygon
     543        from anuga.pyvolution.quad import build_quadtree
     544        from anuga.utilities.polygon import inside_polygon
    545545       
    546546
    … …  
    10891089
    10901090
    1091         from config import time_format
     1091        from anuga.config import time_format
    10921092        import types
    10931093
    … …  
    12371237        from math import pi, cos, sin, sqrt
    12381238        from Numeric import zeros, Float
    1239         from utilities.numerical_tools import mean       
     1239        from anuga.utilities.numerical_tools import mean       
    12401240
    12411241        if self.spatial is True:

  • anuga_core/source/anuga/pyvolution/mesh_factory.py

    r1909 r3514  
    1818    """
    1919
    20     from config import epsilon
     20    from anuga.config import epsilon
    2121
    2222    deltax = float(len1)/m
    … …  
    7272    """
    7373
    74     from config import epsilon
     74    from anuga.config import epsilon
    7575    from Numeric import zeros, Float, Int
    7676
    … …  
    148148    """
    149149
    150     from config import epsilon
     150    from anuga.config import epsilon
    151151    from Numeric import zeros, Float, Int
    152152
    … …  
    211211    import math
    212212
    213     from config import epsilon
     213    from anuga.config import epsilon
    214214
    215215
    … …  
    334334    """
    335335
    336     from util import anglediff
     336    from anuga.pyvolution.util import anglediff
    337337    from math import pi
    338338    import os.path
    … …  
    449449
    450450    from math import pi
    451     from util import anglediff
     451    from anuga.pyvolution.util import anglediff
    452452
    453453
    … …  
    513513    import math
    514514
    515     from config import epsilon
     515    from anuga.config import epsilon
    516516
    517517
    … …  
    595595    import math
    596596
    597     from config import epsilon
     597    from anuga.config import epsilon
    598598
    599599
    … …  
    689689    import math
    690690
    691     from config import epsilon
     691    from anuga.config import epsilon
    692692
    693693

  • anuga_core/source/anuga/pyvolution/mesh_factory_all.py

    r1531 r3514  
    1818    """
    1919
    20     from config import epsilon
     20    from anuga.config import epsilon
    2121
    2222    #E = m*n*2        #Number of triangular elements
    … …  
    7676    """
    7777
    78     from config import epsilon
     78    from anuga.config import epsilon
    7979    from Numeric import zeros, Float, Int
    8080
    … …  
    145145    import math
    146146
    147     from config import epsilon
     147    from anuga.config import epsilon
    148148
    149149
    … …  
    215215    import math
    216216
    217     from config import epsilon
     217    from anuga.config import epsilon
    218218
    219219
    … …  
    351351    """
    352352
    353     from util import anglediff
     353    from anuga.pyvolution.util import anglediff
    354354    from math import pi
    355355    import os.path
    … …  
    466466
    467467    from math import pi
    468     from util import anglediff
     468    from anuga.pyvolution.util import anglediff
    469469
    470470

  • anuga_core/source/anuga/pyvolution/neighbour_mesh.py

    r3488 r3514  
    310310        """
    311311
    312         from config import default_boundary_tag
     312        from anuga.config import default_boundary_tag
    313313
    314314        if boundary is None:
    … …  
    440440       
    441441        from Numeric import allclose, sqrt, array, minimum, maximum
    442         from utilities.numerical_tools import angle, ensure_numeric       
     442        from anuga.utilities.numerical_tools import angle, ensure_numeric       
    443443
    444444
    … …  
    574574        """
    575575
    576         from config import epsilon
    577         from utilities.numerical_tools import anglediff
     576        from anuga.config import epsilon
     577        from anuga.utilities.numerical_tools import anglediff
    578578
    579579        N = self.number_of_elements
    … …  
    710710
    711711        from Numeric import arange
    712         from utilities.numerical_tools import histogram, create_bins
     712        from anuga.utilities.numerical_tools import histogram, create_bins
    713713
    714714        vertex_coordinates = self.vertex_coordinates # Relative coordinates

  • anuga_core/source/anuga/pyvolution/pressure_force.py

    r773 r3514  
    4848
    4949def cyclone(domain):
    50     from config import rho_w
    51     from util import gradient
     50    from anuga.config import rho_w
     51    from anuga.pyvolution.util import gradient
    5252
    5353    xmom = domain.quantities['xmomentum'].explicit_update

  • anuga_core/source/anuga/pyvolution/quantity.py

    r3085 r3514  
    2020    def __init__(self, domain, vertex_values=None):
    2121
    22         from pyvolution.neighbour_mesh import Mesh
     22        from anuga.pyvolution.neighbour_mesh import Mesh
    2323        from Numeric import array, zeros, Float
    2424
    … …  
    265265        """
    266266
    267         from geospatial_data.geospatial_data import Geospatial_data
     267        from anuga.geospatial_data.geospatial_data import Geospatial_data
    268268        from types import FloatType, IntType, LongType, ListType, NoneType
    269269        from Numeric import ArrayType
    … …  
    620620
    621621        from Numeric import Float
    622         from utilities.numerical_tools import ensure_numeric
    623         #from pyvolution.least_squares import fit_to_mesh
    624         from fit_interpolate.fit import fit_to_mesh
    625         from coordinate_transforms.geo_reference import Geo_reference
     622        from anuga.utilities.numerical_tools import ensure_numeric
     623        #from anuga.pyvolution.least_squares import fit_to_mesh
     624        from anuga.fit_interpolate.fit import fit_to_mesh
     625        from anuga.coordinate_transforms.geo_reference import Geo_reference
    626626
    627627
    … …  
    693693
    694694        from load_mesh.loadASCII import import_points_file
    695         from geospatial_data.geospatial_data import points_dictionary2geospatial_data
     695        from anuga.geospatial_data.geospatial_data import points_dictionary2geospatial_data
    696696
    697697        from types import StringType
    … …  
    13221322
    13231323
    1324 from utilities import compile
     1324from anuga.utilities import compile
    13251325if compile.can_use_C_extension('quantity_ext.c'):
    13261326    #Replace python version with c implementations

  • anuga_core/source/anuga/pyvolution/realtime_visualisation.py

    r1295 r3514  
    6666        from Numeric import zeros, Float
    6767
    68         from config import minimum_allowed_height as hmin
     68        from anuga.config import minimum_allowed_height as hmin
    6969        if floor_heights is None:
    7070            floor_heights = zeros(heights.shape, Float)
    … …  
    200200
    201201    #print scene.forward
    202     #FIXME: Use smoother from pyvolution instead
     202    #FIXME: Use smoother from anuga.pyvolution instead
    203203    if domain.smooth:
    204204        #Get all average point values

  • anuga_core/source/anuga/pyvolution/shallow_water.py

    r3505 r3514  
    6262from generic_boundary_conditions import Transmissive_boundary
    6363
    64 from utilities.numerical_tools import gradient, mean
     64from anuga.utilities.numerical_tools import gradient, mean
    6565
    6666
    … …  
    105105
    106106
    107         from config import minimum_allowed_height, maximum_allowed_speed, g
     107        from anuga.config import minimum_allowed_height, maximum_allowed_speed, g
    108108        self.minimum_allowed_height = minimum_allowed_height
    109109        self.maximum_allowed_speed = maximum_allowed_speed
    … …  
    324324        """
    325325
    326         import data_manager
     326        from anuga.pyvolution.data_manager import get_dataobject
    327327
    328328        #Initialise writer
    329         self.writer = data_manager.get_dataobject(self, mode = 'w')
     329        self.writer = get_dataobject(self, mode = 'w')
    330330
    331331        #Store vertices and connectivity
    … …  
    407407    """
    408408
    409     from config import g, epsilon
     409    from anuga.config import g, epsilon
    410410    from math import sqrt
    411411    from Numeric import array
    … …  
    656656    """
    657657
    658     from config import optimised_gradient_limiter
     658    from anuga.config import optimised_gradient_limiter
    659659
    660660    #Remove very thin layers of water
    … …  
    10591059        q = self.domain.get_conserved_quantities(vol_id, edge = edge_id)
    10601060        value = self.function(self.domain.time)
    1061 
    1062    
    1063         try:
    1064             # In case function returns a list of values
    1065             val = value[0]
    1066         except TypeError:
    1067             val = value
    1068 
    1069         # Assign value to first component of q (stage)
    1070         try:
    1071             q[0] = float(val)
    1072         except:
    1073             msg = 'Supplied value could not be converted to float: val=', val     
    1074             raise Exception, msg   
    1075            
    1076            
    1077            
    1078        
     1061        q[0] = value[0]
    10791062        return q
    10801063
    … …  
    14181401        """
    14191402
    1420         from config import rho_a, rho_w, eta_w
     1403        from anuga.config import rho_a, rho_w, eta_w
    14211404        from Numeric import array, Float
    14221405
    … …  
    18681851
    18691852
    1870 from utilities import compile
     1853from anuga.utilities import compile
    18711854if compile.can_use_C_extension('shallow_water_ext.c'):
    18721855    #Replace python version with c implementations
    … …  
    18871870
    18881871#Optimisation with psyco
    1889 from config import use_psyco
     1872from anuga.config import use_psyco
    18901873if use_psyco:
    18911874    try:

  • anuga_core/source/anuga/pyvolution/shallow_water_kinetic.py

    r2259 r3514  
    7373                                tagged_elements, geo_reference, use_inscribed_circle)
    7474
    75         from config import minimum_allowed_height, g
     75        from anuga.config import minimum_allowed_height, g
    7676        self.minimum_allowed_height = minimum_allowed_height
    7777        self.g = g
    … …  
    9494
    9595        #Reduction operation for get_vertex_values
    96         from util import mean
     96        from anuga.pyvolution.util import mean
    9797        self.reduction = mean
    9898        #self.reduction = min  #Looks better near steep slopes
    … …  
    245245        """
    246246
    247         import data_manager
     247        import anuga.pyvolution.data_manager
    248248
    249249        #Initialise writer
    … …  
    328328    """
    329329
    330     from config import g, epsilon
     330    from anuga.config import g, epsilon
    331331    from math import sqrt
    332332    from Numeric import array
    … …  
    425425    """
    426426
    427     from config import g, epsilon
     427    from anuga.config import g, epsilon
    428428    from math import sqrt
    429429    from Numeric import array
    … …  
    684684    """
    685685
    686     from config import optimised_gradient_limiter
     686    from anuga.config import optimised_gradient_limiter
    687687
    688688    #Remove very thin layers of water
    … …  
    11691169    """
    11701170
    1171     from util import gradient
     1171    from anuga.pyvolution.util import gradient
    11721172    from Numeric import zeros, Float, array, sum
    11731173
    … …  
    13991399        """
    14001400
    1401         from config import rho_a, rho_w, eta_w
     1401        from anuga.config import rho_a, rho_w, eta_w
    14021402        from Numeric import array, Float
    14031403
    … …  
    17721772
    17731773
    1774 from utilities import compile
     1774from anuga.utilities import compile
    17751775if compile.can_use_C_extension('shallow_water_kinetic_ext.c'):
    17761776    #Replace python version with c implementations
    … …  
    17911791
    17921792#Optimisation with psyco
    1793 from config import use_psyco
     1793from anuga.config import use_psyco
    17941794if use_psyco:
    17951795    try:

  • anuga_core/source/anuga/pyvolution/test_advection.py

    r1753 r3514  
    66from math import sqrt, pi
    77
    8 from config import g, epsilon
     8from anuga.config import g, epsilon
    99from Numeric import allclose, array, zeros, ones, Float
    1010from advection import *

  • anuga_core/source/anuga/pyvolution/test_combine_pts.py

    r2924 r3514  
    1010from Numeric import allclose, array, transpose
    1111
    12 from coordinate_transforms.geo_reference import Geo_reference
     12from anuga.coordinate_transforms.geo_reference import Geo_reference
    1313from combine_pts import *
    1414from load_mesh.loadASCII import import_points_file
    15 #from geospatial_data.geospatial_data import import_points_file
     15#from anuga.geospatial_data.geospatial_data import import_points_file
    1616
    1717class Test_combine_pts(unittest.TestCase):

  • anuga_core/source/anuga/pyvolution/test_data_manager.py

    r3398 r3514  
    55import copy
    66from Numeric import zeros, array, allclose, Float
    7 from utilities.numerical_tools import mean
     7from anuga.utilities.numerical_tools import mean
    88import tempfile
    99import os
    1010from Scientific.IO.NetCDF import NetCDFFile
    1111
    12 from pyvolution.data_manager import *
    13 from pyvolution.shallow_water import *
    14 from config import epsilon
    15 import pyvolution.data_manager
    16 
    17 from coordinate_transforms.geo_reference import Geo_reference
     12from anuga.pyvolution.data_manager import *
     13from anuga.pyvolution.shallow_water import *
     14from anuga.config import epsilon
     15
     16# This is needed to run the tests of local functions
     17import anuga.pyvolution.data_manager
     18
     19from anuga.coordinate_transforms.geo_reference import Geo_reference
    1820
    1921class Test_Data_Manager(unittest.TestCase):
    … …  
    20552057        from Numeric import array, zeros, allclose, Float, concatenate, NewAxis
    20562058        from Scientific.IO.NetCDF import NetCDFFile
    2057         from geospatial_data import Geospatial_data
     2059        from anuga.geospatial_data.geospatial_data import Geospatial_data
    20582060
    20592061        # Used for points that lie outside mesh
    … …  
    21532155
    21542156        #Read
    2155         from coordinate_transforms.redfearn import redfearn
     2157        from anuga.coordinate_transforms.redfearn import redfearn
    21562158        #fid = NetCDFFile(self.test_MOST_file)
    21572159        fid = NetCDFFile(self.test_MOST_file + '_ha.nc')
    … …  
    22162218
    22172219
    2218         from coordinate_transforms.redfearn import redfearn
     2220        from anuga.coordinate_transforms.redfearn import redfearn
    22192221
    22202222        #fid = NetCDFFile('small_ha.nc')
    … …  
    22842286        # Fourth value (index==3) is -6.50198 cm
    22852287
    2286         from coordinate_transforms.redfearn import redfearn
     2288        from anuga.coordinate_transforms.redfearn import redfearn
    22872289        import os
    22882290        fid1 = NetCDFFile('test_ha.nc','w')
    … …  
    24442446        # Fourth value (index==3) is -6.50198 cm
    24452447
    2446         from coordinate_transforms.redfearn import redfearn
     2448        from anuga.coordinate_transforms.redfearn import redfearn
    24472449        import os
    24482450        fid1 = NetCDFFile('test_ha.nc','w')
    … …  
    25912593    def test_ferret2sww_nz_origin(self):
    25922594        from Scientific.IO.NetCDF import NetCDFFile
    2593         from coordinate_transforms.redfearn import redfearn
     2595        from anuga.coordinate_transforms.redfearn import redfearn
    25942596
    25952597        #Call conversion (with nonzero origin)
    … …  
    27142716        #Import the example's file as a new domain
    27152717        ##########################################
    2716         from data_manager import sww2domain
     2718        from anuga.pyvolution.data_manager import sww2domain
    27172719        from Numeric import allclose
    27182720        import os
    … …  
    28582860        #Import the file as a new domain
    28592861        ##################################
    2860         from data_manager import sww2domain
     2862        from anuga.pyvolution.data_manager import sww2domain
    28612863        from Numeric import allclose
    28622864        import os
    … …  
    28962898
    28972899    #def test_weed(self):
    2898         from data_manager import weed
     2900        from anuga.pyvolution.data_manager import weed
    28992901
    29002902        coordinates1 = [[0.,0.],[1.,0.],[1.,1.],[1.,0.],[2.,0.],[1.,1.]]
    … …  
    29692971        #Import the example's file as a new domain
    29702972        ##########################################
    2971         from data_manager import sww2domain
     2973        from anuga.pyvolution.data_manager import sww2domain
    29722974        from Numeric import allclose
    29732975        import os
    … …  
    32703272        from Scientific.IO.NetCDF import NetCDFFile
    32713273
    3272         import data_manager
     3274        from anuga.pyvolution.data_manager import _read_asc
    32733275        #Write test asc file
    32743276        filename = tempfile.mktemp(".000")
    … …  
    32863288""")
    32873289        fid.close()
    3288         bath_metadata, grid = \
    3289                    data_manager._read_asc(filename, verbose=False)
     3290        bath_metadata, grid = _read_asc(filename, verbose=False)
    32903291        self.failUnless(bath_metadata['xllcorner']  == 2000.5,  'Failed')
    32913292        self.failUnless(bath_metadata['yllcorner']  == 3000.5,  'Failed')
    … …  
    39863987        # k - lat
    39873988        # l - lon
    3988         kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
     3989        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
    39893990            latitudes,longitudes,
    39903991            -10,4,-10,31)
    … …  
    40014002
    40024003        ## 2nd test
    4003         kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
     4004        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
    40044005            latitudes,longitudes,
    40054006            0.5,2.5,5,25)
    … …  
    40164017
    40174018        ## 3rd test
    4018         kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(\
     4019        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(\
    40194020            latitudes,
    40204021            longitudes,
    … …  
    40334034
    40344035        ## 4th test
    4035         kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
     4036        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
    40364037            latitudes,longitudes,
    40374038                                                      -0.1,1.9,-2,17)
    … …  
    40474048                         'failed')
    40484049        ## 5th test
    4049         kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
     4050        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
    40504051            latitudes,longitudes,
    40514052            0.1,1.9,2,17)
    … …  
    40634064        ## 6th test
    40644065
    4065         kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
     4066        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
    40664067            latitudes,longitudes,
    40674068            1.5,4,18,32)
    … …  
    40804081        ## 7th test
    40814082        m2d = array([[0,1,2,3],[4,5,6,7],[8,9,10,11],[12,13,14,15]])
    4082         kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
     4083        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
    40834084            latitudes,longitudes,
    40844085            1.5,1.5,15,15)
    … …  
    41074108        # k - lat
    41084109        # l - lon
    4109         kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
     4110        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
    41104111            latitudes,longitudes,
    41114112            -37,-27,147,149.5)
    … …  
    41364137        # k - lat
    41374138        # l - lon
    4138         kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
     4139        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
    41394140            latitudes,longitudes,
    41404141            -43,-37,148.5,149.5)
    … …  
    41604161        # k - lat
    41614162        # l - lon
    4162         kmin, kmax, lmin, lmax = pyvolution.data_manager._get_min_max_indexes(
     4163        kmin, kmax, lmin, lmax = anuga.pyvolution.data_manager._get_min_max_indexes(
    41634164            latitudes,longitudes)
    41644165

  • anuga_core/source/anuga/pyvolution/test_domain.py

    r3447 r3514  
    55
    66from domain import *
    7 from config import epsilon
     7from anuga.config import epsilon
    88from Numeric import allclose, array, ones, Float
    99
    … …  
    254254    def test_boundary_indices(self):
    255255
    256         from config import default_boundary_tag
     256        from anuga.config import default_boundary_tag
    257257
    258258

  • anuga_core/source/anuga/pyvolution/test_general_mesh.py

    r2528 r3514  
    99
    1010from quantity import *
    11 from config import epsilon
     11from anuga.config import epsilon
    1212from Numeric import allclose, array, ones, Float
    1313

  • anuga_core/source/anuga/pyvolution/test_generic_boundary_conditions.py

    r2154 r3514  
    55
    66from generic_boundary_conditions import *
    7 from config import epsilon
     7from anuga.config import epsilon
    88from Numeric import allclose, array
    99
    … …  
    8888        T = Transmissive_boundary(domain)
    8989
    90         from config import default_boundary_tag
     90        from anuga.config import default_boundary_tag
    9191        domain.set_boundary( {default_boundary_tag: T} )
    9292
    … …  
    110110        import time, os
    111111        from math import sin, pi
    112         from config import time_format
     112        from anuga.config import time_format
    113113
    114114        a = [0.0, 0.0]
    … …  
    152152        #Convert ASCII file to NetCDF (Which is what we really like!)
    153153       
    154         from data_manager import timefile2netcdf               
     154        from anuga.pyvolution.data_manager import timefile2netcdf               
    155155        timefile2netcdf(filename, quantity_names = ['stage', 'ymomentum'])
    156156       
    … …  
    180180
    181181        #Check time interpolation
    182         from config import default_boundary_tag
     182        from anuga.config import default_boundary_tag
    183183        domain.set_boundary( {default_boundary_tag: F} )
    184184
    … …  
    203203        import time, os
    204204        from math import sin, pi
    205         from config import time_format
     205        from anuga.config import time_format
    206206
    207207        a = [0.0, 0.0]
    … …  
    246246
    247247        #Convert ASCII file to NetCDF (Which is what we really like!)
    248         from data_manager import timefile2netcdf               
     248        from anuga.pyvolution.data_manager import timefile2netcdf               
    249249        timefile2netcdf(filename, quantity_names = ['stage', 'xmomentum'])
    250250

  • anuga_core/source/anuga/pyvolution/test_ghost.py

    r2813 r3514  
    55
    66from domain import *
    7 from config import epsilon
     7from anuga.config import epsilon
    88from Numeric import allclose, array, ones, Float
    99

  • anuga_core/source/anuga/pyvolution/test_interpolate_sww.py

    r3298 r3514  
    88import unittest
    99from Numeric import zeros, array, allclose, Float
    10 from utilities.numerical_tools import mean
     10from anuga.utilities.numerical_tools import mean
    1111
    1212from interpolate_sww import *
    13 from pyvolution.shallow_water import Domain, Transmissive_boundary
    14 from pyvolution.data_manager import get_dataobject
     13from anuga.pyvolution.shallow_water import Domain, Transmissive_boundary
     14from anuga.pyvolution.data_manager import get_dataobject
    1515
    1616

  • anuga_core/source/anuga/pyvolution/test_least_squares.py

    r3085 r3514  
    77
    88
    9 from pyvolution.least_squares import *
    10 from pyvolution.neighbour_mesh import Mesh
     9from anuga.pyvolution.least_squares import *
     10from anuga.pyvolution.neighbour_mesh import Mesh
    1111
    1212from Numeric import allclose, array, transpose
    1313
    14 from coordinate_transforms.geo_reference import Geo_reference
     14from anuga.coordinate_transforms.geo_reference import Geo_reference
    1515
    1616def distance(x, y):
    … …  
    10831083        #Check basic interpolation of one quantity using averaging
    10841084        #(no interpolation points or spatial info)
    1085         from utilities.numerical_tools import mean       
     1085        from anuga.utilities.numerical_tools import mean       
    10861086        I = Interpolation_function(time, [mean(Q[0,:]),
    10871087                                          mean(Q[1,:]),
    … …  
    14101410        """
    14111411       
    1412         from coordinate_transforms.geo_reference import Geo_reference
     1412        from anuga.coordinate_transforms.geo_reference import Geo_reference
    14131413
    14141414        #Mesh

  • anuga_core/source/anuga/pyvolution/test_neighbour_mesh.py

    r3086 r3514  
    1212from neighbour_mesh import *
    1313from mesh_factory import rectangular
    14 from config import epsilon
     14from anuga.config import epsilon
    1515from Numeric import allclose, array
    1616
    17 from coordinate_transforms.geo_reference import Geo_reference
    18 from utilities.polygon import is_inside_polygon
     17from anuga.coordinate_transforms.geo_reference import Geo_reference
     18from anuga.utilities.polygon import is_inside_polygon
    1919
    2020def distance(x, y):
    … …  
    567567        mesh.check_integrity()
    568568
    569         from config import default_boundary_tag
     569        from anuga.config import default_boundary_tag
    570570        assert mesh.boundary[ (3, 1) ] == default_boundary_tag
    571571
    … …  
    600600        mesh.check_integrity()
    601601
    602         from config import default_boundary_tag
     602        from anuga.config import default_boundary_tag
    603603        assert mesh.boundary[ (0, 0) ] == default_boundary_tag
    604604        assert mesh.boundary[ (0, 2) ] == default_boundary_tag

  • anuga_core/source/anuga/pyvolution/test_pmesh2domain.py

    r2533 r3514  
    1313     Transmissive_boundary
    1414
    15 from coordinate_transforms.geo_reference import Geo_reference
     15from anuga.coordinate_transforms.geo_reference import Geo_reference
    1616
    1717#This is making pyvolution dependent on pmesh.
    1818# not good.  this should be in a seperate package.(directory)
    19 from pmesh.mesh import importMeshFromFile
     19from anuga.pmesh.mesh import importMeshFromFile
    2020
    2121class Test_pmesh2domain(unittest.TestCase):

  • anuga_core/source/anuga/pyvolution/test_quantity.py

    r2924 r3514  
    66
    77from quantity import *
    8 from config import epsilon
     8from anuga.config import epsilon
    99from Numeric import allclose, array, ones, Float
    1010
    11 from fit_interpolate.fit import fit_to_mesh
    12 #from pyvolution.least_squares import fit_to_mesh               
     11from anuga.fit_interpolate.fit import fit_to_mesh
     12#from anuga.pyvolution.least_squares import fit_to_mesh         
    1313from domain import Domain
    14 from geospatial_data.geospatial_data import Geospatial_data
    15 from coordinate_transforms.geo_reference import Geo_reference
     14from anuga.geospatial_data.geospatial_data import Geospatial_data
     15from anuga.coordinate_transforms.geo_reference import Geo_reference
    1616
    1717#Aux for fit_interpolate.fit example
    … …  
    10611061        from shallow_water import Domain, Transmissive_boundary
    10621062        from Numeric import zeros, Float
    1063         from utilities.numerical_tools import mean
     1063        from anuga.utilities.numerical_tools import mean
    10641064
    10651065        #Create basic mesh
    … …  
    11511151        from shallow_water import Domain, Transmissive_boundary
    11521152        from Numeric import zeros, Float
    1153         from utilities.numerical_tools import mean
     1153        from anuga.utilities.numerical_tools import mean
    11541154
    11551155

  • anuga_core/source/anuga/pyvolution/test_region.py

    r1130 r3514  
    66from domain import *
    77from region import *
    8 #from config import epsilon
     8#from anuga.config import epsilon
    99from Numeric import allclose #, array, ones, Float
    1010

  • anuga_core/source/anuga/pyvolution/test_shallow_water.py

    r2812 r3514  
    44from math import sqrt, pi
    55
    6 from config import g, epsilon
     6from anuga.config import g, epsilon
    77from Numeric import allclose, array, zeros, ones, Float, take
    8 from utilities.numerical_tools import mean
     8from anuga.utilities.numerical_tools import mean
    99
    1010from shallow_water import *
    … …  
    703703        """
    704704
    705         from config import g
     705        from anuga.config import g
    706706        import copy
    707707
    … …  
    751751        #Assuming no friction
    752752
    753         from config import g
     753        from anuga.config import g
    754754
    755755        a = [0.0, 0.0]
    … …  
    789789
    790790    def test_manning_friction(self):
    791         from config import g
     791        from anuga.config import g
    792792
    793793        a = [0.0, 0.0]
    … …  
    858858
    859859    def test_constant_wind_stress(self):
    860         from config import rho_a, rho_w, eta_w
     860        from anuga.config import rho_a, rho_w, eta_w
    861861        from math import pi, cos, sin, sqrt
    862862
    … …  
    910910
    911911    def test_variable_wind_stress(self):
    912         from config import rho_a, rho_w, eta_w
     912        from anuga.config import rho_a, rho_w, eta_w
    913913        from math import pi, cos, sin, sqrt
    914914
    … …  
    979979
    980980    def test_windfield_from_file(self):
    981         from config import rho_a, rho_w, eta_w
     981        from anuga.config import rho_a, rho_w, eta_w
    982982        from math import pi, cos, sin, sqrt
    983         from config import time_format
    984         from util import file_function
     983        from anuga.config import time_format
     984        from anuga.pyvolution.util import file_function
    985985        import time
    986986
    … …  
    10291029
    10301030        #Convert ASCII file to NetCDF (Which is what we really like!)
    1031         from data_manager import timefile2netcdf       
     1031        from anuga.pyvolution.data_manager import timefile2netcdf       
    10321032        timefile2netcdf(filename)
    10331033        os.remove(filename + '.txt')
    … …  
    10951095        """
    10961096
    1097         from config import rho_a, rho_w, eta_w
     1097        from anuga.config import rho_a, rho_w, eta_w
    10981098        from math import pi, cos, sin, sqrt
    10991099
    … …  
    11951195        #Check that first order limiter follows bed_slope
    11961196        from Numeric import alltrue, greater_equal
    1197         from config import epsilon
     1197        from anuga.config import epsilon
    11981198
    11991199        a = [0.0, 0.0]
    … …  
    22382238
    22392239    def test_flatbed_second_order_distribute(self):
    2240         #Use real data from pyvolution 2
     2240        #Use real data from anuga.pyvolution 2
    22412241        #painfully setup and extracted.
    22422242        from mesh_factory import rectangular

  • anuga_core/source/anuga/pyvolution/test_util.py

    r3452 r3514  
    77import tempfile
    88
    9 from util import *
    10 from config import epsilon
    11 from data_manager import timefile2netcdf
    12 
    13 from utilities.numerical_tools import NAN
     9from anuga.pyvolution.util import *
     10from anuga.config import epsilon
     11from anuga.pyvolution.data_manager import timefile2netcdf
     12
     13from anuga.utilities.numerical_tools import NAN
    1414
    1515def test_function(x, y):
    … …  
    2828    #Geometric
    2929    #def test_distance(self):
    30     #    from util import distance#
     30    #    from anuga.pyvolution.util import distance#
    3131    #
    3232    #    self.failUnless( distance([4,2],[7,6]) == 5.0,
    … …  
    4848        #Write file
    4949        import os, time
    50         from config import time_format
     50        from anuga.config import time_format
    5151        from math import sin, pi
    5252
    … …  
    121121        domain1 = Domain(points, vertices, boundary)
    122122
    123         from utilities.numerical_tools import mean
     123        from anuga.utilities.numerical_tools import mean
    124124        domain1.reduction = mean
    125125        domain1.smooth = True #NOTE: Mimic sww output where each vertex has
    … …  
    319319
    320320
    321         from coordinate_transforms.geo_reference import Geo_reference
     321        from anuga.coordinate_transforms.geo_reference import Geo_reference
    322322        xllcorner = 2048
    323323        yllcorner = 11000
    … …  
    331331       
    332332
    333         from utilities.numerical_tools import mean     
     333        from anuga.utilities.numerical_tools import mean       
    334334        domain1.reduction = mean
    335335        domain1.smooth = True #NOTE: Mimic sww output where each vertex has
    … …  
    531531
    532532        import os, time
    533         from config import time_format
     533        from anuga.config import time_format
    534534        from Numeric import sin, pi, exp
    535535        from mesh_factory import rectangular
    536536        from shallow_water import Domain
    537         import data_manager
     537        import anuga.pyvolution.data_manager
    538538
    539539        finaltime = 1200
    … …  
    691691
    692692        import os, time
    693         from config import time_format
     693        from anuga.config import time_format
    694694        from Numeric import sin, pi, exp
    695695        from mesh_factory import rectangular
    696696        from shallow_water import Domain
    697         import data_manager
    698         from pmesh.mesh_interface import create_mesh_from_regions
     697        import anuga.pyvolution.data_manager
     698        from anuga.pmesh.mesh_interface import create_mesh_from_regions
    699699        finaltime = 1200
    700700       
    … …  
    909909        #Write file
    910910        import os, time, calendar
    911         from config import time_format
     911        from anuga.config import time_format
    912912        from math import sin, pi
    913913        from domain import Domain
    … …  
    10011001        #Write file
    10021002        import os, time, calendar
    1003         from config import time_format
     1003        from anuga.config import time_format
    10041004        from math import sin, pi
    10051005        from domain import Domain

  • anuga_core/source/anuga/pyvolution/tsh2sww.py

    r2572 r3514  
    1313from pmesh2domain import pmesh_to_domain_instance
    1414import time, os
    15 from data_manager import get_dataobject   
    16 from utilities.numerical_tools import mean
     15from anuga.pyvolution.data_manager import get_dataobject   
     16from anuga.utilities.numerical_tools import mean
    1717
    1818def tsh2sww(infilename, sww_file_name = None, verbose = False):

  • anuga_core/source/anuga/pyvolution/twolevels.py

    r1014 r3514  
    1313     Constant_height
    1414from Numeric import array
    15 from util import Polygon_function, read_polygon
     15from anuga.pyvolution.util import Polygon_function, read_polygon
    1616
    1717

  • anuga_core/source/anuga/pyvolution/util.py

    r3299 r3514  
    55"""
    66
    7 import utilities.polygon
     7import anuga.utilities.polygon
    88from warnings import warn
    99
    10 from geospatial_data.geospatial_data import ensure_absolute
     10from anuga.geospatial_data.geospatial_data import ensure_absolute
    1111
    1212
    … …  
    169169
    170170    import time, calendar, types
    171     from config import time_format
     171    from anuga.config import time_format
    172172    from Scientific.IO.NetCDF import NetCDFFile
    173173    from Numeric import array, zeros, Float, alltrue, concatenate, reshape
    … …  
    306306
    307307    #from least_squares import Interpolation_function
    308     from fit_interpolate.interpolate import Interpolation_function
     308    from anuga.fit_interpolate.interpolate import Interpolation_function
    309309
    310310    if not spatial:
    … …  
    401401    """Temporary Interface to new location"""
    402402
    403     import utilities.numerical_tools as NT     
     403    import anuga.utilities.numerical_tools as NT       
    404404   
    405405    msg = 'angle has moved from util.py.  '
    406     msg += 'Please use "from utilities.numerical_tools import angle"'
     406    msg += 'Please use "from anuga.utilities.numerical_tools import angle"'
    407407    warn(msg, DeprecationWarning)
    408408
    … …  
    412412    """Temporary Interface to new location"""
    413413
    414     import utilities.numerical_tools as NT
     414    import anuga.utilities.numerical_tools as NT
    415415   
    416416    msg = 'anglediff has moved from util.py.  '
    417     msg += 'Please use "from utilities.numerical_tools import anglediff"'
     417    msg += 'Please use "from anuga.utilities.numerical_tools import anglediff"'
    418418    warn(msg, DeprecationWarning)
    419419
    … …  
    424424    """Temporary Interface to new location"""
    425425
    426     import utilities.numerical_tools as NT   
     426    import anuga.utilities.numerical_tools as NT   
    427427   
    428428    msg = 'mean has moved from util.py.  '
    429     msg += 'Please use "from utilities.numerical_tools import mean"'
     429    msg += 'Please use "from anuga.utilities.numerical_tools import mean"'
    430430    warn(msg, DeprecationWarning)
    431431
    … …  
    436436
    437437    msg = 'point_on_line has moved from util.py.  '
    438     msg += 'Please use "from utilities.polygon import point_on_line"'
     438    msg += 'Please use "from anuga.utilities.polygon import point_on_line"'
    439439    warn(msg, DeprecationWarning)
    440440
    … …  
    445445
    446446    print 'inside_polygon has moved from util.py.  ',
    447     print 'Please use "from utilities.polygon import inside_polygon"'
     447    print 'Please use "from anuga.utilities.polygon import inside_polygon"'
    448448
    449449    return utilities.polygon.inside_polygon(*args, **kwargs)   
    … …  
    453453
    454454    print 'outside_polygon has moved from util.py.  ',
    455     print 'Please use "from utilities.polygon import outside_polygon"'
     455    print 'Please use "from anuga.utilities.polygon import outside_polygon"'
    456456
    457457    return utilities.polygon.outside_polygon(*args, **kwargs)   
    … …  
    462462
    463463    print 'separate_points_by_polygon has moved from util.py.  ',
    464     print 'Please use "from utilities.polygon import separate_points_by_polygon"'
     464    print 'Please use "from anuga.utilities.polygon import separate_points_by_polygon"'
    465465
    466466    return utilities.polygon.separate_points_by_polygon(*args, **kwargs)   
    … …  
    472472
    473473    print 'read_polygon has moved from util.py.  ',
    474     print 'Please use "from utilities.polygon import read_polygon"'
     474    print 'Please use "from anuga.utilities.polygon import read_polygon"'
    475475
    476476    return utilities.polygon.read_polygon(*args, **kwargs)   
    … …  
    481481
    482482    print 'populate_polygon has moved from util.py.  ',
    483     print 'Please use "from utilities.polygon import populate_polygon"'
     483    print 'Please use "from anuga.utilities.polygon import populate_polygon"'
    484484
    485485    return utilities.polygon.populate_polygon(*args, **kwargs)   

  • anuga_core/source/anuga/pyvolution/view_tsh.py

    r2622 r3514  
    99from shallow_water import Domain
    1010from pmesh2domain import pmesh_to_domain_instance
    11 from pyvolution.util import file_function
    12 from utilities.polygon import Polygon_function, read_polygon
     11from anuga.pyvolution.util import file_function
     12from anuga.utilities.polygon import Polygon_function, read_polygon
    1313from Numeric import zeros, Float, maximum, minimum
    1414from realtime_visualisation_new import *

  • anuga_core/source/anuga/utilities/compile.py

    r2778 r3514  
    176176  #Add Python path + utilities to includelist (see ticket:31)
    177177  #Assume there is only one 'utilities' dir under path dirs
    178 
     178 
    179179  utilities_include_dir = None
    180180  for pathdir in sys.path:
    … …  
    190190      #print 'Found %s to be used as include dir' %utilities_include_dir
    191191      break
    192      
    193 
    194      
     192
     193  utilities_include_dir = buildroot + os.sep + "source" + os.sep + "anuga" \
     194                          + os.sep + 'utilities'
     195 
    195196
    196197 

  • anuga_core/source/anuga/utilities/numerical_tools.py

    r3452 r3514  
    290290#Initialise module
    291291
    292 from utilities import compile
     292from anuga.utilities import compile
    293293if compile.can_use_C_extension('util_ext.c'):
    294294    from util_ext import gradient, gradient2

  • anuga_core/source/anuga/utilities/polygon.py

    r3054 r3514  
    1313
    1414from math import sqrt
    15 from utilities.numerical_tools import ensure_numeric
    16 from geospatial_data.geospatial_data import ensure_absolute
     15from anuga.utilities.numerical_tools import ensure_numeric
     16from anuga.geospatial_data.geospatial_data import ensure_absolute
    1717
    1818def point_on_line(x, y, x0, y0, x1, y1):
    … …  
    563563
    564564        if geo_reference is None:
    565             from coordinate_transforms.geo_reference import Geo_reference
     565            from anuga.coordinate_transforms.geo_reference import Geo_reference
    566566            geo_reference = Geo_reference()
    567567

  • anuga_core/source/anuga/utilities/sparse.py

    r2503 r3514  
    370370
    371371#Setup for C extensions
    372 from utilities import compile
     372from anuga.utilities import compile
    373373if compile.can_use_C_extension('sparse_ext.c'):
    374374    #Replace python version with c implementation

  • anuga_core/source/anuga/utilities/test_cg_solve.py

    r2841 r3514  
    77
    88from Numeric import dot, allclose, array, transpose, arange, ones, Float
    9 from utilities.cg_solve import *
    10 from utilities.cg_solve import _conjugate_gradient
    11 from utilities.sparse import Sparse, Sparse_CSR
     9from anuga.utilities.cg_solve import *
     10from anuga.utilities.cg_solve import _conjugate_gradient
     11from anuga.utilities.sparse import Sparse, Sparse_CSR
    1212
    1313

  • anuga_core/source/anuga/utilities/test_numerical_tools.py

    r2971 r3514  
    55from Numeric import zeros, array, allclose
    66from math import sqrt, pi
    7 from config import epsilon
     7from anuga.config import epsilon
    88
    99from numerical_tools import *

  • anuga_core/source/anuga/utilities/test_polygon.py

    r3196 r3514  
    55from Numeric import zeros, array, allclose
    66from math import sqrt, pi
    7 from utilities.numerical_tools import ensure_numeric
     7from anuga.utilities.numerical_tools import ensure_numeric
    88
    99from polygon import *
    10 from coordinate_transforms.geo_reference import Geo_reference
    11 from geospatial_data.geospatial_data import Geospatial_data
     10from anuga.coordinate_transforms.geo_reference import Geo_reference
     11from anuga.geospatial_data.geospatial_data import Geospatial_data
    1212
    1313def test_function(x, y):
    … …  
    6262        """
    6363
    64         from coordinate_transforms.geo_reference import Geo_reference
     64        from anuga.coordinate_transforms.geo_reference import Geo_reference
    6565
    6666        geo = Geo_reference(56, 200, 1000)

  • development/LWRU1/lwru1.py

    r2229 r3514  
    1313# Module imports
    1414
    15 from pyvolution.shallow_water import Domain, Reflective_boundary,\
     15from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
    1616     Dirichlet_boundary,Transmissive_boundary, Constant_height, Constant_stage
    1717
    18 from pyvolution.mesh_factory import rectangular_cross
     18from anuga.pyvolution.mesh_factory import rectangular_cross
    1919from Numeric import array, zeros, Float, allclose
    2020
    … …  
    177177
    178178from pylab import *
    179 from pyvolution.least_squares import Interpolation
     179from anuga.pyvolution.least_squares import Interpolation
    180180
    181181

  • development/analytical solutions/Analytical solution_wave_runup.py

    r2229 r3514  
    6363
    6464#Reduction operation for get_vertex_values
    65 from util import mean
     65from anuga.pyvolution.util import mean
    6666domain.reduction = mean
    6767#domain.reduction = min  #Looks better near steep slopes

  • development/analytical solutions/Analytical_solution_MacDonald_import_mesh.py

    r2229 r3514  
    7878
    7979#Reduction operation for get_vertex_values             
    80 from util import mean
     80from anuga.pyvolution.util import mean
    8181domain.reduction = mean
    8282

  • development/analytical solutions/Analytical_solution_MacDonald_import_mesh_wall.py

    r2229 r3514  
    8282
    8383#Reduction operation for get_vertex_values             
    84 from util import mean
     84from anuga.pyvolution.util import mean
    8585domain.reduction = mean
    8686

  • development/analytical solutions/Analytical_solution_MacDonald_import_mesh_wall0.py

    r2229 r3514  
    8989#------------------------------------------
    9090# Reduction operation for get_vertex_values             
    91 from util import mean
     91from anuga.pyvolution.util import mean
    9292domain.reduction = mean
    9393

  • development/analytical solutions/Analytical_solution_Sampson_cross_mesh.py

    r2648 r3514  
    2222from os import sep
    2323sys.path.append('..'+sep+'pyvolution')
    24 from pyvolution.shallow_water import Domain, Transmissive_boundary, Reflective_boundary,\
     24from anuga.pyvolution.shallow_water import Domain, Transmissive_boundary, Reflective_boundary,\
    2525     Dirichlet_boundary, gravity, linear_friction
    2626from math import sqrt, cos, sin, pi, exp
    27 from pyvolution.mesh_factory import rectangular_cross
    28 from pyvolution.quantity import Quantity
    29 from utilities.polygon import inside_polygon
     27from anuga.pyvolution.mesh_factory import rectangular_cross
     28from anuga.pyvolution.quantity import Quantity
     29from anuga.utilities.polygon import inside_polygon
    3030from Numeric import asarray
    3131from least_squares import Interpolation
    … …  
    6767#-----------------------------------------
    6868#Reduction operation for get_vertex_values
    69 from utilities.numerical_tools import mean
     69from anuga.utilities.numerical_tools import mean
    7070domain.reduction = mean
    7171#domain.reduction = min  #Looks better near steep slopes

  • development/analytical solutions/Analytical_solution_Sampson_import_mesh.py

    r2229 r3514  
    5959
    6060#Reduction operation for get_vertex_values             
    61 from util import mean
     61from anuga.pyvolution.util import mean
    6262domain.reduction = mean
    6363#domain.reduction = min  #Looks better near steep slopes

  • development/analytical solutions/Analytical_solution_Yoon_cross_mesh.py

    r2648 r3514  
    1414#from os import sep
    1515#sys.path.append('..'+sep+'pyvolution')
    16 from pyvolution.shallow_water import Domain, Transmissive_boundary, Reflective_boundary,\
     16from anuga.pyvolution.shallow_water import Domain, Transmissive_boundary, Reflective_boundary,\
    1717     Dirichlet_boundary
    1818from math import sqrt, cos, sin, pi
    19 from pyvolution.mesh_factory import rectangular_cross
    20 from utilities.polygon import inside_polygon
     19from anuga.pyvolution.mesh_factory import rectangular_cross
     20from anuga.utilities.polygon import inside_polygon
    2121from Numeric import asarray
    22 from pyvolution.least_squares import Interpolation
     22from anuga.pyvolution.least_squares import Interpolation
    2323
    2424#-------------------------------
    … …  
    5454#------------------------------------------
    5555# Reduction operation for get_vertex_values
    56 from util import mean
     56from anuga.pyvolution.util import mean
    5757domain.reduction = mean #domain.reduction = min  #Looks better near steep slopes
    5858

  • development/analytical solutions/Analytical_solution_Yoon_import_mesh.py

    r2491 r3514  
    1818from math import sqrt, cos, sin, pi
    1919from mesh_factory import strang_mesh
    20 from util import inside_polygon
     20from anuga.pyvolution.util import inside_polygon
    2121from Numeric import asarray
    2222from least_squares import Interpolation
    … …  
    5151#------------------------------------------
    5252# Reduction operation for get_vertex_values
    53 from util import mean
     53from anuga.pyvolution.util import mean
    5454domain.reduction = mean #domain.reduction = min  #Looks better near steep slopes
    5555

  • development/analytical solutions/Analytical_solution_circular_hydraulic_jump.py

    r2229 r3514  
    6666#------------------------------------------
    6767# Reduction operation for get_vertex_values
    68 from util import mean
     68from anuga.pyvolution.util import mean
    6969domain.reduction = mean
    7070#domain.reduction = min  #Looks better near steep slopes

  • development/analytical solutions/Analytical_solution_contracting_channel.py

    r2229 r3514  
    7777#------------------------------------------
    7878# Reduction operation for get_vertex_values
    79 #from util import mean
     79#from anuga.pyvolution.util import mean
    8080#domain.reduction = mean
    8181

  • development/analytical solutions/Analytical_solution_contracting_channel_import_mesh.py

    r2229 r3514  
    5353#------------------------------------------
    5454# Reduction operation for get_vertex_values             
    55 #from util import mean
     55#from anuga.pyvolution.util import mean
    5656#domain.reduction = mean
    5757

  • development/analytical solutions/Non_symmetrical_dam_break.py

    r2229 r3514  
    1616     Dirichlet_boundary
    1717#from pmesh2domain import pmesh_to_domain_instance
    18 from util import Polygon_function
     18from anuga.pyvolution.util import Polygon_function
    1919from mesh_factory import rectangular_cross
    2020

  • development/analytical solutions/Sydney.py

    r2229 r3514  
    1717     Dirichlet_boundary, Transmissive_boundary
    1818from pmesh2domain import pmesh_to_domain_instance
    19 from util import Polygon_function,read_polygon
     19from anuga.pyvolution.util import Polygon_function,read_polygon
    2020
    2121
    … …  
    3737
    3838#Reduction operation for get_vertex_values
    39 from util import mean
     39from anuga.pyvolution.util import mean
    4040domain.reduction = mean
    4141#domain.reduction = min  #Looks better near steep slopes

  • development/cairns_2006/run_cairns.py

    r3434 r3514  
    99#-------------------------------
    1010import sys, os
    11 from pyvolution.shallow_water import Domain, Reflective_boundary,\
     11from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
    1212     File_boundary, Transmissive_Momentum_Set_Stage_boundary,\
    1313     Transmissive_boundary, Dirichlet_boundary
    14 from pyvolution.mesh_factory import rectangular_cross
    15 from pyvolution.pmesh2domain import pmesh_to_domain_instance
     14from anuga.pyvolution.mesh_factory import rectangular_cross
     15from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
    1616from Numeric import array, zeros, Float, allclose
    1717import cairns_project as project
    1818#import project
    1919from caching import cache
    20 from utilities.polygon import read_polygon, Polygon_function
     20from anuga.utilities.polygon import read_polygon, Polygon_function
    2121
    2222from conversion import convert_latlon_to_xycoords

  • development/dam_2006/run_dam.py

    r3456 r3514  
    2323
    2424# Related major packages
    25 from pyvolution.shallow_water import Domain, Reflective_boundary, \
     25from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, \
    2626                            Dirichlet_boundary, Time_boundary, File_boundary
    27 from pyvolution.util import Screen_Catcher
    28 from pyvolution.region import Set_region
    29 from fit_interpolate.interpolate import interpolate_sww2csv
     27from anuga.pyvolution.util import Screen_Catcher
     28from anuga.pyvolution.region import Set_region
     29from anuga.fit_interpolate.interpolate import interpolate_sww2csv
    3030import create_mesh
    3131

  • development/euler/euler.py

    r2494 r3514  
    8888
    8989        #Reduction operation for get_vertex_values
    90         from util import mean
     90        from anuga.pyvolution.util import mean
    9191        self.reduction = mean
    9292        #self.reduction = min  #Looks better near steep slopes
    … …  
    204204        """
    205205
    206         import data_manager
     206        import anuga.pyvolution.data_manager
    207207
    208208        #Initialise writer
    … …  
    305305    """
    306306
    307     from pyvolution.config import g, epsilon
     307    from anuga.pyvolution.config import g, epsilon
    308308    from math import sqrt
    309309    from Numeric import array
    … …  
    10361036    """
    10371037
    1038     from util import gradient
     1038    from anuga.pyvolution.util import gradient
    10391039    from Numeric import zeros, Float, array, sum
    10401040
    … …  
    17161716
    17171717
    1718 from utilities import compile
     1718from anuga.utilities import compile
    17191719if compile.can_use_C_extension('shallow_water_ext.c'):
    17201720    #Replace python version with c implementations

  • development/euler/test_euler.py

    r2494 r3514  
    44from math import sqrt, pi
    55
    6 from pyvolution.config import g, epsilon
     6from anuga.pyvolution.config import g, epsilon
    77from Numeric import allclose, array, zeros, ones, Float, take
    88from shallow_water import *
    … …  
    964964        from math import pi, cos, sin, sqrt
    965965        from config import time_format
    966         from util import file_function
     966        from anuga.pyvolution.util import file_function
    967967        import time
    968968
    … …  
    10111011
    10121012        #Convert ASCII file to NetCDF (Which is what we really like!)
    1013         from data_manager import timefile2netcdf       
     1013        from anuga.pyvolution.data_manager import timefile2netcdf       
    10141014        timefile2netcdf(filename)
    10151015
    … …  
    21512151
    21522152    def test_flatbed_second_order_distribute(self):
    2153         #Use real data from pyvolution 2
     2153        #Use real data from anuga.pyvolution 2
    21542154        #painfully setup and extracted.
    21552155        from mesh_factory import rectangular
    … …  
    29242924        domain1 = Domain(points, vertices, boundary)
    29252925
    2926         from util import mean
     2926        from anuga.pyvolution.util import mean
    29272927        domain1.reduction = mean
    29282928        domain1.smooth = False  #Exact result
    … …  
    30423042        domain1 = Domain(points, vertices, boundary)
    30433043
    3044         from util import mean
     3044        from anuga.pyvolution.util import mean
    30453045        domain1.reduction = mean
    30463046        domain1.smooth = True #To mimic MOST output

  • development/momentum_sink/scripts/CCS.py

    r2927 r3514  
    1616import project
    1717import string
    18 from pyvolution.util import file_function
     18from anuga.pyvolution.util import file_function
    1919from numerical_tools import norm, corr, err 
    2020

  • development/momentum_sink/scripts/PCS.py

    r2927 r3514  
    66import Numeric
    77import project
    8 from pyvolution.util import file_function
     8from anuga.pyvolution.util import file_function
    99from create_buildings import  WidtH
    1010# from run_friction import fric

  • development/momentum_sink/scripts/compare_sww.py

    r2927 r3514  
    44from os import sep
    55import project
    6 from pyvolution.util import file_function
     6from anuga.pyvolution.util import file_function
    77import Numeric
    88

  • development/momentum_sink/scripts/loop_buildings.py

    r3112 r3514  
    88
    99import time
    10 from pyvolution.pmesh2domain import pmesh_to_domain_instance
     10from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
    1111from caching import cache
    12 from pyvolution.shallow_water import Domain, Reflective_boundary,\
     12from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
    1313File_boundary, Dirichlet_boundary, Time_boundary, Transmissive_boundary
    14 from pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA
     14from anuga.pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA
    1515import project
    1616from create_buildings import create_mesh

  • development/momentum_sink/scripts/loop_friction.py

    r3112 r3514  
    1111import project_friction
    1212import Numeric
    13 from pyvolution.pmesh2domain import pmesh_to_domain_instance
     13from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
    1414from caching import cache
    15 from pyvolution.shallow_water import Domain, Reflective_boundary,\
     15from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
    1616     File_boundary, Dirichlet_boundary, Time_boundary, Transmissive_boundary
    1717from region import Set_region
    18 from pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA
     18from anuga.pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA
    1919from friction_block import create_mesh
    2020from pmesh.mesh import importMeshFromFile

  • development/momentum_sink/scripts/plot_cross_section.py

    r2927 r3514  
    55import Numeric
    66import project
    7 from pyvolution.util import file_function
    8 #from pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
     7from anuga.pyvolution.util import file_function
     8#from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
    99#from coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
    1010from pylab import *

  • development/momentum_sink/scripts/plot_gauges.py

    r2927 r3514  
    55from os import sep
    66import project
    7 from pyvolution.util import file_function
    8 #from pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
     7from anuga.pyvolution.util import file_function
     8#from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
    99from pylab import *
    1010from compare_sww import gauge_locations

  • development/momentum_sink/scripts/plot_velocity_CS.py

    r2927 r3514  
    66import Numeric
    77import project
    8 from pyvolution.util import file_function
     8from anuga.pyvolution.util import file_function
    99from create_buildings import  WidtH
    1010# from run_friction import fric

  • development/momentum_sink/scripts/process_gauges.py

    r2927 r3514  
    44
    55import project
    6 from pyvolution.util import file_function
    7 from pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
     6from anuga.pyvolution.util import file_function
     7from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
    88from pylab import *
    99

  • development/momentum_sink/scripts/run_buildings.py

    r2927 r3514  
    88import project
    99
    10 from pyvolution.pmesh2domain import pmesh_to_domain_instance
     10from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
    1111from caching import cache
    12 from pyvolution.shallow_water import Domain, Reflective_boundary,\
     12from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
    1313     File_boundary, Dirichlet_boundary, Time_boundary, Transmissive_boundary
    14 from pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA
     14from anuga.pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA
    1515
    1616

  • development/momentum_sink/scripts/run_friction.py

    r2927 r3514  
    1414import project_friction
    1515
    16 from pyvolution.pmesh2domain import pmesh_to_domain_instance
     16from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
    1717from caching import cache
    18 from pyvolution.shallow_water import Domain, Reflective_boundary,\
     18from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
    1919     File_boundary, Dirichlet_boundary, Time_boundary, Transmissive_boundary,\
    2020     Set_region
    21 from pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA
     21from anuga.pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA
    2222
    2323

  • development/okushiri_2005/extract_timeseries.py

    r2609 r3514  
    5151
    5252
    53 from pyvolution.util import file_function
    54 from utilities.numerical_tools import ensure_numeric
     53from anuga.pyvolution.util import file_function
     54from anuga.utilities.numerical_tools import ensure_numeric
    5555gauge_values = [ensure_numeric(input_stage),
    5656                ensure_numeric(ch5),

  • development/okushiri_2005/lwru2.py

    r2866 r3514  
    7676
    7777# Module imports
    78 from pyvolution.shallow_water import Domain, Reflective_boundary,\
     78from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
    7979     File_boundary, Transmissive_Momentum_Set_Stage_boundary
    80 from pyvolution.mesh_factory import rectangular_cross
    81 from pyvolution.pmesh2domain import pmesh_to_domain_instance
     80from anuga.pyvolution.mesh_factory import rectangular_cross
     81from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
    8282from Numeric import array, zeros, Float, allclose
    8383import project
    … …  
    8888
    8989#Preparing points (Only when using original Benchmark_2_Bathymetry.txt file)
    90 #from pyvolution.data_manager import xya2pts
     90#from anuga.pyvolution.data_manager import xya2pts
    9191#xya2pts(project.bathymetry_filename, verbose = True,
    9292#        z_func = lambda z: -z)
    … …  
    148148Br = Reflective_boundary(domain)
    149149
    150 from pyvolution.util import file_function
     150from anuga.pyvolution.util import file_function
    151151function = file_function(project.boundary_filename[:-4] + '.tms',
    152152                         domain,

  • development/parallel/build_submesh.py

    r3460 r3514  
    1717     reshape, arrayrange, take, nonzero
    1818
    19 from pyvolution.neighbour_mesh import Mesh
     19from anuga.pyvolution.neighbour_mesh import Mesh
    2020
    2121

  • development/parallel/documentation/code/RunParallelMerimbulaMetis.py

    r3184 r3514  
    4040# pmesh
    4141
    42 from pyvolution.pmesh2domain import pmesh_to_domain_instance
    43 from pyvolution.advection import Domain as Advection_Domain
     42from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
     43from anuga.pyvolution.advection import Domain as Advection_Domain
    4444from parallel.parallel_advection import Parallel_Domain
    4545
    46 from pyvolution.generic_boundary_conditions import Transmissive_boundary
     46from anuga.pyvolution.generic_boundary_conditions import Transmissive_boundary
    4747
    4848# Mesh partition routines

  • development/parallel/documentation/code/RunParallelSwMerimbulaMetis.py

    r3185 r3514  
    4040# pmesh
    4141
    42 from pyvolution.shallow_water import Domain
     42from anuga.pyvolution.shallow_water import Domain
    4343from parallel.parallel_shallow_water import Parallel_Domain
    44 from pyvolution.pmesh2domain import pmesh_to_domain_instance
     44from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
    4545
    4646# Mesh partition routines

  • development/parallel/parallel_advection.py

    r3460 r3514  
    2323    pass
    2424
    25 from pyvolution.advection_vtk import *
     25from anuga.pyvolution.advection_vtk import *
    2626from Numeric import zeros, Float, Int, ones, allclose, array
    2727import pypar

  • development/parallel/parallel_shallow_water.py

    r3460 r3514  
    2727    pass
    2828
    29 from pyvolution.shallow_water import *
     29from anuga.pyvolution.shallow_water import *
    3030from Numeric import zeros, Float, Int, ones, allclose, array
    3131

  • development/parallel/print_stats.py

    r3460 r3514  
    2222
    2323from Numeric import array, Int8, zeros, ones, take, nonzero, Float
    24 from utilities.norms import l1_norm, l2_norm, linf_norm
     24from anuga.utilities.norms import l1_norm, l2_norm, linf_norm
    2525
    2626#########################################################

  • development/parallel/test_parallel_sw.py

    r3460 r3514  
    1919
    2020from Numeric import array, zeros, Float, take, nonzero
    21 from pyvolution.shallow_water import Domain
    22 from pyvolution.shallow_water import Reflective_boundary as sw_reflective_boundary
    23 from pyvolution.shallow_water import Transmissive_boundary as sw_transmissive_boundary
     21from anuga.pyvolution.shallow_water import Domain
     22from anuga.pyvolution.shallow_water import Reflective_boundary as sw_reflective_boundary
     23from anuga.pyvolution.shallow_water import Transmissive_boundary as sw_transmissive_boundary
    2424from parallel_shallow_water import Parallel_Domain
    2525from parallel_shallow_water import Reflective_boundary as par_reflective_boundary
    2626from parallel_shallow_water import Transmissive_boundary as par_transmissive_boundary
    27 from pyvolution.pmesh2domain import pmesh_to_domain_instance
    28 from utilities.norms import *
    29 from utilities.util_ext import double_precision
     27from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
     28from anuga.utilities.norms import *
     29from anuga.utilities.util_ext import double_precision
    3030from print_stats import print_test_stats, build_full_flag
    3131from pmesh_divide import pmesh_divide_metis

  • development/pyvolution-1d/data_manager.py

    r2792 r3514  
    249249            #Create new file
    250250            fid.institution = 'Geoscience Australia'
    251             fid.description = 'Output from pyvolution suitable for plotting'
     251            fid.description = 'Output from anuga.pyvolution suitable for plotting'
    252252
    253253            if domain.smooth:
    … …  
    14991499    from Numeric import array2string
    15001500
    1501     from utilities.polygon import inside_polygon, outside_polygon, separate_points_by_polygon
    1502     from util import apply_expression_to_dictionary
     1501    from anuga.utilities.polygon import inside_polygon, outside_polygon, separate_points_by_polygon
     1502    from anuga.pyvolution.util import apply_expression_to_dictionary
    15031503
    15041504    msg = 'Format must be either asc or ers'
    … …  
    24602460    from Numeric import array
    24612461    from config import time_format
    2462     from util import ensure_numeric
     2462    from anuga.pyvolution.util import ensure_numeric
    24632463
    24642464
    … …  
    31923192    from Numeric import array, Float, concatenate, NewAxis, zeros,\
    31933193         sometrue
    3194     from utilities.polygon import inside_polygon
     3194    from anuga.utilities.polygon import inside_polygon
    31953195
    31963196    #FIXME: Should be variable
    … …  
    33763376    from pmesh2domain import pmesh_to_domain_instance
    33773377    import time, os
    3378     from data_manager import get_dataobject
     3378    from anuga.pyvolution.data_manager import get_dataobject
    33793379    from os import sep, path
    3380     from util import mean
     3380    from anuga.pyvolution.util import mean
    33813381
    33823382    if verbose == True:print 'Creating domain from', filename

  • development/pyvolution-1d/generic_boundary_conditions.py

    r2716 r3514  
    131131        from Numeric import array
    132132        from config import time_format
    133         from util import File_function
     133        from anuga.pyvolution.util import File_function
    134134
    135135        Boundary.__init__(self)
    … …  
    181181        from Numeric import array, zeros, Float
    182182        from config import time_format
    183         from util import file_function
     183        from anuga.pyvolution.util import file_function
    184184
    185185        Boundary.__init__(self)

  • development/pyvolution-1d/shallow_water_1d.py

    r3510 r3514  
    8484       
    8585        #Reduction operation for get_vertex_values
    86         from util import mean
     86        from anuga.pyvolution.util import mean
    8787        self.reduction = mean
    8888        #self.reduction = min  #Looks better near steep slopes
    … …  
    221221        """
    222222
    223         import data_manager
     223        import anuga.pyvolution.data_manager
    224224
    225225        #Initialise writer
    … …  
    10561056    """
    10571057
    1058     from util import gradient
     1058    from anuga.pyvolution.util import gradient
    10591059    from Numeric import zeros, Float, array, sum
    10601060

  • development/pyvolution-1d/shallow_water_minmod.py

    r3424 r3514  
    8484       
    8585        #Reduction operation for get_vertex_values
    86         from util import mean
     86        from anuga.pyvolution.util import mean
    8787        self.reduction = mean
    8888        #self.reduction = min  #Looks better near steep slopes
    … …  
    221221        """
    222222
    223         import data_manager
     223        import anuga.pyvolution.data_manager
    224224
    225225        #Initialise writer
    … …  
    991991    """
    992992
    993     from util import gradient
     993    from anuga.pyvolution.util import gradient
    994994    from Numeric import zeros, Float, array, sum
    995995

  • development/steve/get_triangle_data.py

    r2229 r3514  
    1515from shallow_water import Domain
    1616from pmesh2domain import pmesh_to_domain_instance
    17 from util import file_function, Polygon_function, read_polygon
     17from anuga.pyvolution.util import file_function, Polygon_function, read_polygon
    1818from Numeric import zeros, Float, maximum, minimum
    1919

  • development/steve/get_triangle_data_new.py

    r2229 r3514  
    1515from shallow_water import Domain
    1616from pmesh2domain import pmesh_to_domain_instance
    17 from util import file_function, Polygon_function, read_polygon
     17from anuga.pyvolution.util import file_function, Polygon_function, read_polygon
    1818from Numeric import zeros, Float, maximum, minimum
    1919

  • development/steve/sww_viewer_vtk.py

    r2386 r3514  
    2626
    2727import project
    28 from pyvolution.data_manager import get_time_interp, interpolated_quantity
     28from anuga.pyvolution.data_manager import get_time_interp, interpolated_quantity
    2929from caching import cache
    3030filename = project.filename[:-3] + '.sww' #filename is of form filename.py
    … …  
    4040
    4141"""
    42 The following is borrowed from data_manager.sww2domain
     42The following is borrowed from anuga.pyvolution.data_manager.sww2domain
    4343"""
    4444NaN=9.969209968386869e+036
    … …  
    4646
    4747from Scientific.IO.NetCDF import NetCDFFile
    48 from pyvolution.shallow_water_vtk import Domain
     48from anuga.pyvolution.shallow_water_vtk import Domain
    4949from Numeric import asarray, transpose, resize
    5050

  • development/stochastic_study/create_realisations.py

    r3035 r3514  
    1111import cPickle
    1212from load_mesh.loadASCII import import_points_file, import_mesh_file
    13 from pyvolution.least_squares import fit_to_mesh
     13from anuga.pyvolution.least_squares import fit_to_mesh
    1414import project
    1515

  • development/stochastic_study/extract_timeseries.py

    r2979 r3514  
    5252
    5353
    54 from pyvolution.util import file_function
    55 from utilities.numerical_tools import ensure_numeric
     54from anuga.pyvolution.util import file_function
     55from anuga.utilities.numerical_tools import ensure_numeric
    5656gauge_values = [ensure_numeric(input_stage),
    5757                ensure_numeric(ch5),

  • development/stochastic_study/plot_spread.py

    r3507 r3514  
    99
    1010# Application specific imports
    11 from utilities.numerical_tools import histogram, create_bins
     11from anuga.utilities.numerical_tools import histogram, create_bins
    1212from read_realisations import read_realisations
    1313import project

  • development/stochastic_study/run_model.py

    r3035 r3514  
    2525
    2626# Related major packages
    27 from pyvolution.shallow_water import Domain
    28 from pyvolution.shallow_water import Reflective_boundary
    29 from pyvolution.shallow_water import Transmissive_Momentum_Set_Stage_boundary
    30 from pyvolution.pmesh2domain import pmesh_to_domain_instance
    31 from pyvolution.data_manager import xya2pts
    32 from pyvolution.util import file_function
     27from anuga.pyvolution.shallow_water import Domain
     28from anuga.pyvolution.shallow_water import Reflective_boundary
     29from anuga.pyvolution.shallow_water import Transmissive_Momentum_Set_Stage_boundary
     30from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
     31from anuga.pyvolution.data_manager import xya2pts
     32from anuga.pyvolution.util import file_function
    3333from caching.caching import cache
    3434

  • development/stochastic_study/run_simple_model.py

    r3035 r3514  
    2626
    2727# Application specific imports
    28 from pyvolution.mesh_factory import rectangular
    29 from pyvolution.shallow_water import Domain
    30 from pyvolution.shallow_water import Reflective_boundary
    31 from pyvolution.shallow_water import Dirichlet_boundary
    32 from pyvolution.util import file_function
     28from anuga.pyvolution.mesh_factory import rectangular
     29from anuga.pyvolution.shallow_water import Domain
     30from anuga.pyvolution.shallow_water import Reflective_boundary
     31from anuga.pyvolution.shallow_water import Dirichlet_boundary
     32from anuga.pyvolution.util import file_function
    3333from caching.caching import cache
    3434import project                 # Definition of file names and polygons

  • inundation-numpy-branch/debug/mesh_error_reporting/create_mesh.py

    r1878 r3514  
    77
    88from pmesh.mesh import *
    9 from pyvolution.coordinate_transforms.geo_reference import Geo_reference
     9from anuga.pyvolution.coordinate_transforms.geo_reference import Geo_reference
    1010
    1111#-------------------------------------------------------------

  • inundation-numpy-branch/debug/mesh_error_reporting/show_bad_mesh.py

    r3437 r3514  
    1414
    1515
    16 from pyvolution.least_squares import Interpolation
     16from anuga.pyvolution.least_squares import Interpolation
    1717from Numeric import allclose, array, transpose
    1818

  • inundation-numpy-branch/debug/mesh_error_reporting/show_mesh_bug.py

    r1878 r3514  
    6868
    6969# Module imports
    70 from pyvolution.shallow_water import Domain, Reflective_boundary,\
     70from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
    7171            File_boundary, Transmissive_Momentum_Set_Stage_boundary
    72 from pyvolution.mesh_factory import rectangular
    73 from pyvolution.pmesh2domain import pmesh_to_domain_instance
     72from anuga.pyvolution.mesh_factory import rectangular
     73from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
    7474from Numeric import array, zeros, Float, allclose
    7575import filenames
    … …  
    8585
    8686#Preparing points
    87 from pyvolution.data_manager import xya2pts
     87from anuga.pyvolution.data_manager import xya2pts
    8888xya2pts(filenames.bathymetry_filename, verbose = True,
    8989        stride = 16,
    … …  
    112112
    113113#LS code to be included in set_quantity
    114 from pyvolution import util, least_squares
     114from anuga.pyvolution import util, least_squares
    115115points, attributes = util.read_xya(filenames.bathymetry_filename[:-4] + '.pts')
    116116

  • inundation-numpy-branch/examples/beach.py

    r2533 r3514  
    1515#sys.path.append('..'+sep+'pyvolution')
    1616
    17 from pyvolution.shallow_water import Domain, Reflective_boundary, Dirichlet_boundary,\
     17from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, Dirichlet_boundary,\
    1818     Transmissive_boundary, Time_boundary, Wind_stress
    1919
    20 from pyvolution.pmesh2domain import pmesh_to_domain_instance
    21 from utilities.polygon import read_polygon, Polygon_function
     20from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
     21from anuga.utilities.polygon import read_polygon, Polygon_function
    2222from math import pi
    2323from Numeric import choose, greater, ones, sin, exp

  • inundation-numpy-branch/examples/bedslope.py

    r2438 r3514  
    88# Module imports
    99#
    10 from pyvolution.mesh_factory import rectangular
    11 from pyvolution.shallow_water import Domain, Reflective_boundary,\
     10from anuga.pyvolution.mesh_factory import rectangular
     11from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
    1212     Dirichlet_boundary, Time_boundary, Transmissive_boundary
    1313

  • inundation-numpy-branch/examples/run_gippsland.py

    r2056 r3514  
    1 from pyvolution.data_manager import asc_csiro2sww
     1from anuga.pyvolution.data_manager import asc_csiro2sww
    22import time
    33

  • inundation-numpy-branch/fit_interpolate/benchmark_least_squares.py

    r3437 r3514  
    2121from random import seed, random
    2222
    23 from pyvolution.least_squares import Interpolation
     23from anuga.pyvolution.least_squares import Interpolation
    2424from pmesh.mesh import Mesh
    2525

  • inundation-numpy-branch/fit_interpolate/interpolate.py

    r2504 r3514  
    2323     ArrayType, allclose, take, NewAxis
    2424
    25 from pyvolution.mesh import Mesh
    26 from utilities.sparse import Sparse, Sparse_CSR
    27 from utilities.cg_solve import conjugate_gradient, VectorShapeError
     25from anuga.pyvolution.mesh import Mesh
     26from anuga.utilities.sparse import Sparse, Sparse_CSR
     27from anuga.utilities.cg_solve import conjugate_gradient, VectorShapeError
    2828from coordinate_transforms.geo_reference import Geo_reference
    29 from pyvolution.quad import build_quadtree
    30 from utilities.numerical_tools import ensure_numeric
    31 from utilities.polygon import inside_polygon
     29from anuga.pyvolution.quad import build_quadtree
     30from anuga.utilities.numerical_tools import ensure_numeric
     31from anuga.utilities.polygon import inside_polygon
    3232
    3333from search_functions import search_tree_of_vertices
    … …  
    394394
    395395
    396         from util import mean, ensure_numeric
     396        from anuga.pyvolution.util import mean, ensure_numeric
    397397        from config import time_format
    398398        import types
    … …  
    526526        from math import pi, cos, sin, sqrt
    527527        from Numeric import zeros, Float
    528         from util import mean       
     528        from anuga.pyvolution.util import mean       
    529529
    530530        if self.spatial is True:

  • inundation-numpy-branch/fit_interpolate/test_interpolate.py

    r2394 r3514  
    2020from coordinate_transforms.geo_reference import Geo_reference
    2121from shallow_water import Domain, Transmissive_boundary #, mean
    22 from util import mean
    23 from data_manager import get_dataobject
     22from anuga.pyvolution.util import mean
     23from anuga.pyvolution.data_manager import get_dataobject
    2424
    2525def distance(x, y):
    … …  
    623623        #Check basic interpolation of one quantity using averaging
    624624        #(no interpolation points or spatial info)
    625         from util import mean       
     625        from anuga.pyvolution.util import mean       
    626626        I = Interpolation_interface(time, [mean(Q[0,:]),
    627627                                          mean(Q[1,:]),

  • inundation-numpy-branch/geospatial_data/__init__.py

    r2309 r3514  
    22"""
    33
    4 from geospatial_data import *
     4from anuga.geospatial_data.geospatial_data import *
    55
    66

  • inundation-numpy-branch/geospatial_data/geospatial_data.py

    r2608 r3514  
    55
    66
    7 from utilities.numerical_tools import ensure_numeric
     7from anuga.utilities.numerical_tools import ensure_numeric
    88
    99from numpy import concatenate

  • inundation-numpy-branch/geospatial_data/test_geospatial_data.py

    r2608 r3514  
    77from math import sqrt, pi
    88
    9 from geospatial_data import *
     9from anuga.geospatial_data.geospatial_data import *
    1010
    1111from coordinate_transforms.geo_reference import Geo_reference

  • inundation-numpy-branch/pmesh/create_mesh.py

    r2376 r3514  
    100100    from mesh import Mesh
    101101    from coordinate_transforms.redfearn import redfearn
    102     from utilities.polygon import populate_polygon
    103     from utilities.numerical_tools import ensure_numeric
     102    from anuga.utilities.polygon import populate_polygon
     103    from anuga.utilities.numerical_tools import ensure_numeric
    104104    from coordinate_transforms.geo_reference import Geo_reference
    105105

  • inundation-numpy-branch/pmesh/mesh.py

    r3437 r3514  
    2828import load_mesh
    2929from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
    30 from utilities.polygon import point_in_polygon
     30from anuga.utilities.polygon import point_in_polygon
    3131
    3232SET_COLOUR='red'
    3333
    3434#FIXME: this is not tested.
    35 from utilities.numerical_tools import gradient
     35from anuga.utilities.numerical_tools import gradient
    3636
    3737

  • inundation-numpy-branch/pmesh/mesh_interface.py

    r2430 r3514  
    55
    66from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
    7 from utilities.polygon import populate_polygon
    8 from utilities.numerical_tools import ensure_numeric
     7from anuga.utilities.polygon import populate_polygon
     8from anuga.utilities.numerical_tools import ensure_numeric
    99from Numeric import Float
    1010

  • inundation-numpy-branch/pmesh/test_mesh.py

    r3437 r3514  
    1212from load_mesh.loadASCII import *
    1313from coordinate_transforms.geo_reference import Geo_reference
    14 from utilities.polygon import inside_polygon
     14from anuga.utilities.polygon import inside_polygon
    1515
    1616class meshTestCase(unittest.TestCase):

  • inundation-numpy-branch/pmesh/test_mesh_interface.py

    r2402 r3514  
    55from mesh_interface import *
    66from load_mesh.loadASCII import *
    7 from utilities.polygon import inside_polygon
     7from anuga.utilities.polygon import inside_polygon
    88from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
    99

  • inundation-numpy-branch/pyvolution/_test_sww2domain.py

    r1133 r3514  
    6161##NOW TEST IT!!!
    6262
    63 from data_manager import sww2domain
     63from anuga.pyvolution.data_manager import sww2domain
    6464from Numeric import allclose
    6565

  • inundation-numpy-branch/pyvolution/_test_sww2domain2.py

    r1133 r3514  
    5959##NOW TEST IT!!!
    6060
    61 from data_manager import sww2domain
     61from anuga.pyvolution.data_manager import sww2domain
    6262from Numeric import allclose
    6363

  • inundation-numpy-branch/pyvolution/bed_w_file_boundary.py

    r1673 r3514  
    5757
    5858#Convert ASCII file to NetCDF (Which is what we really like!)
    59 from data_manager import timefile2swww       
     59from anuga.pyvolution.data_manager import timefile2swww       
    6060timefile2swww(filename, quantity_names = domain.conserved_quantities)
    6161

  • inundation-numpy-branch/pyvolution/check_sww_tsh.py

    r1379 r3514  
    55from os import sep, path
    66
    7 import data_manager
     7import anuga.pyvolution.data_manager
    88from load_mesh.loadASCII import import_mesh_file
    99from shallow_water import Domain

  • inundation-numpy-branch/pyvolution/combine_pts.py

    r2252 r3514  
    55"""
    66
    7 from utilities.polygon import outside_polygon, inside_polygon
     7from anuga.utilities.polygon import outside_polygon, inside_polygon
    88from Numeric import take, concatenate
    99import time

  • inundation-numpy-branch/pyvolution/data_manager.py

    r2541 r3514  
    248248            #Create new file
    249249            fid.institution = 'Geoscience Australia'
    250             fid.description = 'Output from pyvolution suitable for plotting'
     250            fid.description = 'Output from anuga.pyvolution suitable for plotting'
    251251
    252252            if domain.smooth:
    … …  
    15721572    from Numeric import array2string
    15731573
    1574     from utilities.polygon import inside_polygon, outside_polygon, separate_points_by_polygon
    1575     from util import apply_expression_to_dictionary
     1574    from anuga.utilities.polygon import inside_polygon, outside_polygon, separate_points_by_polygon
     1575    from anuga.pyvolution.util import apply_expression_to_dictionary
    15761576
    15771577    msg = 'Format must be either asc or ers'
    … …  
    25712571    from Numeric import array
    25722572    from config import time_format
    2573     from utilities.numerical_tools import ensure_numeric   
     2573    from anuga.utilities.numerical_tools import ensure_numeric   
    25742574
    25752575
    … …  
    30933093    from pmesh2domain import pmesh_to_domain_instance
    30943094    import time, os
    3095     from data_manager import get_dataobject
     3095    from anuga.pyvolution.data_manager import get_dataobject
    30963096    from os import sep, path
    3097     from utilities.numerical_tools import mean
     3097    from anuga.utilities.numerical_tools import mean
    30983098
    30993099    if verbose == True:print 'Creating domain from', filename

  • inundation-numpy-branch/pyvolution/data_manager_obsolete_stuff.py

    r2344 r3514  
    221221    from Numeric import array, Float, concatenate, NewAxis, zeros,\
    222222         sometrue
    223     from utilities.polygon import inside_polygon
     223    from anuga.utilities.polygon import inside_polygon
    224224
    225225    #FIXME: Should be variable

  • inundation-numpy-branch/pyvolution/domain.py

    r2608 r3514  
    238238        """
    239239
    240         from util import apply_expression_to_dictionary
     240        from anuga.pyvolution.util import apply_expression_to_dictionary
    241241        return apply_expression_to_dictionary(expression, self.quantities)
    242242

  • inundation-numpy-branch/pyvolution/flatbed.py

    r901 r3514  
    1313     Constant_height
    1414from Numeric import array
    15 from util import Polygon_function, read_polygon
     15from anuga.pyvolution.util import Polygon_function, read_polygon
    1616
    1717

  • inundation-numpy-branch/pyvolution/general_mesh.py

    r2608 r3514  
    5050
    5151
    52         This is a cut down version of mesh from pyvolution mesh.py
     52        This is a cut down version of mesh from anuga.pyvolution mesh.py
    5353    """
    5454

  • inundation-numpy-branch/pyvolution/generic_boundary_conditions.py

    r2154 r3514  
    131131        from Numeric import array
    132132        from config import time_format
    133         from util import File_function
     133        from anuga.pyvolution.util import File_function
    134134
    135135        Boundary.__init__(self)
    … …  
    181181        from Numeric import array, zeros, Float
    182182        from config import time_format
    183         from util import file_function
     183        from anuga.pyvolution.util import file_function
    184184
    185185        Boundary.__init__(self)

  • inundation-numpy-branch/pyvolution/island.py

    r1280 r3514  
    1313     Constant_height
    1414from Numeric import array
    15 from util import Polygon_function, read_polygon
     15from anuga.pyvolution.util import Polygon_function, read_polygon
    1616from math import exp
    1717

  • inundation-numpy-branch/pyvolution/least_squares.py

    r2608 r3514  
    2525
    2626#FIXME (Ole): Meshes to move somewhere else
    27 from pyvolution.mesh import Mesh
    28 from utilities.sparse import Sparse, Sparse_CSR
    29 from utilities.cg_solve import conjugate_gradient, VectorShapeError
    30 from utilities.numerical_tools import ensure_numeric, mean, gradient
     27from anuga.pyvolution.mesh import Mesh
     28from anuga.utilities.sparse import Sparse, Sparse_CSR
     29from anuga.utilities.cg_solve import conjugate_gradient, VectorShapeError
     30from anuga.utilities.numerical_tools import ensure_numeric, mean, gradient
    3131
    3232
    … …  
    441441        #Maybe we need some sort of blocking
    442442
    443         from pyvolution.quad import build_quadtree
    444         from utilities.polygon import inside_polygon
     443        from anuga.pyvolution.quad import build_quadtree
     444        from anuga.utilities.polygon import inside_polygon
    445445       
    446446
    … …  
    11341134        from math import pi, cos, sin, sqrt
    11351135        from Numeric import zeros, Float
    1136         from utilities.numerical_tools import mean       
     1136        from anuga.utilities.numerical_tools import mean       
    11371137
    11381138        if self.spatial is True:

  • inundation-numpy-branch/pyvolution/mesh.py

    r2608 r3514  
    492492        from config import epsilon
    493493        from math import pi
    494         from utilities.numerical_tools import anglediff
     494        from anuga.utilities.numerical_tools import anglediff
    495495
    496496        N = self.number_of_elements
    … …  
    616616        """
    617617
    618         from utilities.numerical_tools import histogram
     618        from anuga.utilities.numerical_tools import histogram
    619619
    620620        vertex_coordinates = self.vertex_coordinates

  • inundation-numpy-branch/pyvolution/mesh_factory.py

    r2608 r3514  
    334334    """
    335335
    336     from util import anglediff
     336    from anuga.pyvolution.util import anglediff
    337337    from math import pi
    338338    import os.path
    … …  
    449449
    450450    from math import pi
    451     from util import anglediff
     451    from anuga.pyvolution.util import anglediff
    452452
    453453

  • inundation-numpy-branch/pyvolution/mesh_factory_all.py

    r1531 r3514  
    351351    """
    352352
    353     from util import anglediff
     353    from anuga.pyvolution.util import anglediff
    354354    from math import pi
    355355    import os.path
    … …  
    466466
    467467    from math import pi
    468     from util import anglediff
     468    from anuga.pyvolution.util import anglediff
    469469
    470470

  • inundation-numpy-branch/pyvolution/pressure_force.py

    r773 r3514  
    4949def cyclone(domain):
    5050    from config import rho_w
    51     from util import gradient
     51    from anuga.pyvolution.util import gradient
    5252
    5353    xmom = domain.quantities['xmomentum'].explicit_update

  • inundation-numpy-branch/pyvolution/quantity.py

    r2608 r3514  
    267267        """
    268268
    269         from geospatial_data.geospatial_data import Geospatial_data
     269        from anuga.geospatial_data.geospatial_data import Geospatial_data
    270270        from types import FloatType, IntType, LongType, ListType, NoneType
    271271
    … …  
    613613
    614614
    615         from utilities.numerical_tools import ensure_numeric
     615        from anuga.utilities.numerical_tools import ensure_numeric
    616616        from least_squares import fit_to_mesh
    617617        from coordinate_transforms.geo_reference import Geo_reference
    … …  
    685685
    686686        from load_mesh.loadASCII import import_points_file
    687         from geospatial_data.geospatial_data import points_dictionary2geospatial_data
     687        from anuga.geospatial_data.geospatial_data import points_dictionary2geospatial_data
    688688
    689689        from types import StringType
    … …  
    12961296
    12971297
    1298 from utilities import compile
     1298from anuga.utilities import compile
    12991299if compile.can_use_C_extension('quantity_ext.c'):
    13001300    #Replace python version with c implementations

  • inundation-numpy-branch/pyvolution/realtime_visualisation.py

    r1295 r3514  
    200200
    201201    #print scene.forward
    202     #FIXME: Use smoother from pyvolution instead
     202    #FIXME: Use smoother from anuga.pyvolution instead
    203203    if domain.smooth:
    204204        #Get all average point values

  • inundation-numpy-branch/pyvolution/shallow_water.py

    r2516 r3514  
    6262from generic_boundary_conditions import Transmissive_boundary
    6363
    64 from utilities.numerical_tools import gradient, mean
     64from anuga.utilities.numerical_tools import gradient, mean
    6565
    6666
    … …  
    285285        """
    286286
    287         import data_manager
     287        import anuga.pyvolution.data_manager
    288288
    289289        #Initialise writer
    … …  
    17791779
    17801780
    1781 from utilities import compile
     1781from anuga.utilities import compile
    17821782if compile.can_use_C_extension('shallow_water_ext.c'):
    17831783    #Replace python version with c implementations

  • inundation-numpy-branch/pyvolution/shallow_water_kinetic.py

    r2259 r3514  
    9494
    9595        #Reduction operation for get_vertex_values
    96         from util import mean
     96        from anuga.pyvolution.util import mean
    9797        self.reduction = mean
    9898        #self.reduction = min  #Looks better near steep slopes
    … …  
    245245        """
    246246
    247         import data_manager
     247        import anuga.pyvolution.data_manager
    248248
    249249        #Initialise writer
    … …  
    11691169    """
    11701170
    1171     from util import gradient
     1171    from anuga.pyvolution.util import gradient
    11721172    from Numeric import zeros, Float, array, sum
    11731173
    … …  
    17721772
    17731773
    1774 from utilities import compile
     1774from anuga.utilities import compile
    17751775if compile.can_use_C_extension('shallow_water_kinetic_ext.c'):
    17761776    #Replace python version with c implementations

  • inundation-numpy-branch/pyvolution/test_data_manager.py

    r2526 r3514  
    55import copy
    66from Numeric import zeros, array, allclose, Float
    7 from utilities.numerical_tools import mean
     7from anuga.utilities.numerical_tools import mean
    88import tempfile
    99import os
    1010from Scientific.IO.NetCDF import NetCDFFile
    1111
    12 from data_manager import *
     12from anuga.pyvolution.data_manager import *
    1313from shallow_water import *
    1414from config import epsilon
    15 import data_manager
     15import anuga.pyvolution.data_manager
    1616
    1717from coordinate_transforms.geo_reference import Geo_reference
    … …  
    25282528        #Import the example's file as a new domain
    25292529        ##########################################
    2530         from data_manager import sww2domain
     2530        from anuga.pyvolution.data_manager import sww2domain
    25312531        from Numeric import allclose
    25322532        import os
    … …  
    26652665        #Import the file as a new domain
    26662666        ##################################
    2667         from data_manager import sww2domain
     2667        from anuga.pyvolution.data_manager import sww2domain
    26682668        from Numeric import allclose
    26692669        import os
    … …  
    27032703
    27042704    #def test_weed(self):
    2705         from data_manager import weed
     2705        from anuga.pyvolution.data_manager import weed
    27062706
    27072707        coordinates1 = [[0.,0.],[1.,0.],[1.,1.],[1.,0.],[2.,0.],[1.,1.]]
    … …  
    27762776        #Import the example's file as a new domain
    27772777        ##########################################
    2778         from data_manager import sww2domain
     2778        from anuga.pyvolution.data_manager import sww2domain
    27792779        from Numeric import allclose
    27802780        import os
    … …  
    30773077        from Scientific.IO.NetCDF import NetCDFFile
    30783078
    3079         import data_manager
     3079        import anuga.pyvolution.data_manager
    30803080        #Write test asc file
    30813081        filename = tempfile.mktemp(".000")

  • inundation-numpy-branch/pyvolution/test_generic_boundary_conditions.py

    r2154 r3514  
    152152        #Convert ASCII file to NetCDF (Which is what we really like!)
    153153       
    154         from data_manager import timefile2netcdf               
     154        from anuga.pyvolution.data_manager import timefile2netcdf               
    155155        timefile2netcdf(filename, quantity_names = ['stage', 'ymomentum'])
    156156       
    … …  
    246246
    247247        #Convert ASCII file to NetCDF (Which is what we really like!)
    248         from data_manager import timefile2netcdf               
     248        from anuga.pyvolution.data_manager import timefile2netcdf               
    249249        timefile2netcdf(filename, quantity_names = ['stage', 'xmomentum'])
    250250

  • inundation-numpy-branch/pyvolution/test_interpolate_sww.py

    r1814 r3514  
    88import unittest
    99from Numeric import zeros, array, allclose, Float
    10 from util import mean
     10from anuga.pyvolution.util import mean
    1111
    1212from interpolate_sww import *
    1313from shallow_water import *
    14 from data_manager import *
     14from anuga.pyvolution.data_manager import *
    1515#from config import epsilon
    1616

  • inundation-numpy-branch/pyvolution/test_least_squares.py

    r2526 r3514  
    10851085        #Check basic interpolation of one quantity using averaging
    10861086        #(no interpolation points or spatial info)
    1087         from utilities.numerical_tools import mean       
     1087        from anuga.utilities.numerical_tools import mean       
    10881088        I = Interpolation_function(time, [mean(Q[0,:]),
    10891089                                          mean(Q[1,:]),

  • inundation-numpy-branch/pyvolution/test_mesh.py

    r2608 r3514  
    1515from numpy import allclose, array, zeros, Float
    1616
    17 from utilities.polygon import inside_polygon
     17from anuga.utilities.polygon import inside_polygon
    1818
    1919def distance(x, y):

  • inundation-numpy-branch/pyvolution/test_quantity.py

    r2608 r3514  
    280280    def test_set_values_using_least_squares(self):
    281281
    282         from geospatial_data.geospatial_data import Geospatial_data
     282        from anuga.geospatial_data.geospatial_data import Geospatial_data
    283283       
    284284        quantity = Quantity(self.mesh4)
    … …  
    331331
    332332        from domain import Domain
    333         from geospatial_data.geospatial_data import Geospatial_data       
     333        from anuga.geospatial_data.geospatial_data import Geospatial_data       
    334334        from coordinate_transforms.geo_reference import Geo_reference
    335335        from least_squares import fit_to_mesh
    … …  
    389389        quantity.vertex_values[:] = 0.0
    390390       
    391         from geospatial_data.geospatial_data import Geospatial_data
     391        from anuga.geospatial_data.geospatial_data import Geospatial_data
    392392        geo = Geospatial_data(data_points, z, data_georef)
    393393
    … …  
    10621062        from mesh_factory import rectangular
    10631063        from shallow_water import Domain, Transmissive_boundary
    1064         from utilities.numerical_tools import mean
     1064        from anuga.utilities.numerical_tools import mean
    10651065
    10661066        #Create basic mesh
    … …  
    11511151        from mesh_factory import rectangular
    11521152        from shallow_water import Domain, Transmissive_boundary
    1153         from utilities.numerical_tools import mean
     1153        from anuga.utilities.numerical_tools import mean
    11541154
    11551155

  • inundation-numpy-branch/pyvolution/test_shallow_water.py

    r2526 r3514  
    66from config import g, epsilon
    77from Numeric import allclose, array, zeros, ones, Float, take
    8 from utilities.numerical_tools import mean
     8from anuga.utilities.numerical_tools import mean
    99
    1010from shallow_water import *
    … …  
    967967        from math import pi, cos, sin, sqrt
    968968        from config import time_format
    969         from util import file_function
     969        from anuga.pyvolution.util import file_function
    970970        import time
    971971
    … …  
    10141014
    10151015        #Convert ASCII file to NetCDF (Which is what we really like!)
    1016         from data_manager import timefile2netcdf       
     1016        from anuga.pyvolution.data_manager import timefile2netcdf       
    10171017        timefile2netcdf(filename)
    10181018        os.remove(filename + '.txt')
    … …  
    21692169
    21702170    def test_flatbed_second_order_distribute(self):
    2171         #Use real data from pyvolution 2
     2171        #Use real data from anuga.pyvolution 2
    21722172        #painfully setup and extracted.
    21732173        from mesh_factory import rectangular

  • inundation-numpy-branch/pyvolution/test_util.py

    r2526 r3514  
    66from math import sqrt, pi
    77
    8 from util import *
     8from anuga.pyvolution.util import *
    99from config import epsilon
    10 from data_manager import timefile2netcdf
     10from anuga.pyvolution.data_manager import timefile2netcdf
    1111
    1212
    … …  
    2626    #Geometric
    2727    #def test_distance(self):
    28     #    from util import distance#
     28    #    from anuga.pyvolution.util import distance#
    2929    #
    3030    #    self.failUnless( distance([4,2],[7,6]) == 5.0,
    … …  
    119119        domain1 = Domain(points, vertices, boundary)
    120120
    121         from utilities.numerical_tools import mean
     121        from anuga.utilities.numerical_tools import mean
    122122        domain1.reduction = mean
    123123        domain1.smooth = True #NOTE: Mimic sww output where each vertex has
    … …  
    319319       
    320320
    321         from utilities.numerical_tools import mean     
     321        from anuga.utilities.numerical_tools import mean       
    322322        domain1.reduction = mean
    323323        domain1.smooth = True #NOTE: Mimic sww output where each vertex has
    … …  
    522522        from mesh_factory import rectangular
    523523        from shallow_water import Domain
    524         import data_manager
     524        import anuga.pyvolution.data_manager
    525525
    526526        finaltime = 1200

  • inundation-numpy-branch/pyvolution/tsh2sww.py

    r906 r3514  
    1313from pmesh2domain import pmesh_to_domain_instance
    1414import time, os
    15 from data_manager import get_dataobject   
    16 from util import mean
     15from anuga.pyvolution.data_manager import get_dataobject   
     16from anuga.pyvolution.util import mean
    1717
    1818def tsh2sww(infilename, sww_file_name = None, verbose = False):

  • inundation-numpy-branch/pyvolution/twolevels.py

    r1014 r3514  
    1313     Constant_height
    1414from Numeric import array
    15 from util import Polygon_function, read_polygon
     15from anuga.pyvolution.util import Polygon_function, read_polygon
    1616
    1717

  • inundation-numpy-branch/pyvolution/util.py

    r2526 r3514  
    66
    77
    8 import utilities.polygon
     8import anuga.utilities.polygon
    99from warnings import warn
    1010
    … …  
    173173    from Scientific.IO.NetCDF import NetCDFFile
    174174    from Numeric import array, zeros, Float, alltrue, concatenate, reshape
    175     from utilities.numerical_tools import ensure_numeric   
     175    from anuga.utilities.numerical_tools import ensure_numeric   
    176176
    177177    #Open NetCDF file
    … …  
    401401    """Temporary Interface to new location"""
    402402
    403     import utilities.numerical_tools as NT     
     403    import anuga.utilities.numerical_tools as NT       
    404404   
    405405    msg = 'angle has moved from util.py.  '
    406     msg += 'Please use "from utilities.numerical_tools import angle"'
     406    msg += 'Please use "from anuga.utilities.numerical_tools import angle"'
    407407    warn(msg, DeprecationWarning)
    408408
    … …  
    412412    """Temporary Interface to new location"""
    413413
    414     import utilities.numerical_tools as NT
     414    import anuga.utilities.numerical_tools as NT
    415415   
    416416    msg = 'anglediff has moved from util.py.  '
    417     msg += 'Please use "from utilities.numerical_tools import anglediff"'
     417    msg += 'Please use "from anuga.utilities.numerical_tools import anglediff"'
    418418    warn(msg, DeprecationWarning)
    419419
    … …  
    424424    """Temporary Interface to new location"""
    425425
    426     import utilities.numerical_tools as NT   
     426    import anuga.utilities.numerical_tools as NT   
    427427   
    428428    msg = 'mean has moved from util.py.  '
    429     msg += 'Please use "from utilities.numerical_tools import mean"'
     429    msg += 'Please use "from anuga.utilities.numerical_tools import mean"'
    430430    warn(msg, DeprecationWarning)
    431431
    … …  
    436436
    437437    msg = 'point_on_line has moved from util.py.  '
    438     msg += 'Please use "from utilities.polygon import point_on_line"'
     438    msg += 'Please use "from anuga.utilities.polygon import point_on_line"'
    439439    warn(msg, DeprecationWarning)
    440440
    … …  
    445445
    446446    print 'inside_polygon has moved from util.py.  ',
    447     print 'Please use "from utilities.polygon import inside_polygon"'
     447    print 'Please use "from anuga.utilities.polygon import inside_polygon"'
    448448
    449449    return utilities.polygon.inside_polygon(*args, **kwargs)   
    … …  
    453453
    454454    print 'outside_polygon has moved from util.py.  ',
    455     print 'Please use "from utilities.polygon import outside_polygon"'
     455    print 'Please use "from anuga.utilities.polygon import outside_polygon"'
    456456
    457457    return utilities.polygon.outside_polygon(*args, **kwargs)   
    … …  
    462462
    463463    print 'separate_points_by_polygon has moved from util.py.  ',
    464     print 'Please use "from utilities.polygon import separate_points_by_polygon"'
     464    print 'Please use "from anuga.utilities.polygon import separate_points_by_polygon"'
    465465
    466466    return utilities.polygon.separate_points_by_polygon(*args, **kwargs)   
    … …  
    472472
    473473    print 'read_polygon has moved from util.py.  ',
    474     print 'Please use "from utilities.polygon import read_polygon"'
     474    print 'Please use "from anuga.utilities.polygon import read_polygon"'
    475475
    476476    return utilities.polygon.read_polygon(*args, **kwargs)   
    … …  
    481481
    482482    print 'populate_polygon has moved from util.py.  ',
    483     print 'Please use "from utilities.polygon import populate_polygon"'
     483    print 'Please use "from anuga.utilities.polygon import populate_polygon"'
    484484
    485485    return utilities.polygon.populate_polygon(*args, **kwargs)   

  • inundation-numpy-branch/pyvolution/view_tsh.py

    r1363 r3514  
    99from shallow_water import Domain
    1010from pmesh2domain import pmesh_to_domain_instance
    11 from util import file_function, Polygon_function, read_polygon
     11from anuga.pyvolution.util import file_function, Polygon_function, read_polygon
    1212from Numeric import zeros, Float, maximum, minimum
    1313from realtime_visualisation_new import *

  • inundation-numpy-branch/utilities/numerical_tools.py

    r2548 r3514  
    236236#Initialise module
    237237
    238 #from utilities import compile
     238#from anuga.utilities import compile
    239239import compile
    240240if compile.can_use_C_extension('util_ext.c'):

  • inundation-numpy-branch/utilities/polygon.py

    r2548 r3514  
    77from math import sqrt
    88
    9 from utilities.numerical_tools import ensure_numeric
     9from anuga.utilities.numerical_tools import ensure_numeric
    1010
    1111

  • inundation-numpy-branch/utilities/test_numerical_tools.py

    r2546 r3514  
    55from numpy import zeros, array, allclose
    66from math import sqrt, pi
    7 from pyvolution.config import epsilon
     7from anuga.pyvolution.config import epsilon
    88
    99from numerical_tools import *

  • production/broome_2006/project.py

    r3477 r3514  
    44from os import sep, environ, getenv, getcwd
    55from os.path import expanduser, basename
    6 #from utilities.polygon import read_polygon
     6#from anuga.utilities.polygon import read_polygon
    77import sys
    88from pmesh.create_mesh import convert_points_from_latlon_to_utm
    99from coordinate_transforms.redfearn import degminsec2decimal_degrees
    1010from time import localtime, strftime
    11 from geospatial_data import *
     11from anuga.geospatial_data.geospatial_data import *
    1212
    1313#Making assumptions about the location of scenario data

  • production/broome_2006/run_broome.py

    r3477 r3514  
    1919
    2020# Related major packages
    21 from pyvolution.shallow_water import Domain, Reflective_boundary, \
     21from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, \
    2222                            Dirichlet_boundary, Time_boundary, File_boundary
    23 from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
    24 from pyvolution.combine_pts import combine_rectangular_points_files
    25 from pyvolution.pmesh2domain import pmesh_to_domain_instance
     23from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
     24from anuga.pyvolution.combine_pts import combine_rectangular_points_files
     25from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
    2626from shutil import copy
    2727from os import mkdir, access, F_OK
    28 from geospatial_data import *
     28from anuga.geospatial_data.geospatial_data import *
    2929import sys
    30 from pyvolution.util import Screen_Catcher
     30from anuga.pyvolution.util import Screen_Catcher
    3131
    3232# Application specific imports
    … …  
    107107print 'number of interior regions', len(interior_regions)
    108108
    109 from utilities.polygon import plot_polygons
     109from anuga.utilities.polygon import plot_polygons
    110110if sys.platform == 'win32':
    111111    #figname = project.outputtimedir + 'pt_hedland_polys'
    … …  
    169169# skipped as results in file SU-AU_clipped is correct for all WA
    170170
    171 from pyvolution.data_manager import ferret2sww
     171from anuga.pyvolution.data_manager import ferret2sww
    172172
    173173south = project.south

  • production/gippsland_2005/get_timeseries.py

    r2885 r3514  
    44
    55import project
    6 from pyvolution.util import file_function
    7 #from pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
     6from anuga.pyvolution.util import file_function
     7#from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
    88from coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
    99from pylab import *

  • production/gippsland_2005/run_gippsland2.py

    r2180 r3514  
    66import time
    77
    8 from pyvolution.data_manager import convert_dem_from_ascii2netcdf,\
     8from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf,\
    99     dem2pts, asc_csiro2sww
    10 from pyvolution.pmesh2domain import pmesh_to_domain_instance
     10from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
    1111from caching import cache
    1212from create_mesh2 import create_mesh
    13 from pyvolution.shallow_water import Domain, Reflective_boundary,\
     13from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
    1414     File_boundary, Dirichlet_boundary, Time_boundary, Transmissive_boundary
    15 from pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA
     15from anuga.pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA
    1616
    1717# Import this last!  It stuffs up the loading of c extensions otherwise.

  • production/karratha_2005/export_results.py

    r2065 r3514  
    11import project, os
    22
    3 from pyvolution.data_manager import sww2dem
    4 from pyvolution.ermapper_grids import read_ermapper_grid
     3from anuga.pyvolution.data_manager import sww2dem
     4from anuga.pyvolution.ermapper_grids import read_ermapper_grid
    55
    66

  • production/karratha_2005/get_cross_section.py

    r2885 r3514  
    33
    44import project
    5 from pyvolution.util import file_function
    6 from pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
     5from anuga.pyvolution.util import file_function
     6from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
    77
    88

  • production/karratha_2005/get_timeseries.py

    r2885 r3514  
    44
    55import project
    6 from pyvolution.util import file_function
    7 from pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
     6from anuga.pyvolution.util import file_function
     7from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
    88from pylab import *
    99

  • production/karratha_2005/process_buildings.py

    r2882 r3514  
    44
    55import project
    6 from pyvolution.util import file_function
    7 from pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
     6from anuga.pyvolution.util import file_function
     7from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
    88from pylab import *
    99

  • production/karratha_2005/run_karratha.py

    r2318 r3514  
    1919
    2020
    21 from pyvolution.shallow_water import Domain, Reflective_boundary, File_boundary,\
     21from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, File_boundary,\
    2222     Dirichlet_boundary, Time_boundary, Transmissive_boundary
    23 from pyvolution.data_manager import convert_dem_from_ascii2netcdf,\
     23from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf,\
    2424     dem2pts, ferret2sww
    25 from pyvolution.pmesh2domain import pmesh_to_domain_instance
     25from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
    2626from caching import cache
    2727import project
    … …  
    4444source_dir = project.boundarydir
    4545
    46 from pyvolution.data_manager import ferret2sww
     46from anuga.pyvolution.data_manager import ferret2sww
    4747
    4848south = project.south

  • production/onslow_2006/MOST_timeseries.py

    r3285 r3514  
    2121from os import sep, getcwd, F_OK, access, mkdir
    2222import project
    23 from pyvolution.util import sww2timeseries, get_gauges_from_file
     23from anuga.pyvolution.util import sww2timeseries, get_gauges_from_file
    2424
    2525# User defined inputs

  • production/onslow_2006/compare_timeseries_data.py

    r3338 r3514  
    1919from os import sep
    2020import project
    21 from pyvolution.util import sww2timeseries, get_gauges_from_file
     21from anuga.pyvolution.util import sww2timeseries, get_gauges_from_file
    2222
    2323# User defined inputs

  • production/onslow_2006/export_results.py

    r3323 r3514  
    22import sys
    33
    4 from pyvolution.data_manager import sww2dem
    5 from pyvolution.ermapper_grids import read_ermapper_grid
    6 from pyvolution.util import Screen_Catcher
     4from anuga.pyvolution.data_manager import sww2dem
     5from anuga.pyvolution.ermapper_grids import read_ermapper_grid
     6from anuga.pyvolution.util import Screen_Catcher
    77from os import sep
    88

  • production/onslow_2006/get_timeseries.py

    r3252 r3514  
    44
    55import project
    6 from pyvolution.util import file_function
     6from anuga.pyvolution.util import file_function
    77from coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
    88from pylab import *

  • production/onslow_2006/make_gauges.py

    r3188 r3514  
    55import project
    66from pylab import plot, xlabel, ylabel, title, ion, axis, savefig, close, text
    7 from utilities.polygon import poly_xy, is_inside_polygon
     7from anuga.utilities.polygon import poly_xy, is_inside_polygon
    88from Numeric import arange
    99from pmesh.create_mesh import convert_points_from_latlon_to_utm

  • production/onslow_2006/make_report.py

    r3477 r3514  
    5353from os import getcwd, sep, altsep, mkdir, access, F_OK
    5454import project
    55 from pyvolution.util import sww2timeseries, get_gauges_from_file
     55from anuga.pyvolution.util import sww2timeseries, get_gauges_from_file
    5656
    5757# Derive scenario name

  • production/onslow_2006/plot_data_extent.py

    r3150 r3514  
    11from pylab import *
    2 from geospatial_data import *
     2from anuga.geospatial_data.geospatial_data import *
    33from pmesh.create_mesh import convert_points_from_latlon_to_utm
    44from coordinate_transforms.redfearn import degminsec2decimal_degrees
    55from os import sep
    6 from utilities.polygon import inside_polygon
     6from anuga.utilities.polygon import inside_polygon
    77import project
    8 from utilities.polygon import plot_polygons, poly_xy, polygon_area
     8from anuga.utilities.polygon import plot_polygons, poly_xy, polygon_area
    99
    1010datadir = project.datadir
    … …  
    1818def read_community_file(filename1, filename2, polygon):
    1919    from coordinate_transforms.redfearn import redfearn
    20     from utilities.polygon import inside_polygon
     20    from anuga.utilities.polygon import inside_polygon
    2121    fid1 = open(filename1)
    2222    lines = fid1.readlines()

  • production/onslow_2006/project.py

    r3396 r3514  
    55from os import sep, environ, getenv, getcwd
    66from os.path import expanduser
    7 #from utilities.polygon import read_polygon
     7#from anuga.utilities.polygon import read_polygon
    88import sys
    99

  • production/onslow_2006/project_new.py

    r2615 r3514  
    55from os import sep, environ
    66from os.path import expanduser
    7 from utilities.polygon import read_polygon
     7from anuga.utilities.polygon import read_polygon
    88import sys
    99

  • production/onslow_2006/project_old.py

    r2615 r3514  
    55from os import sep, environ
    66from os.path import expanduser
    7 from utilities.polygon import read_polygon
     7from anuga.utilities.polygon import read_polygon
    88import sys
    99

  • production/onslow_2006/run_onslow.py

    r3276 r3514  
    2323
    2424# Related major packages
    25 from pyvolution.shallow_water import Domain, Reflective_boundary, \
     25from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, \
    2626                            Dirichlet_boundary, Time_boundary, File_boundary
    27 from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
    28 from pyvolution.combine_pts import combine_rectangular_points_files
    29 from pyvolution.pmesh2domain import pmesh_to_domain_instance
    30 from geospatial_data import *
    31 from pyvolution.util import Screen_Catcher
     27from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
     28from anuga.pyvolution.combine_pts import combine_rectangular_points_files
     29from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
     30from anuga.geospatial_data.geospatial_data import *
     31from anuga.pyvolution.util import Screen_Catcher
    3232
    3333# Application specific imports
    … …  
    183183#-------------------------------------------------------------------------------
    184184print 'start ferret2sww'
    185 from pyvolution.data_manager import ferret2sww
     185from anuga.pyvolution.data_manager import ferret2sww
    186186
    187187south = project.south

  • production/onslow_2006/run_onslow_new.py

    r2615 r3514  
    2020
    2121# Related major packages
    22 from pyvolution.shallow_water import Domain, Reflective_boundary, \
     22from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, \
    2323                            Dirichlet_boundary, Time_boundary, File_boundary
    24 from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
    25 from pyvolution.combine_pts import combine_rectangular_points_files
    26 from pyvolution.pmesh2domain import pmesh_to_domain_instance
    27 from geospatial_data import add_points_files
     24from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
     25from anuga.pyvolution.combine_pts import combine_rectangular_points_files
     26from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
     27from anuga.geospatial_data.geospatial_data import add_points_files
    2828
    2929# Application specific imports
    … …  
    3434from os import mkdir, access, F_OK
    3535
    36 from geospatial_data import *
     36from anuga.geospatial_data.geospatial_data import *
    3737
    3838#-------------------------------------------------------------------------------
    … …  
    182182#-------------------------------------------------------------------------------
    183183
    184 from pyvolution.data_manager import ferret2sww
     184from anuga.pyvolution.data_manager import ferret2sww
    185185
    186186south = project.south

  • production/onslow_2006/run_onslow_old.py

    r2615 r3514  
    2121
    2222# Related major packages
    23 from pyvolution.shallow_water import Domain, Reflective_boundary, \
     23from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, \
    2424                            Dirichlet_boundary, Time_boundary, File_boundary
    25 from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
    26 from pyvolution.combine_pts import combine_rectangular_points_files
    27 from pyvolution.pmesh2domain import pmesh_to_domain_instance
    28 #from geospatial_data import *
     25from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
     26from anuga.pyvolution.combine_pts import combine_rectangular_points_files
     27from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
     28#from anuga.geospatial_data.geospatial_data import *
    2929
    3030# Application specific imports
    … …  
    206206#------------------------------------------------------------------------------
    207207'''
    208 from pyvolution.data_manager import ferret2sww
     208from anuga.pyvolution.data_manager import ferret2sww
    209209
    210210south = project.south

  • production/onslow_2006/run_timeseries.py

    r3132 r3514  
    11""" Script for generating figures, see sww2timeseries for documentation"""
    22
    3 from pyvolution.util import sww2timeseries
     3from anuga.pyvolution.util import sww2timeseries
    44import project
    55from os import sep

  • production/pt_hedland_2006/compare_timeseries.py

    r3190 r3514  
    1919from os import sep
    2020import project
    21 from pyvolution.util import sww2timeseries, get_gauges_from_file
     21from anuga.pyvolution.util import sww2timeseries, get_gauges_from_file
    2222
    2323# User defined inputs

  • production/pt_hedland_2006/export_results.py

    r3291 r3514  
    22import sys
    33
    4 from pyvolution.data_manager import sww2dem
    5 from pyvolution.ermapper_grids import read_ermapper_grid
    6 from pyvolution.util import Screen_Catcher
     4from anuga.pyvolution.data_manager import sww2dem
     5from anuga.pyvolution.ermapper_grids import read_ermapper_grid
     6from anuga.pyvolution.util import Screen_Catcher
    77from os import sep
    88

  • production/pt_hedland_2006/make_report.py

    r3479 r3514  
    5252from os import getcwd, sep, altsep, mkdir, access, F_OK
    5353import project
    54 from pyvolution.util import sww2timeseries, get_gauges_from_file
     54from anuga.pyvolution.util import sww2timeseries, get_gauges_from_file
    5555
    5656# Derive scenario name

  • production/pt_hedland_2006/project.py

    r3477 r3514  
    55from os import sep, environ, getenv, getcwd
    66from os.path import expanduser, basename
    7 #from utilities.polygon import read_polygon
     7#from anuga.utilities.polygon import read_polygon
    88import sys
    99from pmesh.create_mesh import convert_points_from_latlon_to_utm
    1010from coordinate_transforms.redfearn import degminsec2decimal_degrees
    1111from time import localtime, strftime
    12 from geospatial_data import *
     12from anuga.geospatial_data.geospatial_data import *
    1313
    1414#Making assumptions about the location of scenario data

  • production/pt_hedland_2006/run_pt_hedland.py

    r3287 r3514  
    1919
    2020# Related major packages
    21 from pyvolution.shallow_water import Domain, Reflective_boundary, \
     21from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, \
    2222                            Dirichlet_boundary, Time_boundary, File_boundary
    23 from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
    24 from pyvolution.combine_pts import combine_rectangular_points_files
    25 from pyvolution.pmesh2domain import pmesh_to_domain_instance
     23from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, \
     24     dem2pts
     25from anuga.pyvolution.combine_pts import combine_rectangular_points_files
     26from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
    2627from shutil import copy
    2728from os import mkdir, access, F_OK
    28 from geospatial_data import *
     29from anuga.geospatial_data.geospatial_data import *
    2930import sys
    30 from pyvolution.util import Screen_Catcher
     31from anuga.pyvolution.util import Screen_Catcher
    3132
    3233# Application specific imports
    … …  
    108109print 'number of interior regions', len(interior_regions)
    109110
    110 from utilities.polygon import plot_polygons
     111from anuga.utilities.polygon import plot_polygons
    111112if sys.platform == 'win32':
    112113    #figname = project.outputtimedir + 'pt_hedland_polys'
    … …  
    170171# skipped as results in file SU-AU_clipped is correct for all WA
    171172
    172 from pyvolution.data_manager import ferret2sww
     173from anuga.pyvolution.data_manager import ferret2sww
    173174
    174175south = project.south

  • production/pt_hedland_2006/run_timeseries.py

    r2839 r3514  
    11""" Script for generating figures, see sww2timeseries for documentation"""
    22
    3 from pyvolution.util import sww2timeseries
     3from anuga.pyvolution.util import sww2timeseries
    44import project
    55from os import sep

  • production/swan_river_tin_2005/generate_tin.py

    r2010 r3514  
    44"""
    55
    6 from pyvolution.data_manager import hecras_cross_sections2pts
     6from anuga.pyvolution.data_manager import hecras_cross_sections2pts
    77
    88filename = 'cross_sections'

  • production/swan_river_tin_2005/populate_mesh.py

    r2233 r3514  
    22"""
    33
    4 from pyvolution.pmesh2domain import pmesh_to_domain_instance
     4from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
    55from caching import cache
    6 from pyvolution.shallow_water import Domain, Reflective_boundary
     6from anuga.pyvolution.shallow_water import Domain, Reflective_boundary
    77
    88

  • production/swan_river_tin_2005/thin_generate_alpha.py

    r3437 r3514  
    33
    44
    5 from pyvolution.load_mesh.loadASCII import reduce_pts
     5from anuga.pyvolution.load_mesh.loadASCII import reduce_pts
    66from pmesh.mesh import importMeshFromFile
    77

  • production/sydney_2006/export_results.py

    r3190 r3514  
    11import project, os
    22
    3 from pyvolution.data_manager import sww2dem
    4 from pyvolution.ermapper_grids import read_ermapper_grid
     3from anuga.pyvolution.data_manager import sww2dem
     4from anuga.pyvolution.ermapper_grids import read_ermapper_grid
    55
    66name = project.outputname

  • production/sydney_2006/get_timeseries.py

    r3190 r3514  
    44
    55import project
    6 from pyvolution.util import file_function
     6from anuga.pyvolution.util import file_function
    77#from coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
    88from pylab import *

  • production/sydney_2006/plot_integral.py

    r3190 r3514  
    66
    77import project
    8 from pyvolution.util import file_function
     8from anuga.pyvolution.util import file_function
    99from pylab import *
    1010

  • production/sydney_2006/process_gauges.py

    r3190 r3514  
    44
    55import project
    6 from pyvolution.util import file_function
    7 #from pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
     6from anuga.pyvolution.util import file_function
     7#from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
    88from pylab import *
    99

  • production/sydney_2006/project.py

    r3273 r3514  
    55from os import sep, environ
    66from os.path import expanduser
    7 from utilities.polygon import read_polygon
     7from anuga.utilities.polygon import read_polygon
    88import sys
    99

  • production/sydney_2006/run_sydney.py

    r2188 r3514  
    1717
    1818
    19 from pyvolution.shallow_water import Domain, Reflective_boundary, File_boundary,\
     19from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, File_boundary,\
    2020     Dirichlet_boundary, Time_boundary, Transmissive_boundary
    21 from pyvolution.data_manager import convert_dem_from_ascii2netcdf,\
     21from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf,\
    2222     dem2pts
    23 from pyvolution.pmesh2domain import pmesh_to_domain_instance
     23from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
    2424from caching import cache
    2525import project

  • production/sydney_2006/run_sydney_smf.py

    r3190 r3514  
    2020
    2121# Related major packages
    22 from pyvolution.shallow_water import Domain, Reflective_boundary, Dirichlet_boundary
    23 from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
    24 #from pyvolution.data_manager_old import convert_dem_from_ascii2netcdf, dem2pts
    25 from pyvolution.combine_pts import combine_rectangular_points_files
    26 from pyvolution.pmesh2domain import pmesh_to_domain_instance
    27 from pyvolution.quantity import Quantity
     22from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, Dirichlet_boundary
     23from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
     24#from anuga.pyvolution.data_manager_old import convert_dem_from_ascii2netcdf, dem2pts
     25from anuga.pyvolution.combine_pts import combine_rectangular_points_files
     26from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
     27from anuga.pyvolution.quantity import Quantity
    2828from Numeric import allclose
    29 from utilities.polygon import inside_polygon
     29from anuga.utilities.polygon import inside_polygon
    3030
    3131# Application specific imports
    3232import project                 # Definition of file names and polygons
    33 from pyvolution.smf import slump_tsunami  # Function for submarine mudslide
     33from anuga.pyvolution.smf import slump_tsunami  # Function for submarine mudslide
    3434
    3535

  • production/sydney_2006/run_sydney_smf_polyingo.py

    r3190 r3514  
    2020
    2121# Related major packages
    22 from pyvolution.shallow_water import Domain, Reflective_boundary, Time_boundary, Dirichlet_boundary
    23 from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
    24 from pyvolution.combine_pts import combine_rectangular_points_files
    25 from pyvolution.pmesh2domain import pmesh_to_domain_instance
    26 from pyvolution.quantity import Quantity
    27 from geospatial_data import *
    28 from utilities.polygon import inside_polygon
     22from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, Time_boundary, Dirichlet_boundary
     23from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
     24from anuga.pyvolution.combine_pts import combine_rectangular_points_files
     25from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
     26from anuga.pyvolution.quantity import Quantity
     27from anuga.geospatial_data.geospatial_data import *
     28from anuga.utilities.polygon import inside_polygon
    2929from Numeric import allclose
    3030
    … …  
    211211                    verbose = True)
    212212
    213 from pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA
     213from anuga.pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA
    214214
    215215#Add elevation data to the mesh

  • production/sydney_2006/run_timeseries.py

    r3190 r3514  
    11#from get_timeseries_test import sww2timeseries
    2 from pyvolution.util import sww2timeseries
     2from anuga.pyvolution.util import sww2timeseries
    33import project
    44from os import sep

  • production/wollongong_2006/run_flagstaff.py

    r3438 r3514  
    2424
    2525# Related major packages
    26 from pyvolution.shallow_water import Domain
    27 from pyvolution.shallow_water import Dirichlet_boundary
    28 from pyvolution.shallow_water import Time_boundary
    29 from pyvolution.shallow_water import Reflective_boundary
    30 from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
     26from anuga.pyvolution.shallow_water import Domain
     27from anuga.pyvolution.shallow_water import Dirichlet_boundary
     28from anuga.pyvolution.shallow_water import Time_boundary
     29from anuga.pyvolution.shallow_water import Reflective_boundary
     30from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
    3131from pmesh.mesh_interface import create_mesh_from_regions
    3232from pmesh.mesh import importUngenerateFile, Segment
Note: See TracChangeset for help on using the changeset viewer.