Changeset 5899 for anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/general_mesh.py

Timestamp:

Nov 6, 2008, 12:28:22 PM (15 years ago)

Author:

rwilson

Message:

Initial NumPy? changes (again!).

File:

• anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/general_mesh.py (modified) (10 diffs)

anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/general_mesh.py

@@ -1 @@
-
-from Numeric import concatenate, reshape, take, allclose
-from Numeric import array, zeros, Int, Float, sqrt, sum, arange
+## Automatically adapted for numpy.oldnumeric Oct 28, 2008 by alter_code1.py
+
+
+##from numpy.oldnumeric import concatenate, reshape, take, allclose
+##from numpy.oldnumeric import array, zeros, Int, Float, sqrt, sum, arange
+from numpy import concatenate, reshape, take, allclose
+from numpy import array, zeros, int, float, sqrt, sum, arange
 
 from anuga.coordinate_transforms.geo_reference import Geo_reference
@@ -90 +94 @@
         if verbose: print 'General_mesh: Building basic mesh structure in ANUGA domain' 
 
-        self.triangles = array(triangles, Int)
-        self.nodes = array(nodes, Float)
+##        self.triangles = array(triangles, Int)
+##        self.nodes = array(nodes, Float)
+        self.triangles = array(triangles, int)
+        self.nodes = array(nodes, float)
 
 
@@ -138 +144 @@
 
         msg = 'Vertex indices reference non-existing coordinate sets'
-        assert max(self.triangles.flat) < self.nodes.shape[0], msg
+        assert max(self.triangles.ravel()) < self.nodes.shape[0], msg
 
 
@@ -146 +152 @@
                       max(self.nodes[:,0]), max(self.nodes[:,1]) ]
 
-        self.xy_extent = array(xy_extent, Float)
+##        self.xy_extent = array(xy_extent, Float)
+        self.xy_extent = array(xy_extent, float)
 
 
         # Allocate space for geometric quantities
-        self.normals = zeros((N, 6), Float)
-        self.areas = zeros(N, Float)
-        self.edgelengths = zeros((N, 3), Float)
+##        self.normals = zeros((N, 6), Float)
+##        self.areas = zeros(N, Float)
+##        self.edgelengths = zeros((N, 3), Float)
+        self.normals = zeros((N, 6), float)
+        self.areas = zeros(N, float)
+        self.edgelengths = zeros((N, 3), float)
 
         # Get x,y coordinates for all triangles and store
@@ -311 +321 @@
             i = triangle_id
             msg = 'triangle_id must be an integer'
+            print 'type(triangle_id)=%s. triangle_id=%s' % (type(triangle_id), str(triangle_id))
             assert int(i) == i, msg
             assert 0 <= i < self.number_of_triangles
@@ -349 +360 @@
 
         M = self.number_of_triangles
-        vertex_coordinates = zeros((3*M, 2), Float)
+##        vertex_coordinates = zeros((3*M, 2), Float)
+        vertex_coordinates = zeros((3*M, 2), float)
 
         for i in range(M):
@@ -376 +388 @@
             indices = range(M)
 
-        return take(self.triangles, indices)
+        return take(self.triangles, indices, axis=0)
     
 
@@ -409 +421 @@
         
         #T = reshape(array(range(K)).astype(Int), (M,3))
-        T = reshape(arange(K).astype(Int), (M,3))  # Faster
+##        T = reshape(arange(K).astype(Int), (M,3))  # Faster
+        T = reshape(arange(K).astype(int), (M,3))  # Faster
         
         return T     
@@ -442 +455 @@
             
             # Get number of triangles for this node
-            count = self.number_of_triangles_per_node[node]
+            count = int(self.number_of_triangles_per_node[node])
 
             for i in range(count):
@@ -582 +595 @@
         Y = C[:,1:6:2].copy()
 
-        xmin = min(X.flat)
-        xmax = max(X.flat)
-        ymin = min(Y.flat)
-        ymax = max(Y.flat)
+        xmin = min(X.ravel())
+        xmax = max(X.ravel())
+        ymin = min(Y.ravel())
+        ymax = max(Y.ravel())
         #print "C",C
         return xmin, xmax, ymin, ymax