Changeset 3438

Timestamp:

Aug 2, 2006, 2:15:17 PM (19 years ago)

Author:

ole

Message:

Changed parallel code back to using pypar as a third party dependency

Files:

• inundation/parallel/test_parallel_sw.py (modified) (1 diff)
• production/wollongong_2006/run_flagstaff.py (modified) (2 diffs)

inundation/parallel/test_parallel_sw.py

@@ -19 +19 @@
 
 from Numeric import array, zeros, Float, take, nonzero
-from shallow_water import Domain
-from shallow_water import Reflective_boundary as sw_reflective_boundary
-from shallow_water import Transmissive_boundary as sw_transmissive_boundary
+from pyvolution.shallow_water import Domain
+from pyvolution.shallow_water import Reflective_boundary as sw_reflective_boundary
+from pyvolution.shallow_water import Transmissive_boundary as sw_transmissive_boundary
 from parallel_shallow_water import Parallel_Domain
 from parallel_shallow_water import Reflective_boundary as par_reflective_boundary
 from parallel_shallow_water import Transmissive_boundary as par_transmissive_boundary
-from pmesh2domain import pmesh_to_domain_instance
+from pyvolution.pmesh2domain import pmesh_to_domain_instance
 from utilities.norms import *
 from utilities.util_ext import double_precision

production/wollongong_2006/run_flagstaff.py

@@ -33 +33 @@
 
 # Parallelism
-from pypar_dist import pypar   # The Python-MPI interface
+import pypar   # The Python-MPI interface
 from parallel.pmesh_divide import pmesh_divide_metis
 from parallel.build_submesh import build_submesh
@@ -173 +173 @@
 #------------------------------------------------------------------------------
 
+
+domain.set_quantity('elevation', quantities['elevation']) # Get elevation 
 domain.set_quantity('stage', project.initial_sealevel)
 domain.set_quantity('friction', 0.03)