Changeset 9501


Ignore:
Timestamp:
Jan 27, 2015, 7:19:44 AM (9 years ago)
Author:
steve
Message:

Moved anuga_parallel to anuga.parallel to setup structure for move to github

Location:
trunk/anuga_core/source/anuga
Files:
16 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/anuga_core/source/anuga/parallel/parallel_generic_communications.py

    r9261 r9501  
    4040
    4141
    42     import anuga_parallel.pypar_extras as par_exts
     42    import anuga.parallel.pypar_extras as par_exts
    4343
    4444    par_exts.allreduce(domain.local_timestep, pypar.MIN,
    … …  
    176176    # Do all the comuunication using isend/irecv via the buffers in the
    177177    # full_send_dict and ghost_recv_dict
    178     from anuga_parallel.pypar_extras import mpiextras
     178    from anuga.parallel.pypar_extras import mpiextras
    179179
    180180    mpiextras.send_recv_via_dicts(domain.full_send_dict,domain.ghost_recv_dict)

  • trunk/anuga_core/source/anuga/parallel/pymetis/test_metis.py

    r8784 r9501  
    99# path.append('..' + sep + 'pymetis')
    1010
    11 import anuga_parallel.pymetis.metis  as metis
     11import anuga.parallel.pymetis.metis  as metis
    1212
    1313class TestMetis(unittest.TestCase):

  • trunk/anuga_core/source/anuga/parallel/sequential_distribute.py

    r9500 r9501  
    248248
    249249
    250     from anuga_parallel import myid, numprocs
     250    from anuga import myid, numprocs
    251251
    252252    from os.path import join

  • trunk/anuga_core/source/anuga/parallel/test/test_failure.py

    r9500 r9501  
    7777filename=os.path.join(path, 'example_rating_curve.csv')
    7878
     79
     80mod_path = get_pathname_from_package('anuga.parallel')
     81
    7982line0 = [[10.0, 10.0], [30.0, 10.0]]
    8083#line0 = [[29.0, 10.0], [30.0, 10.0]]
    8184line1 = [[0.0, 10.0], [0.0, 15.0]]
    82 Q0 = file_function(os.path.join('..','data','test_hydrograph.tms'), quantities=['hydrograph'])
     85Q0 = file_function(os.path.join(mod_path,'data','test_hydrograph.tms'), quantities=['hydrograph'])
    8386Q1 = 5.0
    8487

  • trunk/anuga_core/source/anuga/parallel/test/test_parallel_boyd_box_op_apron.py

    r9433 r9501  
    2828
    2929import numpy as num
    30 from anuga_parallel.parallel_inlet_operator import Parallel_Inlet_operator
    31 from anuga_parallel import distribute, myid, numprocs, finalize
     30from anuga.parallel.parallel_inlet_operator import Parallel_Inlet_operator
     31from anuga.parallel import distribute, myid, numprocs, finalize
    3232from anuga.geometry.polygon import inside_polygon, is_inside_polygon, line_intersect
    3333
    34 from anuga_parallel.parallel_operator_factory import Inlet_operator, Boyd_box_operator
     34from anuga.parallel.parallel_operator_factory import Inlet_operator, Boyd_box_operator
    3535
    3636import random
    … …  
    8787#filename=os.path.join(path, 'example_rating_curve.csv')
    8888
     89mod_path = get_pathname_from_package('anuga.parallel')
    8990line0 = [[10.0, 10.0], [30.0, 10.0]]
    9091#line0 = [[29.0, 10.0], [30.0, 10.0]]
    9192line1 = [[0.0, 10.0], [0.0, 15.0]]
    92 Q0 = file_function(os.path.join('..','data','test_hydrograph.tms'), quantities=['hydrograph'])
     93Q0 = file_function(os.path.join(mod_path,'data','test_hydrograph.tms'), quantities=['hydrograph'])
    9394Q1 = 5.0
    9495

  • trunk/anuga_core/source/anuga/parallel/test/test_parallel_boyd_box_operator.py

    r9433 r9501  
    3434
    3535import numpy as num
    36 from anuga_parallel.parallel_inlet_operator import Parallel_Inlet_operator
    37 from anuga_parallel import distribute, myid, numprocs, finalize
     36from anuga.parallel.parallel_inlet_operator import Parallel_Inlet_operator
     37from anuga.parallel import distribute, myid, numprocs, finalize
    3838from anuga.geometry.polygon import inside_polygon, is_inside_polygon, line_intersect
    3939
    40 from anuga_parallel.parallel_operator_factory import Inlet_operator, Boyd_box_operator
     40from anuga.parallel.parallel_operator_factory import Inlet_operator, Boyd_box_operator
    4141
    4242import random
    … …  
    9393#filename=os.path.join(path, 'example_rating_curve.csv')
    9494
     95mod_path = get_pathname_from_package('anuga.parallel')
     96
    9597line0 = [[10.0, 10.0], [30.0, 10.0]]
    9698#line0 = [[29.0, 10.0], [30.0, 10.0]]
    9799line1 = [[0.0, 10.0], [0.0, 15.0]]
    98 Q0 = file_function(os.path.join('..','data','test_hydrograph.tms'), quantities=['hydrograph'])
     100Q0 = file_function(os.path.join(mod_path,'data','test_hydrograph.tms'), quantities=['hydrograph'])
    99101Q1 = 5.0
    100102

  • trunk/anuga_core/source/anuga/parallel/test/test_parallel_boyd_pipe_operator.py

    r9433 r9501  
    2828#from parallel_inlet_operator import Parallel_Inlet_operator
    2929
    30 from anuga_parallel import distribute, myid, numprocs, finalize
     30from anuga.parallel import distribute, myid, numprocs, finalize
    3131from anuga.geometry.polygon import inside_polygon, is_inside_polygon, line_intersect
    3232
    33 from anuga_parallel.parallel_operator_factory import Inlet_operator
    34 from anuga_parallel.parallel_operator_factory import Boyd_pipe_operator
     33from anuga.parallel.parallel_operator_factory import Inlet_operator
     34from anuga.parallel.parallel_operator_factory import Boyd_pipe_operator
    3535
    3636import random
    … …  
    8787#filename=os.path.join(path, 'example_rating_curve.csv')
    8888
     89mod_path = get_pathname_from_package('anuga.parallel')
     90
    8991line0 = [[10.0, 10.0], [30.0, 10.0]]
    9092#line0 = [[29.0, 10.0], [30.0, 10.0]]
    9193line1 = [[0.0, 10.0], [0.0, 15.0]]
    92 Q0 = file_function(os.path.join('..','data','test_hydrograph.tms'), quantities=['hydrograph'])
     94Q0 = file_function(os.path.join(mod_path,'data','test_hydrograph.tms'), quantities=['hydrograph'])
    9395Q1 = 5.0
    9496

  • trunk/anuga_core/source/anuga/parallel/test/test_parallel_distribute_domain.py

    r9433 r9501  
    1515import sys
    1616
    17 
     17from anuga.utilities.system_tools import get_pathname_from_package
    1818
    1919import numpy as num
    … …  
    4848
    4949
    50 from anuga_parallel import distribute, myid, numprocs, finalize
     50from anuga.parallel import distribute, myid, numprocs, finalize
    5151
    5252
    … …  
    5555#--------------------------------------------------------------------------
    5656
    57 mesh_filename = os.path.join('..','data','merimbula_10785_1.tsh')
    58 #mesh_filename = os.path.join('..','data','test-100.tsh')
     57mod_path = get_pathname_from_package('anuga.parallel')
     58
     59mesh_filename = os.path.join(mod_path,'data','merimbula_10785_1.tsh')
     60#mesh_filename = os.path.join(mod_path,'data','test-100.tsh')
    5961yieldstep = 1
    6062finaltime = 20

  • trunk/anuga_core/source/anuga/parallel/test/test_parallel_distribute_mesh.py

    r9424 r9501  
    1010from anuga import rectangular_cross
    1111
    12 from anuga_parallel.distribute_mesh import pmesh_divide_metis
    13 from anuga_parallel.distribute_mesh import build_submesh
    14 from anuga_parallel.distribute_mesh import submesh_full, submesh_ghost, submesh_quantities
    15 from anuga_parallel.distribute_mesh import extract_submesh, rec_submesh, send_submesh
    16 
    17 from anuga_parallel import myid, numprocs, barrier, finalize
     12from anuga.parallel.distribute_mesh import pmesh_divide_metis
     13from anuga.parallel.distribute_mesh import build_submesh
     14from anuga.parallel.distribute_mesh import submesh_full, submesh_ghost, submesh_quantities
     15from anuga.parallel.distribute_mesh import extract_submesh, rec_submesh, send_submesh
     16
     17from anuga.parallel import myid, numprocs, barrier, finalize
    1818
    1919import numpy as num

  • trunk/anuga_core/source/anuga/parallel/test/test_parallel_file_boundary.py

    r9424 r9501  
    5656from anuga import create_domain_from_file
    5757
    58 from anuga_parallel import distribute, myid, numprocs, send, receive, barrier, finalize
    59 
    60 from anuga.file.test_mux import Test_Mux
     58from anuga.parallel import distribute, myid, numprocs, send, receive, barrier, finalize
     59
     60from anuga.file.test.test_mux import Test_Mux
    6161
    6262verbose = False

  • trunk/anuga_core/source/anuga/parallel/test/test_parallel_frac_op.py

    r9433 r9501  
    2929
    3030import numpy as num
    31 from anuga_parallel.parallel_inlet_operator import Parallel_Inlet_operator
    32 from anuga_parallel import distribute, myid, numprocs, finalize
     31from anuga.parallel.parallel_inlet_operator import Parallel_Inlet_operator
     32from anuga.parallel import distribute, myid, numprocs, finalize
    3333from anuga.geometry.polygon import inside_polygon, is_inside_polygon, line_intersect
    3434
    … …  
    8787
    8888#filename=os.path.join(path, 'example_rating_curve.csv')
     89mod_path = get_pathname_from_package('anuga.parallel')
    8990
    9091line0 = [[10.0, 10.0], [30.0, 10.0]]
    9192#line0 = [[29.0, 10.0], [30.0, 10.0]]
    9293line1 = [[0.0, 10.0], [0.0, 15.0]]
    93 Q0 = file_function(os.path.join('..','data','test_hydrograph.tms'), quantities=['hydrograph'])
     94Q0 = file_function(os.path.join(mod_path,'data','test_hydrograph.tms'), quantities=['hydrograph'])
    9495Q1 = 5.0
    9596

  • trunk/anuga_core/source/anuga/parallel/test/test_parallel_inlet_operator.py

    r9433 r9501  
    3434
    3535import numpy as num
    36 from anuga_parallel.parallel_inlet_operator import Parallel_Inlet_operator
    37 from anuga_parallel import distribute, myid, numprocs, finalize
     36from anuga.parallel.parallel_inlet_operator import Parallel_Inlet_operator
     37from anuga.parallel import distribute, myid, numprocs, finalize
    3838from anuga.geometry.polygon import inside_polygon, is_inside_polygon, line_intersect
    3939
    40 from anuga_parallel.parallel_operator_factory import Inlet_operator
     40from anuga.parallel.parallel_operator_factory import Inlet_operator
    4141
    4242import random
    … …  
    9393#filename=os.path.join(path, 'example_rating_curve.csv')
    9494
     95mod_path = get_pathname_from_package('anuga.parallel')
    9596line0 = [[10.0, 10.0], [30.0, 10.0]]
    9697#line0 = [[29.0, 10.0], [30.0, 10.0]]
    9798line1 = [[0.0, 10.0], [0.0, 15.0]]
    98 Q0 = file_function(os.path.join('..','data','test_hydrograph.tms'), quantities=['hydrograph'])
     99Q0 = file_function(os.path.join(mod_path,'data','test_hydrograph.tms'), quantities=['hydrograph'])
    99100Q1 = 5.0
    100101

  • trunk/anuga_core/source/anuga/parallel/test/test_parallel_shallow_domain.py

    r9433 r9501  
    3939from anuga.utilities.util_ext        import double_precision
    4040from anuga.utilities.norms           import l1_norm, l2_norm, linf_norm
     41from anuga.utilities.system_tools    import get_pathname_from_package
    4142
    4243from anuga import Domain
    … …  
    5051
    5152
    52 from anuga_parallel import distribute, myid, numprocs, finalize
     53from anuga import distribute, myid, numprocs, finalize
    5354
    5455
    … …  
    5657# Setup parameters
    5758#--------------------------------------------------------------------------
     59
     60mod_path = get_pathname_from_package('anuga.parallel')
    5861
    5962mesh_filename = os.path.join('..','data','merimbula_10785_1.tsh')

  • trunk/anuga_core/source/anuga/parallel/test/test_parallel_sw_flow.py

    r9424 r9501  
    2525from anuga import Time_boundary
    2626from anuga import Transmissive_boundary
    27 
    2827from anuga import rectangular_cross_domain
    2928
    30 
    31 from anuga_parallel import distribute, myid, numprocs, send, receive, barrier, finalize
     29from anuga import distribute, myid, numprocs, send, receive, barrier, finalize
    3230
    3331#--------------------------------------------------------------------------

  • trunk/anuga_core/source/anuga/parallel/test/test_sequential_dist_sw_flow.py

    r9433 r9501  
    2929
    3030
    31 from anuga_parallel import distribute, myid, numprocs, send, receive, barrier, finalize
    32 
    33 from anuga_parallel.sequential_distribute import sequential_distribute_dump
    34 from anuga_parallel.sequential_distribute import sequential_distribute_load
     31from anuga import distribute, myid, numprocs, send, receive, barrier, finalize
     32
     33from anuga.parallel.sequential_distribute import sequential_distribute_dump
     34from anuga.parallel.sequential_distribute import sequential_distribute_load
    3535
    3636import anuga.utilities.plot_utils as util

  • trunk/anuga_core/source/anuga/structures/riverwall.py

    r9348 r9501  
    11import os
    2 from anuga_parallel import barrier, numprocs, myid
     2from anuga import barrier, numprocs, myid
    33import numpy
    44
Note: See TracChangeset for help on using the changeset viewer.