Revision: 8924
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8924&view=rev
Author: jswhit
Date: 2011-01-17 17:48:03 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
try to use netCDF4 module first before falling back on included NetCDFFile
function
Modified Paths:
--------------
trunk/toolkits/basemap/examples/ccsm_popgrid.py
trunk/toolkits/basemap/examples/fcstmaps.py
trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py
trunk/toolkits/basemap/examples/plothighsandlows.py
trunk/toolkits/basemap/examples/ploticos.py
trunk/toolkits/basemap/examples/plotprecip.py
Modified: trunk/toolkits/basemap/examples/ccsm_popgrid.py
===================================================================
--- trunk/toolkits/basemap/examples/ccsm_popgrid.py 2011-01-17 17:28:07 UTC
(rev 8923)
+++ trunk/toolkits/basemap/examples/ccsm_popgrid.py 2011-01-17 17:48:03 UTC
(rev 8924)
@@ -24,7 +24,11 @@
import numpy.ma as ma
import numpy as np
import matplotlib.pyplot as plt
-from mpl_toolkits.basemap import Basemap, NetCDFFile
+from mpl_toolkits.basemap import Basemap
+try:
+ from netCDF4 import Dataset as NetCDFFile
+except ImportError:
+ from mpl_toolkits.basemap import 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-01-17 17:28:07 UTC (rev
8923)
+++ trunk/toolkits/basemap/examples/fcstmaps.py 2011-01-17 17:48:03 UTC (rev
8924)
@@ -5,7 +5,11 @@
import sys
import numpy.ma as ma
import datetime
-from mpl_toolkits.basemap import Basemap, NetCDFFile, addcyclic, num2date
+from mpl_toolkits.basemap import Basemap, addcyclic, num2date
+try:
+ from netCDF4 import Dataset as NetCDFFile
+except ImportError:
+ from mpl_toolkits.basemap import NetCDFFile
# today's date is default.
Modified: trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py
===================================================================
--- trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py 2011-01-17
17:28:07 UTC (rev 8923)
+++ trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py 2011-01-17
17:48:03 UTC (rev 8924)
@@ -6,8 +6,12 @@
import sys
import numpy.ma as ma
import datetime
-from mpl_toolkits.basemap import Basemap, NetCDFFile, addcyclic, num2date
+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
# today's date is default.
Modified: trunk/toolkits/basemap/examples/plothighsandlows.py
===================================================================
--- trunk/toolkits/basemap/examples/plothighsandlows.py 2011-01-17 17:28:07 UTC
(rev 8923)
+++ trunk/toolkits/basemap/examples/plothighsandlows.py 2011-01-17 17:48:03 UTC
(rev 8924)
@@ -5,8 +5,12 @@
import numpy as np
import matplotlib.pyplot as plt
import sys
-from mpl_toolkits.basemap import Basemap, NetCDFFile, addcyclic
+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
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-01-17 17:28:07 UTC (rev
8923)
+++ trunk/toolkits/basemap/examples/ploticos.py 2011-01-17 17:48:03 UTC (rev
8924)
@@ -1,7 +1,11 @@
-from mpl_toolkits.basemap import Basemap, NetCDFFile
+from mpl_toolkits.basemap import Basemap
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
# 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-01-17 17:28:07 UTC
(rev 8923)
+++ trunk/toolkits/basemap/examples/plotprecip.py 2011-01-17 17:48:03 UTC
(rev 8924)
@@ -1,4 +1,8 @@
-from mpl_toolkits.basemap import Basemap, cm, NetCDFFile
+from mpl_toolkits.basemap import Basemap, cm
+try:
+ from netCDF4 import Dataset as NetCDFFile
+except ImportError:
+ from mpl_toolkits.basemap import NetCDFFile
import numpy as np
import matplotlib.pyplot as plt
import copy
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
