Changeset 1565

Timestamp:

Jul 1, 2005, 5:08:10 PM (19 years ago)

Author:

steve

Message:

Working on passing quantities from serial to parallel domains

Location:

inundation/ga/storm_surge

Files:

• parallel/pmesh_divide.py (modified) (3 diffs)
• parallel/run_parallel_sw_merimbula.py (modified) (4 diffs)
• pyvolution/general_mesh.py (modified) (2 diffs)
• pyvolution/realtime_visualisation_new.py (modified) (3 diffs)
• zeus/pyvolution.zbi (modified) (previous)

inundation/ga/storm_surge/parallel/pmesh_divide.py

@@ -18 +18 @@
 #########################################################
 
+from pmesh2domain import pmesh_to_domain_instance
 from math import floor
-from pmesh2domain import pmesh_to_domain_instance
-
-#########################################################
-#
-# Find the minimum x coordinate
-#
-# *) t1 and t2 are two node coordinates
-#
-# -------------------------------------------------------
-#
-# *) The node with the minimum x coordinate is returned
-#
-#########################################################
-
-def min_x(t1, t2):
-    if t1[0] < t2[0]:
-        return t1
-    else:
-        return t2
-
-#########################################################
-#
-# Find the maximum x coordinate
-#
-# *) t1 and t2 are two node coordinates
-#
-# -------------------------------------------------------
-#
-# *) The node with the maximum x coordinate is returned
-#
-#########################################################
-
-def max_x(t1, t2):
-    if t1[0] > t2[0]:
-        return t1
-    else:
-        return t2
-
-#########################################################
-#
-# Find the minimum y coordinate
-#
-# *) t1 and t2 are two node coordinates
-#
-# -------------------------------------------------------
-#
-# *) The node with the minimum y coordinate is returned
-#
-#########################################################
-def min_y(t1, t2):
-    if t1[1] < t2[1]:
-        return t1
-    else:
-        return t2
-
-#########################################################
-#
-# Find the maximum y coordinate
-#
-# *) t1 and t2 are two node coordinates
-#
-# -------------------------------------------------------
-#
-# *) The node with the maximum y coordinate is returned
-#
-#########################################################
-def max_y(t1, t2):
-    if t1[1] > t2[1]:
-        return t1
-    else:
-        return t2
 
 #########################################################
@@ -113 +43 @@
     # read in the pmesh
 
-    domain = pmesh_to_domain_instance(f, Domain)#
+    domain = pmesh_to_domain_instance(f, Domain)
 
     # find the bounding box
-
-    x_coord_min = reduce(min_x, domain.coordinates)[0]
-    x_coord_max = reduce(max_x, domain.coordinates)[0]
-    y_coord_min = reduce(min_y, domain.coordinates)[1]
-    y_coord_max = reduce(max_y, domain.coordinates)[1]
-
-
-    rect = [x_coord_min, y_coord_min, x_coord_max, y_coord_max]
+    x_coord_min = domain.xy_extent[0]
+    x_coord_max = domain.xy_extent[2]
+    y_coord_min = domain.xy_extent[1]
+    y_coord_max = domain.xy_extent[3]
+
+    rect = domain.xy_extent
 
     # find the size of each sub-box
@@ -197 +125 @@
 
     return nodes, triangles, boundary,  triangles_per_proc, rect
