Changeset 981 for trunk/UTIL

Timestamp:

Jun 7, 2013, 1:22:11 PM (12 years ago)

Author:

aslmd

Message:

UTIL PYTHON planetoplot_v2. added support for wind vectors in 2D section (not only maps, thanks Benjamin for the request). fixed stride problems (not all though). now to stride vectors simply use the stride command, this is more flexible. added stride to pp.py. also corrected a bug for logx axis (thanks Alizee)

Location:

trunk/UTIL/PYTHON/planetoplot_v2

Files:

• pp.py (modified) (3 diffs)
• ppclass.py (modified) (12 diffs)
• ppplot.py (modified) (2 diffs)
• set_ppclass.txt (modified) (1 diff)

trunk/UTIL/PYTHON/planetoplot_v2/pp.py

@@ -48 +48 @@
 parser.add_option('-c','--contour',action='store',dest='contour',type="string",default=None,help="one 'variable' for contour")
 parser.add_option('-i','--vecx',action='store',dest='vecx',type="string",default=None,help="one 'variable' for wind vector x component")
-parser.add_option('-j','--vecy',action='store',dest='vecy',type="string",default=None,help="one 'variable' for wind vector x component")
+parser.add_option('-j','--vecy',action='store',dest='vecy',type="string",default=None,help="one 'variable' for wind vector y component")
 parser.add_option('-m','--mult',action='store',dest='mult',type="float",default=None,help="multiplicative factor on field")
 parser.add_option('-a','--add',action='store',dest='add',type="float",default=None,help="additive factor on field")
@@ -55 +55 @@
 parser.add_option('-s','--changetime',action='store',dest='changetime',type="string",default=None,\
                   help="transformation on time axis : [None] | mars_sol2ls | mars_meso_ls | mars_meso_sol | mars_meso_utc | mars_meso_lt ")
+parser.add_option('--stridex',action='store',dest='stridex',type="int",default=1,help="Load data every stridex grid points over x dimension")
+parser.add_option('--stridey',action='store',dest='stridey',type="int",default=1,help="Load data every stridex grid points over y dimension")
+parser.add_option('--stridez',action='store',dest='stridez',type="int",default=1,help="Load data every stridex grid points over z dimension")
+parser.add_option('--stridet',action='store',dest='stridet',type="int",default=1,help="Load data every stridex grid points over t dimension")
 # plot --> upper case
 # -- generic
@@ -125 +129 @@
 user.compute = opt.compute
 user.changetime = opt.changetime
+user.stridex = opt.stridex
+user.stridey = opt.stridey
+user.stridez = opt.stridez
+user.stridet = opt.stridet
 # define field
 user.define()

trunk/UTIL/PYTHON/planetoplot_v2/ppclass.py

@@ -572 +572 @@
               obj.changetime = self.changetime
               obj.performtimechange()
+              # get strides
+              obj.stridex = self.stridex ; obj.stridey = self.stridey
+              obj.stridez = self.stridez ; obj.stridet = self.stridet
               ### get index
-              obj.getindextime(dalist=st,ind=t,stride=self.stridet)
-              obj.getindexvert(dalist=sz,ind=z,stride=self.stridez)
-              obj.getindexhori(dalistx=sx,dalisty=sy,indx=x,indy=y,stridex=self.stridex,stridey=self.stridey)
+              obj.getindextime(dalist=st,ind=t)
+              obj.getindexvert(dalist=sz,ind=z)
+              obj.getindexhori(dalistx=sx,dalisty=sy,indx=x,indy=y)
         # change status
         self.status = "defined"
@@ -1191 +1194 @@
         self.compute = None
         self.changetime = None
+        self.stridex = 1 ; self.stridey = 1 ; self.stridez = 1 ; self.stridet = 1
 
     # open a file. for now it is netcdf. TBD for other formats.
@@ -1364 +1368 @@
     ### TBD: il faudrait ne prendre que les indices qui correspondent a l interieur d un plot (dans all)
     # -------------------------------
-    def getindextime(self,dalist=None,ind=None,stride=1):
+    def getindextime(self,dalist=None,ind=None):
         if self.method_t == "free": 
-            self.index_t = np.arange(0,self.dim_t,stride)
+            self.index_t = np.arange(0,self.dim_t,self.stridet)
             if self.dim_t > 1:  
                 self.dimplot = self.dimplot + 1 
@@ -1376 +1380 @@
             start = np.argmin( np.abs( self.field_t - dalist[ind][0] ) )
             stop = np.argmin( np.abs( self.field_t - dalist[ind][1] ) )
-            self.index_t = np.arange(start,stop,stride)
+            self.index_t = np.arange(start,stop,self.stridet)
             if self.verbose: print "**** OK. t values. comp over interval ",self.field_t[start],self.field_t[stop]," nvalues=",self.index_t.size
         elif self.method_t == "fixed":
@@ -1388 +1392 @@
     ### TBD: il faudrait ne prendre que les indices qui correspondent a l interieur d un plot (dans all)
     # -------------------------------
-    def getindexvert(self,dalist=None,ind=None,stride=1):
+    def getindexvert(self,dalist=None,ind=None):
         if self.method_z == "free": 
-            self.index_z = np.arange(0,self.dim_z,stride)
+            self.index_z = np.arange(0,self.dim_z,self.stridez)
             if self.dim_z > 1:  
                 self.dimplot = self.dimplot + 1
@@ -1400 +1404 @@
             start = np.argmin( np.abs( self.field_z - dalist[ind][0] ) )
             stop = np.argmin( np.abs( self.field_z - dalist[ind][1] ) )
