Changeset 6304 for branches/numpy/anuga/abstract_2d_finite_volumes/domain.py

Timestamp:

Feb 10, 2009, 11:11:04 AM (16 years ago)

Author:

rwilson

Message:

Initial commit of numpy changes. Still a long way to go.

Location:

branches/numpy

Files:

• . (copied) (copied from anuga_core/source)
• anuga/abstract_2d_finite_volumes/domain.py (modified) (11 diffs)

branches/numpy/anuga/abstract_2d_finite_volumes/domain.py

@@ -31 +31 @@
 from quantity import Quantity
 
-import Numeric as num
+import numpy as num
 
 
@@ -185 +185 @@
             buffer_shape = self.full_send_dict[key][0].shape[0]
             self.full_send_dict[key].append(num.zeros((buffer_shape, self.nsys),
-                                                      num.Float))
+                                                      num.float))
 
         for key in self.ghost_recv_dict:
             buffer_shape = self.ghost_recv_dict[key][0].shape[0]
             self.ghost_recv_dict[key].append(num.zeros((buffer_shape, self.nsys),
-                                             num.Float))
+                                             num.float))
 
         # Setup cell full flag
@@ -197 +197 @@
         N = len(self) #number_of_elements
         self.number_of_elements = N
-        self.tri_full_flag = num.ones(N, num.Int)
+        self.tri_full_flag = num.ones(N, num.int)
         for i in self.ghost_recv_dict.keys():
             for id in self.ghost_recv_dict[i][0]:
@@ -258 +258 @@
         # (boolean) array, to be used during the flux calculation.
         N = len(self) # Number_of_triangles
-        self.already_computed_flux = num.zeros((N, 3), num.Int)
+        self.already_computed_flux = num.zeros((N, 3), num.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 = num.zeros(N, num.Float)
+        self.max_speed = num.zeros(N, num.float)
 
         if mesh_filename is not None:
@@ -375 +375 @@
             raise Exception, msg
 
-        q = num.zeros(len(self.conserved_quantities), num.Float)
+        q = num.zeros(len(self.conserved_quantities), num.float)
 
         for i, name in enumerate(self.conserved_quantities):
@@ -447 +447 @@
 
         name:  Name of quantity
-        value: Compatible list, Numeric array, const or function (see below)
+        value: Compatible list, numeric array, const or function (see below)
 
         The values will be stored in elements following their internal ordering.
@@ -879 +879 @@
 
             msg += '------------------------------------------------\n'
-            msg += '  Speeds in [%f, %f]\n' % (min(self.max_speed),
-                                               max(self.max_speed))
+            msg += '  Speeds in [%f, %f]\n' % (min(self.max_speed.flat),
+                                               max(self.max_speed.flat))
             msg += '  Histogram:\n'
 
@@ -892 +892 @@
                 else:
                     # Closed upper interval
-                    hi = max(self.max_speed)
+                    hi = max(self.max_speed.flat)
                     msg += '    [%f, %f]: %d\n' % (lo, hi, count)
 
-            N = len(self.max_speed)
+            N = len(self.max_speed.flat)
             if N > 10:
                 msg += '  Percentiles (10%):\n'
@@ -1357 +1357 @@
                 self.number_of_steps = 0
                 self.number_of_first_order_steps = 0
-                self.max_speed = num.zeros(N, num.Float)
+                self.max_speed = num.zeros(N, num.float)
 
     ##
@@ -1626 +1626 @@
         # momentum
         if self.protect_against_isolated_degenerate_timesteps is True and \
-               self.max_speed > 10.0: # FIXME (Ole): Make this configurable
+               num.max(self.max_speed) > 10.0: # FIXME (Ole): Make this configurable
 
             # Setup 10 bins for speed histogram
@@ -1641 +1641 @@
 
                     # Find triangles in last bin
-                    # FIXME - speed up using Numeric
+                    # FIXME - speed up using numeric package
                     d = 0
                     for i in range(self.number_of_full_triangles):