Changeset 9500

Timestamp:

Jan 26, 2015, 8:24:59 PM (10 years ago)

Author:

steve

Message:

setup up to move anuga_parllel to anuga.parallel

Location:

trunk/anuga_core/source

Files:

• .coveragerc (added)
• anuga/__init__.py (modified) (2 diffs)
• anuga/euler (deleted)
• anuga/utilities/quad_tree.c (modified) (1 diff)
• anuga/utilities/setup.py (modified) (2 diffs)
• anuga_parallel/distribute_mesh.py (modified) (1 diff)
• anuga_parallel/parallel_api.py (modified) (1 diff)
• anuga_parallel/parallel_operator_factory.py (modified) (2 diffs)
• anuga_parallel/parallel_shallow_water.py (modified) (1 diff)
• anuga_parallel/sequential_distribute.py (modified) (1 diff)
• anuga_parallel/test/test_distribute_mesh.py (modified) (1 diff)
• anuga_parallel/test/test_failure.py (modified) (1 diff)
• setup.cfg (added)

trunk/anuga_core/source/anuga/__init__.py

@@ -86 +86 @@
 # Parallel api 
 #----------------------------
-from anuga_parallel.parallel_api import distribute
-from anuga_parallel.parallel_api import myid, numprocs, get_processor_name
-from anuga_parallel.parallel_api import send, receive
-from anuga_parallel.parallel_api import pypar_available, barrier, finalize
+## from anuga_parallel.parallel_api import distribute
+## from anuga_parallel.parallel_api import myid, numprocs, get_processor_name
+## from anuga_parallel.parallel_api import send, receive
+## from anuga_parallel.parallel_api import pypar_available, barrier, finalize
+
+## if pypar_available:
+##     from anuga_parallel.parallel_api import sequential_distribute_dump
+##     from anuga_parallel.parallel_api import sequential_distribute_load
+
+from anuga.parallel.parallel_api import distribute
+from anuga.parallel.parallel_api import myid, numprocs, get_processor_name
+from anuga.parallel.parallel_api import send, receive
+from anuga.parallel.parallel_api import pypar_available, barrier, finalize
 
 if pypar_available:
-    from anuga_parallel.parallel_api import sequential_distribute_dump
-    from anuga_parallel.parallel_api import sequential_distribute_load
+    from anuga.parallel.parallel_api import sequential_distribute_dump
+    from anuga.parallel.parallel_api import sequential_distribute_load
 
 
@@ -226 +235 @@
 
 if pypar_available:
-    from anuga_parallel.parallel_operator_factory import Inlet_operator
-    from anuga_parallel.parallel_operator_factory import Boyd_box_operator
-    from anuga_parallel.parallel_operator_factory import Boyd_pipe_operator
-    from anuga_parallel.parallel_operator_factory import Weir_orifice_trapezoid_operator
+    from anuga.parallel.parallel_operator_factory import Inlet_operator
+    from anuga.parallel.parallel_operator_factory import Boyd_box_operator
+    from anuga.parallel.parallel_operator_factory import Boyd_pipe_operator
+    from anuga.parallel.parallel_operator_factory import Weir_orifice_trapezoid_operator
 else:
     from anuga.structures.inlet_operator import Inlet_operator

trunk/anuga_core/source/anuga/utilities/quad_tree.c

