Changeset 936 for trunk

Timestamp:

Apr 22, 2013, 8:31:47 PM (12 years ago)

Author:

aslmd

Message:

UTIL PYTHON planetoplot_v2. fixed bug with minimum close to 0. number of ticks in 1D plots can be set with self.div. better labelling (actual values). better handling of time in case this is Ls.

Location:

trunk/UTIL/PYTHON/planetoplot_v2

Files:

• ppclass.py (modified) (2 diffs)
• ppplot.py (modified) (5 diffs)
• set_ppclass.txt (modified) (1 diff)

trunk/UTIL/PYTHON/planetoplot_v2/ppclass.py

@@ -710 +710 @@
                         plobj.label = ""
                         if self.nfin > 1: plobj.label = plobj.label + " file #"+str(i+1)
-                        if self.nvin > 1: plobj.label = plobj.label + " var #"+str(j+1)
-                        if self.nplott > 1: plobj.label = plobj.label + " t #"+str(t+1)
-                        if self.nplotz > 1: plobj.label = plobj.label + " z #"+str(z+1)
-                        if self.nploty > 1: plobj.label = plobj.label + " y #"+str(y+1)
-                        if self.nplotx > 1: plobj.label = plobj.label + " x #"+str(x+1)
+                        if self.nvin > 1: plobj.label = plobj.label + " var "+plobj.var
+                        if self.nplott > 1: plobj.label = plobj.label + " t="+str(self.t[t])
+                        if self.nplotz > 1: plobj.label = plobj.label + " z="+str(self.z[z])
+                        if self.nploty > 1: plobj.label = plobj.label + " y="+str(self.y[y])
+                        if self.nplotx > 1: plobj.label = plobj.label + " x="+str(self.x[x])
                     # specific 2d plot stuff
                     if dp == 2:
@@ -1174 +1174 @@
           self.name_t = "nothing"
           for c in glob_listt:
-            if c in self.f.dimensions.keys():
+            if c in self.f.variables.keys():
              self.name_t = c
+             if self.verbose: print "**** OK. Found time variable: ",c
           try:
             # speed up: only get first value, last one.
-            dafirst = self.f.variables[self.name_t][0]
-            dalast = self.f.variables[self.name_t][self.dim_t-1]
-            self.field_t = np.linspace(dafirst,dalast,num=self.dim_t)
-            if dafirst == dalast: self.field_t = np.array([dafirst])
+            tabtime = self.f.variables[self.name_t]
+            # (consider the case where tabtime is not dim 1)
+            # (time is most often the first dimension)
+            if tabtime.ndim == 2: tabtime = tabtime[:,0]
+            elif tabtime.ndim == 3: tabtime = tabtime[:,0,0]
+            elif tabtime.ndim == 4: tabtime = tabtime[:,0,0,0]
+            # (now proceed)
+            dafirst = tabtime[0]
+            if self.dim_t == 1:
+                self.field_t = np.array([dafirst])
+            else:
+                daint = tabtime[1] - dafirst
+                dalast = dafirst + (self.dim_t-1)*daint 
+                if dalast != tabtime[self.dim_t-1] and self.verbose:
+                    print "!! WARNING !! Time axis has been recast to be monotonic",dalast,tabtime[self.dim_t-1]
+                self.field_t = np.linspace(dafirst,dalast,num=self.dim_t)
           except:
             # ... or if a problem encountered, define a simple time axis

trunk/UTIL/PYTHON/planetoplot_v2/ppplot.py

@@ -12 +12 @@
 from matplotlib.cm import get_cmap
 from mpl_toolkits.basemap import Basemap
-from matplotlib.ticker import FormatStrFormatter
+from matplotlib.ticker import FormatStrFormatter,MaxNLocator
 # personal librairies
 import ppcompute
@@ -219 +219 @@
     amin = ppcompute.min(field)
     amax = ppcompute.max(field)
-    cmin = 100.*np.abs((amin - zevmin)/amin)
+    if np.abs(amin) < 1.e-15: 
+        zevmin = 0.
+        cmin = 0.
+    else:
+        cmin = 100.*np.abs((amin - zevmin)/amin)
     cmax = 100.*np.abs((amax - zevmax)/amax)
     if cmin > 150. or cmax > 150.:
@@ -430 +434 @@
         ax = mpl.gca()
         # format labels
-        if self.swap: ax.get_xaxis().set_major_formatter(FormatStrFormatter(self.fmt))
-        else: ax.get_yaxis().set_major_formatter(FormatStrFormatter(self.fmt))
+        if self.swap: ax.xaxis.set_major_formatter(FormatStrFormatter(self.fmt))
+        else: ax.yaxis.set_major_formatter(FormatStrFormatter(self.fmt))
         # plot limits: ensure that no curve would be outside the window
         # x-axis
@@ -447 +451 @@
         if ymax > y2: y2 = ymax
         ax.set_ybound(lower=y1,upper=y2)
-        ## set with .div the number of ticks. less good than automatic.
-        #ticks = self.div + 1
-        #ax.get_xaxis().set_ticks(np.linspace(x1,x2,ticks/2+1))
+        ## set with .div the number of ticks. (is it better than automatic?)
+        ax.xaxis.set_major_locator(MaxNLocator(self.div/2))
 
 ################################
@@ -586 +589 @@
                 wlon, wlat = area[self.area]
             # -- settings for meridians and parallels
-            steplon = abs(wlon[1]-wlon[0])/6.
-            steplat = abs(wlat[1]-wlat[0])/3.
-            mertab = np.r_[wlon[0]:wlon[1]:steplon] ; merlab = [0,0,0,1]
-            partab = np.r_[wlat[0]:wlat[1]:steplat] ; parlab = [1,0,0,0]
+            steplon = int(abs(wlon[1]-wlon[0])/6.)
+            steplat = int(abs(wlat[1]-wlat[0])/3.)
+            #mertab = np.r_[wlon[0]:wlon[1]:steplon] ; merlab = [0,0,0,1]
+            #partab = np.r_[wlat[0]:wlat[1]:steplat] ; parlab = [1,0,0,0]
+            mertab = np.r_[-360.:360.:steplon] ; merlab = [0,0,0,1]
+            partab = np.r_[-90.:90.:steplat] ; parlab = [1,0,0,0]
             format = '%.1f'
             # -- center of domain and bounding lats

trunk/UTIL/PYTHON/planetoplot_v2/set_ppclass.txt

@@ -13 +13 @@
   # t-axis: possible names to search for. add in the line with a separating ;
   #
-Times;time;Time;time_counter
+Times;time;Time;time_counter;Ls
   # area: possible names to search for. add in the line with a separating ;
   #