Changeset 440 in lmdz_wrf for trunk

Timestamp:

May 26, 2015, 3:46:27 PM (10 years ago)

Author:

lfita

Message:

Adding kind of statistics on the plot following trajectory

Location:

trunk/tools

Files:

• drawing.py (modified) (4 diffs)
• drawing_tools.py (modified) (1 diff)

trunk/tools/drawing.py

@@ -2244 +2244 @@
     draw_vals_trajectories(ncfile, values, variable)
     ncfile= [ncfile] ',' list of files to use
-    values= [statistics]:[Tint]:[labels]@[locleg]:[gvarname]:[timetit]:[tkind]:[timefmt]:[title]:[gkind]
-      [statistics]: which statistics to use, from: 'center', 'min', 'max', 'mean', 
+    values= [statisticskind]:[Tint]:[labels]@[locleg]:[gvarname]:[timetit]:[tkind]:[timefmt]:[title]:[gkind]
+      [statisticskind]=[statistics][kind]
+        [statistics]: which statistics to use, from: 'center', 'min', 'max', 'mean', 
         'mean2', 'stdev'
+        [kind]: 'box', 'circle' statistics taking the values from a box or a circle
+        'trj': value following the trajectory
       [Tint]: [Tbeg]@[Tend] or None, interval of time to plot or -1 for all the times
       [labels]: ',' separated list of labels for the legend
@@ -2283 +2286 @@
         quit(-1)
 
-    statistics = values.split(':')[0]
+    statisticskind = values.split(':')[0]
     Tint = values.split(':')[1]
     labels = values.split(':')[2]
@@ -2318 +2321 @@
         trjobj = NetCDFFile(trjfile, 'r')
         otim = trjobj.variables['time']
-        if not trjobj.variables.has_key(statistics + 'box_' + variable):
+        if not trjobj.variables.has_key(statisticskind + '_' + variable):
             print errormsg
             print '  ' + fname + ": file '" + trjfile + "' does not have variable '"+\
-              statistics + 'box_' + variable + "' !!"
+              statisticskind + '_' + variable + "' !!"
             quit(-1)
-        ovar = trjobj.variables[statistics + 'box_' + variable]
+        ovar = trjobj.variables[statisticskind + '_' + variable]
         dimt = otim.shape[0]
 
@@ -2362 +2365 @@
 
     drw.plot_TimeSeries(vartimetrjv, drw.units_lunits(gunits), tunits,               \
-      'val_trajectories_' + statistics, gvarname, timetit, tkind, timefmt, title,    \
+      'val_trajectories_' + statisticskind, gvarname, timetit, tkind, timefmt, title,\
       leglabels, locleg, gkind)
 

trunk/tools/drawing_tools.py

@@ -2318 +2318 @@
     plt.xlabel(ttit)
     plt.ylabel(vtit + " (" + vunits + ")")
-    plt.title(tit).replace('_','\_').replace('&','\&')
+    plt.title(tit.replace('_','\_').replace('&','\&'))
 
     figname = hfileout + '_' + vtit