-            self.index_z = np.arange(start,stop,stride)
+            self.index_z = np.arange(start,stop,self.stridez)
             if self.verbose: print "**** OK. z values. comp over interval",self.field_z[start],self.field_z[stop]," nvalues=",self.index_z.size
         elif self.method_z == "fixed":
@@ -1416 +1420 @@
     ### TBD: il faudrait ne prendre que les indices qui correspondent a l interieur d un plot (dans all)
     # -------------------------------
-    def getindexhori(self,dalistx=None,dalisty=None,indx=None,indy=None,stridex=1,stridey=1):
+    def getindexhori(self,dalistx=None,dalisty=None,indx=None,indy=None):
         ## get what is the method over x and y axis
         test = self.method_x+self.method_y
@@ -1425 +1429 @@
         ## - LON IS COMP AND LAT IS FREE
         if self.method_x == "free" or test in ["compfree","compcomp"]:
-            self.index_x = range(0,self.dim_x,stridex)
+            self.index_x = range(0,self.dim_x,self.stridex)
             if self.dim_x > 1:  
                 if self.method_x == "free": self.dimplot = self.dimplot + 1
@@ -1433 +1437 @@
                 if self.verbose: print "**** OK. no x dimension."
         if self.method_y == "free" or test in ["freecomp","compcomp"]:
-            self.index_y = range(0,self.dim_y,stridey)
+            self.index_y = range(0,self.dim_y,self.stridey)
             if self.dim_y > 1:  
                 if self.method_y == "free": self.dimplot = self.dimplot + 1
@@ -1565 +1569 @@
           self.field_x = self.field_x[self.index_y2d, self.index_x2d]
           self.field_y = self.field_y[self.index_y2d, self.index_x2d]
+          # ... there are special cases with strides
+          # ... some other fixes will be needed probably TBD
+          if self.method_x == "free" and self.stridex != 1:
+              self.field_x = self.field_x[self.index_x]
+          if self.method_y == "free" and self.stridey != 1: 
+              self.field_y = self.field_y[self.index_y]
         self.field_z = self.field_z[self.index_z]
         self.field_t = self.field_t[self.index_t]
@@ -1573 +1583 @@
           pass
         elif test in ["fixedfree","fixedcomp"] or test in ["freefixed","compfixed"]: 
+         if self.stridex == 1 and self.stridey == 1:
           time0 = timelib.time()
           # now have to obtain the new indexes which correspond to the extracted self.field
@@ -1606 +1617 @@
           if what_I_am_supposed_to_do == "keepx":     self.field = self.field[:,:,0,:] ; ny = 1 ; self.field = np.reshape(self.field,(nt,nz,ny,nx))
           elif what_I_am_supposed_to_do == "keepy":   self.field = self.field[:,:,:,0] ; nx = 1 ; self.field = np.reshape(self.field,(nt,nz,ny,nx))
+         else:
+          # there is a problem above if stride != 1. a fix must be found. rewrite might be necessary. TBD
+          pass
         # make a mask in case there are non-NaN missing values. (what about NaN missing values?)
         # ... this is important for computations below (see ppcompute)

trunk/UTIL/PYTHON/planetoplot_v2/ppplot.py

@@ -476 +476 @@
         ax.set_ybound(lower=y1,upper=y2)
         ## set with .div the number of ticks. (is it better than automatic?)
-        ax.xaxis.set_major_locator(MaxNLocator(self.div/2))
+        if not self.logx:
+            ax.xaxis.set_major_locator(MaxNLocator(self.div/2))
+        else:
+            print "!! WARNING. in logx mode, ticks are set automatically."
 
 ################################
@@ -727 +730 @@
         ### not expecting NaN in self.addvecx and self.addvecy. masked arrays is just enough.
         stride = 3
-        #stride = 1
-        if self.addvecx is not None and self.addvecy is not None and self.mapmode:
-                ### for metwinds only ???
-                [vecx,vecy] = m.rotate_vector(self.addvecx,self.addvecy,self.absc,self.ordi) 
-                #vecx,vecy = self.addvecx,self.addvecy
+        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: 
+                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)
                 # reference vector is scaled
                 if self.wscale is None: self.wscale = ppcompute.mean(np.sqrt(self.addvecx*self.addvecx+self.addvecy*self.addvecy))
                 # make vector field
-                q = m.quiver( x[::stride,::stride],y[::stride,::stride],\
-                              vecx[::stride,::stride],vecy[::stride,::stride],\
-                              angles='xy',color=self.colorvec,pivot='middle',\
-                              scale=self.wscale*reducevec,width=widthvec )
+                if self.mapmode: 
+                    q = m.quiver( x[::stride,::stride],y[::stride,::stride],\
+                                  vecx[::stride,::stride],vecy[::stride,::stride],\
+                                  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],\
+                                    angles='xy',color=self.colorvec,pivot='tail',\
+                                    scale=self.wscale*reducevec,width=widthvec )
                 # make vector key.
                 #keyh = 1.025 ; keyv = 1.05 # upper right corner over colorbar

trunk/UTIL/PYTHON/planetoplot_v2/set_ppclass.txt

@@ -10 +10 @@
   # z-axis: possible names to search for. add in the line with a separating ;
   #
-altitude;Alt;vert;presnivs;bottom_top;altitude_abg
+altitude;Alt;vert;presnivs;bottom_top;altitude_abg;lev
   # t-axis: possible names to search for. add in the line with a separating ;
   #