Changeset 3563


Ignore:
Timestamp:
Sep 12, 2006, 4:35:11 PM (17 years ago)
Author:
ole
Message:

Moved shallow water out from the old pyvolution directory.
All tests pass, most examples and okushiri works again.

Files:
22 edited
5 moved

Legend:

Unmodified
Added
Removed

  • anuga_core/compile_all.py

    r3560 r3563  
    3030
    3131os.chdir('..')
     32os.chdir('shallow_water')
     33execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
     34
     35os.chdir('..')
    3236os.chdir('mesh_engine')
    3337execfile('compile.py')

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

    r3560 r3563  
    99
    1010from anuga.abstract_2d_finite_volumes.neighbour_mesh import Mesh
    11 from anuga.abstract_2d_finite_volumes.generic_boundary_conditions import Boundary
    12 from anuga.abstract_2d_finite_volumes.generic_boundary_conditions import File_boundary
    13 from anuga.abstract_2d_finite_volumes.generic_boundary_conditions import Dirichlet_boundary
    14 from anuga.abstract_2d_finite_volumes.generic_boundary_conditions import Time_boundary
    15 from anuga.abstract_2d_finite_volumes.generic_boundary_conditions import Transmissive_boundary
     11from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
     12     import Boundary
     13from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
     14     import File_boundary
     15from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
     16     import Dirichlet_boundary
     17from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
     18     import Time_boundary
     19from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
     20     import Transmissive_boundary
     21
    1622from anuga.abstract_2d_finite_volumes.pmesh2domain import pmesh_to_domain
    17 from anuga.abstract_2d_finite_volumes.region import Set_region as region_set_region
     23from anuga.abstract_2d_finite_volumes.region\
     24     import Set_region as region_set_region
    1825
    1926import types

  • anuga_core/source/anuga/abstract_2d_finite_volumes/most2nc.py

    r1124 r3563  
     1"""This has to do with creating elevation data files for use with ferret2sww.
     2It reads a bathymetry ascii file and creates a NetCDF (nc) file similar to MOSTs output.
     3
     4 $Author: Peter Row
     5 
     6"""
     7
     8
    19def most2nc(input_file=None,output_file=None,inverted_bathymetry = False,\
    210            verbose = True):

  • anuga_core/source/anuga/abstract_2d_finite_volumes/pmesh2domain.py

    r2812 r3563  
    77"""
    88
     9import sys
     10
     11
     12
    913def pmesh_instance_to_domain_instance(mesh,
    1014                                      DomainClass):
    … …  
    1418    Use pmesh_to_domain_instance to convert a mesh file to a domain instance.
    1519    """
    16     import sys
    17     from domain import Domain
    1820
    1921    vertex_coordinates, vertices, tag_dict, vertex_quantity_dict \
    … …  
    2123                        pmesh_to_domain(mesh_instance=mesh)
    2224
    23 
    24     assert issubclass(DomainClass, Domain),"DomainClass is not a subclass of Domain."
     25    # NOTE(Ole): This import cannot be at the module level due to mutual
     26    # dependency with domain.py
     27    from anuga.abstract_2d_finite_volumes.domain import Domain
     28
     29 
     30
     31
     32    msg = 'The class %s is not a subclass of the generic domain class %s'\
     33          %(DomainClass, Domain)
     34    assert issubclass(DomainClass, Domain), msg
    2535
    2636
    … …  
    7484    """
    7585   
    76     import sys
    77     from domain import Domain
    78 
    79     vertex_coordinates, vertices, tag_dict, vertex_quantity_dict \
    80                         ,tagged_elements_dict, geo_reference = \
     86    vertex_coordinates, vertices, tag_dict, vertex_quantity_dict, \
     87                        tagged_elements_dict, geo_reference = \
    8188                        pmesh_to_domain(file_name=file_name)
    8289
    8390
    84     assert issubclass(DomainClass, Domain),"DomainClass is not a subclass of Domain."
     91    # NOTE(Ole): This import cannot be at the module level due to mutual
     92    # dependency with domain.py
     93    from anuga.abstract_2d_finite_volumes.domain import Domain
     94
     95
     96    msg = 'The class %s is not a subclass of the generic domain class %s'\
     97          %(DomainClass, Domain)
     98    assert issubclass(DomainClass, Domain), msg
     99
    85100
    86101

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

    r3560 r3563  
    152152        #Convert ASCII file to NetCDF (Which is what we really like!)
    153153       
    154         from anuga.abstract_2d_finite_volumes.data_manager import timefile2netcdf               
     154        from anuga.shallow_water.data_manager import timefile2netcdf
     155       
    155156        timefile2netcdf(filename, quantity_names = ['stage', 'ymomentum'])
    156157       
    … …  
    246247
    247248        #Convert ASCII file to NetCDF (Which is what we really like!)
    248         from anuga.abstract_2d_finite_volumes.data_manager import timefile2netcdf               
     249        from anuga.shallow_water.data_manager import timefile2netcdf
     250       
    249251        timefile2netcdf(filename, quantity_names = ['stage', 'xmomentum'])
    250252

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

    r3560 r3563  
    1111
    1212from interpolate_sww import *
    13 from anuga.abstract_2d_finite_volumes.shallow_water import Domain, Transmissive_boundary
    14 from anuga.abstract_2d_finite_volumes.data_manager import get_dataobject
     13from anuga.shallow_water import Domain, Transmissive_boundary
     14from anuga.shallow_water.data_manager import get_dataobject
    1515
    1616

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

    r3535 r3563  
    66from Numeric import allclose, array
    77
    8 from shallow_water import Domain
    98
    109#from anuga.pyvolution.pmesh2domain import *
    11 
    1210from pmesh2domain import *
    1311
    14 from shallow_water import Domain, Reflective_boundary, Dirichlet_boundary,\
     12from anuga.shallow_water import Domain,\
     13     Reflective_boundary, Dirichlet_boundary,\
    1514     Transmissive_boundary
    1615

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

    r3560 r3563  
    99from anuga.abstract_2d_finite_volumes.util import *
    1010from anuga.config import epsilon
    11 from anuga.abstract_2d_finite_volumes.data_manager import timefile2netcdf
     11from anuga.shallow_water.data_manager import timefile2netcdf
    1212
    1313from anuga.utilities.numerical_tools import NAN
    … …  
    535535        from mesh_factory import rectangular
    536536        from shallow_water import Domain
    537         import anuga.abstract_2d_finite_volumes.data_manager
     537        import anuga.shallow_water.data_manager
    538538
    539539        finaltime = 1200
    … …  
    695695        from mesh_factory import rectangular
    696696        from shallow_water import Domain
    697         import anuga.abstract_2d_finite_volumes.data_manager
     697        import anuga.shallow_water.data_manager
    698698        from anuga.pmesh.mesh_interface import create_mesh_from_regions
    699699        finaltime = 1200

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

    r3560 r3563  
    2828
    2929from anuga.utilities.numerical_tools import ensure_numeric
    30 from anuga.abstract_2d_finite_volumes.data_manager import Exposure_csv
     30from anuga.shallow_water.data_manager import Exposure_csv
    3131from anuga.abstract_2d_finite_volumes.util import file_function
    3232from anuga.geospatial_data.geospatial_data import ensure_absolute

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

    r3560 r3563  
    1313from anuga.pmesh.mesh import Mesh
    1414from anuga.coordinate_transforms.geo_reference import Geo_reference
    15 from anuga.abstract_2d_finite_volumes.shallow_water import Domain, Transmissive_boundary
     15from anuga.shallow_water import Domain, Transmissive_boundary
    1616from anuga.utilities.numerical_tools import mean
    17 from anuga.abstract_2d_finite_volumes.data_manager import get_dataobject
     17from anuga.shallow_water.data_manager import get_dataobject
    1818
    1919from Numeric import zeros, Float, allclose

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

    r3514 r3563  
    1313import sys
    1414from os import sep, path
    15 #sys.path.append('..'+sep+'pyvolution')
    16 
    17 from anuga.pyvolution.shallow_water import Domain, Reflective_boundary,\
     15
     16from anuga.shallow_water import Domain, Reflective_boundary,\
    1817     Dirichlet_boundary,\
    19      Transmissive_boundary, Time_boundary, Wind_stress
    20 
    21 from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
     18     Transmissive_boundary, Time_boundary
     19
     20from anuga.shallow_water.shallow_water_domain import Wind_stress
     21
     22from anuga.abstract_2d_finite_volumes.pmesh2domain import pmesh_to_domain_instance
    2223from anuga.utilities.polygon import read_polygon, Polygon_function
    2324from math import pi

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

    r3560 r3563  
    99# Module imports
    1010from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular
    11 from anuga.abstract_2d_finite_volumes.shallow_water import Domain, Reflective_boundary,\
     11from anuga.shallow_water import Domain, Reflective_boundary,\
    1212     Dirichlet_boundary, Time_boundary, Transmissive_boundary
    1313

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

    r3560 r3563  
    1616# Application specific imports
    1717from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular
    18 from anuga.abstract_2d_finite_volumes.shallow_water import Domain, Reflective_boundary, Dirichlet_boundary
     18from anuga.shallow_water import Domain, Reflective_boundary, Dirichlet_boundary
    1919from anuga.pmesh.mesh_interface import create_mesh_from_regions
    2020from anuga.utilities.polygon import Polygon_function, read_polygon

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

    r3560 r3563  
    1111
    1212from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular_cross
    13 from anuga.abstract_2d_finite_volumes.shallow_water import Domain
    14 from anuga.abstract_2d_finite_volumes.shallow_water import Reflective_boundary
    15 from anuga.abstract_2d_finite_volumes.shallow_water import Dirichlet_boundary
    16 from anuga.abstract_2d_finite_volumes.shallow_water import Time_boundary
    17 from anuga.abstract_2d_finite_volumes.shallow_water import Transmissive_boundary
     13from anuga.shallow_water import Domain
     14from anuga.shallow_water import Reflective_boundary
     15from anuga.shallow_water import Dirichlet_boundary
     16from anuga.shallow_water import Time_boundary
     17from anuga.shallow_water import Transmissive_boundary
    1818
    1919

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

    r3560 r3563  
    1616from anuga.pmesh.mesh_interface import create_mesh_from_regions
    1717from abstract_2d_finite_volumes.mesh_factory import rectangular_cross
    18 from abstract_2d_finite_volumes.shallow_water import Domain
    19 from abstract_2d_finite_volumes.shallow_water import Reflective_boundary
    20 from abstract_2d_finite_volumes.shallow_water import Dirichlet_boundary
    21 from abstract_2d_finite_volumes.shallow_water import Time_boundary
    22 from abstract_2d_finite_volumes.shallow_water import Transmissive_Momentum_Set_Stage_boundary
     18from anuga.shallow_water import Domain
     19from anuga.shallow_water import Reflective_boundary
     20from anuga.shallow_water import Dirichlet_boundary
     21from anuga.shallow_water import Time_boundary
     22from anuga.shallow_water import Transmissive_Momentum_Set_Stage_boundary
    2323from abstract_2d_finite_volumes.util import file_function
    2424from pylab import plot, xlabel, ylabel, title, ion, close, savefig, figure, axis, legend, grid, hold

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

    r3560 r3563  
    2020from interpolate import *
    2121from anuga.coordinate_transforms.geo_reference import Geo_reference
    22 from shallow_water import Domain, Transmissive_boundary
     22from anuga.shallow_water import Domain, Transmissive_boundary
    2323from anuga.utilities.numerical_tools import mean, NAN
    24 from anuga.abstract_2d_finite_volumes.data_manager import get_dataobject
     24from anuga.shallow_water.data_manager import get_dataobject
    2525from anuga.geospatial_data.geospatial_data import Geospatial_data
    2626from anuga.pmesh.mesh import Mesh

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

    r3560 r3563  
    35473547    from anuga.abstract_2d_finite_volumes.pmesh2domain import pmesh_to_domain_instance
    35483548    import time, os
    3549     from anuga.abstract_2d_finite_volumes.data_manager import get_dataobject
     3549    #from data_manager import get_dataobject
    35503550    from os import sep, path
    35513551    from anuga.utilities.numerical_tools import mean

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

    r3560 r3563  
    5555
    5656
    57 from domain import Domain as Generic_Domain
    58 from generic_boundary_conditions import Boundary
    59 from generic_boundary_conditions import File_boundary
    60 from generic_boundary_conditions import Dirichlet_boundary
    61 from generic_boundary_conditions import Time_boundary
    62 from generic_boundary_conditions import Transmissive_boundary
     57from anuga.abstract_2d_finite_volumes.domain import Domain as Generic_Domain
     58from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
     59     import Boundary
     60from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
     61     import File_boundary
     62from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
     63     import Dirichlet_boundary
     64from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
     65     import Time_boundary
     66from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
     67     import Transmissive_boundary
    6368
    6469from anuga.utilities.numerical_tools import gradient, mean
    … …  
    334339        """
    335340
    336         from anuga.abstract_2d_finite_volumes.data_manager import get_dataobject
     341        from anuga.shallow_water.data_manager import get_dataobject
    337342
    338343        #Initialise writer

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

    r3560 r3563  
    1010from Scientific.IO.NetCDF import NetCDFFile
    1111
    12 from anuga.abstract_2d_finite_volumes.data_manager import *
    13 from anuga.abstract_2d_finite_volumes.shallow_water import *
     12from anuga.shallow_water.data_manager import *
     13from anuga.shallow_water import *
    1414from anuga.config import epsilon
    1515
    1616# This is needed to run the tests of local functions
    17 import anuga.abstract_2d_finite_volumes.data_manager
     17import data_manager
    1818
    1919from anuga.coordinate_transforms.geo_reference import Geo_reference
    … …  
    27182718        ################################################
    27192719        from mesh_factory import rectangular
    2720         from shallow_water import Domain, Reflective_boundary, Dirichlet_boundary,\
    2721             Constant_height, Time_boundary, Transmissive_boundary
    27222720        from Numeric import array
    27232721
    … …  
    27642762        #Import the example's file as a new domain
    27652763        ##########################################
    2766         from anuga.abstract_2d_finite_volumes.data_manager import sww2domain
     2764        from data_manager import sww2domain
    27672765        from Numeric import allclose
    27682766        import os
    … …  
    28642862
    28652863        from mesh_factory import rectangular
    2866         from shallow_water import Domain, Reflective_boundary, Dirichlet_boundary,\
    2867              Constant_height, Time_boundary, Transmissive_boundary
    28682864        from Numeric import array
    28692865
    … …  
    29082904        #Import the file as a new domain
    29092905        ##################################
    2910         from anuga.abstract_2d_finite_volumes.data_manager import sww2domain
     2906        from data_manager import sww2domain
    29112907        from Numeric import allclose
    29122908        import os
    … …  
    29462942
    29472943    #def test_weed(self):
    2948         from anuga.abstract_2d_finite_volumes.data_manager import weed
     2944        from data_manager import weed
    29492945
    29502946        coordinates1 = [[0.,0.],[1.,0.],[1.,1.],[1.,0.],[2.,0.],[1.,1.]]
    … …  
    29732969        ################################################
    29742970        from mesh_factory import rectangular
    2975         from shallow_water import Domain, Reflective_boundary, Dirichlet_boundary,\
    2976              Constant_height, Time_boundary, Transmissive_boundary
    29772971        from Numeric import array
    29782972        #Create basic mesh
    … …  
    30193013        #Import the example's file as a new domain
    30203014        ##########################################
    3021         from anuga.abstract_2d_finite_volumes.data_manager import sww2domain
     3015        from data_manager import sww2domain
    30223016        from Numeric import allclose
    30233017        import os
    … …  
    33203314        from Scientific.IO.NetCDF import NetCDFFile
    33213315
    3322         from anuga.abstract_2d_finite_volumes.data_manager import _read_asc
     3316        from data_manager import _read_asc
    33233317        #Write test asc file
    33243318        filename = tempfile.mktemp(".000")
    … …  
    40354029        # k - lat
    40364030        # l - lon
    4037         kmin, kmax, lmin, lmax = anuga.abstract_2d_finite_volumes.data_manager._get_min_max_indexes(
     4031        kmin, kmax, lmin, lmax = data_manager._get_min_max_indexes(
    40384032            latitudes,longitudes,
    40394033            -10,4,-10,31)
    … …  
    40504044
    40514045        ## 2nd test
    4052         kmin, kmax, lmin, lmax = anuga.abstract_2d_finite_volumes.data_manager._get_min_max_indexes(
     4046        kmin, kmax, lmin, lmax = data_manager._get_min_max_indexes(
    40534047            latitudes,longitudes,
    40544048            0.5,2.5,5,25)
    … …  
    40654059
    40664060        ## 3rd test
    4067         kmin, kmax, lmin, lmax = anuga.abstract_2d_finite_volumes.data_manager._get_min_max_indexes(\
     4061        kmin, kmax, lmin, lmax = data_manager._get_min_max_indexes(\
    40684062            latitudes,
    40694063            longitudes,
    … …  
    40824076
    40834077        ## 4th test
    4084         kmin, kmax, lmin, lmax = anuga.abstract_2d_finite_volumes.data_manager._get_min_max_indexes(
     4078        kmin, kmax, lmin, lmax = data_manager._get_min_max_indexes(
    40854079            latitudes,longitudes,
    40864080                                                      -0.1,1.9,-2,17)
    … …  
    40964090                         'failed')
    40974091        ## 5th test
    4098         kmin, kmax, lmin, lmax = anuga.abstract_2d_finite_volumes.data_manager._get_min_max_indexes(
     4092        kmin, kmax, lmin, lmax = data_manager._get_min_max_indexes(
    40994093            latitudes,longitudes,
    41004094            0.1,1.9,2,17)
    … …  
    41124106        ## 6th test
    41134107
    4114         kmin, kmax, lmin, lmax = anuga.abstract_2d_finite_volumes.data_manager._get_min_max_indexes(
     4108        kmin, kmax, lmin, lmax = data_manager._get_min_max_indexes(
    41154109            latitudes,longitudes,
    41164110            1.5,4,18,32)
    … …  
    41294123        ## 7th test
    41304124        m2d = array([[0,1,2,3],[4,5,6,7],[8,9,10,11],[12,13,14,15]])
    4131         kmin, kmax, lmin, lmax = anuga.abstract_2d_finite_volumes.data_manager._get_min_max_indexes(
     4125        kmin, kmax, lmin, lmax = data_manager._get_min_max_indexes(
    41324126            latitudes,longitudes,
    41334127            1.5,1.5,15,15)
    … …  
    41564150        # k - lat
    41574151        # l - lon
    4158         kmin, kmax, lmin, lmax = anuga.abstract_2d_finite_volumes.data_manager._get_min_max_indexes(
     4152        kmin, kmax, lmin, lmax = data_manager._get_min_max_indexes(
    41594153            latitudes,longitudes,
    41604154            -37,-27,147,149.5)
    … …  
    41854179        # k - lat
    41864180        # l - lon
    4187         kmin, kmax, lmin, lmax = anuga.abstract_2d_finite_volumes.data_manager._get_min_max_indexes(
     4181        kmin, kmax, lmin, lmax = data_manager._get_min_max_indexes(
    41884182            latitudes,longitudes,
    41894183            -43,-37,148.5,149.5)
    … …  
    42094203        # k - lat
    42104204        # l - lon
    4211         kmin, kmax, lmin, lmax = anuga.abstract_2d_finite_volumes.data_manager._get_min_max_indexes(
     4205        kmin, kmax, lmin, lmax = data_manager._get_min_max_indexes(
    42124206            latitudes,longitudes)
    42134207

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

    r3560 r3563  
    88from anuga.utilities.numerical_tools import mean
    99
    10 from shallow_water import *
     10from shallow_water_domain import *
    1111
    1212
    … …  
    201201        vertices = [ [1,0,2], [1,2,4], [4,2,5], [3,1,4]]
    202202
     203
     204        #from anuga.abstract_2d_finite_volumes.domain import Domain as Generic_domain
     205        #msg = 'The class %s is not a subclass of the generic domain class %s'\
     206        #      %(DomainClass, Domain)
     207        #assert issubclass(DomainClass, Domain), msg
     208
    203209        domain = Domain(points, vertices)
    204210        domain.check_integrity()
    … …  
    10291035
    10301036        #Convert ASCII file to NetCDF (Which is what we really like!)
    1031         from anuga.abstract_2d_finite_volumes.data_manager import timefile2netcdf       
     1037        from data_manager import timefile2netcdf       
    10321038        timefile2netcdf(filename)
    10331039        os.remove(filename + '.txt')
    … …  
    15841590        """
    15851591        from mesh_factory import rectangular
    1586         from shallow_water import Domain, Reflective_boundary,\
    1587              Dirichlet_boundary, Constant_height
    15881592        from Numeric import array
    15891593
    … …  
    16381642        """
    16391643        from mesh_factory import rectangular
    1640         from shallow_water import Domain, Reflective_boundary,\
    1641              Dirichlet_boundary, Constant_height
    16421644        from Numeric import array
    16431645
    … …  
    16901692        """
    16911693        from mesh_factory import rectangular
    1692         from shallow_water import Domain, Reflective_boundary,\
    1693              Dirichlet_boundary, Constant_height
    16941694        from Numeric import array
    16951695
    … …  
    17671767        """
    17681768        from mesh_factory import rectangular
    1769         from shallow_water import Domain, Reflective_boundary,\
    1770              Dirichlet_boundary, Constant_height
    17711769        from Numeric import array
    17721770
    … …  
    18551853        """
    18561854        from mesh_factory import rectangular
    1857         from shallow_water import Domain, Reflective_boundary,\
    1858              Dirichlet_boundary, Constant_height
    18591855        from Numeric import array
    18601856
    … …  
    19291925        from os import sep; sys.path.append('..'+sep+'abstract_2d_finite_volumes')
    19301926        from mesh_factory import rectangular
    1931         from shallow_water import Domain, Reflective_boundary
    19321927
    19331928
    … …  
    19811976
    19821977        from mesh_factory import rectangular
    1983         from shallow_water import Domain, Reflective_boundary,\
    1984              Dirichlet_boundary, Constant_height
    19851978        from Numeric import array
    19861979
    … …  
    20512044
    20522045        from mesh_factory import rectangular
    2053         from shallow_water import Domain, Reflective_boundary,\
    2054              Dirichlet_boundary, Constant_height
    20552046        from Numeric import array
    20562047
    … …  
    20842075    def test_flatbed_first_order(self):
    20852076        from mesh_factory import rectangular
    2086         from shallow_water import Domain,\
    2087              Reflective_boundary, Dirichlet_boundary
    2088 
    20892077        from Numeric import array
    20902078
    … …  
    21312119    def test_flatbed_second_order(self):
    21322120        from mesh_factory import rectangular
    2133         from shallow_water import Domain,\
    2134              Reflective_boundary, Dirichlet_boundary
    2135 
    21362121        from Numeric import array
    21372122
    … …  
    21922177    def test_flatbed_second_order_vmax_0(self):
    21932178        from mesh_factory import rectangular
    2194         from shallow_water import Domain,\
    2195              Reflective_boundary, Dirichlet_boundary
    2196 
    21972179        from Numeric import array
    21982180
    … …  
    22412223        #painfully setup and extracted.
    22422224        from mesh_factory import rectangular
    2243         from shallow_water import Domain,\
    2244              Reflective_boundary, Dirichlet_boundary
    2245 
    22462225        from Numeric import array
    22472226
    … …  
    23912370
    23922371        from mesh_factory import rectangular
    2393         from shallow_water import Domain, Reflective_boundary, Constant_height
    23942372        from Numeric import array
    23952373
    … …  
    24292407
    24302408        from mesh_factory import rectangular
    2431         from shallow_water import Domain, Reflective_boundary, Constant_height
    24322409        from Numeric import array
    24332410
    … …  
    24932470
    24942471        from mesh_factory import rectangular
    2495         from shallow_water import Domain, Reflective_boundary, Constant_height
    24962472        from Numeric import array
    24972473
    … …  
    25802556
    25812557        from mesh_factory import rectangular
    2582         from shallow_water import Domain, Reflective_boundary, Constant_height
    25832558        from Numeric import array
    25842559
    … …  
    26732648
    26742649        from mesh_factory import rectangular
    2675         from shallow_water import Domain, Reflective_boundary, Constant_height
    26762650        from Numeric import array
    26772651
    … …  
    27622736
    27632737        from mesh_factory import rectangular
    2764         from shallow_water import Domain, Reflective_boundary, Constant_height
    27652738        from Numeric import array
    27662739
    … …  
    28792852
    28802853        from mesh_factory import rectangular
    2881         from shallow_water import Domain, Reflective_boundary, Constant_height
    28822854        from Numeric import array
    28832855
    … …  
    29212893    def test_complex_bed(self):
    29222894        #No friction is tested here
    2923 
    2924         from shallow_water import Domain, Reflective_boundary, Dirichlet_boundary,\
    2925              Transmissive_boundary, Time_boundary,\
    2926              Weir_simple as Weir, Constant_height
    29272895
    29282896        from mesh_factory import rectangular

  • development/okushiri_2005/lwru2.py

    r3560 r3563  
    7676
    7777# Module imports
    78 from anuga.abstract_2d_finite_volumes.shallow_water import Domain, Reflective_boundary,\
     78from anuga.shallow_water import Domain, Reflective_boundary,\
    7979     File_boundary, Transmissive_Momentum_Set_Stage_boundary
     80
    8081from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular_cross
    8182from anuga.abstract_2d_finite_volumes.pmesh2domain import pmesh_to_domain_instance

  • documentation/user_manual/examples/file_function_example.py

    r3534 r3563  
    44#Notice the statistics output
    55
    6 from anuga.pyvolution.util import file_function
     6from anuga.abstract_2d_finite_volumes.util import file_function
    77 
    88f = file_function('bedslope.sww',

  • documentation/user_manual/examples/harbour.py

    r3534 r3563  
    1616
    1717from anuga.pmesh.mesh_interface import create_mesh_from_regions
    18 from anuga.pyvolution.shallow_water import Domain
    19 from anuga.pyvolution.shallow_water import Reflective_boundary
    20 from anuga.pyvolution.shallow_water import Dirichlet_boundary
    21 from anuga.pyvolution.shallow_water import Time_boundary
    22 from anuga.pyvolution.shallow_water import Transmissive_boundary
     18from anuga.shallow_water import Domain
     19from anuga.shallow_water import Reflective_boundary
     20from anuga.shallow_water import Dirichlet_boundary
     21from anuga.shallow_water import Time_boundary
     22from anuga.shallow_water import Transmissive_boundary
    2323
    2424waveheight = 1.0
    … …  
    127127gauges, gaugex, gaugey = gauge_line(west,east,north,south)
    128128
    129 from anuga.pyvolution.util import file_function
     129from anuga.abstract_2d_finite_volumes.util import file_function
    130130
    131131f = file_function('harbour.sww',

  • documentation/user_manual/examples/runsydney.py

    r3534 r3563  
    2020
    2121# Related major packages
    22 from anuga.pyvolution.shallow_water import Domain, Dirichlet_boundary
    23 from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
    24 from anuga.pyvolution.combine_pts import combine_rectangular_points_files
     22from anuga.shallow_water import Domain, Dirichlet_boundary
     23from anuga.shallow_water.data_manager import convert_dem_from_ascii2netcdf, dem2pts
     24from anuga.abstract_2d_finite_volumes.combine_pts import combine_rectangular_points_files
    2525from anuga.pmesh.mesh_interface import create_mesh_from_regions
    2626
    2727# Application specific imports
    2828import project                           # Define file names and polygons
    29 from anuga.pyvolution.smf import slump_tsunami # Function for submarine mudslide
     29from anuga.shallow_water.smf import slump_tsunami # Function for submarine mudslide
    3030
    3131

  • documentation/user_manual/examples/runup.py

    r3534 r3563  
    1010#------------------------------------------------------------------------------
    1111
    12 from anuga.pyvolution.mesh_factory import rectangular_cross
    13 from anuga.pyvolution.shallow_water import Domain
    14 from anuga.pyvolution.shallow_water import Reflective_boundary
    15 from anuga.pyvolution.shallow_water import Dirichlet_boundary
    16 from anuga.pyvolution.shallow_water import Time_boundary
    17 from anuga.pyvolution.shallow_water import Transmissive_boundary
     12from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular_cross
     13from anuga.shallow_water import Domain
     14from anuga.shallow_water import Reflective_boundary
     15from anuga.shallow_water import Dirichlet_boundary
     16from anuga.shallow_water import Time_boundary
     17from anuga.shallow_water import Transmissive_boundary
    1818
    1919

  • documentation/user_manual/examples/runuptest.py

    r3534 r3563  
    1111
    1212from anuga.pmesh.mesh_interface import create_mesh_from_regions
    13 from anuga.pyvolution.shallow_water import Domain
    14 from anuga.pyvolution.shallow_water import Reflective_boundary
    15 from anuga.pyvolution.shallow_water import Dirichlet_boundary
    16 from anuga.pyvolution.shallow_water import Time_boundary
    17 from anuga.pyvolution.shallow_water import Transmissive_boundary
     13from anuga.shallow_water import Domain
     14from anuga.shallow_water import Reflective_boundary
     15from anuga.shallow_water import Dirichlet_boundary
     16from anuga.shallow_water import Time_boundary
     17from anuga.shallow_water import Transmissive_boundary
    1818
    1919
    … …  
    103103gauges, gaugex, gaugey = gauge_line(west,east,north,south)
    104104
    105 from anuga.pyvolution.util import file_function
     105from anuga.abstract_2d_finite_volumes.util import file_function
    106106
    107107f = file_function('test.sww',
Note: See TracChangeset for help on using the changeset viewer.