Changeset 3612

Timestamp:

Sep 15, 2006, 4:17:49 PM (18 years ago)

Author:

ole

Message:

Parallel API now transfers all quantities, boundary conditions and some domain attributes in addition to the meshes.

Parallelisation virtually down to one line of code!

Location:

anuga_core/source

Files:

• anuga/abstract_2d_finite_volumes/domain.py (modified) (1 diff)
• anuga_parallel/parallel_api.py (modified) (3 diffs)
• anuga_parallel/test_parallel_sw_runup.py (modified) (6 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

@@ -174 +174 @@
         self.CFL = CFL
 
+        self.boundary_map = None  # Will be populated by set_boundary        
+        
+
         #Model time
         self.time = 0.0

anuga_core/source/anuga_parallel/parallel_api.py

@@ -33 +33 @@
     if myid == 0:
         domain_name = domain.get_name()
+        domain_dir = domain.get_datadir()
+        # FIXME - what other attributes need to be transferred?
+
         for p in range(1, numprocs):
-            print 'p', p            
-            pypar.send(domain_name, p)
+            pypar.send((domain_name, domain_dir), p)
     else:
-        if verbose: print 'Receiving'
+        if verbose: print 'P%d: Receiving domain attributes' %(myid)
 
-        domain_name = pypar.receive(0)
+        domain_name, domain_dir = pypar.receive(0)
+
+
+
+    # Distribute boundary conditions    
+    if myid == 0:
+        boundary_map = domain.boundary_map
+        for p in range(1, numprocs):
+            pypar.send(boundary_map, p)
+    else:
+        if verbose: print 'P%d: Receiving boundary map' %(myid)        
+
+        boundary_map = pypar.receive(0)
+        
+
 
 
@@ -57 +73 @@
         # Read in the mesh partition that belongs to this
         # processor
+        if verbose: print 'P%d: Receiving submeshes' %(myid)                
         points, vertices, boundary, quantities,\
                 ghost_recv_dict, full_send_dict,\
                 = rec_submesh(0)
-
 
 
@@ -78 +94 @@
 
     #------------------------------------------------------------------------
+    # Transfer boundary conditions to each subdomain
+    #------------------------------------------------------------------------
+    boundary_map['ghost'] = None  # Add binding to ghost boundary
+    domain.set_boundary(boundary_map)
+
+
+    #------------------------------------------------------------------------
     # Transfer other attributes to each subdomain
     #------------------------------------------------------------------------
-
-    # FIXME Do them all
-    domain.set_name(domain_name)    
+    domain.set_name(domain_name)
+    domain.set_datadir(domain_dir)        
 
     #------------------------------------------------------------------------

anuga_core/source/anuga_parallel/test_parallel_sw_runup.py

@@ -7 +7 @@
 similar to a beach environment
 
-This is a very simple test of the parallel algorithm
+This is a very simple test of the parallel algorithm using the simplified parallel API
 """
 
@@ -23 +23 @@
 from anuga.shallow_water import Transmissive_boundary
 
-from parallel_api import *
+from parallel_api import distribute, myid
 
 
@@ -32 +32 @@
 domain = Domain(points, vertices, boundary) # Create domain
 domain.set_name('runup')                    # Set sww filename
+domain.set_datadir('.')                     # Set output dir
 
 
@@ -46 +47 @@
 
 
-#--------------------------------------------------------------------------
-# Create the parallel domain
-#--------------------------------------------------------------------------
-domain = distribute(domain, verbose=True)
-
-print 'P%d: name = %s' %(myid, domain.get_name())
-
-
-# TODO: Communicate all attributes of domain including boundary conditions
-
-# Name and dir, etc currently has to be set here as they are not
-# transferred from the original domain
-#domain.set_name('runup')                    # Set sww filename
-
-
-
-
 #------------------------------------------------------------------------------
-# Setup parallel boundary conditions
+# Setup boundary conditions
 #------------------------------------------------------------------------------
 
@@ -71 +55 @@
 
 # Associate boundary tags with boundary objects
-domain.set_boundary({'left': Br, 'right': Bd, 'top': Br, 'bottom': Br,
-                     'ghost': None})
+domain.set_boundary({'left': Br, 'right': Bd, 'top': Br, 'bottom': Br})
+
+
+#--------------------------------------------------------------------------
+# Create the parallel domain
+#--------------------------------------------------------------------------
+domain = distribute(domain, verbose=True)
 
 
@@ -80 +69 @@
 
 for t in domain.evolve(yieldstep = 0.1, finaltime = 10.0):
-    pass
-    #domain.write_time()
+    domain.write_time()