Changeset 8565

Timestamp:

Sep 9, 2012, 8:51:01 AM (13 years ago)

Author:

steve

Message:

calc_sides using zip

File:

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

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

@@ -183 +183 @@
 
 
-def calc_sides(triangles):
+def calc_sides_old(triangles):
     '''Build dictionary mapping from sides (2-tuple of points)
     to left hand side neighbouring triangle
@@ -219 +219 @@
     return sides
 
-def calc_sides_zip(triangles):
+def calc_sides(triangles):
     '''Build dictionary mapping from sides (2-tuple of points)
     to left hand side neighbouring triangle
@@ -234 +234 @@
     c = triangles[:,2]
 
-    id = num.arange(len(triangles))
-    face = num.ones(len(triangles),num.int)
-
-    sides.update(dict(zip(zip(a,b),zip(id,2*face))))
-    sides.update(dict(zip(zip(b,c),zip(id,0*face))))
-    sides.update(dict(zip(zip(c,a),zip(id,1*face))))
+    id = 3*num.arange(len(triangles))
+
+    sides.update(dict(zip(zip(a,b),id+2)))
+    sides.update(dict(zip(zip(b,c),id+0)))
+    sides.update(dict(zip(zip(c,a),id+1)))
 
     return sides