Changeset 2095

Timestamp:

Nov 29, 2005, 4:53:47 PM (19 years ago)

Author:

jack

Message:

Improved handling of the single-processor case in pmesh_divide_metis. Lots of redundant data restructuring removed.

File:

• inundation/parallel/pmesh_divide.py (modified) (1 diff)

inundation/parallel/pmesh_divide.py

@@ -322 +322 @@
         # print edgecut
         # print npart
+        # print epart
+        # Assign triangles to processes, according to what metis told us.
+        
+        # tri_index maps triangle number -> processor, new triangle number
+        # (local to the processor)
+        tri_index = {}
+        triangles = []        
+        for i in range(n_tri):
+            triangles_per_proc[epart[i]] = triangles_per_proc[epart[i]] + 1
+            tri_list[epart[i]].append(domain.triangles[i])
+            tri_index[i] = ([epart[i], len(tri_list[epart[i]]) - 1])
+
+        # print tri_list
+        # print triangles_per_proc
+        
+        # order the triangle list so that all of the triangles belonging
+        # to processor i are listed before those belonging to processor
+        # i+1
+
+        for i in range(n_procs):
+            for t in tri_list[i]:
+                triangles.append(t)
+            
+        # the boundary labels have to changed in accoradance with the
+        # new triangle ordering, proc_sum and tri_index help with this
+
+        proc_sum[0] = 0
+        for i in range(n_procs - 1):
+            proc_sum[i+1]=proc_sum[i]+triangles_per_proc[i]
+
+        # relabel the boundary elements to fit in with the new triangle
+        # ordering
+
+        boundary = {}
+        for b in domain.boundary:
+            t =  tri_index[b[0]]
+            boundary[proc_sum[t[0]]+t[1], b[1]] = domain.boundary[b]
+
+        quantities = reorder(domain.quantities, tri_index, proc_sum)
     else:
-        epart = [0] * n_tri
-
-    # print epart
-
-
-    # Assign triangles to processes, according to what metis told us.
-
-    # tri_index maps triangle number -> processor, new triangle number
-    # (local to the processor)
-    tri_index = {}
-    triangles = []        
-    for i in range(n_tri):
-        triangles_per_proc[epart[i]] = triangles_per_proc[epart[i]] + 1
-        tri_list[epart[i]].append(domain.triangles[i])
-        tri_index[i] = ([epart[i], len(tri_list[epart[i]]) - 1])
-
-    # print tri_list
-    # print triangles_per_proc
-
-    # order the triangle list so that all of the triangles belonging
-    # to processor i are listed before those belonging to processor
-    # i+1
-
-    for i in range(n_procs):
-        for t in tri_list[i]:
-            triangles.append(t)
-            
-    # the boundary labels have to changed in accoradance with the
-    # new triangle ordering, proc_sum and tri_index help with this
-
-    proc_sum[0] = 0
-    for i in range(n_procs - 1):
-        proc_sum[i+1]=proc_sum[i]+triangles_per_proc[i]
-
-    # relabel the boundary elements to fit in with the new triangle
-    # ordering
-
-    boundary = {}
-    for b in domain.boundary:
-        t =  tri_index[b[0]]
-        boundary[proc_sum[t[0]]+t[1], b[1]] = domain.boundary[b]
-
-    quantities = reorder(domain.quantities, tri_index, proc_sum)
-
+        boundary = domain.boundary.copy()
+        triangles_per_proc[0] = n_tri
+        triangles = domain.triangles.copy()
+        # This is essentially the same as a chunk of code from reorder.
+        quantities = {}
+        for k in domain.quantities:
+            quantities[k] = zeros((n_tri, 3), Float)
+            for i in range(n_tri):
+                quantities[k][i] = domain.quantities[k].vertex_values[i]
+        
     # extract the node list
     nodes = domain.coordinates.copy()
-
     # convert the triangle datastructure to be an array type
     # this helps with the communication