Changeset 502 for trunk/UTIL/PYTHON/planetoplot.py

Timestamp:

Jan 23, 2012, 5:04:36 PM (13 years ago)

Author:

acolaitis

Message:

Python. Minor corrections to several subroutines. Added possibility to label manually x and y axis. (use --xlabel and --ylabel). Corrected make_netcdf for certain tricky cases. Modified mcs.py to be complied with recent modifs in hrecast and zrecast. Treated cases with division by 0 in operation -%.

File:

• trunk/UTIL/PYTHON/planetoplot.py (modified) (5 diffs)

trunk/UTIL/PYTHON/planetoplot.py

@@ -59 +59 @@
            zarea=None,\
            axtime=None,\
-           redope=None):
+           redope=None,\
+           xlab=None,\
+           ylab=None):
 
 
@@ -74 +76 @@
     from mymath import deg,max,min,mean,get_tsat,writeascii,fig2data,fig2img
     import matplotlib as mpl
-    from matplotlib.pyplot import contour,contourf, subplot, figure, rcParams, savefig, colorbar, pcolor, show, plot, clabel, title, close, legend, xlabel, axis
+    from matplotlib.pyplot import contour,contourf, subplot, figure, rcParams, savefig, colorbar, pcolor, show, plot, clabel, title, close, legend, xlabel, axis, ylabel
     from matplotlib.cm import get_cmap
     #from mpl_toolkits.basemap import cm
@@ -265 +267 @@
                 if ope == "-":     all_var[k+1]= all_var[k-1] - all_var[k]
                 elif ope == "+":   all_var[k+1]= all_var[k-1] + all_var[k]
-                elif ope == "-%":  all_var[k+1]= 100.*(all_var[k-1] + all_var[k])/all_var[k]
+                elif ope == "-%":
+                    masked = np.ma.masked_where(all_var[k] == 0,all_var[k])
+                    masked.set_fill_value([np.NaN])
+                    all_var[k+1]= 100.*(all_var[k-1] - masked)/masked
                 all_varname[k+1] = all_varname[k] ; all_time[k+1] = all_time[k] ; all_namefile[k+1] = all_namefile[k] ; numplot = numplot+2
              elif ope in ["cat"]:
@@ -440 +445 @@
                         else:                                             plot(what_I_plot_frame,x,label=lbl)  ## vertical profile
                         if nplot > 1: legend(loc='best')
-                        if indextime is None and axtime is not None:      xlabel(axtime.upper()) ## define the right label
+                        if indextime is None and axtime is not None and xlab is None:    xlabel(axtime.upper()) ## define the right label
                         if save == 'txt':  writeascii(np.transpose(what_I_plot),'profile'+str(nplot*1000+imov)+'.txt')
 
@@ -498 +503 @@
                            if ylog:      mpl.pyplot.semilogy()
                            if invert_y:  ax = mpl.pyplot.gca() ; ax.set_ylim(ax.get_ylim()[::-1])
+                           if xlab is not None: xlabel(xlab)
+                           if ylab is not None: ylabel(ylab)
 
                         if mrate is not None: