Changeset 5899 for anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/neighbour_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/neighbour_mesh.py (modified) (9 diffs)

anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/neighbour_mesh.py

@@ +1 @@
+## Automatically adapted for numpy.oldnumeric Oct 28, 2008 by alter_code1.py
+
 """Classes implementing general 2D triangular mesh with neighbour structure.
 
@@ -11 +13 @@
 from anuga.caching import cache
 from math import pi, sqrt
-from Numeric import array, allclose
+#from numpy.oldnumeric import array, allclose
+from numpy import array, allclose
         
 
@@ -81 +84 @@
 
 
-        from Numeric import array, zeros, Int, Float, maximum, sqrt, sum
+#        from numpy.oldnumeric import array, zeros, Int, Float, maximum, sqrt, sum
+        from numpy import array, zeros, int, float, maximum, sqrt, sum
 
         General_mesh.__init__(self, coordinates, triangles,
@@ -98 +102 @@
 
         #Allocate space for geometric quantities
-        self.centroid_coordinates = zeros((N, 2), Float)
-
-        self.radii = zeros(N, Float)
-
-        self.neighbours = zeros((N, 3), Int)
-        self.neighbour_edges = zeros((N, 3), Int)
-        self.number_of_boundaries = zeros(N, Int)
-        self.surrogate_neighbours = zeros((N, 3), Int)
+        self.centroid_coordinates = zeros((N, 2), float)
+
+        self.radii = zeros(N, float)
+
+        self.neighbours = zeros((N, 3), int)
+        self.neighbour_edges = zeros((N, 3), int)
+        self.number_of_boundaries = zeros(N, int)
+        self.surrogate_neighbours = zeros((N, 3), int)
 
         #Get x,y coordinates for all triangles and store
@@ -388 +392 @@
             self.element_tag is defined
         """
-        from Numeric import array, Int
+#        from numpy.oldnumeric import array, Int
+        from numpy import array, int
 
         if tagged_elements is None:
@@ -395 +400 @@
             #Check that all keys in given boundary exist
             for tag in tagged_elements.keys():
-                tagged_elements[tag] = array(tagged_elements[tag]).astype(Int)
+                tagged_elements[tag] = array(tagged_elements[tag]).astype(int)
 
                 msg = 'Not all elements exist. '
@@ -463 +468 @@
         """
         
-        from Numeric import allclose, sqrt, array, minimum, maximum
+#        from numpy.oldnumeric import allclose, sqrt, array, minimum, maximum
+        from numpy import allclose, sqrt, array, minimum, maximum
         from anuga.utilities.numerical_tools import angle, ensure_numeric     
 
@@ -629 +635 @@
         from anuga.utilities.numerical_tools import anglediff
 
-        from Numeric import sort, allclose
+#        from numpy.oldnumeric import sort, allclose
+        from numpy import sort, allclose
 
         N = len(self)
@@ -805 +812 @@
         """
 
-        from Numeric import arange
+#        from numpy.oldnumeric import arange
+        from numpy import arange
         from anuga.utilities.numerical_tools import histogram, create_bins