Changeset 502 for trunk

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 -%.

Location:

trunk/UTIL/PYTHON

Files:

• make_netcdf.py (modified) (1 diff)
• mcs.py (modified) (2 diffs)
• myplot.py (modified) (1 diff)
• myscript.py (modified) (1 diff)
• planetoplot.py (modified) (5 diffs)
• pp.py (modified) (1 diff)

trunk/UTIL/PYTHON/make_netcdf.py

@@ -82 +82 @@
                  if j is 0:                ##this should solve most conflicts with Time
                     zzvardim[j]=a[1]
+                 elif j is 3:
+                    zzvardim[j]=a[1]
                  else:
                     zzvardim[j]=a[0]

trunk/UTIL/PYTHON/mcs.py

@@ -53 +53 @@
    filename=opt.file
 
-   if opt.hrecast:
-      if (path.exists(filename[0:len(filename)-3]+"_h.nc") and (not opt.override)):
-         print "--> "+filename[0:len(filename)-3]+"_h.nc"
-         print "Recasted file is already there, skipping interpolation. [use --override to force interpolation]"
-         filename=filename[0:len(filename)-3]+"_h.nc"
-      else:
-         print "--> "+filename[0:len(filename)-3]+"_h.nc"
-         filename=call_hrecast (  input_name      = [filename], \
-                    fields  = varznames, \
-                    predefined = 'mcs')[0]
+#   if opt.hrecast:
+#      if (path.exists(filename[0:len(filename)-3]+"_h.nc") and (not opt.override)):
+#         print "--> "+filename[0:len(filename)-3]+"_h.nc"
+#         print "Recasted file is already there, skipping interpolation. [use --override to force interpolation]"
+#         filename=filename[0:len(filename)-3]+"_h.nc"
+#      else:
+#         print "--> "+filename[0:len(filename)-3]+"_h.nc"
+#         filename=call_hrecast (  input_name      = [filename], \
+#                    fields  = varznames, \
+#                    predefined = 'mcs')[0]
 
    if opt.zrecast:
@@ -75 +75 @@
                     fields  = varznames, \
                     predefined = 'mcs')[0]
+
+   if opt.hrecast:
+      if (path.exists(filename[0:len(filename)-3]+"_h.nc") and (not opt.override)):
+         print "--> "+filename[0:len(filename)-3]+"_h.nc"
+         print "Recasted file is already there, skipping interpolation. [use --override to force interpolation]"
+         filename=filename[0:len(filename)-3]+"_h.nc"
+      else:
+         print "--> "+filename[0:len(filename)-3]+"_h.nc"
+         filename=call_hrecast (  input_name      = [filename], \
+                    fields  = varznames, \
+                    predefined = 'mcs')[0]
+
+
    # Files
 

trunk/UTIL/PYTHON/myplot.py

@@ -722 +722 @@
 def fmtvar (whichvar="def"):
     fmtvar    =     { \
+             "MIXED":        "%.0f",\
+             "UPDRAFT":      "%.0f",\
+             "DOWNDRAFT":    "%.0f",\
              "TK":           "%.0f",\
              # Variables from TES ncdf format

trunk/UTIL/PYTHON/myscript.py

@@ -35 +35 @@
     parser.add_option('--trans',        action='store',dest='trans',     type="float",   default=1.,    help='shaded plot transparency, 0 to 1 (=opaque) [1]')
     parser.add_option('--area',         action='store',dest='area',       type="string",   default=None,  help='area on the map to be plot [None]')
+    parser.add_option('--xlabel',       action='store',dest='xlab',       type="string",  default=None, help='customize the x-axis label')
+    parser.add_option('--ylabel',       action='store',dest='ylab',       type="string",  default=None, help='customize the y-axis label')
 
     ### SPECIFIC FOR MAPPING [MAPMODE 1]

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:

trunk/UTIL/PYTHON/pp.py

@@ -157 +157 @@
                 blat=opt.blat,blon=opt.blon,tsat=opt.tsat,flagnolow=opt.nolow,\
                 mrate=opt.rate,mquality=opt.quality,trans=opt.trans,zarea=opt.area,axtime=opt.axtime,\
-                redope=opt.redope)
+                redope=opt.redope,xlab=opt.xlab,ylab=opt.ylab)
         print 'DONE: '+name
         system("rm -f to_be_erased")