Changeset 1520

Timestamp:

Jun 20, 2005, 4:53:05 PM (19 years ago)

Author:

steve

Message:

 

Location:

inundation/ga/storm_surge

Files:

• parallel/build_commun.py (modified) (22 diffs)
• parallel/parallel_meshes.py (modified) (4 diffs)
• parallel/run_advection.py (modified) (4 diffs)
• parallel/run_parallel_advection.py (modified) (3 diffs)
• parallel/run_parallel_mesh.py (modified) (3 diffs)
• pyvolution-parallel/run_advection.py (modified) (2 diffs)

inundation/ga/storm_surge/parallel/build_commun.py

@@ -1 +1 @@
 #########################################################
-#   
+#
 # Handle the communication between the host machine
 # (processor 0) and the processors. The host machine is
-# responsible for the doing the initial grid partitioning. 
+# responsible for the doing the initial grid partitioning.
 #
 # The routines given below should be moved to the
@@ -18 +18 @@
 #########################################################
 
+import logging, logging.config
+logger = logging.getLogger('parallel')
+logger.setLevel(logging.WARNING)
+
+try:
+    logging.config.fileConfig('log.ini')
+except:
+    pass
+
 
 import sys
@@ -38 +47 @@
 
 def send_submesh(submesh, triangles_per_proc, tagmap, p):
-    
+
     # send the number of triangles per processor
-    
-    print "pypar send triangles per proc",p 
+
+    print "pypar send triangles per proc",p
     pypar.send(triangles_per_proc, p, use_buffer=True)
 
@@ -47 +56 @@
 
     flat_full_commun = []
+
 
     for c in submesh["full_commun"][p]:
         for i in range(len(submesh["full_commun"][p][c])):
-            flat_full_commun.append([c,submesh["full_commun"][p][c][i]]) 
-    
+            flat_full_commun.append([c,submesh["full_commun"][p][c][i]])
+
     # send the array sizes so memory can be allocated
-    
+
     setup_array = [0, 0, 0, 0, 0, 0, 0]
     setup_array[0] = len(submesh["full_nodes"][p])
@@ -64 +74 @@
     print "pypar send setup_array", p
     pypar.send(setup_array, p)
-    
+
     # send the nodes
-    
+
     print "pypar send full_nodes", p
     pypar.send(submesh["full_nodes"][p], p, use_buffer=True)
@@ -72 +82 @@
     print "pypar send ghost_nodes", p
     pypar.send(submesh["ghost_nodes"][p], p, use_buffer=True)
-    
+
     # send the triangles
-    
+
     print "pypar send full_triangles", p
     pypar.send(submesh["full_triangles"][p], p, use_buffer=True)
@@ -82 +92 @@
 
     # send the boundary (is it quicker to send as an array?)
-    
+
     print "pypar send full_boundary", p
     bc = []
@@ -93 +103 @@
     print "pypar send ghost_commun", p, len(submesh["ghost_commun"][p])
     pypar.send(submesh["ghost_commun"][p], p, use_buffer=True)
-    
+
     print "pypar send full_commun", p, len(flat_full_commun)
     pypar.send(flat_full_commun, p, use_buffer=True)
@@ -117 +127 @@
 
 def rec_submesh(tagmap, p):
-    
+
     from Numeric import zeros, Float, Int
 
@@ -124 +134 @@
 
     submesh_cell = {}
-    
+
     # receive the number of triangles per processor
-    
+
     triangles_per_proc = []
     for i in range(numproc):
@@ -133 +143 @@
     print "pypar rec triangles_per_proc", p
     triangles_per_proc = pypar.receive(p, triangles_per_proc)
-    
+
     # recieve information about the array sizes
-    
+
     setup_array = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
     print "pypar rec setup_array", p
@@ -141 +151 @@
 
     # receive the full nodes
-    
+
     no_full_nodes = setup_array[0]
     full_nodes = []
@@ -150 +160 @@
 
     # receive the ghost nodes
-    
+
     no_ghost_nodes = setup_array[1]
     ghost_nodes = []
@@ -157 +167 @@
     print "pypar rec ghost_nodes ", p
     submesh_cell["ghost_nodes"] = pypar.receive(p, ghost_nodes)
- 
+
     # receive the full triangles
-    
+
     no_full_triangles = setup_array[2]
     full_triangles = []
@@ -168 +178 @@
 
     # receive the ghost triangles
-    
+
     no_ghost_triangles = setup_array[3]
     ghost_triangles = []
@@ -175 +185 @@
     print "pypar rec ghost_triangles", p
     submesh_cell["ghost_triangles"] = pypar.receive(p, ghost_triangles)
-   
+
     # receive the full boundary
-    
+
     print "pypar rec full_boundary", p
     no_full_boundary = setup_array[4]
@@ -188 +198 @@
     for t in tagmap:
         itagmap[tagmap[t]]=t
-        
+
     submesh_cell["full_boundary"] = {}
     for b in bnd_c:
@@ -194 +204 @@
 
     # receive the ghost communication pattern
-    
+
     no_ghost_commun = setup_array[5]
     ghost_commun = []
@@ -204 +214 @@
 
     # receive the full communication pattern
-    
+
     no_full_commun = setup_array[6]
     full_commun = []
@@ -211 +221 @@
     print "pypar rec full_commun", p
     full_commun = pypar.receive(p, full_commun)
-    
+
     submesh_cell["full_commun"] = {}
     for c in full_commun:
@@ -219 +229 @@
 
     # find the full triangles assigned to this processor
