Changeset 7308 for anuga_core/source/anuga/shallow_water/data_manager.py

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.

File:

• anuga_core/source/anuga/shallow_water/data_manager.py (modified) (10 diffs)

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