Changeset 3595

Timestamp:

Sep 14, 2006, 3:59:27 PM (19 years ago)

Author:

ole

Message:

Arranged for domain name to be communicated automatically in the parallel API

Location:

anuga_core/source/anuga_parallel

Files:

• parallel_api.py (modified) (2 diffs)
• test_parallel_sw_runup.py (modified) (3 diffs)

anuga_core/source/anuga_parallel/parallel_api.py

@@ -25 +25 @@
 
 
-def distribute(domain):
+def distribute(domain, verbose=False):
+    """ Distribute the domain to all processes
+    """
+
+    # For some obscure reason this communication must happen prior to
+    # the more complex mesh distribution - Oh Well!
+    if myid == 0:
+        domain_name = domain.get_name()
+        for p in range(1, numprocs):
+            print 'p', p            
+            pypar.send(domain_name, p)
+    else:
+        if verbose: print 'Receiving'
+
+        domain_name = pypar.receive(0)
+
 
     if myid == 0:
-        #-------------------------------------------------------------------
-        # Distribute the domain
-        #-------------------------------------------------------------------
+        # Partition and distribute mesh.
+        # Structures returned is in the
+        # correct form for the ANUGA data structure
+
 
         points, vertices, boundary, quantities,\
                 ghost_recv_dict, full_send_dict,\
                 = distribute_mesh(domain)
-        print 'Communication done'        
+
+        if verbose: print 'Communication done'
         
     else:
         # Read in the mesh partition that belongs to this
-        # processor (note that the information is in the
-        # correct form for the GA data structure)
-
+        # processor
         points, vertices, boundary, quantities,\
                 ghost_recv_dict, full_send_dict,\
                 = rec_submesh(0)
 
+
+
     #------------------------------------------------------------------------
-    # Start the computations on each subpartion
+    # Build the domain for this processor using partion structures
     #------------------------------------------------------------------------
-
-    # Build the domain for this processor
     domain = Parallel_Domain(points, vertices, boundary,
                              full_send_dict  = full_send_dict,
@@ -56 +71 @@
 
     #------------------------------------------------------------------------
-    # Setup initial conditions
+    # Transfer initial conditions to each subdomain
     #------------------------------------------------------------------------
     for q in quantities:
-        domain.set_quantity(q, quantities[q]) # Distribute all quantities    
+        domain.set_quantity(q, quantities[q]) 
 
+
+    #------------------------------------------------------------------------
+    # Transfer other attributes to each subdomain
+    #------------------------------------------------------------------------
+
+    # FIXME Do them all
+    domain.set_name(domain_name)    
 
     #------------------------------------------------------------------------

anuga_core/source/anuga_parallel/test_parallel_sw_runup.py

@@ -49 +49 @@
 # Create the parallel domain
 #--------------------------------------------------------------------------
-domain = distribute(domain)
+domain = distribute(domain, verbose=True)
 
+print 'P%d: name = %s' %(myid, domain.get_name())
 
 
@@ -57 +58 @@
 # 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
+#domain.set_name('runup')                    # Set sww filename
 
 
@@ -79 +80 @@
 
 for t in domain.evolve(yieldstep = 0.1, finaltime = 10.0):
-    domain.write_time()
+    pass
+    #domain.write_time()