Changeset 2130 for inundation/parallel/build_local.py

Timestamp:

Dec 8, 2005, 8:29:24 AM (19 years ago)

Author:

linda

Message:

Modified the parallel code to agree with the python style files

File:

• inundation/parallel/build_local.py (modified) (9 diffs)

inundation/parallel/build_local.py

@@ -18 +18 @@
 #########################################################
 
-from mesh import *
-from Numeric import *
+from Numeric import  zeros, Float, Int, concatenate, \
+     take, arrayrange, put, sort, compress, equal
+
 
 #########################################################
@@ -44 +45 @@
     Ntriangles = len(triangles)
     
-    # extract the nodes (using the local ID)
+    # Extract the nodes (using the local ID)
     
     GAnodes = take(nodes, (1, 2), 1)
 
-    # build a global ID to local ID mapping
+    # Build a global ID to local ID mapping
 
     NGlobal = 0
@@ -55 +56 @@
             NGlobal = nodes[i][0]
     index = zeros(int(NGlobal)+1, Int)
-    put(index, take(nodes, (0,), 1).astype(Int), arrayrange(Nnodes))
+    put(index, take(nodes, (0,), 1).astype(Int), \
+        arrayrange(Nnodes))
         
-    # change the global IDs in the triangles to the local IDs
+    # Change the global IDs in the triangles to the local IDs
 
     GAtriangles = zeros((Ntriangles, 3), Int)
@@ -94 +96 @@
 def build_local_commun(index, ghostc, fullc, nproc):
 
-    # initialise
+    # Initialise
 
     full_send = {}
     ghost_recv = {}
 
-    # build the ghost_recv dictionary (sort the
+    # Build the ghost_recv dictionary (sort the
     # information by the global numbering)
     
@@ -112 +114 @@
             ghost_recv[c][0] = take(index, d)
             
-    # build a temporary copy of the full_send dictionary
+    # Build a temporary copy of the full_send dictionary
     # (this version allows the information to be stored
     # by the global numbering)
@@ -122 +124 @@
             if not tmp_send.has_key(neigh):
                 tmp_send[neigh] = []
-            tmp_send[neigh].append([global_id, index[global_id]])
-
-    # extract the full send information and put it in the form
+            tmp_send[neigh].append([global_id, \
+                                    index[global_id]])
+
+    # Extract the full send information and put it in the form
     # required for the full_send dictionary
 
@@ -158 +161 @@
 def build_local_mesh(submesh, lower_t, upper_t, nproc):
 
-    # combine the full nodes and ghost nodes
-
-    nodes = concatenate((submesh["full_nodes"], submesh["ghost_nodes"]))
-    
-    # combine the full triangles and ghost triangles
+    # Combine the full nodes and ghost nodes
+
+    nodes = concatenate((submesh["full_nodes"], \
+                         submesh["ghost_nodes"]))
+    
+    # Combine the full triangles and ghost triangles
 
     gtri =  take(submesh["ghost_triangles"],(1, 2, 3),1)
     triangles = concatenate((submesh["full_triangles"], gtri))
 
-    # renumber the boundary edges to correspond to the new
+    # Renumber the boundary edges to correspond to the new
     # triangle numbering
 
     GAboundary = {}
     for b in submesh["full_boundary"]:
-        GAboundary[b[0]-lower_t,b[1]]=submesh["full_boundary"][b]
-
-    # make note of the new triangle numbers, including the ghost
+        GAboundary[b[0]-lower_t,b[1]] = submesh["full_boundary"][b]
+
+    # Make note of the new triangle numbers, including the ghost
     # triangles
 
@@ -187 +191 @@
         index[submesh["ghost_triangles"][i][0]] = i+upper_t-lower_t
 
-    # change the node numbering (and update the numbering in the
+    # Change the node numbering (and update the numbering in the
     # triangles)
 
     [GAnodes, GAtriangles] = build_local_GA(nodes, triangles)
 
-    # extract the local quantities
+    # Extract the local quantities
     
     quantities ={}
@@ -202 +206 @@
         quantities[k][Nf:Nf+Ng] = submesh["ghost_quan"][k]
                              
-    # change the communication pattern into a form needed by
-    # the parallel_advection.py file
+    # Change the communication pattern into a form needed by
+    # the parallel_adv
 
     gcommun = submesh["ghost_commun"]
     fcommun = submesh["full_commun"]
-    [ghost_rec, full_send] = build_local_commun(index, gcommun, fcommun, nproc)
-
-    # clean up before exiting
+    [ghost_rec, full_send] = \
+                build_local_commun(index, gcommun, fcommun, nproc)
+
+    # Clean up before exiting
 
     del(index)
 
-    return GAnodes, GAtriangles, GAboundary, quantities, ghost_rec, full_send
+    return GAnodes, GAtriangles, GAboundary, quantities, ghost_rec, \
+           full_send