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

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

Location:
anuga_core/source/anuga/shallow_water
Files:
5 moved

Legend:

Unmodified
Added
Removed

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