Changeset 439 for trunk/UTIL

Timestamp:

Dec 1, 2011, 10:51:35 AM (13 years ago)

Author:

acolaitis

Message:

PYTHON. Added a function call_contour in myplot, which replace the part of planetplot devoted to contour plot. It is the same code, but it makes the main file less messy, and now call_contour can be coded in the movie part.

File:

• trunk/UTIL/PYTHON/planetoplot.py (modified) (3 diffs)

trunk/UTIL/PYTHON/planetoplot.py

@@ -64 +64 @@
                        fmtvar,definecolorvec,defcolorb,getprefix,putpoints,calculate_bounds,errormess,definesubplot,\
                        zoomset,getcoorddef,getwinddef,whatkindfile,reducefield,bounds,getstralt,getfield,smooth,nolow,\
-                       getname,localtime,polarinterv,getsindex,define_axis,determineplot,readslices,bidimfind,getlschar,hole_bounds
+                       getname,localtime,polarinterv,getsindex,define_axis,determineplot,readslices,bidimfind,getlschar,hole_bounds,\
+                       call_contour
     from mymath import deg,max,min,mean,get_tsat,writeascii,fig2data,fig2img
     import matplotlib as mpl
@@ -279 +280 @@
        #### Contour plot -- to be activated with movies
        if var2 and mrate is None:
-           what_I_plot, error = reducefield(all_var2[index_f], d4=indextime, d1=indexlon, d2=indexlat , d3=indexvert, yint=yintegral, alt=vert)
-           #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(all_var2[index_f].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 !")
+           call_contour(lon,lat,vert,time,vertmode,all_var2[index_f],indextime,indexlon,indexlat,indexvert,yintegral,mapmode,typefile, var2, ticks)
 
        #### Shaded plot
@@ -360 +338 @@
                        if invert_y:     lima,limb = mpl.pyplot.ylim() ; mpl.pyplot.ylim(limb,lima)
                        if ylog:         mpl.pyplot.semilogy()
-
-
+                   
                     if not tile:
                         #zelevels = np.linspace(zevmin*(1. + 1.e-7),zevmax*(1. - 1.e-7)) #,num=20)