Changeset 3096

Timestamp:

Jun 6, 2006, 12:25:00 PM (18 years ago)

Author:

ole

Message:

Allowed parallel code to access pypar directly in its directory pypar_dist

Location:

inundation

Files:

• parallel/build_commun.py (modified) (1 diff)
• parallel/documentation/code/RunParallelSwMerimbulaMetis.py (modified) (1 diff)
• parallel/parallel_shallow_water.py (modified) (2 diffs)
• pypar_dist/__init__.py (modified) (1 diff)

inundation/parallel/build_commun.py

@@ -29 +29 @@
 
 import sys
-import pypar
+from pypar_dist import pypar
 
 from build_local import build_local_mesh

inundation/parallel/documentation/code/RunParallelSwMerimbulaMetis.py

@@ -25 +25 @@
 #########################################################
 import sys
-import parallel.pypar as pypar   # The Python-MPI interface
+from pypar_dist import pypar   # The Python-MPI interface
 import time
 

inundation/parallel/parallel_shallow_water.py

@@ -4 +4 @@
 # FIXME: This should be removed. Set evironment variable PYTHONPATH to
 # directory ...../anuga/inundation instead
-sys.path.append('..'+sep+'pyvolution')
+#sys.path.append('..'+sep+'pyvolution')
 
 """Class Parallel_Shallow_Water_Domain -
@@ -29 +29 @@
 from pyvolution.shallow_water import *
 from Numeric import zeros, Float, Int, ones, allclose, array
-import pypar
+from pypar_dist import pypar
 
 

inundation/pypar_dist/__init__.py

@@ -8 +8 @@
 from pypar import __version__, __date__, __author__
 
+#Add path of package to PYTHONPATH to allow C-extension to be loaded
+#import sys
+#sys.path += __path__