Changeset 8022 for trunk/anuga_core

Timestamp:

Sep 20, 2010, 8:46:00 PM (14 years ago)

Author:

steve

Message:

Setting parallel code to run on a single processor without pypar

Location:

trunk/anuga_core/source

Files:

• anuga/advection/__init__.py (modified) (1 diff)
• anuga_parallel (modified) (1 prop)
• anuga_parallel/__init__.py (modified) (1 diff)
• anuga_parallel/parallel_meshes.py (modified) (2 diffs)

trunk/anuga_core/source/anuga/advection/__init__.py

@@ -8 +8 @@
 sys.path += __path__
 
+from advection import Advection_Domain
 
 
 
+
+

trunk/anuga_core/source/anuga_parallel/__init__.py

@@ -11 +11 @@
 from parallel_api import pypar_available, barrier, finalize
 
-from parallel_meshes import parallel_rectangle
-
-from parallel_shallow_water import Parallel_domain as Parallel_shallow_water_domain
-from parallel_advection     import Parallel_domain as Parallel_advection_domain
+if pypar_available:
+    from parallel_meshes import parallel_rectangle
+    from parallel_shallow_water import Parallel_domain as Parallel_shallow_water_domain
+    from parallel_advection     import Parallel_domain as Parallel_advection_domain
+else:
+    from anuga import rectangular_cross as parallel_rectangle
+    from anuga import Domain as Parallel_shallow_water_domain
+    from anuga.advection import Advection_Domain as Parallel_advection_domain
 
 
+        

trunk/anuga_core/source/anuga_parallel/parallel_meshes.py

@@ -15 +15 @@
 
 import sys
-#from Numeric import array, zeros, Float, Int, ones, sum
-
 import numpy as num
+
+from anuga_parallel.parallel_abstraction import pypar_available
 import pypar
 
@@ -23 +23 @@
 
 
-
+if pypar_available