Changeset 864

Timestamp:

Jan 24, 2013, 12:45:30 PM (13 years ago)

Author:

aslmd

Message:

UTIL PYTHON. Fixed the movie problem when playing in Windows. Added a noproj case for -p for simple 2D plots. Various other small improvements about the aspect of plots (grid, vector width, ...)

Location:

trunk/UTIL/PYTHON

Files:

• myplot.py (modified) (5 diffs)
• planetoplot.py (modified) (8 diffs)
• pp.py (modified) (1 diff)
• sedim.py (added)
• videosink.py (modified) (2 diffs)

trunk/UTIL/PYTHON/myplot.py

@@ -549 +549 @@
         ##### strangely enough this does not work for api or ncrcat results!
         zesol = plus_in_month[ int(zetime[5]+zetime[6])-1 ] + int(zetime[8]+zetime[9]) - 1 ##les sols GCM commencent a 0
-        dals = int( 10. * sol2ls ( zesol ) ) / 10.
+        dals = int(sol2ls ( zesol )) #int( 10. * sol2ls ( zesol ) ) / 10.
         ###
         zetime2 = nc.variables['Times'][1]
@@ -830 +830 @@
     u = smooth(u,csmooth)
     v = smooth(v,csmooth)
-    widthvec = 0.003 #0.005 #0.003
+    widthvec = 0.004 #0.003 #0.005 #0.003
     q = plt.quiver( x[::stride,::stride],\
                     y[::stride,::stride],\
@@ -912 +912 @@
     else:                   errormess("projection not supported.")
     fontsizemer = int(mpl.rcParams['font.size']*3./4.)
-    if zewidth > 60000.:
+    if zewidth > 60000. or char in ["npstere","spstere","ortho"]:
         if char in ["cyl","lcc","merc","nsper","laea"]:   step = findstep(wlon)
         else:                                             step = 10.
@@ -935 +935 @@
             m.drawparallels(np.r_[-1.:1.:0.05], labels=[1,0,0,0], color=zecolor, linewidth=zelinewidth, fontsize=fontsizemer, fmt='%5.2f')
         else:  ## GLOBAL OR REGIONAL MODE
-            m.drawmeridians(np.r_[-180.:180.:steplon], labels=[0,0,0,1], color=zecolor, linewidth=zelinewidth, fontsize=fontsizemer, latmax=zelatmax)
-            m.drawparallels(np.r_[-90.:90.:step], labels=[1,0,0,0], color=zecolor, linewidth=zelinewidth, fontsize=fontsizemer, latmax=zelatmax)
+            m.drawmeridians(np.r_[-360.:360.:steplon], labels=[0,0,0,1], color=zecolor, linewidth=zelinewidth, fontsize=fontsizemer, latmax=zelatmax)
+            m.drawparallels(np.r_[-180.:180.:step], labels=[1,0,0,0], color=zecolor, linewidth=zelinewidth, fontsize=fontsizemer, latmax=zelatmax)
     if back: 
       if back not in ["coast","sea"]:   m.warpimage(marsmap(back),scale=0.75)
@@ -1154 +1154 @@
                 "def":          "black",\
                 "vis":          "yellow",\
-                "vishires":     "green",\
+                "vishires":     "blue",\
                 "molabw":       "yellow",\
                 "mola":         "black",\
                 "gist_heat":    "white",\
-                "hot":          "tk",\
                 "gist_rainbow": "black",\
                 "spectral":     "black",\

trunk/UTIL/PYTHON/planetoplot.py

@@ -106 +106 @@
     from itertools import cycle
     import os
+    from scipy import ndimage
 
 #########################
@@ -133 +134 @@
     nlon, nlat, nvert, ntime, mapmode, nslices = determineplot(slon, slat, svert, stime, redope)
     zelen = len(namefiles)*len(var)
+### we have a special mode obtained by -p noproj in which lat/lon plots are just flat 2D plots
+    if proj == "noproj": mapmode = 0
 ### we correct number of plot fields for possible operation (substract, etc...)
     if ope is not None:
@@ -188 +191 @@
       [lon2d,lat2d] = getcoorddef(nc)
     ### we get an adapted map projection if none is provided by the user
-      if proj == None:   proj = getproj(nc)                 
+      if proj == None:   proj = getproj(nc)   
     ### we define plot boundaries given projection or user choices
       if firstfile:
@@ -282 +285 @@
               lonp,latp = ( lon2d[indices[0,0,0],indices[0,0,1]] , lat2d[indices[0,0,0],indices[0,0,1]] )
           ### we get rid of boundary relaxation zone for plots. important to do that now and not before.
-          if typefile in ['meso'] and mapmode == 1:
+          if (typefile in ['meso'] and mapmode == 1):
              if '9999' not in getattr(nc,'START_DATE'): lon2d = dumpbdy(lon2d,6) ; lat2d = dumpbdy(lat2d,6)  
           ### we read the keyword for vertical dimension. we take care for vertical staggering.
@@ -553 +556 @@
                        # now that the section is determined we can set the real lat
                        # ... or for now, a temptative one.
-                       if slon is not None: latyeah = lat2d[:,0]
-                       if slat is not None: lonyeah = lon2d[0,:]
+                       milieux = int(lat2d.shape[1]/2.)
+                       milieuy = int(lat2d.shape[0]/2.)
+                       if slon is not None or proj == "noproj": latyeah = lat2d[:,milieux]
+                       if slat is not None or proj == "noproj": lonyeah = lon2d[milieuy,:]
                    what_I_plot, x, y = define_axis(lonyeah,latyeah,vert,time,indexlon,indexlat,indexvert,\
                          itime,what_I_plot, len(all_var[index_f].shape),vertmode,redope)
+               ###
+               if analysis in ['laplace']: what_I_plot = ndimage.laplace(what_I_plot)
                ###
                if (fileref is not None) and ((index_f+1)%3 == 0):    zevmin, zevmax = calculate_bounds(what_I_plot,vmin=minop,vmax=maxop)
@@ -609 +616 @@
                         m = define_proj(proj,wlon,wlat,back=back,blat=blat,blon=blon)  ## this is dirty, defined above but out of imov loop
                         x, y = m(lon2d, lat2d)                                         ## this is dirty, defined above but out of imov loop
-                    if typefile in ['meso'] and mapmode == 1: 
+                    if (typefile in ['meso'] and mapmode == 1):
                        if '9999' not in getattr(nc,'START_DATE'): what_I_plot_frame = dumpbdy(what_I_plot_frame,6,condition=True)
 #                   if typefile in ['mesoideal']:    what_I_plot_frame = dumpbdy(what_I_plot_frame,0,stag='W',condition=dumped_vert_stag)
@@ -633 +640 @@
                         if this_is_a_regular_plot:   plot(x,what_I_plot_frame,zeline,label=lbl,marker=zemarker)  ## vertical profile
                         else:                        plot(what_I_plot_frame,x,zeline,label=lbl,marker=zemarker)  ## regular plot
+                        mpl.pyplot.grid(True)
                         if nplot > 1: legend(loc='best')
                         if indextime is None and axtime is not None and xlab is None:    xlabel(axtime.upper()) ## define the right label
@@ -935 +943 @@
     #### Getting more out of this video -- PROBLEMS WITH CREATED VIDEOS
     #
-    #if mrate is not None:
-    #    print "Re-encoding movie.. first pass"
-    #    video.first_pass(filename=moviename,quality=mquality,rate=mrate)
+    if mrate is not None and save != "html":
+        print "Re-encoding movie.. first pass"
+        video.first_pass(filename=zeplot,quality=mquality,rate=mrate)
     #    print "Re-encoding movie.. second pass"
     #    video.second_pass(filename=moviename,quality=mquality,rate=mrate)   

trunk/UTIL/PYTHON/pp.py

@@ -189 +189 @@
     #if typefile not in ["meso","mesoapi"]: name = 'pycommand'
     if opt.save == "gui":    name = 'pycommand'
-    elif opt.save == "avi":  system("mv -f movie*.avi "+name+".avi")
     elif opt.save == "html": system("cat $PYTHONPATH/header.html > anim.html ; cat zepics >> anim.html ; cat $PYTHONPATH/body.html >> anim.html ; rm -rf zepics "+name+" ; mkdir "+name+" ; mv anim.html image*png "+name) 
     f = open(name+'.sh', 'w')

trunk/UTIL/PYTHON/videosink.py

@@ -29 +29 @@
              if quality:bitrate="50000"
              cmdstring  = ('mencoder',
-                     filename+'_raw.avi',
-                     '-of', 'rawvideo',
+                     'movie_raw.avi',
+                     '-of', 'avi',
                      '-nosound',
                      '-ofps',str(rate),
@@ -36 +36 @@
                      '-x264encopts', 'subq=1:frameref=1:bitrate='+bitrate+':bframes=1:pass=1',
                      '-vf', 'scale=1280:720',
-                     '-o', filename+'_first.264'
+                     '-o', filename+'.avi'
                     )
+             ## si second_pass '-o', filename+'_first.264'
+             ## ... et seconde ligne: filename+'_raw.avi'
              subprocess.call(cmdstring,shell=False)