Changeset 982 for trunk/UTIL

Timestamp:

Jun 7, 2013, 3:23:01 PM (12 years ago)

Author:

aslmd

Message:

UTIL PYTHON planetoplot_v2. Finished the job about striding. Possibility to stride vectors and not field. Updated vector.py

Location:

trunk/UTIL/PYTHON/planetoplot_v2

Files:

• examples/vector.py (modified) (1 diff)
• pp.py (modified) (2 diffs)
• ppclass.py (modified) (3 diffs)
• ppplot.py (modified) (4 diffs)

trunk/UTIL/PYTHON/planetoplot_v2/examples/vector.py

@@ -9 +9 @@
 u.z = "50000"
 u.filename = "vector"
-u.get()
-u.defineplot()
-#u.p[0].proj = "ortho"
-#u.p[0].blat = -45.
-u.makeplot()
+
+# stride both x and y
+# this impacts field + vector
+u.stridex = 3
+u.stridey = 3
+u.getplot()
+u.stridex = 1 # (reinitialise)
+u.stridey = 1 # (reinitialise)
+
+# stride vectors only
+# not field (here topography)
+u.stridevecx = 3
+u.stridevecy = 3
+u.getplot()
+
 
 

trunk/UTIL/PYTHON/planetoplot_v2/pp.py

@@ -92 +92 @@
 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('--stridevecx',action='store',dest='stridevecx',type="int",default=1,help="Define an abscissa stride on vectors only -- not on field")
+parser.add_option('--stridevecy',action='store',dest='stridevecy',type="int",default=1,help="Define an ordinate stride on vectors only -- not on field")
+###########################
 (opt,args) = parser.parse_args()
 # remains F G R  
@@ -133 +136 @@
 user.stridez = opt.stridez
 user.stridet = opt.stridet
+user.stridevecx = opt.stridevecx
+user.stridevecy = opt.stridevecy
 # define field
 user.define()

trunk/UTIL/PYTHON/planetoplot_v2/ppclass.py

@@ -135 +135 @@
                       stridex=1,stridey=1,\
                       stridez=1,stridet=1,\
+                      stridevecx=1,\
+                      stridevecy=1,\
                       compute="mean",\
                       verbose=False,\
@@ -182 +184 @@
         self.stridex = stridex ; self.stridey = stridey
         self.stridez = stridez ; self.stridet = stridet
+        self.stridevecx = stridevecx
+        self.stridevecy = stridevecy
         self.compute = compute
         self.verbose = verbose
@@ -799 +803 @@
                         if self.vmin is not None: plobj.vmin = self.vmin
                         if self.vmax is not None: plobj.vmax = self.vmax
+                        plobj.stridevecx = self.stridevecx
+                        plobj.stridevecy = self.stridevecy
                     # finally append plot object
                     self.p.append(plobj)

trunk/UTIL/PYTHON/planetoplot_v2/ppplot.py

@@ -513 +513 @@
                  showcb=True,\
                  wscale=None,\
+                 stridevecx=1,\
+                 stridevecy=1,\
                  colorvec="black"):
         ## get initialization from parent class
@@ -531 +533 @@
         self.showcb = showcb
         self.wscale = wscale
+        self.stridevecx = stridevecx
+        self.stridevecy = stridevecy
 
     # define_from_var
@@ -729 +733 @@
         ############################################################################################
         ### not expecting NaN in self.addvecx and self.addvecy. masked arrays is just enough.
-        stride = 3
-        stride = 1 ## no need to stride. done with data. except if you want to stride wind and not field TBD.
         if self.addvecx is not None and self.addvecy is not None: 
+                # vectors on map projection or simple 2D mapping
                 if self.mapmode: [vecx,vecy] = m.rotate_vector(self.addvecx,self.addvecy,self.absc,self.ordi) # for metwinds only ?
                 else: vecx,vecy = self.addvecx,self.addvecy ; x,y = np.meshgrid(x,y)
@@ -738 +741 @@
                 # make vector field
                 if self.mapmode: 
-                    q = m.quiver( x[::stride,::stride],y[::stride,::stride],\
-                                  vecx[::stride,::stride],vecy[::stride,::stride],\
+                    q = m.quiver( x[::self.stridevecy,::self.stridevecx],y[::self.stridevecy,::self.stridevecx],\
+                                  vecx[::self.stridevecy,::self.stridevecx],vecy[::self.stridevecy,::self.stridevecx],\
                                   angles='xy',color=self.colorvec,pivot='tail',\
                                   scale=self.wscale*reducevec,width=widthvec )
                 else:
-                    q = mpl.quiver( x[::stride,::stride],y[::stride,::stride],\
-                                    vecx[::stride,::stride],vecy[::stride,::stride],\
+                    q = mpl.quiver( x[::self.stridevecy,::self.stridevecx],y[::self.stridevecy,::self.stridevecx],\
+                                    vecx[::self.stridevecy,::self.stridevecx],vecy[::self.stridevecy,::self.stridevecx],\
                                     angles='xy',color=self.colorvec,pivot='tail',\
                                     scale=self.wscale*reducevec,width=widthvec )