Changeset 1559

Timestamp:

Jun 30, 2005, 2:50:49 PM (19 years ago)

Author:

linda

Message:

merimbula test run

Location:

inundation/ga/storm_surge/parallel

Files:

• build_commun.py (modified) (7 diffs)
• build_submesh.py (modified) (1 diff)
• pmesh_divide.py (modified) (1 diff)
• run_parallel_merimbula.py (modified) (7 diffs)
• run_parallel_mesh.py (modified) (2 diffs)

inundation/ga/storm_surge/parallel/build_commun.py

@@ -18 +18 @@
 #########################################################
 
+from Numeric import array, Int, Float
 import logging, logging.config
 logger = logging.getLogger('parallel')
@@ -49 +50 @@
 
     print "pypar sending submesh to processor ",p
-
+    
     # build and send the tagmap for the boundary conditions
     
@@ -87 +88 @@
 
     pypar.send(setup_array, p)
-
+    
     # send the nodes
 
@@ -94 +95 @@
 
     # send the triangles
-
-
-    pypar.send(submesh["full_triangles"][p], p, use_buffer=True)
+    
+    pypar.send(array(submesh["full_triangles"][p], Int), p, use_buffer=True)
     pypar.send(submesh["ghost_triangles"][p], p, use_buffer=True)
 
@@ -110 +110 @@
     pypar.send(submesh["ghost_commun"][p], p, use_buffer=True)
     pypar.send(flat_full_commun, p, use_buffer=True)
-
 
 
@@ -177 +176 @@
 
     no_full_triangles = setup_array[2]
-    full_triangles = []
+    submesh_cell["full_triangles"] = []
     for i in range(no_full_triangles):
-        full_triangles.append([0.0, 0.0, 0.0])
-    submesh_cell["full_triangles"] = pypar.receive(p, full_triangles)
+        submesh_cell["full_triangles"].append([0, 0, 0])
+
+    full_triangles = pypar.receive(p, array(submesh_cell["full_triangles"], Int))
+    
+    for i in range(no_full_triangles):
+        submesh_cell["full_triangles"][i][0] = full_triangles[i][0]
+        submesh_cell["full_triangles"][i][1] = full_triangles[i][1]
+        submesh_cell["full_triangles"][i][2] = full_triangles[i][2]
 
     # receive the ghost triangles
@@ -240 +245 @@
     # datastructure
 
