Changeset 9501

Timestamp:

Jan 27, 2015, 7:19:44 AM (10 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:

• parallel (moved) (moved from trunk/anuga_core/source/anuga_parallel)
• parallel/parallel_generic_communications.py (modified) (2 diffs)
• parallel/pymetis/test_metis.py (modified) (1 diff)
• parallel/sequential_distribute.py (modified) (1 diff)
• parallel/test/test_failure.py (modified) (1 diff)
• parallel/test/test_parallel_boyd_box_op_apron.py (modified) (2 diffs)
• parallel/test/test_parallel_boyd_box_operator.py (modified) (2 diffs)
• parallel/test/test_parallel_boyd_pipe_operator.py (modified) (2 diffs)
• parallel/test/test_parallel_distribute_domain.py (modified) (3 diffs)
• parallel/test/test_parallel_distribute_mesh.py (modified) (1 diff)
• parallel/test/test_parallel_file_boundary.py (modified) (1 diff)
• parallel/test/test_parallel_frac_op.py (modified) (2 diffs)
• parallel/test/test_parallel_inlet_operator.py (modified) (2 diffs)
• parallel/test/test_parallel_shallow_domain.py (modified) (3 diffs)
• parallel/test/test_parallel_sw_flow.py (modified) (1 diff)
• parallel/test/test_sequential_dist_sw_flow.py (modified) (1 diff)
• structures/riverwall.py (modified) (1 diff)

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

@@ -40 +40 @@
 
 
-    import anuga_parallel.pypar_extras as par_exts
+    import anuga.parallel.pypar_extras as par_exts
 
     par_exts.allreduce(domain.local_timestep, pypar.MIN,
@@ -176 +176 @@
     # Do all the comuunication using isend/irecv via the buffers in the
     # full_send_dict and ghost_recv_dict
-    from anuga_parallel.pypar_extras import mpiextras
+    from anuga.parallel.pypar_extras import mpiextras
 
     mpiextras.send_recv_via_dicts(domain.full_send_dict,domain.ghost_recv_dict)

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

@@ -9 +9 @@
 # path.append('..' + sep + 'pymetis')
 
-import anuga_parallel.pymetis.metis  as metis
+import anuga.parallel.pymetis.metis  as metis
 
 class TestMetis(unittest.TestCase):

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

@@ -248 +248 @@
 
 
-    from anuga_parallel import myid, numprocs
+    from anuga import myid, numprocs
 
     from os.path import join

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

@@ -77 +77 @@
 filename=os.path.join(path, 'example_rating_curve.csv')
 
+
+mod_path = get_pathname_from_package('anuga.parallel')
+
 line0 = [[10.0, 10.0], [30.0, 10.0]]
 #line0 = [[29.0, 10.0], [30.0, 10.0]]
 line1 = [[0.0, 10.0], [0.0, 15.0]]
-Q0 = file_function(os.path.join('..','data','test_hydrograph.tms'), quantities=['hydrograph'])
+Q0 = file_function(os.path.join(mod_path,'data','test_hydrograph.tms'), quantities=['hydrograph'])
 Q1 = 5.0
 

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

@@ -28 +28 @@
 
 import numpy as num
-from anuga_parallel.parallel_inlet_operator import Parallel_Inlet_operator
-from anuga_parallel import distribute, myid, numprocs, finalize
+from anuga.parallel.parallel_inlet_operator import Parallel_Inlet_operator
+from anuga.parallel import distribute, myid, numprocs, finalize
 from anuga.geometry.polygon import inside_polygon, is_inside_polygon, line_intersect
 
-from anuga_parallel.parallel_operator_factory import Inlet_operator, Boyd_box_operator
+from anuga.parallel.parallel_operator_factory import Inlet_operator, Boyd_box_operator
 
 import random
@@ -87 +87 @@
 #filename=os.path.join(path, 'example_rating_curve.csv')
 
+mod_path = get_pathname_from_package('anuga.parallel')
 line0 = [[10.0, 10.0], [30.0, 10.0]]
 #line0 = [[29.0, 10.0], [30.0, 10.0]]
 line1 = [[0.0, 10.0], [0.0, 15.0]]
-Q0 = file_function(os.path.join('..','data','test_hydrograph.tms'), quantities=['hydrograph'])
+Q0 = file_function(os.path.join(mod_path,'data','test_hydrograph.tms'), quantities=['hydrograph'])
 Q1 = 5.0
 

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

@@ -34 +34 @@
 
 import numpy as num
-from anuga_parallel.parallel_inlet_operator import Parallel_Inlet_operator
-from anuga_parallel import distribute, myid, numprocs, finalize
+from anuga.parallel.parallel_inlet_operator import Parallel_Inlet_operator
+from anuga.parallel import distribute, myid, numprocs, finalize
 from anuga.geometry.polygon import inside_polygon, is_inside_polygon, line_intersect
 
-from anuga_parallel.parallel_operator_factory import Inlet_operator, Boyd_box_operator
+from anuga.parallel.parallel_operator_factory import Inlet_operator, Boyd_box_operator
 
 import random
@@ -93 +93 @@
 #filename=os.path.join(path, 'example_rating_curve.csv')
 
+mod_path = get_pathname_from_package('anuga.parallel')
+
 line0 = [[10.0, 10.0], [30.0, 10.0]]
 #line0 = [[29.0, 10.0], [30.0, 10.0]]
 line1 = [[0.0, 10.0], [0.0, 15.0]]
-Q0 = file_function(os.path.join('..','data','test_hydrograph.tms'), quantities=['hydrograph'])
+Q0 = file_function(os.path.join(mod_path,'data','test_hydrograph.tms'), quantities=['hydrograph'])
 Q1 = 5.0
 

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

@@ -28 +28 @@
 #from parallel_inlet_operator import Parallel_Inlet_operator
 
-from anuga_parallel import distribute, myid, numprocs, finalize
+from anuga.parallel import distribute, myid, numprocs, finalize
 from anuga.geometry.polygon import inside_polygon, is_inside_polygon, line_intersect
 
-from anuga_parallel.parallel_operator_factory import Inlet_operator
-from anuga_parallel.parallel_operator_factory import Boyd_pipe_operator
+from anuga.parallel.parallel_operator_factory import Inlet_operator
+from anuga.parallel.parallel_operator_factory import Boyd_pipe_operator
 
 import random
@@ -87 +87 @@
 #filename=os.path.join(path, 'example_rating_curve.csv')
 
+mod_path = get_pathname_from_package('anuga.parallel')
+
 line0 = [[10.0, 10.0], [30.0, 10.0]]
 #line0 = [[29.0, 10.0], [30.0, 10.0]]
 line1 = [[0.0, 10.0], [0.0, 15.0]]
-Q0 = file_function(os.path.join('..','data','test_hydrograph.tms'), quantities=['hydrograph'])
+Q0 = file_function(os.path.join(mod_path,'data','test_hydrograph.tms'), quantities=['hydrograph'])
 Q1 = 5.0
 

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

@@ -15 +15 @@
 import sys
 
-
+from anuga.utilities.system_tools import get_pathname_from_package
 
 import numpy as num
@@ -48 +48 @@
 
 
-from anuga_parallel import distribute, myid, numprocs, finalize
+from anuga.parallel import distribute, myid, numprocs, finalize
 
 
@@ -55 +55 @@
 #--------------------------------------------------------------------------
 
-mesh_filename = os.path.join('..','data','merimbula_10785_1.tsh')
-#mesh_filename = os.path.join('..','data','test-100.tsh')
+mod_path = get_pathname_from_package('anuga.parallel')
+
+mesh_filename = os.path.join(mod_path,'data','merimbula_10785_1.tsh')
+#mesh_filename = os.path.join(mod_path,'data','test-100.tsh')
 yieldstep = 1
 finaltime = 20

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

@@ -10 +10 @@
 from anuga import rectangular_cross
 
-from anuga_parallel.distribute_mesh import pmesh_divide_metis
-from anuga_parallel.distribute_mesh import build_submesh
-from anuga_parallel.distribute_mesh import submesh_full, submesh_ghost, submesh_quantities
-from anuga_parallel.distribute_mesh import extract_submesh, rec_submesh, send_submesh
-
-from anuga_parallel import myid, numprocs, barrier, finalize
+from anuga.parallel.distribute_mesh import pmesh_divide_metis
+from anuga.parallel.distribute_mesh import build_submesh
+from anuga.parallel.distribute_mesh import submesh_full, submesh_ghost, submesh_quantities
+from anuga.parallel.distribute_mesh import extract_submesh, rec_submesh, send_submesh
+
+from anuga.parallel import myid, numprocs, barrier, finalize
 
 import numpy as num

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

@@ -56 +56 @@
 from anuga import create_domain_from_file
 
-from anuga_parallel import distribute, myid, numprocs, send, receive, barrier, finalize
-
-from anuga.file.test_mux import Test_Mux
+from anuga.parallel import distribute, myid, numprocs, send, receive, barrier, finalize
+
+from anuga.file.test.test_mux import Test_Mux
 
 verbose = False

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

@@ -29 +29 @@
 
 import numpy as num
-from anuga_parallel.parallel_inlet_operator import Parallel_Inlet_operator
-from anuga_parallel import distribute, myid, numprocs, finalize
+from anuga.parallel.parallel_inlet_operator import Parallel_Inlet_operator
+from anuga.parallel import distribute, myid, numprocs, finalize
 from anuga.geometry.polygon import inside_polygon, is_inside_polygon, line_intersect
 
@@ -87 +87 @@
 
 #filename=os.path.join(path, 'example_rating_curve.csv')
+mod_path = get_pathname_from_package('anuga.parallel')
 
 line0 = [[10.0, 10.0], [30.0, 10.0]]
 #line0 = [[29.0, 10.0], [30.0, 10.0]]
 line1 = [[0.0, 10.0], [0.0, 15.0]]
-Q0 = file_function(os.path.join('..','data','test_hydrograph.tms'), quantities=['hydrograph'])
+Q0 = file_function(os.path.join(mod_path,'data','test_hydrograph.tms'), quantities=['hydrograph'])
 Q1 = 5.0
 

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

@@ -34 +34 @@
 
 import numpy as num
-from anuga_parallel.parallel_inlet_operator import Parallel_Inlet_operator
-from anuga_parallel import distribute, myid, numprocs, finalize
+from anuga.parallel.parallel_inlet_operator import Parallel_Inlet_operator
+from anuga.parallel import distribute, myid, numprocs, finalize
 from anuga.geometry.polygon import inside_polygon, is_inside_polygon, line_intersect
 
-from anuga_parallel.parallel_operator_factory import Inlet_operator
+from anuga.parallel.parallel_operator_factory import Inlet_operator
 
 import random
@@ -93 +93 @@
 #filename=os.path.join(path, 'example_rating_curve.csv')
 
+mod_path = get_pathname_from_package('anuga.parallel')
 line0 = [[10.0, 10.0], [30.0, 10.0]]
 #line0 = [[29.0, 10.0], [30.0, 10.0]]
 line1 = [[0.0, 10.0], [0.0, 15.0]]
-Q0 = file_function(os.path.join('..','data','test_hydrograph.tms'), quantities=['hydrograph'])
+Q0 = file_function(os.path.join(mod_path,'data','test_hydrograph.tms'), quantities=['hydrograph'])
 Q1 = 5.0
 

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

@@ -39 +39 @@
 from anuga.utilities.util_ext        import double_precision
 from anuga.utilities.norms           import l1_norm, l2_norm, linf_norm
+from anuga.utilities.system_tools    import get_pathname_from_package
 
 from anuga import Domain
@@ -50 +51 @@
 
 
-from anuga_parallel import distribute, myid, numprocs, finalize
+from anuga import distribute, myid, numprocs, finalize
 
 
@@ -56 +57 @@
 # Setup parameters
 #--------------------------------------------------------------------------
+
+mod_path = get_pathname_from_package('anuga.parallel')
 
 mesh_filename = os.path.join('..','data','merimbula_10785_1.tsh')

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

@@ -25 +25 @@
 from anuga import Time_boundary
 from anuga import Transmissive_boundary
-
 from anuga import rectangular_cross_domain
 
-
-from anuga_parallel import distribute, myid, numprocs, send, receive, barrier, finalize
+from anuga import distribute, myid, numprocs, send, receive, barrier, finalize
 
 #--------------------------------------------------------------------------

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

@@ -29 +29 @@
 
 
-from anuga_parallel import distribute, myid, numprocs, send, receive, barrier, finalize
-
-from anuga_parallel.sequential_distribute import sequential_distribute_dump
-from anuga_parallel.sequential_distribute import sequential_distribute_load
+from anuga import distribute, myid, numprocs, send, receive, barrier, finalize
+
+from anuga.parallel.sequential_distribute import sequential_distribute_dump
+from anuga.parallel.sequential_distribute import sequential_distribute_load
 
 import anuga.utilities.plot_utils as util

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

@@ -1 +1 @@
 import os
-from anuga_parallel import barrier, numprocs, myid
+from anuga import barrier, numprocs, myid
 import numpy