Changeset 434 for trunk/UTIL/PYTHON/planetoplot.py

Timestamp:

Nov 30, 2011, 7:36:50 PM (13 years ago)

Author:

aslmd

Message:

GRAPHICS: solved two problems of indentation in the two previous commits. moved the modification of indextime in the right place. other purely cosmetic changes.

File:

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

trunk/UTIL/PYTHON/planetoplot.py

@@ -265 +265 @@
                else: errormess("local times not supported for GCM files. not too hard to modify the code though.")
        if mapmode == 1 and stime is None:   indextime = 1
+       elif mrate is not None:              indextime = None
        else:                                indextime = getsindex(stime,((nplot-1)//(nlon*nlat*nvert))%ntime,time)
        ltst = None 
@@ -273 +274 @@
        ticks = ndiv + 1
 
-       #### Contour plot
-       if var2:
+       #### 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
@@ -306 +307 @@
        varname = all_varname[index_f]
        if varname:
-           zindtime=indextime
-           if mrate is not None:zindtime=None
-           what_I_plot, error = reducefield(all_var[index_f], d4=zindtime, d1=indexlon, d2=indexlat , d3=indexvert , yint=yintegral, alt=vert, anomaly=anomaly)
+           what_I_plot, error = reducefield(all_var[index_f], d4=indextime, d1=indexlon, d2=indexlat , d3=indexvert , yint=yintegral, alt=vert, anomaly=anomaly)
            what_I_plot = what_I_plot*mult
            if not error: 
@@ -335 +334 @@
                ##### simple 2D field and movies of 2D fields
                if len(what_I_plot.shape) >= 2:
-                 if (len(what_I_plot.shape) is 3 and mrate is None):
-                    print "3D field in input but not rate specified for movie (use --rate RATE or specify --time TIME)"
-                    print "Exiting now"
-                    exit()
-                 istart=0
-                 if mrate is not None:iend=len(time)-1
-                 else:iend=istart
+                 if (len(what_I_plot.shape) is 3 and mrate is None): 
+                     errormess("3D field in input but not rate specified for movie (use --rate RATE or specify --time TIME). Exit.")
+                 istart=0 
+                 if mrate is not None: iend=len(time)-1
+                 else:                 iend=istart
                  imov=istart
-
                  while imov <= iend:
-                    what_I_plot_frame=what_I_plot
-                    if mrate is not None:
-                       what_I_plot_frame=what_I_plot[imov,:,:]
-                       print "-> frame ",imov+1
-                    if hole: what_I_plot_frame = hole_bounds(what_I_plot_frame,zevmin,zevmax)
-                    else: what_I_plot_frame = bounds(what_I_plot_frame,zevmin,zevmax)
-                    if flagnolow: what_I_plot_frame = nolow(what_I_plot_frame)
+                    what_I_plot_frame = what_I_plot
+                    if mrate is not None:      what_I_plot_frame = what_I_plot[imov,:,:] ; print "-> frame ",imov+1
+                    if hole:                   what_I_plot_frame = hole_bounds(what_I_plot_frame,zevmin,zevmax)
+                    else:                      what_I_plot_frame = bounds(what_I_plot_frame,zevmin,zevmax)
+                    if flagnolow:              what_I_plot_frame = nolow(what_I_plot_frame)
                     if not tile:
                         #zelevels = np.linspace(zevmin*(1. + 1.e-7),zevmax*(1. - 1.e-7)) #,num=20)
                         zelevels = np.linspace(zevmin,zevmax,num=ticks)
-                        if imov is 0:
-                           print np.array(x).shape
-                           print np.array(y).shape
-                           print np.array(what_I_plot_frame).shape
-   
+                        if imov is 0:          print np.array(x).shape, np.array(y).shape, np.array(what_I_plot_frame).shape
                         if mapmode == 1:       m.contourf( x, y, what_I_plot_frame, zelevels, cmap = palette)
                         elif mapmode == 0:     contourf( x, y, what_I_plot_frame, zelevels, cmap = palette)
@@ -374 +364 @@
                         #mframe=fig2data(mpl.pyplot.gcf())
                         mframe=fig2img(mpl.pyplot.gcf())
-
-                        if ((mrate is not None) and (imov is 0)):
-                            W,H = mpl.pyplot.gcf().canvas.get_width_height()
-                            video = VideoSink((H,W), "test", rate=mrate, byteorder="rgba")
-                        if mrate is not None: 
-                            video.run(mframe)
-                            mpl.pyplot.close()
-
-                        imov=imov+1
+                    if ((mrate is not None) and (imov is 0)):
+                        W,H = mpl.pyplot.gcf().canvas.get_width_height()
+                        video = VideoSink((H,W), "test", rate=mrate, byteorder="rgba")
+                    if mrate is not None: 
+                        video.run(mframe)
+                        mpl.pyplot.close()
+                    imov=imov+1
                  if mrate is not None: video.close
                ##### 1D field