Changeset 2091

Timestamp:

Nov 29, 2005, 1:54:52 PM (19 years ago)

Author:

linda

Message:

nomsg

Location:

inundation/parallel

Files:

• build_local.py (modified) (4 diffs)
• build_submesh.py (modified) (7 diffs)

inundation/parallel/build_local.py

@@ -13 +13 @@
 #
 #  Authors: Linda Stals and Matthew Hardy, June 2005
+#  Modified: Linda Stals, Nov 2005 (optimise python code)
 #
 #
@@ -84 +85 @@
 # *) full_recv dictionary is local id, global id, value
 #
-# *) The information is ordered by the global id so the
-# local and global id do not need to be compared when the
-# information is sent/received because the order is
-# predetermined.
+# *) The information is ordered by the global id. This
+# means that the communication order is predetermined and
+# local and global id do not need to be
+# compared when the information is sent/received.
 #
 #########################################################
@@ -132 +133 @@
         full_send[neigh][1] = neigh_commun[:,0]
 
-    # parallel advection expects numeric arrays
-
-##    for key in full_send:
-##        full_send[key][0] = array(full_send[key][0],Int)
-##        full_send[key][1] = array(full_send[key][1],Int)
-
-##    for key in ghost_recv:
-##        ghost_recv[key][0] = array(ghost_recv[key][0],Int)
-##        ghost_recv[key][1] = array(ghost_recv[key][1],Int)
-
     return ghost_recv, full_send
 
@@ -152 +143 @@
 # *) Change the nodes global ID's to an integer value,
 # starting from 0. The node numbering in the triangles
-# must also be updated to take this into accound.
+# must also be updated to take this into account.
 #
 # *) The triangle number will also change, which affects

inundation/parallel/build_submesh.py

@@ +1 @@
+#########################################################
+#
+# Subdivide the GA domain. This module is primarily
+# responsible for building the ghost layer and
+# communication pattern
+#
+#
+#  Author: Linda Stals, June 2005
+#  Modified: Linda Stals, Nov 2005 (optimise python code)
+#
+#
+#########################################################
+
 import sys
 from mesh import *
@@ -56 +69 @@
                 subboundary[k]=boundary[k]
         boundary_list.append(subboundary)
-
-        # 
+        
         # find nodes in processor p
 
@@ -281 +293 @@
         # loop over the ghost triangles in the current processor,
         # find which processor contains the corresponding full copy
-        # and make note that that processor must send updates to this
+        # and note that the processor must send updates to this
         # processor
 
@@ -360 +372 @@
     return submesh
 
+
+#########################################################
+#
+# Certain quantities may be assigned to the triangles,
+# these quantities must be subdivided in the same way
+# as the triangles
+#
+#  *) The quantities are ordered in the same way as the
+# triangles
+#
+# -------------------------------------------------------
+#
+#  *) The quantites attached to the full triangles are
+# stored in full_quan
+#
+#  *) The quantities attached to the ghost triangles are
+# stored in ghost_quan
+#########################################################
+
 def submesh_quantities(submesh, quantities, triangles_per_proc):
     
@@ -366 +397 @@
     lower = 0
 
+    # build an empty dictionary to hold the quantites
+    
     submesh["full_quan"] = {}
     submesh["ghost_quan"] = {}
-
     for k in quantities:
         submesh["full_quan"][k] = []
         submesh["ghost_quan"][k] = []
-                    
+
+    # loop trough the subdomains
+    
     for p in range(nproc):
         upper =   lower+triangles_per_proc[p]
 
+        # find the global ID of the ghost triangles
+        
         global_id = []
         M = len(submesh["ghost_triangles"][p])
@@ -381 +417 @@
             global_id.append(submesh["ghost_triangles"][p][j][0])
 
+        # use the global ID to extract the quantites information from
+        # the full domain
+        
         for k in quantities:
             submesh["full_quan"][k].append(quantities[k][lower:upper])
@@ -421 +460 @@
 
     submeshg = submesh_ghost(submeshf, mesh, triangles_per_proc)
+
+    # order the quantities information to be the same as the triangle
+    # information
     
     submesh = submesh_quantities(submeshg, quantities, triangles_per_proc)