Changeset 981 for trunk/UTIL/PYTHON/planetoplot_v2/ppclass.py

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)

File:

• trunk/UTIL/PYTHON/planetoplot_v2/ppclass.py (modified) (12 diffs)

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)