Changeset 2909

Timestamp:

May 18, 2006, 1:06:32 PM (19 years ago)

Author:

linda

Message:

The parallel listed in the documentation is stored in the documentation/code directory

Location:

inundation/parallel

Files:

• build_commun.py (modified) (1 diff)
• build_submesh.py (modified) (2 diffs)
• documentation/code/RunParallelAdvection.py (modified) (1 diff)
• documentation/code/RunParallelMerimbulaMetis.py (modified) (3 diffs)
• documentation/code/RunParallelSwMerimbulaMetis.py (modified) (2 diffs)
• run_parallel_merimbula_test.py (modified) (2 diffs)
• run_parallel_sw_merimbula_test.py (modified) (2 diffs)

inundation/parallel/build_commun.py

@@ -313 +313 @@
     return GAnodes, GAtriangles, boundary, quantities, ghost_rec, full_send
 
-
+#########################################################
+#
+# 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_boundary, ghost_commun and full_commun belonging
+# to processor zero are returned.
+#
+#########################################################
+def extract_hostmesh(submesh, triangles_per_proc):
+
+    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_boundary"] = submesh["ghost_boundary"][0]
+    submesh_cell["ghost_commun"] = submesh["ghost_commun"][0]
+    submesh_cell["full_commun"] = submesh["full_commun"][0]
+    submesh_cell["full_quan"] ={}
+    submesh_cell["ghost_quan"]={}
+    for k in submesh["full_quan"]:
+        submesh_cell["full_quan"][k] = submesh["full_quan"][k][0]
+        submesh_cell["ghost_quan"][k] = submesh["ghost_quan"][k][0]
+
+    numprocs = pypar.size()
+    points, vertices, boundary, quantities, ghost_recv_dict, full_send_dict = \
+            build_local_mesh(submesh_cell, 0, triangles_per_proc[0], numprocs)
+    return  points, vertices, boundary, quantities, ghost_recv_dict, \
+           full_send_dict
+
+
+

inundation/parallel/build_submesh.py

@@ -13 +13 @@
 
 import sys
-import pypar    # The Python-MPI interface
 
 from Numeric import zeros, Float, Int, concatenate, \
@@ -540 +539 @@
     return submesh
 
-#########################################################
-#
-# 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_boundary, ghost_commun and full_commun belonging
-# to processor zero are returned.
-#
-#########################################################
-def extract_hostmesh(submesh, triangles_per_proc):
-
-    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_boundary"] = submesh["ghost_boundary"][0]
-    submesh_cell["ghost_commun"] = submesh["ghost_commun"][0]
-    submesh_cell["full_commun"] = submesh["full_commun"][0]
-    submesh_cell["full_quan"] ={}
-    submesh_cell["ghost_quan"]={}
-    for k in submesh["full_quan"]:
-        submesh_cell["full_quan"][k] = submesh["full_quan"][k][0]
-        submesh_cell["ghost_quan"][k] = submesh["ghost_quan"][k][0]
-
-    numprocs = pypar.size()
-    points, vertices, boundary, quantities, ghost_recv_dict, full_send_dict = \
-            build_local_mesh(submesh_cell, 0, triangles_per_proc[0], numprocs)
-    return  points, vertices, boundary, quantities, ghost_recv_dict, \
-           full_send_dict
-

inundation/parallel/documentation/code/RunParallelAdvection.py

@@ -17 +17 @@
 from os import sep
 sys.path.append('..'+sep+'pyvolution')
+sys.path.append('..'+sep+'parallel')
 
 # Parallel communication routines

inundation/parallel/documentation/code/RunParallelMerimbulaMetis.py

@@ -32 +32 @@
 from os import sep
 sys.path.append('..'+sep+'pyvolution')
+sys.path.append('..'+sep+'parallel')
 
 # Numeric arrays
@@ -48 +49 @@
 
 from pmesh_divide  import pmesh_divide_metis
-from build_submesh import build_submesh, extract_hostmesh
+from build_submesh import build_submesh
 from build_local   import build_local_mesh
-from build_commun  import send_submesh, rec_submesh
+from build_commun  import send_submesh, rec_submesh, extract_hostmesh
 
 
@@ -114 +115 @@
     # Build the local mesh for processor 0
 
-     points, vertices, boundary, quantities, ghost_recv_dict, full_send_dict =\
+    points, vertices, boundary, quantities, ghost_recv_dict, full_send_dict = \
              extract_hostmesh(submesh, triangles_per_proc)
 

inundation/parallel/documentation/code/RunParallelSwMerimbulaMetis.py

@@ -30 +30 @@
 from os import sep
 sys.path.append('..'+sep+'pyvolution')
+sys.path.append('..'+sep+'parallel')
 
 # Numeric arrays
@@ -44 +45 @@
 
 from pmesh_divide import pmesh_divide_metis
-from build_submesh import build_submesh, extract_hostmesh
+from build_submesh import build_submesh
 from build_local   import build_local_mesh
-from build_commun  import send_submesh, rec_submesh
+from build_commun  import send_submesh, rec_submesh, extract_hostmesh
 
 ###############################

inundation/parallel/run_parallel_merimbula_test.py

@@ -51 +51 @@
 
 from pmesh_divide  import pmesh_divide_metis
-from build_submesh import build_submesh, extract_hostmesh
+from build_submesh import build_submesh
 from build_local   import build_local_mesh
-from build_commun  import send_submesh, rec_submesh
+from build_commun  import send_submesh, rec_submesh, extract_hostmesh
 
 
@@ -109 +109 @@
       send_submesh(submesh, triangles_per_proc, p)
 
-    hostmesh = extract_hostmesh(submesh)
-    [points, vertices, boundary, quantities, ghost_recv_dict, full_send_dict] = \
-             build_local_mesh(hostmesh, 0, triangles_per_proc[0], numprocs)
+    # Build the local mesh for processor 0
+    
+    points, vertices, boundary, quantities, ghost_recv_dict, full_send_dict = \
+              extract_hostmesh(submesh, triangles_per_proc)
 
 # read in the mesh partition that belongs to this

inundation/parallel/run_parallel_sw_merimbula_test.py

@@ -64 +64 @@
 
 from pmesh_divide import pmesh_divide_metis
-from build_submesh import build_submesh, extract_hostmesh
+from build_submesh import build_submesh
 from build_local   import build_local_mesh
-from build_commun  import send_submesh, rec_submesh
+from build_commun  import send_submesh, rec_submesh, extract_hostmesh
 
 ###############################
@@ -143 +143 @@
     # Build the local mesh for processor 0
 
-    hostmesh = extract_hostmesh(submesh)
     points, vertices, boundary, quantities, ghost_recv_dict, full_send_dict = \
-             build_local_mesh(hostmesh, 0, triangles_per_proc[0], numprocs)
+             extract_hostmesh(submesh, triangles_per_proc)
 
 # Read in the mesh partition that belongs to this