Changeset 6174 for anuga_core/source/anuga/abstract_2d_finite_volumes/general_mesh.py

Timestamp:

Jan 15, 2009, 11:03:42 AM (15 years ago)

Author:

rwilson

Message:

Changed .array(A) to .array(A, num.Int) where appropriate. Helps when going to numpy.

File:

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

anuga_core/source/anuga/abstract_2d_finite_volumes/general_mesh.py

@@ -185 +185 @@
             #   - Stored as six floats n0x,n0y,n1x,n1y,n2x,n2y per triangle
 
-            n0 = num.array([x2 - x1, y2 - y1])
+            n0 = num.array([x2 - x1, y2 - y1], num.Float)
             l0 = num.sqrt(num.sum(n0**2))
 
-            n1 = num.array([x0 - x2, y0 - y2])
+            n1 = num.array([x0 - x2, y0 - y2], num.Float)
             l1 = num.sqrt(num.sum(n1**2))
 
-            n2 = num.array([x1 - x0, y1 - y0])
+            n2 = num.array([x1 - x0, y1 - y0], num.Float)
             l2 = num.sqrt(num.sum(n2**2))
 
@@ -273 +273 @@
             if not self.geo_reference.is_absolute():
                 return V + num.array([self.geo_reference.get_xllcorner(),
-                                      self.geo_reference.get_yllcorner()])
+                                      self.geo_reference.get_yllcorner()], num.Float)
             else:
                 return V
@@ -315 +315 @@
             if absolute is True and not self.geo_reference.is_absolute():
                 offset=num.array([self.geo_reference.get_xllcorner(),
-                                  self.geo_reference.get_yllcorner()])
+                                  self.geo_reference.get_yllcorner()], num.Float)
                 return num.array([V[i3,:]+offset,
                                   V[i3+1,:]+offset,
-                                  V[i3+2,:]+offset])
+                                  V[i3+2,:]+offset], num.Float)
             else:
-                return num.array([V[i3,:], V[i3+1,:], V[i3+2,:]])
+                return num.array([V[i3,:], V[i3+1,:], V[i3+2,:]], num.Float)