SF.net SVN: matplotlib:[8938] trunk/toolkits/basemap/examples/ NetCDFFile_tst.py

[<js...@us...>]

Revision: 8938
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8938&view=rev
Author:   jswhit
Date:     2011-02-01 04:15:20 +0000 (Tue, 01 Feb 2011)

Log Message:
-----------
try to use netCDF4

Modified Paths:
--------------
    trunk/toolkits/basemap/examples/NetCDFFile_tst.py

Modified: trunk/toolkits/basemap/examples/NetCDFFile_tst.py
===================================================================
--- trunk/toolkits/basemap/examples/NetCDFFile_tst.py	2011-02-01 04:02:08 UTC (rev 8937)
+++ trunk/toolkits/basemap/examples/NetCDFFile_tst.py	2011-02-01 04:15:20 UTC (rev 8938)
@@ -5,7 +5,10 @@
 from numpy import ma
 from numpy.testing import assert_array_equal, assert_array_almost_equal
 from numpy.random.mtrand import uniform 
-from mpl_toolkits.basemap import NetCDFFile
+try:
+    from netCDF4 import Dataset as NetCDFFile
+except ImportError:
+    from mpl_toolkits.basemap import NetCDFFile
 
 # test automatic conversion of masked arrays, and
 # packing/unpacking of short ints.
@@ -46,6 +49,8 @@
         file = NetCDFFile(self.file,maskandscale=False)
         datamasked = file.variables['maskeddata']
         datapacked = file.variables['packeddata']
+        if hasattr(datapacked,'set_auto_maskandscale'):
+            datapacked.set_auto_maskandscale(False)
         # check missing_value, scale_factor and add_offset attributes.
         assert datamasked.missing_value == missing_value
         assert datapacked.scale_factor == scale_factor
@@ -57,7 +62,7 @@
         file = NetCDFFile(self.file)
         datamasked = file.variables['maskeddata']
         datapacked = file.variables['packeddata']
-        assert_array_almost_equal(datamasked[:].filled(),ranarr)
+        assert_array_almost_equal(datamasked[:].filled(datamasked.missing_value),ranarr)
         assert_array_almost_equal(datapacked[:],packeddata,decimal=4)
         file.close()
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.