Ignore:
Timestamp:
Aug 21, 2006, 4:10:14 PM (19 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

Location:
inundation-numpy-branch/pyvolution
Files:
33 edited

Legend:

Unmodified
Added
Removed
  • 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 *
Note: See TracChangeset for help on using the changeset viewer.