Changeset 5944

Timestamp:

Nov 12, 2008, 11:44:11 AM (16 years ago)

Author:

rwilson

Message:

More NumPy? changes.

Location:

anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes

Files:

• domain.py (modified) (5 diffs)
• general_mesh.py (modified) (2 diffs)
• pmesh2domain.py (modified) (1 diff)
• quantity.py (modified) (3 diffs)
• test_util.py (modified) (7 diffs)
• util.py (modified) (1 diff)

anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/domain.py

@@ -1084 +1084 @@
 
         """
-        print '.evolve: 0'
 
         from anuga.config import min_timestep, max_timestep, epsilon
@@ -1095 +1094 @@
                %self.get_boundary_tags()
         assert hasattr(self, 'boundary_objects'), msg
-        print '.evolve: 1'
 
 
@@ -1104 +1102 @@
 
         self._order_ = self.default_order
-        print '.evolve: 2'
 
 
@@ -1128 +1125 @@
         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:
@@ -1467 +1458 @@
         # FIXME (Steve): This should be in shallow_water as it assumes x and y
         # momentum
-        if self.protect_against_isolated_degenerate_timesteps is True and\
-               self.max_speed > 10.0: # FIXME (Ole): Make this configurable
+        if self.protect_against_isolated_degenerate_timesteps is True and \
+               numpy.alltrue(self.max_speed > 10.0): # FIXME (Ole): Make this configurable
 
             # Setup 10 bins for speed histogram

anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/general_mesh.py

@@ -2 +2 @@
 
 from anuga.coordinate_transforms.geo_reference import Geo_reference
+from anuga.config import Int
 
 class General_mesh:
@@ -535 +536 @@
 
         # Count number of triangles per node
-        number_of_triangles_per_node = numpy.zeros(self.number_of_full_nodes)
+        number_of_triangles_per_node = numpy.zeros(self.number_of_full_nodes, Int)
         for volume_id, triangle in enumerate(self.get_triangles()):
             for vertex_id in triangle:

anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/pmesh2domain.py

@@ -176 +176 @@
     geo_reference  = mesh_dict['geo_reference']
     if point_atts != None:
+        print 'type(point_titles)=%s, point_titles=%s' % (type(point_titles), str(point_titles))
+        print 'type(point_atts)=%s, point_atts=%s' % (type(point_atts), str(point_atts))
         for quantity, value_vector in map(None, point_titles, point_atts):
             vertex_quantity_dict[quantity] = value_vector

anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/quantity.py

@@ -24 +24 @@
 from anuga.config import points_file_block_line_size as default_block_line_size
 from anuga.config import epsilon
+from anuga.config import Float, Int
 
 class Quantity:
@@ -453 +454 @@
 
         if numeric is not None:
-            if type(numeric) in [FloatType, IntType, LongType]:
+            if type(numeric) in [FloatType, IntType, LongType, numpy.float64]:
                 self.set_values_from_constant(numeric,
                                               location, indices, verbose)
@@ -472 +473 @@
                                                      use_cache=use_cache)
             else:
-                msg = 'Illegal type for argument numeric: %s' % str(numeric)
+                msg = 'Illegal type for argument numeric: %s, type %s' % \
+                      (str(numeric), type(numeric))
                 raise TypeError, msg
 

anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/test_util.py

@@ -385 +385 @@
 
         last_time_index = len(time)-1 #Last last_time_index     
-        d_stage = numpy.reshape(take(stage[last_time_index, :], [0,5,10,15]), (4,1))
-        d_uh = numpy.reshape(take(xmomentum[last_time_index, :], [0,5,10,15]), (4,1))
-        d_vh = numpy.reshape(take(ymomentum[last_time_index, :], [0,5,10,15]), (4,1))
+        d_stage = numpy.reshape(numpy.take(stage[last_time_index, :], [0,5,10,15]), (4,1))
+        d_uh = numpy.reshape(numpy.take(xmomentum[last_time_index, :], [0,5,10,15]), (4,1))
+        d_vh = numpy.reshape(numpy.take(ymomentum[last_time_index, :], [0,5,10,15]), (4,1))
         D = numpy.concatenate( (d_stage, d_uh, d_vh), axis=1)
 
@@ -397 +397 @@
 
         #And the midpoints are found now
-        Dx = take(numpy.reshape(x, (16,1)), [0,5,10,15])
-        Dy = take(numpy.reshape(y, (16,1)), [0,5,10,15])
+        Dx = numpy.take(numpy.reshape(x, (16,1)), [0,5,10,15])
+        Dy = numpy.take(numpy.reshape(y, (16,1)), [0,5,10,15])
 
         diag = numpy.concatenate( (Dx, Dy), axis=1)
@@ -405 +405 @@
 
         #Adjust for georef - make interpolation points absolute
+        print 'd_midpoints=%s %s' % (type(d_midpoints), str(d_midpoints))
         d_midpoints[:,0] += xllcorner
         d_midpoints[:,1] += yllcorner                
@@ -423 +424 @@
 
         timestep = 0 #First timestep
-        d_stage = numpy.reshape(take(stage[timestep, :], [0,5,10,15]), (4,1))
-        d_uh = numpy.reshape(take(xmomentum[timestep, :], [0,5,10,15]), (4,1))
-        d_vh = numpy.reshape(take(ymomentum[timestep, :], [0,5,10,15]), (4,1))
+        d_stage = numpy.reshape(numpy.take(stage[timestep, :], [0,5,10,15]), (4,1))
+        d_uh = numpy.reshape(numpy.take(xmomentum[timestep, :], [0,5,10,15]), (4,1))
+        d_vh = numpy.reshape(numpy.take(ymomentum[timestep, :], [0,5,10,15]), (4,1))
         D = numpy.concatenate( (d_stage, d_uh, d_vh), axis=1)
 
@@ -445 +446 @@
 
         timestep = 33
-        d_stage = numpy.reshape(take(stage[timestep, :], [0,5,10,15]), (4,1))
-        d_uh = numpy.reshape(take(xmomentum[timestep, :], [0,5,10,15]), (4,1))
-        d_vh = numpy.reshape(take(ymomentum[timestep, :], [0,5,10,15]), (4,1))
+        d_stage = numpy.reshape(numpy.take(stage[timestep, :], [0,5,10,15]), (4,1))
+        d_uh = numpy.reshape(numpy.take(xmomentum[timestep, :], [0,5,10,15]), (4,1))
+        d_vh = numpy.reshape(numpy.take(ymomentum[timestep, :], [0,5,10,15]), (4,1))
         D = numpy.concatenate( (d_stage, d_uh, d_vh), axis=1)
 
@@ -466 +467 @@
 
         timestep = 15
-        d_stage = numpy.reshape(take(stage[timestep, :], [0,5,10,15]), (4,1))
-        d_uh = numpy.reshape(take(xmomentum[timestep, :], [0,5,10,15]), (4,1))
-        d_vh = numpy.reshape(take(ymomentum[timestep, :], [0,5,10,15]), (4,1))
+        d_stage = numpy.reshape(numpy.take(stage[timestep, :], [0,5,10,15]), (4,1))
+        d_uh = numpy.reshape(numpy.take(xmomentum[timestep, :], [0,5,10,15]), (4,1))
+        d_vh = numpy.reshape(numpy.take(ymomentum[timestep, :], [0,5,10,15]), (4,1))
         D = numpy.concatenate( (d_stage, d_uh, d_vh), axis=1)
 
@@ -479 +480 @@
         #
         timestep = 16
-        d_stage = numpy.reshape(take(stage[timestep, :], [0,5,10,15]), (4,1))
-        d_uh = numpy.reshape(take(xmomentum[timestep, :], [0,5,10,15]), (4,1))
-        d_vh = numpy.reshape(take(ymomentum[timestep, :], [0,5,10,15]), (4,1))
+        d_stage = numpy.reshape(numpy.take(stage[timestep, :], [0,5,10,15]), (4,1))
+        d_uh = numpy.reshape(numpy.take(xmomentum[timestep, :], [0,5,10,15]), (4,1))
+        d_vh = numpy.reshape(numpy.take(ymomentum[timestep, :], [0,5,10,15]), (4,1))
         D = numpy.concatenate( (d_stage, d_uh, d_vh), axis=1)
 

anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/util.py

@@ -2183 +2183 @@
         if verbose: print 'File %s exists' %(sww_file)
     else:
-        msg = 'File "%s" could not be opened: Error=line2181'\
+        msg = 'File "%s" could not be opened: no read permission'\
                %(sww_file)
         raise msg