Changeset 7308

Timestamp:

Jul 12, 2009, 10:53:38 PM (15 years ago)

Author:

ole

Message:

Tested ANUGA/numpy for Python2.6 on Ubuntu 9.04 and fixed up remaining errors.
In short, they had to do with hasattr, which now can raise a proper exception and the rest
was situations where numpy.int32 had to be converted to a proper int.

Location:

anuga_core/source/anuga

Files:

• shallow_water/data_manager.py (modified) (10 diffs)
• shallow_water/test_data_manager.py (modified) (3 diffs)
• utilities/test_polygon.py (modified) (2 diffs)
• utilities/treenode.py (modified) (1 diff)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -3083 +3083 @@
     else:
         jmin = num.searchsorted(times, mint)
+        
+        # numpy.int32 didn't work in slicing of amplitude below
+        jmin = int(jmin)
 
     if maxt is None:
@@ -3089 +3092 @@
     else:
         jmax = num.searchsorted(times, maxt)
+        
+        # numpy.int32 didn't work in slicing of amplitude below
+        jmax = int(jmax)        
 
     kmin, kmax, lmin, lmax = _get_min_max_indexes(latitudes[:],
@@ -3123 +3129 @@
     #        'print hmmm'
 
-    #Get missing values
+    # Get missing values
     nan_ha = file_h.variables['HA'].missing_value[0]
     nan_ua = file_u.variables['UA'].missing_value[0]
@@ -3132 +3138 @@
         nan_e = None
 
-    #Cleanup
+    # Cleanup
     missing = (amplitudes == nan_ha)
     if num.sometrue (missing):
@@ -3828 +3834 @@
     if verbose: print 'Reading DEM from %s' % inname
 
-    #Read metadata
-    ncols = infile.ncols[0]
-    nrows = infile.nrows[0]
+    # Read metadata (convert from numpy.int32 to int where appropriate)
+    ncols = int(infile.ncols[0])
+    nrows = int(infile.nrows[0])
     xllcorner = infile.xllcorner[0]
     yllcorner = infile.yllcorner[0]
-    cellsize = infile.cellsize[0]
-    NODATA_value = infile.NODATA_value[0]
-    zone = infile.zone[0]
+    cellsize = int(infile.cellsize[0])
+    NODATA_value = int(infile.NODATA_value[0])
+    zone = int(infile.zone[0])
     false_easting = infile.false_easting[0]
     false_northing = infile.false_northing[0]
@@ -3860 +3866 @@
     nrows_new = 1 + (nrows - nrows_stencil) / cellsize_ratio
 
+    #print type(ncols_new), ncols_new
+    
     #Open netcdf file for output
     outfile = NetCDFFile(outname, netcdf_mode_w)
@@ -3885 +3893 @@
 
     # dimension definition
+    #print nrows_new, ncols_new, nrows_new*ncols_new
+    #print type(nrows_new), type(ncols_new), type(nrows_new*ncols_new)
     outfile.createDimension('number_of_points', nrows_new*ncols_new)
 
@@ -6102 +6112 @@
         Maybe make this general, but the viewer assumes these quantities,
         so maybe we don't want it general - unless the viewer is general
-
-        precon
-        triangulation and
-        header have been called.
+        
+        The argument sww_precision allows for storing as either 
+        * single precision (default): num.float32
+        * double precision: num.float64 or num.float 
+
+        Precondition:
+            triangulation and
+            header have been called.
         """
 
@@ -6112 +6126 @@
             slice_index = len(file_time)
             file_time[slice_index] = time
+        else:
+            slice_index = int(slice_index) # In case it was numpy.int    
 
         # Write the conserved quantities from Domain.
@@ -6124 +6140 @@
             else:
                 q_values = quant[q]
-                outfile.variables[q][slice_index] = \
-                                q_values.astype(sww_precision)
+                
+                x = q_values.astype(sww_precision)
+                outfile.variables[q][slice_index] = x
+                    
         
                 # This updates the _range values

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -5960 +5960 @@
         tide = 1
         base_name, files = self.create_mux()
+        
         urs2sww(base_name,
                 mint=0.25,
@@ -5965 +5966 @@
                 mean_stage=tide,
                 remove_nc_files=True,
-                      verbose=self.verbose
-                )
+                verbose=self.verbose)
         sww_file = base_name + '.sww'
         
@@ -11678 +11678 @@
 
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_Data_Manager,'test')
+    suite = unittest.makeSuite(Test_Data_Manager, 'test')
     
+    
+    # FIXME(Ole): When Ross has implemented logging, we can 
+    # probably get rid of all this:
     if len(sys.argv) > 1 and sys.argv[1][0].upper() == 'V':
         Test_Data_Manager.verbose=True

anuga_core/source/anuga/utilities/test_polygon.py

@@ -304 +304 @@
         points = [[0.5, 0.5], [1, -0.5], [1.5, 0], [0.5, 1.5], [0.5, -0.5]]
         res = inside_polygon( points, polygon, verbose=False )
-        assert num.allclose( res, [0,1,2] )
+        assert num.allclose(res, [0,1,2])
 
     def test_outside_polygon(self):
@@ -585 +585 @@
         points = [(1., 0.25),(1., 0.75)]
         inside, outside = in_and_outside_polygon(points, polygon, closed=True)
-        assert (inside, [0,1])
+        assert num.alltrue(inside == [0,1])
         assert len(outside) == 0
 
         inside, outside = in_and_outside_polygon(points, polygon, closed=False)
         assert len(inside) == 0
-        assert (outside, [0,1])
+        assert num.alltrue(outside == [0,1])
 
         points = [(100., 0.25), (0.5, 0.5) ]
         inside, outside = in_and_outside_polygon(points, polygon)
-        assert (inside, [1])
+        assert num.alltrue(inside == [1])
         assert outside[0] == 0
 
         points = [(100., 0.25),(0.5, 0.5), (39,20), (0.6,0.7),(56,43),(67,90)]
         inside, outside = in_and_outside_polygon(points, polygon)
-        assert (inside, [1, 3])
-        assert (outside, [0, 2, 4, 5])
+        assert num.alltrue(inside == [1, 3])
+        assert num.alltrue(outside == [0, 2, 4, 5])
 
     def test_intersection1(self):

anuga_core/source/anuga/utilities/treenode.py

@@ -24 +24 @@
         self.parent = None
 
-        # subclasses can implement these attributes as functions, called
+        # Subclasses can implement these attributes as functions, called
         # when a node (either leaf or internal) is deleted
-        if not hasattr(self,'ClearLeafNode'):
-            self.ClearLeafNode = None
-        if not hasattr(self,'ClearInternalNode'):
-            self.ClearInternalNode = None
+        
+        # FIXME (Ole): The hasattr statements below were commented out on 12 July 2009 by Ole Nielsen due to 
+        # errors appearing when using Python2.6. Tests pass, so I think this was just superfluous anyway.
+        #
+        # Excerpt from What's New in Python 2.6
+        #
+        #The hasattr() function was catching and ignoring all errors,
+        #under the assumption that they meant a __getattr__() method
+        #was failing somehow and the return value of hasattr() would
+        #therefore be False. This logic shouldn't be applied to
+        #KeyboardInterrupt and SystemExit, however; Python 2.6 will no
+        #longer discard such exceptions when hasattr() encounters
+        #them. (Fixed by Benjamin Peterson; issue 2196.)
+        
+        #if not hasattr(self,'ClearLeafNode'):
+        #    self.ClearLeafNode = None
+        #if not hasattr(self,'ClearInternalNode'):
+        #    self.ClearInternalNode = None
+        
+        # # When not already set by derived class, set unique instance name        
+        #if not hasattr(self,'name'):
+        #    if name:
+        #        self.name = name
+        #    else:
+        #        self.name = id(self)        
 
-        # when not already set by derived class, set unique instance name
-        if not hasattr(self,"name"):
-            if name:
-                self.name = name
-            else:
-                self.name = id(self)
+        # When not already set by derived class, set unique instance name
+        if name:
+            self.name = name
+        else:
+            self.name = id(self)        
+        
 
 
-    #Make treenode elements appear as sequences such thta on
-    #can iterate over them             
+
+    # Make treenode elements appear as sequences such that one
+    # can iterate over them             
     def __iter__(self):
         self.index = -1   # incremented on first call to next()