+
+
+
+def pmesh_divide_steve(f, Domain, n_x = 1, n_y = 1):
+
+    # read in the pmesh
+
+    domain = pmesh_to_domain_instance(f, Domain)
+
+
+#    for key, Quantity in domain.quantities.iteritems():
+#        print key
+#        for n in range(10):
+#            print Quantity.centroid_values[n]
+
+    # find the bounding box
+    x_coord_min = domain.xy_extent[0]
+    x_coord_max = domain.xy_extent[2]
+    y_coord_min = domain.xy_extent[1]
+    y_coord_max = domain.xy_extent[3]
+
+    rect = domain.xy_extent
+
+    # find the size of each sub-box
+
+    x_div = (x_coord_max-x_coord_min)/n_x
+    y_div = (y_coord_max-y_coord_min)/n_y
+
+
+    # initialise the lists
+    tri_list = []
+    triangles_per_proc = []
+    proc_sum = []
+    for i in range(n_x*n_y):
+        tri_list.append([])
+        triangles_per_proc.append([])
+        proc_sum.append([])
+        tri_list[i] = []
+
+    # subdivide the triangles depending on which sub-box they sit
+    # in (a triangle sits in the sub-box if its first vectex sits
+    # in that sub-box)
+
+    tri_index = {}
+    N = domain.number_of_elements
+    for i in range(N):
+        t = domain.triangles[i]
+
+        x_coord = domain.centroid_coordinates[i][0]
+        bin_x = int(floor((x_coord-x_coord_min)/x_div))
+        if (bin_x == n_x):
+            bin_x = n_x-1
+
+        y_coord = domain.centroid_coordinates[i][1]
+        bin_y = int(floor((y_coord-y_coord_min)/y_div))
+        if (bin_y == n_y):
+            bin_y = n_y-1
+
+        bin = bin_y*n_x + bin_x
+        tri_list[bin].append(t)
+        tri_index[i] = ([bin, len(tri_list[bin])-1])
+
+    # find the number of triangles per processor and order the
+    # triangle list so that all of the triangles belonging to
+    # processor i are listed before those belonging to processor
+    # i+1
+
+    triangles = []
+    for i in range(n_x*n_y):
+        triangles_per_proc[i] = len(tri_list[i])
+        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_x*n_y-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]
+
+    # extract the node list
+    nodes = domain.coordinates.copy()
+
+    return nodes, triangles, boundary,  triangles_per_proc, rect
+
+
+

inundation/ga/storm_surge/parallel/run_parallel_sw_merimbula.py

@@ -59 +59 @@
 # mesh partition routines
 
-from pmesh_divide import pmesh_divide
+from pmesh_divide import pmesh_divide, pmesh_divide_steve
 from build_submesh import *
 from build_local import *
@@ -79 +79 @@
 
     #filename = 'test-100.tsh'
-    filename = 'merimbula_10785.tsh'
-    nx = 2
+    filename = 'merimbula_10785_1.tsh'
+    nx = numprocs
     ny = 1
     if nx*ny != numprocs:
@@ -86 +86 @@
 
     [nodes, triangles, boundary, triangles_per_proc, rect] =\
-            pmesh_divide(filename, Shallow_Water_Domain, nx, ny)
+            pmesh_divide_steve(filename, Shallow_Water_Domain, nx, ny)
 
     # subdivide the mesh
 
-    print rect
+    #print rect
 
     rect = array(rect, Float)
@@ -123 +123 @@
 
 pypar.broadcast(rect,0)
-print rect
+#print rect
 
 domain = Parallel_Shallow_Water_Domain(points, vertices, boundary,

inundation/ga/storm_surge/pyvolution/general_mesh.py

@@ -84 +84 @@
         #Register number of elements (N)
         self.number_of_elements = N = self.triangles.shape[0]
+
+        self.xy_extent = [ min(self.coordinates[:,0]), min(self.coordinates[:,1]) ,
+                           max(self.coordinates[:,0]), max(self.coordinates[:,1]) ]
+
 
         #Allocate space for geometric quantities
@@ -275 +279 @@
     def get_area(self):
         """Return total area of mesh
-        """
-
-        return sum(self.areas)
+        """
+
+        return sum(self.areas)

inundation/ga/storm_surge/pyvolution/realtime_visualisation_new.py

@@ -21 +21 @@
 
         # models for each quantity
-        self.z_models = {}
-        keys = self.domain.quantities.keys()
+        self.vpython_z_models = {}
         #print keys
-        for key in keys:
-            self.z_models[key] = faces(frame= self.frame)
+        for key in self.domain.quantities:
+            self.vpython_z_models[key] = faces(frame= self.frame)
 
         #print self.z_models
@@ -161 +160 @@
 
             #print 'update bed image'
-            self.z_models[qname].pos    = self.pos
-            self.z_models[qname].color  = self.colour
-            self.z_models[qname].normal = self.normals
+            self.vpython_z_models[qname].pos    = self.pos
+            self.vpython_z_models[qname].color  = self.colour
+            self.vpython_z_models[qname].normal = self.normals
         except:
             print 'Visualisation: Could not update quantity '+qname
@@ -189 +188 @@
 
             #print 'update bed image'
-        self.z_models[qname].pos    = self.pos
-        self.z_models[qname].color  = self.colour
-        self.z_models[qname].normal = self.normals
+        self.vpython_z_models[qname].pos    = self.pos
+        self.vpython_z_models[qname].color  = self.colour
+        self.vpython_z_models[qname].normal = self.normals
         #except:
         #    print 'Visualisation: Could not update quantity '+qname