Changeset 3095

Timestamp:

Jun 6, 2006, 12:14:01 PM (19 years ago)

Author:

ole

Message:

Got parallel example RunParallelSwMerimbulaMetis? to run from an arbitrary location using packages relative to PYTHONPATH

Location:

inundation

Files:

• parallel/__init__.py (added)
• parallel/documentation/code/RunParallelSwMerimbulaMetis.py (modified) (3 diffs)
• parallel/documentation/code/merimbula_10785_1.tsh (added)
• parallel/pmesh_divide.py (modified) (1 diff)
• pymetis/__init__.py (added)
• pyvolution/generic_boundary_conditions.py (modified) (1 diff)

inundation/parallel/documentation/code/RunParallelSwMerimbulaMetis.py

@@ -25 +25 @@
 #########################################################
 import sys
-import pypar    # The Python-MPI interface
+import parallel.pypar as pypar   # The Python-MPI interface
 import time
 
 from os import sep
-sys.path.append('..'+sep+'pyvolution')
-sys.path.append('..'+sep+'parallel')
+
+# ADD directory ..../anuga/inundation to PYTHONPATH instead
+#sys.path.append('..'+sep+'pyvolution')
+#sys.path.append('..'+sep+'parallel')
 
 # Numeric arrays
@@ -38 +40 @@
 # pmesh
 
-from shallow_water import Domain
-from parallel_shallow_water import Parallel_Domain
-from pmesh2domain import pmesh_to_domain_instance
+from pyvolution.shallow_water import Domain
+from parallel.parallel_shallow_water import Parallel_Domain
+from pyvolution.pmesh2domain import pmesh_to_domain_instance
 
 # Mesh partition routines
 
-from pmesh_divide import pmesh_divide_metis
-from build_submesh import build_submesh
-from build_local   import build_local_mesh
-from build_commun  import send_submesh, rec_submesh, extract_hostmesh
+from parallel.pmesh_divide import pmesh_divide_metis
+from parallel.build_submesh import build_submesh
+from parallel.build_local   import build_local_mesh
+from parallel.build_commun  import send_submesh, rec_submesh, extract_hostmesh
 
 ###############################
@@ -156 +158 @@
 # Define the boundaries, including the ghost boundary
 
-from parallel_shallow_water import Transmissive_boundary, Reflective_boundary
+from parallel.parallel_shallow_water import Transmissive_boundary, Reflective_boundary
 
 T = Transmissive_boundary(domain)

inundation/parallel/pmesh_divide.py

@@ -84 +84 @@
 #
 #########################################################
-path.append('..' + sep + 'pymetis')
 
-from metis import partMeshNodal
+#path.append('..' + sep + 'pymetis')
+from pymetis.metis import partMeshNodal
 
 def pmesh_divide_metis(domain, n_procs):

inundation/pyvolution/generic_boundary_conditions.py

@@ -231 +231 @@
         self.F = file_function(filename, domain,
                                interpolation_points=self.midpoint_coordinates,
-                               verbose = verbose)
+                               verbose=verbose)
         self.domain = domain