Changeset 1198 in lmdz_wrf for trunk/tools

Timestamp:

Oct 18, 2016, 5:22:29 PM (8 years ago)

Author:

lfita

Message:

Using `colorbarvals' (list) to keep all the values for the colorbar in 'draw_2D_shad'
Using `cbarv' (list) to keep all the values for the colorbar in 'plot_2D_shadow'

Location:

trunk/tools

Files:

• drawing.py (modified) (4 diffs)
• drawing_tools.py (modified) (5 diffs)

trunk/tools/drawing.py

@@ -62 +62 @@
           variable a given value is required (-1, all the length)
         [dimx/yvn]: name of the variables with the values of the final dimensions (x,y)
-        [dimxyfmt]=[dxf],[Ndx],[dyf],[Ndy]: format of the values at each axis
+        [dimxyfmt]=[dxs],[dxf],[Ndx],[ordx],[dys],[dyf],[Ndy],[ordx]: format of the values at each axis (or 'auto')
           [dxs]: style of x-axis ('auto' for 'pretty')
             'Nfix', values computed at even 'Ndx'
             'Vfix', values computed at even 'Ndx' increments
             'pretty', values computed following aprox. 'Ndx' at 'pretty' intervals (2.,2.5,4,5,10)
-          [dxf]: format of the labels at the x-axis
-          [Ndx]: Number of ticks at the x-axis
+          [dxf]: format of the labels at the x-axis ('auto' for '%5g')
+          [Ndx]: Number of ticks at the x-axis ('auto' for 5)
           [ordx]: angle of orientation of ticks at the x-axis ('auto' for horizontal)
           [dys]: style of y-axis ('auto' for 'pretty')
-          [dyf]: format of the labels at the y-axis
-          [Ndy]: Number of ticks at the y-axis
+          [dyf]: format of the labels at the y-axis ('auto' for '%5g')
+          [Ndy]: Number of ticks at the y-axis ('auto' for 5)
           [ordy]: angle of orientation of ticks at the y-axis ('auto' for horizontal)
         [colorbarvals]=[colbarn],[fmtcolorbar],[orientation]
@@ -97 +97 @@
           [proj]: projection
             * 'cyl', cilindric
-            * 'lcc', lamvbert conformal
+            * 'lcc', lambert conformal
           [res]: resolution:
             * 'c', crude
@@ -220 +220 @@
 
     colbarn, fmtcolbar, colbaror = drw.colorbar_vals(colorbarvals,',')
+    colormapv = [colbarn, fmtcolbar, colbaror]
 
     xstyl, xaxf, Nxax, xaxor, ystyl, yaxf, Nyax, yaxor = drw.format_axes(dimxyf,',')
@@ -229 +230 @@
 
     drw.plot_2D_shadow(valshad, vnamesfig, odimxv, odimyv, odimxu, odimyu, xaxis,    \
-      yaxis, dimnamesv, colbarn, fmtcolbar, colbaror, shading_nx, varunits, figtitle,\
-      figkind, revals, mapvalue, close)
+      yaxis, dimnamesv, colormapv, shading_nx, varunits, figtitle, figkind, revals,  \
+      mapvalue, close)
 
     return

trunk/tools/drawing_tools.py

@@ -3928 +3928 @@
 
 def plot_2D_shadow(varsv, vnames, dimxv, dimyv, dimxu, dimyu, xaxv, yaxv, dimn,      \
-  colorbar, cbarfmt, cbaror, vs, uts, vtit, kfig, reva, mapv, ifclose):
+  cbarv, vs, uts, vtit, kfig, reva, mapv, ifclose):
     """ Adding labels and other staff to the graph
       varsv= 2D values to plot with shading
@@ -3937 +3937 @@
       yaxv= list with the y-axis paramteres [style, format, number and orientation]
       dimn= dimension names to plot
-      colorbar= name of the color bar to use
-      cbarfmt= format of the numbers in the colorbar
-      cbaror= orientation of the colorbar
+      cbarv= list with the parameters of the color bar [colorbar, cbarfmt, cbaror]
+        colorbar: name of the color bar to use
+        cbarfmt: format of the numbers in the colorbar
+        cbaror: orientation of the colorbar
       vs= minmum and maximum values to plot in shadow or:
         'Srange': for full range
@@ -4128 +4129 @@
     plt.rc('text', usetex=True)
 
-    plt.pcolormesh(x, y, varsv, cmap=plt.get_cmap(colorbar), vmin=vsend[0], vmax=vsend[1])
-    if cbaror == 'horizontal':
-        cbar = plt.colorbar(format=cbarfmt,orientation=cbaror)
+    plt.pcolormesh(x, y, varsv, cmap=plt.get_cmap(cbarv[0]), vmin=vsend[0], vmax=vsend[1])
+    if cbarv[2] == 'horizontal':
+        cbar = plt.colorbar(format=cbarv[1],orientation=cbarv[2])
         # From: http://stackoverflow.com/questions/32050030/rotation-of-colorbar-tick-labels-in-matplotlib
         ticklabels= cbar.ax.get_xticklabels()
@@ -4138 +4139 @@
         cbar.ax.set_xticklabels(ticklabs,rotation=90)
     else:
-        cbar = plt.colorbar(format=cbarfmt,orientation=cbaror)
+        cbar = plt.colorbar(format=cbarv[1],orientation=cbarv[2])
     
     if not mapv is None:
-        if colorbar == 'gist_gray':
+        if cbarv[0] == 'gist_gray':
             m.drawcoastlines(color="red")
         else:
@@ -4150 +4151 @@
         parallels = gen.pretty_int(nlat,xlat,yaxv[2])
         m.drawparallels(parallels,labels=[False,True,True,False])
-
-        print fname + '; Lluis nlat:', nlat, 'xlat:', xlat, 'Ny-axis:',yaxv[2]
-        print fname + '; Lluis meridians:', meridians, 'parallels:', parallels
 
         plt.xlabel('W-E')