Changeset 8564

Timestamp:

Sep 9, 2012, 8:37:47 AM (13 years ago)

Author:

steve

Message:

Simpler calc_sides

File:

• trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/pmesh2domain.py (modified) (2 diffs)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/pmesh2domain.py

@@ -176 +176 @@
                 #this creates a dict of lists of faces, indexed by tag
                 #tagged_edges.setdefault(tag,[]).append(sides[key])
-                tag_dict[sides[key]] = tag
+                vol_id = sides[key]/3
+                edge_id = sides[key]%3
+                tag_dict[vol_id,edge_id] = tag
 
     return tag_dict
@@ -182 +184 @@
 
 def calc_sides(triangles):
+    '''Build dictionary mapping from sides (2-tuple of points)
+    to left hand side neighbouring triangle
+    '''
+
+    sides = {}
+    triangles = num.array(triangles,num.int)
+    for id, triangle in enumerate(triangles):
+        a = triangle[0]
+        b = triangle[1]
+        c = triangle[2]
+
+        sides[a,b] = 3*id+2 #(id, face)
+        sides[b,c] = 3*id+0 #(id, face)
+        sides[c,a] = 3*id+1 #(id, face)
+
+    return sides
+
+def calc_sides_old2(triangles):
     '''Build dictionary mapping from sides (2-tuple of points)
     to left hand side neighbouring triangle