@@ -340 +340 @@
 void quad_tree_make_children(quad_tree *node){
 
-  double xmid = (node->xmin+node->xmax)/2;
-  double ymid = (node->ymin+node->ymax)/2;
+  //double xmid = (node->xmin+node->xmax)/2;
+  //double ymid = (node->ymin+node->ymax)/2;
   double width = (node->xmax-node->xmin);
   double height = (node->ymax-node->ymin);

trunk/anuga_core/source/anuga/utilities/setup.py

@@ -16 +16 @@
 
     config.add_extension('sparse_matrix_ext',
-                         sources='sparse_matrix_ext.c')
+                         sources=['sparse_matrix_ext.c', 'sparse_dok.c'])
 
 
@@ -24 +24 @@
     config.add_extension('cg_ext',
                          sources='cg_ext.c',
-                         extra_compile_args=['-fopenmp'])
+                         extra_compile_args=['-fopenmp'],
+                         extra_link_args=['-fopenmp'])
 
     config.add_extension('quad_tree_ext',

trunk/anuga_core/source/anuga_parallel/distribute_mesh.py

@@ -32 +32 @@
     import local_config as config
 except:
-    import anuga_parallel.config as config
+    import config as config
 
 

trunk/anuga_core/source/anuga_parallel/parallel_api.py

@@ -15 +15 @@
 # ANUGA parallel engine (only load if pypar can)
 if pypar_available:
-    from anuga_parallel.sequential_distribute import sequential_distribute_dump
-    from anuga_parallel.sequential_distribute import sequential_distribute_load
-    
-    from anuga_parallel.distribute_mesh  import send_submesh
-    from anuga_parallel.distribute_mesh  import rec_submesh
-    from anuga_parallel.distribute_mesh  import extract_submesh
+    from anuga.parallel.sequential_distribute import sequential_distribute_dump
+    from anuga.parallel.sequential_distribute import sequential_distribute_load
+    
+    from anuga.parallel.distribute_mesh  import send_submesh
+    from anuga.parallel.distribute_mesh  import rec_submesh
+    from anuga.parallel.distribute_mesh  import extract_submesh
 
     # Mesh partitioning using Metis
-    from anuga_parallel.distribute_mesh import build_submesh
-    from anuga_parallel.distribute_mesh import pmesh_divide_metis_with_map
-
-    from anuga_parallel.parallel_shallow_water import Parallel_domain
+    from anuga.parallel.distribute_mesh import build_submesh
+    from anuga.parallel.distribute_mesh import pmesh_divide_metis_with_map
+
+    from anuga.parallel.parallel_shallow_water import Parallel_domain
     
     

trunk/anuga_core/source/anuga_parallel/parallel_operator_factory.py

@@ -19 +19 @@
 from parallel_weir_orifice_trapezoid_operator import Parallel_Weir_orifice_trapezoid_operator#added by PM 22/10/2013
 
-from anuga_parallel import distribute, myid, numprocs, finalize
+from . import distribute, myid, numprocs, finalize
 from anuga.geometry.polygon import inside_polygon, is_inside_polygon, line_intersect
 
@@ -29 +29 @@
 
 from anuga.utilities.numerical_tools import ensure_numeric
-from anuga_parallel.parallel_shallow_water import Parallel_domain
+from anuga.parallel.parallel_shallow_water import Parallel_domain
 
 import math

trunk/anuga_core/source/anuga_parallel/parallel_shallow_water.py

@@ -14 +14 @@
 from anuga import Domain
 
-import anuga_parallel.parallel_generic_communications as generic_comms
+import parallel_generic_communications as generic_comms
+
 import anuga.utilities.parallel_abstraction as pypar
 

trunk/anuga_core/source/anuga_parallel/sequential_distribute.py

@@ -9 +9 @@
 from anuga import Domain
 
-from anuga_parallel.distribute_mesh  import send_submesh
-from anuga_parallel.distribute_mesh  import rec_submesh
-from anuga_parallel.distribute_mesh  import extract_submesh
+from anuga.parallel.distribute_mesh  import send_submesh
+from anuga.parallel.distribute_mesh  import rec_submesh
+from anuga.parallel.distribute_mesh  import extract_submesh
 
 # Mesh partitioning using Metis
-from anuga_parallel.distribute_mesh import build_submesh
-from anuga_parallel.distribute_mesh import pmesh_divide_metis_with_map
-
-from anuga_parallel.parallel_shallow_water import Parallel_domain
+from anuga.parallel.distribute_mesh import build_submesh
+from anuga.parallel.distribute_mesh import pmesh_divide_metis_with_map
+
+from anuga.parallel.parallel_shallow_water import Parallel_domain
 
 

trunk/anuga_core/source/anuga_parallel/test/test_distribute_mesh.py

@@ -9 +9 @@
 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.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
 
 import numpy as num

trunk/anuga_core/source/anuga_parallel/test/test_failure.py

@@ -20 +20 @@
 import numpy as num
 #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