-    
+
     lower_t = 0
     for i in range(myid):
@@ -227 +237 @@
     # convert the information into a form needed by the GA
     # datastructure
-    
+
     [GAnodes, GAtriangles, boundary, ghost_rec, full_send] = build_local_mesh(submesh_cell, lower_t, upper_t, numproc)
-  
+
     return GAnodes, GAtriangles, boundary, ghost_rec, full_send
 
 
-

inundation/ga/storm_surge/parallel/parallel_meshes.py

@@ -17 +17 @@
 
 
-def parallel_rectangular(m, n, len1=1.0, len2=1.0, origin = (0.0, 0.0)):
+def parallel_rectangular(m_g, n_g, len1_g=1.0, len2_g=1.0, origin_g = (0.0, 0.0)):
 
 
@@ -37 +37 @@
     numproc   = pypar.size()
 
-
-
-    delta1 = float(len1)/m
-    delta2 = float(len2)/n
+    m_low, m_high = pypar.balance(m_g, numproc, processor)
+
+    n = n_g
+    m_low  = m_low-1
+    m_high = m_high+1
+    m = m_high - m_low
+
+    delta1 = float(len1_g)/m_g
+    delta2 = float(len2_g)/n_g
+
+    len1 = len1_g*float(m)/float(m_g)
+    len2 = len2_g
+    origin = ( origin_g[0]+float(m_low)/float(m_g)*len1_g, origin_g[1] )
+
 
     #Calculate number of points
@@ -151 +161 @@
         Xf   = zeros(Idfl.shape,Float)
         Xg   = zeros(Idgr.shape,Float)
-        full_send_dict[processor]  = [Idfl, Xf]
-        ghost_recv_dict[processor] = [Idgr, Xg]
+        full_send_dict[processor]  = [Idfl, Idfl, Xf]
+        ghost_recv_dict[processor] = [Idgr, Idgr, Xg]
     elif numproc == 2:
         Idfl.extend(Idfr)
@@ -161 +171 @@
         Xf   = zeros(Idfl.shape,Float)
         Xg   = zeros(Idgr.shape,Float)
-        full_send_dict[(processor-1)%numproc]  = [Idfl, Xf]
-        ghost_recv_dict[(processor-1)%numproc] = [Idgr, Xg]
+        full_send_dict[(processor-1)%numproc]  = [Idfl, Idfl, Xf]
+        ghost_recv_dict[(processor-1)%numproc] = [Idgr, Idgr, Xg]
     else:
         Idfl = array(Idfl,Int)

inundation/ga/storm_surge/parallel/run_advection.py

@@ +1 @@
+import pdb
+pdb.set_trace()
+
 import sys
 from os import sep
@@ -8 +11 @@
 from advection import *
 from Numeric import array
+
 
 from mesh_factory import rectangular
@@ -27 +31 @@
 D = Dirichlet_boundary(array([1.0]))
 
+#turn on the visualisation
+rect = [0.0, 0.0, 1.0, 1.0]
+domain.initialise_visualiser(rect=rect)
+
+
 domain.default_order = 2
 
@@ -37 +46 @@
 for t in domain.evolve(yieldstep = 0.1, finaltime = 1.5):
     domain.write_time()
+    pdb.set_trace()
+

inundation/ga/storm_surge/parallel/run_parallel_advection.py

@@ -22 +22 @@
 M = 50
 
-points, vertices, boundary, full_send_dict, ghost_recv_dict = parallel_rectangular(N, M, len1=1.0)
+points, vertices, boundary, full_send_dict, ghost_recv_dict =  \
+    parallel_rectangular(N, M, len1_g=1.0)
 
 #Create advection domain with direction (1,-1)
@@ -31 +32 @@
 
 #turn on the visualisation
-domain.initialise_visualiser()
+rect = [0.0, 0.0, 1.0, 1.0]
+domain.initialise_visualiser(rect=rect)
 
 #Boundaries
@@ -55 +57 @@
         return self.h*((x>self.x0)&(x<self.x1))
 
+domain.set_quantity('stage', Set_Stage(0.2,0.4,1.0))
+
 if myid == 0:
-    domain.set_quantity('stage', Set_Stage(0.2,0.4,1.0))
     import time
     t0 = time.time()
 
 #Check that the boundary value gets propagated to all elements
-for t in domain.evolve(yieldstep = 0.5, finaltime = 3.0):
+for t in domain.evolve(yieldstep = 0.1, finaltime = 3.0):
     if myid == 0:
         domain.write_time()

inundation/ga/storm_surge/parallel/run_parallel_mesh.py

@@ -65 +65 @@
 from build_local import *
 from build_commun import *
+import pdb
 
 # define the initial time step
@@ -96 +97 @@
 # if this is the host processor
 
+print 'trace'
+pdb.set_trace()
+print 'after trace'
+
 if myid == 0:
 
@@ -115 +120 @@
 # processor (note that the information is in the
 # correct form for the GA data structure
+
 
 [points, vertices, boundary, ghost_recv_dict, full_send_dict] = rec_submesh(tagmap, 0)

inundation/ga/storm_surge/pyvolution-parallel/run_advection.py

@@ -4 +4 @@
 from Numeric import array
 
+import pdb
 from mesh_factory import rectangular
 
@@ -26 +27 @@
 #Check that the boundary value gets propagated to all elements
 for t in domain.evolve(yieldstep = 0.01, finaltime = 1.5):
+    pdb.set_trace()
     domain.write_time()