Changeset 578 for trunk

Timestamp:

Mar 13, 2012, 12:16:26 PM (13 years ago)

Author:

acolaitis

Message:

PYTHON. --title works now with multiple titles in a list (same as --labels.). Bug correction with sslon and sslat.

Location:

trunk/UTIL/PYTHON

Files:

• myplot.py (modified) (1 diff)
• planetoplot.py (modified) (7 diffs)
• pp.py (modified) (1 diff)

trunk/UTIL/PYTHON/myplot.py

@@ -80 +80 @@
     # missing values from zrecast or hrecast are -1e-33
        masked=np.ma.masked_where(field < -1e30,field)
-       masked.set_fill_value([np.NaN])
-       mask = np.ma.getmask(masked)
-       if (True in np.array(mask)):out=masked
-       else:
-       # missing values from api are 1e36
-          masked=np.ma.masked_where(field > 1e35,field)
-          masked.set_fill_value([np.NaN])
-          mask = np.ma.getmask(masked)
-          if (True in np.array(mask)):out=masked
-          else:out=field
+       masked2=np.ma.masked_where(field > 1e35,field)
+       masked.set_fill_value([np.NaN]) ; masked2.set_fill_value([np.NaN])
+       mask = np.ma.getmask(masked) ; mask2 = np.ma.getmask(masked2)
+       if (True in np.array(mask)):
+          out=masked
+          print "Masked array... Missing value is NaN"
+       elif (True in np.array(mask2)):
+          out=masked2
+          print "Masked array... Missing value is NaN"
+#       else:
+#       # missing values from api are 1e36
+#          masked=np.ma.masked_where(field > 1e35,field)
+#          masked.set_fill_value([np.NaN])
+#          mask = np.ma.getmask(masked)
+#          if (True in np.array(mask)):out=masked
+#          else:out=field
+       else:out=field
     return out
 

trunk/UTIL/PYTHON/planetoplot.py

@@ -33 +33 @@
            ndiv=10,\
            mult=1.,\
-           zetitle="fill",\
+           zetitle=["fill"],\
            slon=None,\
            slat=None,\
@@ -99 +99 @@
     ### Which plot needs to be done?
     ################################
+    sslon = None ; sslat = None
     nlon, nlat, nvert, ntime, mapmode, nslices = determineplot(slon, slat, svert, stime)
     if mrate is not None and len(var) > 1: errormess("multivar not allowed in movies. should be fixed soon!")
@@ -196 +197 @@
           ###### STUFF TO GET THE CORRECT LAT/LON FROM MESOSCALE FILES WITH 2D LAT/LON ARRAYS
           ###### principle: calculate correct indices then repopulate slon and slat
-          sslon = None ; sslat = None
           if slon is not None or slat is not None:
               if slon is not None: sslon = np.zeros([1,2])
@@ -521 +521 @@
                             zecb = colorbar( fraction=0.05,pad=0.03,format=daformat,orientation=zeorientation,\
                                       ticks=np.linspace(zevmin,zevmax,num=min([ticks/2+1,21])),extend='neither',spacing='proportional' ) 
-                            if zeorientation == "horizontal" and zetitle != "fill": zecb.ax.set_xlabel(zetitle) ; zetitle=""
+                            if zeorientation == "horizontal" and zetitle[0] != "fill": zecb.ax.set_xlabel(zetitle[index_f]) ; zetitle[index_f]=""
                         if winds:
                             if typefile in ['meso']:
@@ -542 +542 @@
                             what_I_plot_frame, x, y = define_axis( lon,lat,vert,time,indexlon,indexlat,indexvert,\
                                                               itime,what_I_plot_frame, len(all_var2[index_f].shape),vertmode )
-                            cs = contour( x,y,what_I_plot_frame, zelevels, colors='k', linewidths = 1 ) #0.33 colors='w' )# , alpha=0.5)
-                        elif mapmode == 1:  cs = m.contour( x,y,what_I_plot_frame, zelevels, colors='k', linewidths = 1 ) #0.33 colors='w' )# , alpha=0.5)
-
+                            cs = contour( x,y,what_I_plot_frame, zelevels, colors='k', linewidths = 1 ) #0.33 colors='w' )# , alpha=0.5)#, linestyles='solid')
+                        elif mapmode == 1:  cs = m.contour( x,y,what_I_plot_frame, zelevels, colors='k', linewidths = 1 ) #0.33 colors='w' )# , alpha=0.5)# , linestyles='solid')
                     if which in ["regular","unidim"]:
 
@@ -610 +609 @@
             else:                            plottitle = basename+' '+namefiles[0]#index_f]
        if mult != 1:                         plottitle = '{:.0e}'.format(mult) + "*" + plottitle
-       if zetitle != "fill":                 
-          plottitle = zetitle
-          if titleref is "fill":             titleref=zetitle
+       if zetitle[0] != "fill":                 
+          plottitle = zetitle[index_f]
+          if titleref is "fill":             titleref=zetitle[index_f]
           if fileref is not None:
              if index_f is numplot-2:        plottitle = titleref
@@ -628 +627 @@
         zecb = colorbar(cax=cax, orientation="horizontal", format=fmtvar(fvar.upper()),\
                  ticks=np.linspace(zevmin,zevmax,num=min([ticks/2+1,21])),extend='neither',spacing='proportional')
-        if zetitle != "fill": zecb.ax.set_xlabel(zetitle) ; zetitle=""
+        if zetitle[0] != "fill": zecb.ax.set_xlabel(zetitle[index_f]) ; zetitle[index_f]=""
 
       

trunk/UTIL/PYTHON/pp.py

@@ -157 +157 @@
                 hole=opt.hole,save=opt.save,\
                 anomaly=opt.anomaly,var2=opt.var2,ndiv=opt.ndiv,\
-                mult=opt.mult,zetitle=opt.zetitle,\
+                mult=opt.mult,zetitle=separatenames(opt.zetitle),\
                 slon=zeslon,slat=zeslat,svert=zesvert,stime=zestime,\
                 outputname=opt.out,resolution=opt.res,\