Changeset 5892 for anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

Timestamp:

Nov 5, 2008, 4:29:38 PM (15 years ago)

Author:

rwilson

Message:

Made numpy changes, lots of problems.

File:

• anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py (modified) (15 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

@@ -8 +8 @@
 """
 
-from Numeric import allclose, argmax, zeros, Float
+##from numpy.oldnumeric import allclose, argmax, zeros, Float
+import numpy
+
 from anuga.config import epsilon
 from anuga.config import beta_euler, beta_rk2
@@ -105 +107 @@
 
         if verbose: print 'Initialising Domain'
-        from Numeric import zeros, Float, Int, ones
         from quantity import Quantity
 
@@ -155 +156 @@
         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(numpy.zeros( (buffer_shape,self.nsys), numpy.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(numpy.zeros( (buffer_shape,self.nsys), numpy.float))
 
 
@@ -168 +169 @@
         N = len(self) #number_of_elements
         self.number_of_elements = N
-        self.tri_full_flag = ones(N, Int)
+        self.tri_full_flag = numpy.ones(N, numpy.int)
         for i in self.ghost_recv_dict.keys():
             for id in self.ghost_recv_dict[i][0]:
@@ -175 +176 @@
         # Test the assumption that all full triangles are store before
         # the ghost triangles.
-        if not allclose(self.tri_full_flag[:self.number_of_full_nodes],1):
+        if not numpy.allclose(self.tri_full_flag[:self.number_of_full_nodes],1):
             print 'WARNING:  Not all full triangles are store before ghost triangles'
                         
@@ -230 +231 @@
         # calculation
         N = len(self) # Number_of_triangles
-        self.already_computed_flux = zeros((N, 3), Int)
+        self.already_computed_flux = numpy.zeros((N, 3), numpy.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 = numpy.zeros(N, numpy.float)
 
         if mesh_filename is not None:
@@ -266 +267 @@
         """
 
-        from Numeric import zeros, Float
-
         if not (vertex is None or edge is None):
             msg = 'Values for both vertex and edge was specified.'
@@ -273 +272 @@
             raise msg
 
-        q = zeros( len(self.conserved_quantities), Float)
+        q = numpy.zeros( len(self.conserved_quantities), numpy.float)
 
         for i, name in enumerate(self.conserved_quantities):
@@ -769 +768 @@
             # Find index of largest computed flux speed
             if triangle_id is None:
-                k = self.k = argmax(self.max_speed)
+                k = self.k = numpy.argmax(self.max_speed)
             else:
                 errmsg = 'Triangle_id %d does not exist in mesh: %s' %(triangle_id,
@@ -1086 +1085 @@
 
         """
+        print '.evolve: 0'
 
         from anuga.config import min_timestep, max_timestep, epsilon
@@ -1096 +1096 @@
                %self.get_boundary_tags()
         assert hasattr(self, 'boundary_objects'), msg
+        print '.evolve: 1'
 
 
@@ -1104 +1105 @@
 
         self._order_ = self.default_order
+        print '.evolve: 2'
 
 
@@ -1127 +1129 @@
         self.number_of_first_order_steps = 0
 
-
+        print '.evolve: 3'
         # Update ghosts
         self.update_ghosts()
 
+        print '.evolve: 4'
         # Initial update of vertex and edge values
         self.distribute_to_vertices_and_edges()
 
+        print '.evolve: 5'
         # Update extrema if necessary (for reporting)
         self.update_extrema()
         
+        print '.evolve: 6'
         # Initial update boundary values
         self.update_boundary()
 
+        print '.evolve: 7'
         # Or maybe restore from latest checkpoint
         if self.checkpoint is True:
             self.goto_latest_checkpoint()
+        print '.evolve: 8'
 
         if skip_initial_step is False:
@@ -1202 +1209 @@
                 self.number_of_steps = 0
                 self.number_of_first_order_steps = 0
-                self.max_speed = zeros(N, Float)
+                self.max_speed = numpy.zeros(N, numpy.float)
 
     def evolve_one_euler_step(self, yieldstep, finaltime):
@@ -1568 +1575 @@
         """
 
-        from Numeric import ones, sum, equal, Float
-
         N = len(self) # Number_of_triangles
         d = len(self.conserved_quantities)