Changeset 1585

Timestamp:

Jul 6, 2005, 9:55:40 PM (19 years ago)

Author:

steve

Message:

Better partitioning of meribula data set

Location:

inundation/ga/storm_surge

Files:

• parallel/pmesh_divide.py (modified) (5 diffs)
• parallel/run_parallel_sw_merimbula.py (modified) (6 diffs)
• pyvolution/netherlands.py (modified) (2 diffs)
• zeus/pyvolution.zbi (modified) (previous)

inundation/ga/storm_surge/parallel/pmesh_divide.py

@@ -130 +130 @@
 
     # find the number triangles
-    
+
     N = len(tri_index)
 
@@ -137 +137 @@
     index = zeros(N, Int)
     q_reord = {}
-    
+
     # find the new ordering of the triangles
-    
+
     for i in range(N):
         bin = tri_index[i][0]
-        bin_off_set = tri_index[i][1]        
+        bin_off_set = tri_index[i][1]
         index[i] = proc_sum[bin]+bin_off_set
 
     # reorder each quantity according to the new ordering
-    
+
     for k in quantities:
         q_reord[k] = zeros((N, 3), Float)
@@ -153 +153 @@
 
     del index
-    
+
     return q_reord
-    
+
 def pmesh_divide(domain, n_x = 1, n_y = 1):
 
@@ -231 +231 @@
 
     quantities = reorder(domain.quantities, tri_index, proc_sum)
-                         
+
     # extract the node list
     nodes = domain.coordinates.copy()
@@ -237 +237 @@
     return nodes, triangles, boundary, triangles_per_proc, quantities
 
+def pmesh_divide_steve(domain, n_x = 1, n_y = 1):
+
+    # 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]
+
+
+    # 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
+
+    #sort by x coordinate of centroid
+    from Numeric import argsort
+    sort_order = argsort(argsort(domain.centroid_coordinates[:,0]))
+
+    x_div = float(N)/n_x
+
+    for i in range(N):
+        t = domain.triangles[i]
+
+        bin = int(floor(sort_order[i]/x_div))
+        if (bin == n_x):
+            bin = n_x-1
+
+        tri_list[bin].append(t)
+        tri_index[i] = ([bin, len(tri_list[bin])-1])
+
+    #print tri_list
+
+    #print tri_index
+
+    # 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]
+
+    quantities = reorder(domain.quantities, tri_index, proc_sum)
+
+    # extract the node list
+    nodes = domain.coordinates.copy()
+
+    return nodes, triangles, boundary, triangles_per_proc, quantities

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 *
@@ -105 +105 @@
 
     nodes, triangles, boundary, triangles_per_proc, quantities = \
-         pmesh_divide(domain_full, nx, ny)
+         pmesh_divide_steve(domain_full, nx, ny)
 
     rect = array(domain_full.xy_extent, Float)
@@ -146 +146 @@
 
 domain.initialise_visualiser(rect=rect,scale_z =0.1)
+#domain.initialise_visualiser(rect=rect)
 domain.visualise_color_stage = True
 domain.default_order = 1
@@ -156 +157 @@
 domain.set_boundary( {'outflow': R, 'inflow': R, 'inner':R, 'exterior': R, 'open':R} )
 
-print quantities.keys()
+
 domain.set_quantity('stage', quantities['stage'])
 domain.set_quantity('elevation', quantities['elevation'])
@@ -163 +164 @@
 # Evolution
 t0 = time.time()
-domain.visualise = True
+
+print 'Processor %d No of elements %d'%(domain.processor,domain.number_of_elements)
 yieldstep = 10.0
-finaltime = 1000.0
+finaltime = 500.0
 
 #yieldstep = 10
@@ -173 +175 @@
     if myid == 0:
         domain.write_time()
-        print domain.quantities['stage'].centroid_values[0]
+        print domain.quantities['stage'].get_integral()
 
 if myid == 0:

inundation/ga/storm_surge/pyvolution/netherlands.py

@@ -9 +9 @@
 # Module imports
 #
+import rpdb
+rpdb.set_active()
+
 from shallow_water import Domain, Reflective_boundary, Dirichlet_boundary,\
      Transmissive_boundary, Constant_height, Constant_stage
@@ -158 +161 @@
 
 
+
 for t in domain.evolve(yieldstep = 0.1, finaltime = 15.0):
     domain.write_time()
+    rpdb.set_active()
     #domain.visualiser.scale_z = 1.0
     #domain.visualiser.update_quantity_color('xmomentum',scale_z = 4.0)