-    [GAnodes, GAtriangles, boundary, ghost_rec, full_send] = build_local_mesh(submesh_cell, lower_t, upper_t, numproc)
+    [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/build_submesh.py

@@ -382 +382 @@
     return submeshg
 
-
-
-
-
-
-
+#########################################################
+#
+# Extract the submesh that will belong to the
+# "host processor" (i.e. processor zero)
+#
+#  *) See the documentation for build_submesh
+#
+# -------------------------------------------------------
+#
+#  *) A dictionary containing the full_triangles,
+# full_nodes, full_boundary, ghost_triangles, ghost_nodes,
+# ghost_commun and full_commun belonging to processor zero
+# are returned.
+#
+#########################################################
+def extract_hostmesh(submesh):
+    
+    submesh_cell = {}
+    submesh_cell["full_nodes"] = submesh["full_nodes"][0]
+    submesh_cell["ghost_nodes"] = submesh["ghost_nodes"][0]
+    submesh_cell["full_triangles"] = submesh["full_triangles"][0]
+    submesh_cell["ghost_triangles"] = submesh["ghost_triangles"][0]
+    submesh_cell["full_boundary"] = submesh["full_boundary"][0]
+    submesh_cell["ghost_commun"] = submesh["ghost_commun"][0]
+    submesh_cell["full_commun"] = submesh["full_commun"][0]
+
+    return submesh_cell
+
+
+

inundation/ga/storm_surge/parallel/pmesh_divide.py

@@ -175 +175 @@
             triangles.append(t)
 
-    # the boundary labels have to changed in accoradance to the
+    # the boundary labels have to changed in accoradance with the
     # new triangle ordering, proc_sum and tri_index help with this
 

inundation/ga/storm_surge/parallel/run_parallel_merimbula.py

@@ -17 +17 @@
 # grid partitioning are
 #    +) mg2ga.py: read in the test files.
+#    +) pmesh_divide.py: subdivide a pmesh
 #    +) build_submesh.py: build the submeshes on the host
 # processor.
@@ -25 +26 @@
 #
 # *) Things still to do:
-#    +) Fix host commun: The host processor (processor 0)
-# currently uses MPI to communicate the submesh to itself.
-# This is good for testing the communication but is very
-# inefficient and should be removed.
 #    +) Overlap the communication and computation: The
 # communication routines in build_commun.py should be
@@ -82 +79 @@
     # read in the test files
 
-    filename = 'test-100.tsh'
-    [nodes, triangles, boundary, triangles_per_proc, rect] = \
-                       pmesh_divide(filename, Advection_Domain, 2, 1)
-
+#    filename = 'test-100.tsh'
+    filename = 'merimbula_10785.tsh'
+    nx = 3
+    ny = 1
+    if nx*ny != numprocs:
+        print "WARNING: number of subboxes is not equal to the number of proc"
+        
+    [nodes, triangles, boundary, triangles_per_proc, rect] =\
+            pmesh_divide(filename, Advection_Domain, nx, ny)
+    
     # subdivide the mesh
 
@@ -95 +98 @@
 
     # send the mesh partition to the appropriate processor
-
-    for p in range(numprocs):
+    
+    for p in range(1, numprocs):
       send_submesh(submesh, triangles_per_proc, p)
 
+    hostmesh = extract_hostmesh(submesh)
+    [points, vertices, boundary, ghost_recv_dict, full_send_dict] = \
+             build_local_mesh(hostmesh, 0, triangles_per_proc[0], numprocs)
+    
 # read in the mesh partition that belongs to this
 # 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(0)
+else:
+    [points, vertices, boundary, ghost_recv_dict, full_send_dict] = \
+             rec_submesh(0)
 
 #if myid == 0:
@@ -130 +136 @@
 
 T = Transmissive_boundary(domain)
-domain.set_boundary( {'outflow': T, 'inflow': T, 'inner':T, 'exterior': T} )
+domain.set_boundary( {'outflow': T, 'inflow': T, 'inner':T, 'exterior': T, 'open':T} )
 
 class Set_Stage:
@@ -144 +150 @@
         return self.h*((x>self.x0)&(x<self.x1))
 
-domain.set_quantity('stage', Set_Stage(250.0,300.0,1.0))
+#domain.set_quantity('stage', Set_Stage(250.0,300.0,1.0))
+domain.set_quantity('stage', Set_Stage(756000.0,756500.0,1.0))
 
 #---------
@@ -150 +157 @@
 t0 = time.time()
 domain.visualise = True
-yieldstep = 1
-finaltime = 4000
+#yieldstep = 1
+yieldstep = 1000
+finaltime = 50000
+# finaltime = 4000
 for t in domain.evolve(yieldstep = yieldstep, finaltime = finaltime):
     if myid == 0:

inundation/ga/storm_surge/parallel/run_parallel_mesh.py

@@ -25 +25 @@
 #
 # *) Things still to do:
-#    +) Fix host commun: The host processor (processor 0)
-# currently uses MPI to communicate the submesh to itself.
-# This is good for testing the communication but is very
-# inefficient and should be removed.
 #    +) Overlap the communication and computation: The
 # communication routines in build_commun.py should be
@@ -107 +103 @@
     # send the mesh partition to the appropriate processor
     
-    for p in range(numprocs):
+    for p in range(1, numprocs):
       send_submesh(submesh, triangles_per_proc, p)
 
+    hostmesh = extract_hostmesh(submesh)
+    [points, vertices, boundary, ghost_recv_dict, full_send_dict] = \
+             build_local_mesh(hostmesh, 0, triangles_per_proc[0], \
+                              numprocs)
+    
 # read in the mesh partition that belongs to this
 # 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(0)
+else:
+    [points, vertices, boundary, ghost_recv_dict, full_send_dict] = rec_submesh(0)
 
 # define the computation domain