Changeset 9369

Timestamp:

Nov 21, 2014, 9:51:55 PM (10 years ago)

Author:

davies

Message:

Slight changes for raster IO

File:

• trunk/anuga_core/source/anuga/utilities/spatialInputUtil.py (modified) (2 diffs)

trunk/anuga_core/source/anuga/utilities/spatialInputUtil.py

@@ -734 +734 @@
         elif (rasterBandType == 'Float32'):
             CtypeName='f'
+        elif (rasterBandType == 'Float64'):
+            CtypeName='d'
         elif (rasterBandType == 'Byte'):
             CtypeName='B'
@@ -761 +763 @@
         # Deal with nodata
         nodataval = rasterBand.GetNoDataValue()
-        rel_tol = ( abs(elev - nodataval) < nodata_rel_tol*abs(nodataval) )
-        missing = (rel_tol).nonzero()[0] 
-
-        if len(missing) > 0:
-            elev[missing] = numpy.nan
+        if nodataval is not None:
+            if numpy.isfinite(nodataval):
+                rel_tol = ( abs(elev - nodataval) < nodata_rel_tol*abs(nodataval) )
+                missing = (rel_tol).nonzero()[0] 
+
+                if len(missing) > 0:
+                    elev[missing] = numpy.nan
     
         return elev