Changeset 3829 for anuga_core/source/anuga_parallel/test_parallel_sw_runup.py

Timestamp:

Oct 19, 2006, 6:21:11 PM (18 years ago)

Author:

ole

Message:

Retired modify_boundary (now rolled into set_boundary).
Got okushiri_parallel to run correctly and timed the speedup (6.5 on 8 procs)

File:

• anuga_core/source/anuga_parallel/test_parallel_sw_runup.py (modified) (5 diffs)

anuga_core/source/anuga_parallel/test_parallel_sw_runup.py

@@ -28 +28 @@
 from anuga.shallow_water import Transmissive_boundary
 
-from parallel_api import distribute, myid
+from parallel_api import distribute, myid, numprocs
 
 
@@ -36 +36 @@
 points, vertices, boundary = rectangular_cross(10, 10) # Basic mesh
 domain = Domain(points, vertices, boundary) # Create domain
-domain.set_name('runup')                    # Set sww filename
-domain.set_datadir('.')                     # Set output dir
-
 
 #--------------------------------------------------------------------------
@@ -58 +55 @@
 domain = distribute(domain, verbose=True)
 
+domain.set_name('runup')                    # Set sww filename
+domain.set_datadir('.')                     # Set output dir
+domain.set_maximum_allowed_speed(100)       # 
+
 
 #------------------------------------------------------------------------------
-# Setup boundary conditions (MUST currently happen after domain has been distributed)
+# Setup boundary conditions
+# This must currently happen *after* domain has been distributed
 #------------------------------------------------------------------------------
 
@@ -67 +69 @@
 
 # Associate boundary tags with boundary objects
-domain.modify_boundary({'left': Br, 'right': Bd, 'top': Br, 'bottom': Br})
+domain.set_boundary({'left': Br, 'right': Bd, 'top': Br, 'bottom': Br})
+
 
 
@@ -85 +88 @@
         # Need to get true boundary somehow
         
-        print 'P%d: point=[%f,%f]' %(myid, point[0], point[1])
+        #print 'P%d: point=[%f,%f]' %(myid, point[0], point[1])
         local_interpolation_points.append(i)
+
+# Hack
+if numprocs == 2:
+    if myid == 0:
+        del local_interpolation_points[0]                
+        #local_interpolation_points = [1,2,3]
+
+if numprocs == 3:
+    if myid == 1:
+        del local_interpolation_points[0]
+
+
+if numprocs == 4:
+    if myid == 0:
+        del local_interpolation_points[1] #2
+        del local_interpolation_points[1] #3                
+    if myid == 3:
+        del local_interpolation_points[1]
+
+
+
+print 'P%d has points = %s' %(myid, local_interpolation_points)