Changeset 1280 for trunk/UTIL

Timestamp:

Jun 2, 2014, 11:19:13 PM (10 years ago)

Author:

aslmd

Message:

PLANETOPLOT. added plot options in ppclass. fixed stride problem. raise the title a little bit.

Location:

trunk/UTIL/PYTHON/planetoplot_v2

Files:

• pp.py (modified) (3 diffs)
• ppclass.py (modified) (5 diffs)
• ppplot.py (modified) (3 diffs)

trunk/UTIL/PYTHON/planetoplot_v2/pp.py

@@ -80 +80 @@
 parser.add_option('--nxticks',action='append',dest='nxticks',type="float",default=None,help="ticks for x axis [not for 2D map]")
 parser.add_option('--nyticks',action='append',dest='nyticks',type="float",default=None,help="ticks for y axis [not for 2D map]")
+parser.add_option('--xp',action='store',dest='xp',type="int",default=None,help="x size of figure (integer)")
+parser.add_option('--yp',action='store',dest='yp',type="int",default=None,help="y size of figure (integer)")
 # -- 1D plot
 parser.add_option('-L','--linestyle',action='append',dest='linestyle',type="string",default=None,help="[1D] linestyle: '-' '--' '.' '..'")
@@ -97 +99 @@
 parser.add_option('-M','--vmax',action='append',dest='vmax',type="float",default=None,help='[2D] float: maximum value for displayed field')
 parser.add_option('-W','--wscale',action='append',dest='wscale',type="float",default=None,help='[2D] float: set size of reference wind vector')
-parser.add_option('--svx',action='store',dest='svx',type="int",default=1,help="Define an abscissa stride on vectors only -- not on field")
-parser.add_option('--svy',action='store',dest='svy',type="int",default=1,help="Define an ordinate stride on vectors only -- not on field")
+parser.add_option('--svx',action='store',dest='svx',type="int",default=None,help="Define an abscissa stride on vectors only -- not on field")
+parser.add_option('--svy',action='store',dest='svy',type="int",default=None,help="Define an ordinate stride on vectors only -- not on field")
 parser.add_option('--cbticks',action='append',dest='cbticks',type="float",default=None,help="ticks for colorbar")
 ###########################
@@ -142 +144 @@
 user.svx = opt.svx ; user.svy = opt.svy
 user.savtxt = opt.savtxt
+if opt.xp is not None: user.xp = opt.xp
+if opt.yp is not None: user.yp = opt.yp
 # define field
 user.define()

trunk/UTIL/PYTHON/planetoplot_v2/ppclass.py

@@ -162 +162 @@
                       sx=1,sy=1,\
                       sz=1,st=1,\
-                      svx=1,\
-                      svy=1,\
+                      svx=None,\
+                      svy=None,\
                       compute="mean",\
                       kind3d="tyx",\
@@ -182 +182 @@
                       nxticks=10,nyticks=10,\
                       proj=None,\
+                      blat=None,\
+                      blon=None,\
+                      wscale=None,\
                       vmin=None,vmax=None,\
                       div=None,\
@@ -251 +254 @@
         self.ymin = ymin ; self.ymax = ymax
         self.proj = proj
+        self.blat = blat ; self.blon = blon
+        self.wscale = wscale
         self.vmin = vmin ; self.vmax = vmax
         self.div = div
@@ -308 +313 @@
             self.ylabel = other.ylabel ; self.ycoeff = other.ycoeff
             self.proj = other.proj
+            self.blat = other.blat ; self.blon = other.blon
+            self.wscale = other.wscale
             self.vmin = other.vmin ; self.vmax = other.vmax
             self.xmin = other.xmin ; self.xmax = other.xmax
@@ -884 +891 @@
                         plobj.svx = self.svx
                         plobj.svy = self.svy
+                        plobj.blat = self.blat
+                        plobj.blon = self.blon
+                        plobj.wscale = self.wscale
                         # -- light grey background for missing values
                         if type(plobj.f).__name__ in 'MaskedArray': plobj.axisbg = '0.75'

trunk/UTIL/PYTHON/planetoplot_v2/ppplot.py

@@ -435 +435 @@
            mpl.xlabel(self.ylabel)
            mpl.ylabel(self.xlabel)
-        mpl.title(self.title)
+        mpl.title(self.title,y=1.01) # raise a little bit for subscript
         # if masked array, set masked values to filled values (e.g. np.nan) for plotting purposes
         if type(self.f).__name__ in 'MaskedArray':
@@ -614 +614 @@
                  showcb=True,\
                  wscale=None,\
-                 svx=1,\
-                 svy=1,\
+                 svx=3,\
+                 svy=3,\
                  leftcorrect=False,\
                  colorvec="black"):
@@ -903 +903 @@
                 # vectors on map projection or simple 2D mapping
                 if self.mapmode: 
-                   [vecx,vecy] = m.rotate_vector(self.vx,self.vy,self.x,self.y) # for metwinds only ?
+                   try:
+                     [vecx,vecy] = m.rotate_vector(self.vx,self.vy,self.x,self.y) # for metwinds only ?
+                   except:
+                     print "!! ERROR !! Problem with field shapes for vector?" 
+                     print self.vx.shape,self.vy.shape,self.x.shape,self.y.shape
+                     exit()
                 else:
                    vecx,vecy = self.vx,self.vy