source: issm/oecreview/Archive/21337-21723/ISSM-21425-21426.diff@ 21726

../trunk-jpl/src/m/plot/plotmodel.py

@@ -5 +5 @@
 try:
         import pylab as p
         import matplotlib.pyplot as plt
-        from mpl_toolkits.axes_grid1 import ImageGrid, AxesGrid
+        from mpl_toolkits.axes_grid1 import ImageGrid, AxesGrid
 except ImportError:
         print "could not import pylab, matplotlib has not been installed, no plotting capabilities enabled"
 
@@ -16 +16 @@
         '''     at command prompt, type 'plotdoc()' for additional documentation
         '''
 
-        #First process options 
+        #First process options
         options=plotoptions(*args)
 
         #get number of subplots
@@ -35 +35 @@
         else:
                 nrows=np.ceil(numberofplots/subplotwidth)
                 nr=False
-        
+
         if options.list[0].exist('ncols'):
                 ncols=options.list[0].getfieldvalue('ncols')
                 nc=True
@@ -44 +44 @@
                 nc=False
         ncols=int(ncols)
         nrows=int(nrows)
-        
+
         #check that nrows and ncols were given at the same time!
         if not nr==nc:
                 raise StandardError('error: nrows and ncols need to be specified together, or not at all')
-        
+
         #Go through plots
         if numberofplots:
                 #if plt.fignum_exists(figurenumber): 
@@ -81 +81 @@
                 cbar_location=options.list[0].getfieldvalue('colorbarpos','right') # right,top
                 cbar_size=options.list[0].getfieldvalue('colorbarsize','5%')
                 cbar_pad=options.list[0].getfieldvalue('colorbarpad','2.5%') # None or %
-                
+
                 axgrid=ImageGrid(fig, 111,
                                 nrows_ncols=(nrows,ncols),
                                 ngrids=plotnum,

../trunk-jpl/src/m/plot/plot_unit.py

@@ -28 +28 @@
         # }}}
         # {{{ define wich colormap to use 
         try:
-                defaultmap=plt.cm.get_cmap('viridis')
+                defaultmap=plt.cm.get_cmap('viridis',colorlevels)
         except AttributeError:
                 print("Viridis can't be found (probably too old Matplotlib) reverting to gnuplot colormap")
                 defaultmap=truncate_colormap('gnuplot2',0.1,0.9,colorlevels)