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

anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/domain.py

@@ +1 @@
+## Automatically adapted for numpy.oldnumeric Oct 28, 2008 by alter_code1.py
+
 """Class Domain - 2D triangular domains for finite-volume computations of
    conservation laws.
@@ -8 +10 @@
 """
 
-from Numeric import allclose, argmax, zeros, Float
+##from numpy.oldnumeric import allclose, argmax, zeros, Float
+from numpy import allclose, argmax, zeros, float
 from anuga.config import epsilon
 from anuga.config import beta_euler, beta_rk2
@@ -105 +108 @@
 
         if verbose: print 'Initialising Domain'
-        from Numeric import zeros, Float, Int, ones
+##        from numpy.oldnumeric import zeros, Float, Int, ones
+        from numpy import zeros, float, int, ones
         from quantity import Quantity
 
@@ -155 +159 @@
         for key in self.full_send_dict:
             buffer_shape = self.full_send_dict[key][0].shape[0]
-            self.full_send_dict[key].append(zeros( (buffer_shape,self.nsys) ,Float))
+            self.full_send_dict[key].append(zeros( (buffer_shape,self.nsys) ,float))
 
 
         for key in self.ghost_recv_dict:
             buffer_shape = self.ghost_recv_dict[key][0].shape[0]
-            self.ghost_recv_dict[key].append(zeros( (buffer_shape,self.nsys) ,Float))
+            self.ghost_recv_dict[key].append(zeros( (buffer_shape,self.nsys) ,float))
 
 
@@ -168 +172 @@
         N = len(self) #number_of_elements
         self.number_of_elements = N
-        self.tri_full_flag = ones(N, Int)
+        self.tri_full_flag = ones(N, int)
         for i in self.ghost_recv_dict.keys():
             for id in self.ghost_recv_dict[i][0]:
@@ -230 +234 @@
         # calculation
         N = len(self) # Number_of_triangles
-        self.already_computed_flux = zeros((N, 3), Int)
+        self.already_computed_flux = zeros((N, 3), int)
 
         # Storage for maximal speeds computed for each triangle by
         # compute_fluxes
         # This is used for diagnostics only (reset at every yieldstep)
-        self.max_speed = zeros(N, Float)
+        self.max_speed = zeros(N, float)
 
         if mesh_filename is not None:
@@ -266 +270 @@
         """
 
-        from Numeric import zeros, Float
+##        from numpy.oldnumeric import zeros, Float
+        from numpy import zeros, float
 
         if not (vertex is None or edge is None):
@@ -273 +278 @@
             raise msg
 
-        q = zeros( len(self.conserved_quantities), Float)
+        q = zeros( len(self.conserved_quantities), float)
 
         for i, name in enumerate(self.conserved_quantities):
@@ -1202 +1207 @@
                 self.number_of_steps = 0
                 self.number_of_first_order_steps = 0
-                self.max_speed = zeros(N, Float)
+                self.max_speed = zeros(N, float)
 
     def evolve_one_euler_step(self, yieldstep, finaltime):
@@ -1568 +1573 @@
         """
 
-        from Numeric import ones, sum, equal, Float
+##        from numpy.oldnumeric import ones, sum, equal, Float
+        from numpy import ones, sum, equal, float
 
         N = len(self) # Number_of_triangles