Changeset 440

Timestamp:

Dec 1, 2011, 11:10:25 AM (13 years ago)

Author:

acolaitis

Message:

PYTHON. Contour plots now working in movies. I had to modify the call_contour (get out the reducefield part, introduce a new variable what_I_plot_contour dedicated to var2) in order to conserve the speed of movie rendering. (otherwise there were calls to reducefield for each frame in call_contour)

Location:

trunk/UTIL/PYTHON

Files:

• myplot.py (modified) (1 diff)
• planetoplot.py (modified) (3 diffs)

trunk/UTIL/PYTHON/myplot.py

@@ -1034 +1034 @@
 
     return nlon, nlat, nvert, ntime, mapmode, nslices
+
+# Author: AC
+# Reduce complexity of main script by moving the contour part here. Also allow to call it from elsewhere
+# which can be usefull
+
+def call_contour(what_I_plot,error,lon,lat,vert,time,vertmode,ze_var2,indextime,indexlon,indexlat,indexvert,yintegral,mapmode,typefile,var2,ticks):
+      from matplotlib.pyplot import contour, plot
+      import numpy as np
+      #what_I_plot = what_I_plot*mult
+      if not error:
+         if mapmode == 1:
+             if typefile in ['mesoapi','meso']:    what_I_plot = dumpbdy(what_I_plot,6)
+         zevmin, zevmax = calculate_bounds(what_I_plot)
+         zelevels = np.linspace(zevmin,zevmax,ticks) #20)
+         if var2 == 'HGT':  zelevels = np.arange(-10000.,30000.,2000.)
+         if mapmode == 0:
+             #if typefile in ['mesoideal']:    what_I_plot = dumpbdy(what_I_plot,0,stag='W')
+             itime=indextime
+             if len(what_I_plot.shape) is 3: itime=[0]
+             what_I_plot, x, y = define_axis(lon,lat,vert,time,indexlon,indexlat,indexvert,\
+                   itime,what_I_plot, len(ze_var2.shape),vertmode)
+         ### If we plot a 2-D field
+         if len(what_I_plot.shape) is 2:
+             #zelevels=[0.2,0.4,0.6,0.8,1.]
+             cs = contour(x,y,what_I_plot, zelevels, colors='k', linewidths = 1 ) #0.33 colors='w' )# , alpha=0.5)
+             #clabel(cs,zelevels,inline=3,fmt='%1.1f',fontsize=7)
+         ### If we plot a 1-D field
+         elif len(what_I_plot.shape) is 1:
+             plot(what_I_plot,x)
+      else:
+         errormess("There is an error in reducing field !")
+      return error 
+

trunk/UTIL/PYTHON/planetoplot.py

@@ -279 +279 @@
 
        #### Contour plot -- to be activated with movies
-       if var2 and mrate is None:
-           call_contour(lon,lat,vert,time,vertmode,all_var2[index_f],indextime,indexlon,indexlat,indexvert,yintegral,mapmode,typefile, var2, ticks)
+       if var2:
+           what_I_plot_contour, error = reducefield(all_var2[index_f], d4=indextime, d1=indexlon, d2=indexlat , d3=indexvert, yint=yintegral, alt=vert)
+           call_contour(what_I_plot_contour,error,lon,lat,vert,time,vertmode,all_var2[index_f],indextime,indexlon,indexlat,indexvert,yintegral,mapmode,typefile, var2, ticks)
 
        #### Shaded plot
@@ -329 +330 @@
                     if flagnolow:    what_I_plot_frame = nolow(what_I_plot_frame)
 
-                    # Renew axis directives for movie frames which are not the first one.
                     if imov > 0:
+                       # Renew axis directives for movie frames which are not the first one.
                        zxmin, zxmax = xaxis ; zymin, zymax = yaxis
                        if zxmin is not None: mpl.pyplot.xlim(xmin=zxmin)
@@ -338 +339 @@
                        if invert_y:     lima,limb = mpl.pyplot.ylim() ; mpl.pyplot.ylim(limb,lima)
                        if ylog:         mpl.pyplot.semilogy()
-                   
+                       # Renew contours for movie frames which are not the first one
+                       if var2:
+                         call_contour(what_I_plot_contour[imov,:,:],error,lon,lat,vert,time,vertmode,all_var2[index_f],imov,indexlon,indexlat,indexvert,yintegral,mapmode,typefile, var2, ticks)
                     if not tile:
                         #zelevels = np.linspace(zevmin*(1. + 1.e-7),zevmax*(1. - 1.e-7)) #,num=20)