Menu
▾
▴
SF.net SVN: matplotlib:[8979] trunk/toolkits/basemap
|
From: <js...@us...> - 2011-02-12 14:01:41
|
Revision: 8979
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8979&view=rev
Author: jswhit
Date: 2011-02-12 14:01:34 +0000 (Sat, 12 Feb 2011)
Log Message:
-----------
use netcdf4-python instead of built-in NetCDFFile.
Modified Paths:
--------------
trunk/toolkits/basemap/MANIFEST.in
trunk/toolkits/basemap/examples/ccsm_popgrid.py
trunk/toolkits/basemap/examples/fcstmaps.py
trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py
trunk/toolkits/basemap/examples/lic_demo.py
trunk/toolkits/basemap/examples/plothighsandlows.py
trunk/toolkits/basemap/examples/ploticos.py
trunk/toolkits/basemap/examples/plotprecip.py
trunk/toolkits/basemap/examples/plotsst.py
trunk/toolkits/basemap/examples/pnganim.py
Removed Paths:
-------------
trunk/toolkits/basemap/examples/NetCDFFile_tst.py
Modified: trunk/toolkits/basemap/MANIFEST.in
===================================================================
--- trunk/toolkits/basemap/MANIFEST.in 2011-02-12 13:58:04 UTC (rev 8978)
+++ trunk/toolkits/basemap/MANIFEST.in 2011-02-12 14:01:34 UTC (rev 8979)
@@ -80,7 +80,6 @@
include examples/C02562.orog.nc
include examples/ccsm_popgrid.nc
include examples/rita.nc
-include examples/NetCDFFile_tst.py
include examples/maskoceans.py
include examples/README
include lib/mpl_toolkits/__init__.py
Deleted: trunk/toolkits/basemap/examples/NetCDFFile_tst.py
===================================================================
--- trunk/toolkits/basemap/examples/NetCDFFile_tst.py 2011-02-12 13:58:04 UTC (rev 8978)
+++ trunk/toolkits/basemap/examples/NetCDFFile_tst.py 2011-02-12 14:01:34 UTC (rev 8979)
@@ -1,70 +0,0 @@
-import sys
-import unittest
-import os
-import tempfile
-from numpy import ma
-from numpy.testing import assert_array_equal, assert_array_almost_equal
-from numpy.random.mtrand import uniform
-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.
-
-FILE_NAME = tempfile.mktemp(".nc")
-ndim = 10
-ranarr = 100.*uniform(size=(ndim))
-packeddata = 10.*uniform(size=(ndim))
-missing_value = -9999.
-ranarr[::2] = missing_value
-maskedarr = ma.masked_values(ranarr,-9999.)
-scale_factor = (packeddata.max()-packeddata.min())/(2.*32766.)
-add_offset = 0.5*(packeddata.max()+packeddata.min())
-packeddata2 = ((packeddata-add_offset)/scale_factor).astype('i2')
-
-class TestCase(unittest.TestCase):
-
- def setUp(self):
- self.file = FILE_NAME
- file = NetCDFFile(self.file,'w')
- file.createDimension('n', None) # use unlimited dim.
- foo = file.createVariable('maskeddata', 'f8', ('n',))
- foo.missing_value = missing_value
- bar = file.createVariable('packeddata', 'i2', ('n',))
- bar.scale_factor = scale_factor
- bar.add_offset = add_offset
- foo[0:ndim] = maskedarr
- bar[0:ndim] = packeddata
- file.close()
-
- def tearDown(self):
- # Remove the temporary files
- os.remove(self.file)
-
- def runTest(self):
- """testing auto-conversion of masked arrays and packed integers"""
- # no auto-conversion.
- 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
- assert datapacked.add_offset == add_offset
- assert_array_equal(datapacked[:],packeddata2)
- assert_array_almost_equal(datamasked[:],ranarr)
- file.close()
- # auto-conversion
- file = NetCDFFile(self.file)
- datamasked = file.variables['maskeddata']
- datapacked = file.variables['packeddata']
- assert_array_almost_equal(datamasked[:].filled(datamasked.missing_value),ranarr)
- assert_array_almost_equal(datapacked[:],packeddata,decimal=4)
- file.close()
-
-if __name__ == '__main__':
- unittest.main()
Modified: trunk/toolkits/basemap/examples/ccsm_popgrid.py
===================================================================
--- trunk/toolkits/basemap/examples/ccsm_popgrid.py 2011-02-12 13:58:04 UTC (rev 8978)
+++ trunk/toolkits/basemap/examples/ccsm_popgrid.py 2011-02-12 14:01:34 UTC (rev 8979)
@@ -25,10 +25,7 @@
import numpy as np
import matplotlib.pyplot as plt
from mpl_toolkits.basemap import Basemap
-try:
- from netCDF4 import Dataset as NetCDFFile
-except ImportError:
- from mpl_toolkits.basemap import NetCDFFile
+from netCDF4 import Dataset as NetCDFFile
# read in data from netCDF file.
infile = 'ccsm_popgrid.nc'
Modified: trunk/toolkits/basemap/examples/fcstmaps.py
===================================================================
--- trunk/toolkits/basemap/examples/fcstmaps.py 2011-02-12 13:58:04 UTC (rev 8978)
+++ trunk/toolkits/basemap/examples/fcstmaps.py 2011-02-12 14:01:34 UTC (rev 8979)
@@ -6,10 +6,7 @@
import numpy.ma as ma
import datetime
from mpl_toolkits.basemap import Basemap, addcyclic, num2date
-try:
- from netCDF4 import Dataset as NetCDFFile
-except ImportError:
- from mpl_toolkits.basemap import NetCDFFile
+from netCDF4 import Dataset as NetCDFFile
# today's date is default.
Modified: trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py
===================================================================
--- trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py 2011-02-12 13:58:04 UTC (rev 8978)
+++ trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py 2011-02-12 14:01:34 UTC (rev 8979)
@@ -8,10 +8,7 @@
import datetime
from mpl_toolkits.basemap import Basemap, addcyclic, num2date
from mpl_toolkits.axes_grid1 import AxesGrid
-try:
- from netCDF4 import Dataset as NetCDFFile
-except ImportError:
- from mpl_toolkits.basemap import NetCDFFile
+from netCDF4 import Dataset as NetCDFFile
# today's date is default.
Modified: trunk/toolkits/basemap/examples/lic_demo.py
===================================================================
--- trunk/toolkits/basemap/examples/lic_demo.py 2011-02-12 13:58:04 UTC (rev 8978)
+++ trunk/toolkits/basemap/examples/lic_demo.py 2011-02-12 14:01:34 UTC (rev 8979)
@@ -1,10 +1,7 @@
# example showing how to use Line Integral Convolution to visualize a vector
# flow field (from Hurricane Earl). Produces something akin to streamlines.
# Requires vectorplot scikit (http://scikits.appspot.com/vectorplot).
-try:
- from netCDF4 import Dataset as NetCDFFile
-except ImportError:
- from mpl_toolkits.basemap import NetCDFFile
+from netCDF4 import Dataset as NetCDFFile
from mpl_toolkits.basemap import Basemap
import numpy as np
import matplotlib.pyplot as plt
Modified: trunk/toolkits/basemap/examples/plothighsandlows.py
===================================================================
--- trunk/toolkits/basemap/examples/plothighsandlows.py 2011-02-12 13:58:04 UTC (rev 8978)
+++ trunk/toolkits/basemap/examples/plothighsandlows.py 2011-02-12 14:01:34 UTC (rev 8979)
@@ -7,10 +7,7 @@
import sys
from mpl_toolkits.basemap import Basemap, addcyclic
from scipy.ndimage.filters import minimum_filter, maximum_filter
-try:
- from netCDF4 import Dataset as NetCDFFile
-except ImportError:
- from mpl_toolkits.basemap import NetCDFFile
+from netCDF4 import Dataset as NetCDFFile
def extrema(mat,mode='wrap',window=10):
"""find the indices of local extrema (min and max)
Modified: trunk/toolkits/basemap/examples/ploticos.py
===================================================================
--- trunk/toolkits/basemap/examples/ploticos.py 2011-02-12 13:58:04 UTC (rev 8978)
+++ trunk/toolkits/basemap/examples/ploticos.py 2011-02-12 14:01:34 UTC (rev 8979)
@@ -2,10 +2,7 @@
import matplotlib.pyplot as plt
import numpy as np
from numpy import ma
-try:
- from netCDF4 import Dataset as NetCDFFile
-except ImportError:
- from mpl_toolkits.basemap import NetCDFFile
+from netCDF4 import Dataset as NetCDFFile
# read in orography of icosahedral global grid.
f = NetCDFFile('C02562.orog.nc')
lons = (180./np.pi)*f.variables['grid_center_lon'][:]
Modified: trunk/toolkits/basemap/examples/plotprecip.py
===================================================================
--- trunk/toolkits/basemap/examples/plotprecip.py 2011-02-12 13:58:04 UTC (rev 8978)
+++ trunk/toolkits/basemap/examples/plotprecip.py 2011-02-12 14:01:34 UTC (rev 8979)
@@ -1,8 +1,5 @@
from mpl_toolkits.basemap import Basemap, cm
-try:
- from netCDF4 import Dataset as NetCDFFile
-except ImportError:
- from mpl_toolkits.basemap import NetCDFFile
+from netCDF4 import Dataset as NetCDFFile
import numpy as np
import matplotlib.pyplot as plt
import copy
Modified: trunk/toolkits/basemap/examples/plotsst.py
===================================================================
--- trunk/toolkits/basemap/examples/plotsst.py 2011-02-12 13:58:04 UTC (rev 8978)
+++ trunk/toolkits/basemap/examples/plotsst.py 2011-02-12 14:01:34 UTC (rev 8979)
@@ -1,8 +1,5 @@
from mpl_toolkits.basemap import Basemap, date2index, num2date
-try:
- from netCDF4 import Dataset as NetCDFFile
-except:
- from mpl_toolkits.basemap import NetCDFFile
+from netCDF4 import Dataset as NetCDFFile
import numpy as np
import matplotlib.pyplot as plt
import sys, datetime
Modified: trunk/toolkits/basemap/examples/pnganim.py
===================================================================
--- trunk/toolkits/basemap/examples/pnganim.py 2011-02-12 13:58:04 UTC (rev 8978)
+++ trunk/toolkits/basemap/examples/pnganim.py 2011-02-12 14:01:34 UTC (rev 8979)
@@ -10,10 +10,7 @@
import numpy.ma as ma
import datetime, sys, time, subprocess
from mpl_toolkits.basemap import Basemap, shiftgrid, date2index, num2date
-try:
- from netCDF4 import Dataset as NetCDFFile
-except:
- from mpl_toolkits.basemap import NetCDFFile
+from netCDF4 import Dataset as NetCDFFile
# times for March 1993 'storm of the century'
date1 = datetime.datetime(1993,3,10,0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
