Changeset 679 in lmdz_wrf

Timestamp:

Jan 21, 2016, 11:05:39 AM (9 years ago)

Author:

lfita

Message:

Adding point frequency on `draw_lines_time'

Location:

trunk/tools

Files:

• drawing.py (modified) (5 diffs)
• drawing_tools.py (modified) (7 diffs)

trunk/tools/drawing.py

@@ -1813 +1813 @@
       ncfilens= [filen] ',' separated list of netCDF files
       values= [dimvname];[valuesaxis];[dimtit];[leglabels];[vtit];[title];[timevals];[locleg];
-        [graphk];[collines];[points];[period]
+        [graphk];[collines];[points];[pointfreq];[period]
         [dimvname]: ',' list of names of the variables with he values of the common dimension
         [valuesaxis]: which axis will be used for the values ('x', or 'y')
@@ -1840 +1840 @@
         [points]: ',' list of type of points for the lines, None for automatic, single
           value all the same
+        [pointfreq]: frequency of point plotting, 'all' for all time steps
         [period]: which period to plot
           '-1': all period
@@ -1856 +1857 @@
     expectargs = '[dimvname];[valuesaxis];[dimtit];[leglabels];[vtit];[title];'
     expectargs = expectargs + '[timevals];[locleg];[graphk];[collines];[points];'
-    expectargs = expectargs + '[period]'
+    expectargs = expectargs + '[pointfreq];[period]'
     drw.check_arguments(fname,len(expectargs.split(';')),values,';',expectargs)
 
@@ -1871 +1872 @@
     collines0 = values.split(';')[9]
     points0 = values.split(';')[10]
-    period = values.split(';')[11]
+    pointfreq0 = values.split(';')[11]
+    period = values.split(';')[12]
 
     Nfiles = len(ncfiles)
@@ -2043 +2045 @@
         legvals = None
 
+    if pointfreq0 == 'all':
+        pointfreq = None
+    else:
+        pointfreq = int(pointfreq0)
+
     drw.plot_lines_time(dimvalues, varvalues, valuesaxis, dimtit, legvals, vartit,   \
-      varunits, timepos, timelabels, title, locleg, graphk, collines, points)
+      varunits, timepos, timelabels, title, locleg, graphk, collines, points, pointfreq)
 
     return

trunk/tools/drawing_tools.py

@@ -2491 +2491 @@
     Nlines = len(valtimes)
 # Canging line kinds every 7 lines (end of standard colors)
-    pointkindsauto=['.', 'x', 'o', '*', 'o', '<', '>', '5']
+    pointkindsauto=['.', ',', 'x', 'o', '*', '+', '<', '|', '_', '>', '1', '8', 's', \
+      'p', 'h', 'D']
     Npts = len(pointkindsauto)
     linekinds = []
@@ -5339 +5340 @@
 # Canging line kinds every 7 lines (end of standard colors)
     linekinds=['.-','x-','o-']
+    pointkindsauto=['.', ',', 'x', 'o', '*', '+', '<', '|', '_', '>', '1', '8', 's', \
+      'p', 'h', 'D']
 
     Ntraj = len(vardv)
@@ -5395 +5398 @@
 
 def plot_lines_time(vardv, varvv, vaxis, dtit, linesn0, vtit, vunit, tpos, tlabs,    \
-  gtit, gloc, kfig, coll, ptl):
+  gtit, gloc, kfig, coll, ptl, ptf):
     """ Function to plot a collection of lines with a time axis
       vardv= list of set of dimension values
@@ -5417 +5420 @@
       ptl= ',' list of type of points for the lines, None for automatic, single
           value all the same
-
+      ptf= frequency of point plotting, 'all' for all time steps
+ 
       plot_lines([np.arange(10)], [np.sin(np.arange(10)*np.pi/2.5)], 'y', 'time (s)',      \
   ['2.5'], 'sin', '-', 'sinus frequency dependency', 'pdf')
     """
-    fname = 'plot_lines'
+    fname = 'plot_lines_time'
 
     if vardv == 'h':
@@ -5430 +5434 @@
 # Canging line kinds every 7 lines (end of standard colors)
     linekinds = []
+    pointkinds = []
+    pointkindsauto=['.', ',', 'x', 'o', '*', '+', '<', '|', '_', '>', '1', '8', 's', \
+      'p', 'h', 'D']
+    Nkpts = len(pointkindsauto)
     if ptl is None:
-        linekindsauto=['.-','x-','o-']
-        for ptype in range(4):
-            for ip in range(7):
-                linekinds.append(linekindsauto[ptype])
-    else:
-        linekinds = ptl
+        if ptf is None:
+            for ptype in range(4):
+                for ip in range(Nkpts):
+                    linekinds.append(pointkindsauto[ptype] + '-')
+        else:
+            for ptype in range(4):
+                for ip in range(Nkpts):
+                    linekinds.append('-')
+                    pointkinds.append(pointkindsauto[ptype])
+    else:
+        if ptf is None:
+            for pt in ptl:
+                linekinds.append(pt + '-')
+        else:
+            pointkinds = ptl
+            for pt in ptl:
+                linekinds.append('-')
 
     Ntraj = len(vardv)
@@ -5458 +5477 @@
         for il in range(Ntraj):
             if coll is None:
-                plt.plot(varvv[il], vardv[il], linekinds[il], label= linesn[il])
+                if ptf is None:
+                    plt.plot(varvv[il], vardv[il], linekinds[il], label= linesn[il])
+                else:
+                    plt.plot(varvv[il], vardv[il], linekinds[il])
+                    plt.plot(varvv[il][::ptf], vardv[il][::ptf], pointkinds[il],     \
+                      label= linesn[il])
             else:
-                plt.plot(varvv[il], vardv[il], linekinds[il], label= linesn[il],\
-                  color=coll[il])
+                if ptf is None:
+                    plt.plot(varvv[il], vardv[il], linekinds[il], label= linesn[il], \
+                      color=coll[il])
+                else:
+                    plt.plot(varvv[il], vardv[il], linekinds[il], color=coll[il])
+                    plt.plot(varvv[il][::ptf], vardv[il][::ptf], pointkinds[il],     \
+                      label= linesn[il], color=coll[il])
 
             minvv = np.min(varvv[il])
@@ -5484 +5513 @@
         for il in range(Ntraj):
             if coll is None:
-                plt.plot(vardv[il], varvv[il], linekinds[il], label= linesn[il])
+                if ptf is None:
+                    plt.plot(vardv[il], varvv[il], linekinds[il], label= linesn[il])
+                else:
+                    plt.plot(vardv[il], varvv[il], linekinds[il])
+                    plt.plot(vardv[il][::ptf], varvv[il][::ptf], pointkinds[il],     \
+                      label= linesn[il])
             else:
-                plt.plot(vardv[il], varvv[il], linekinds[il], label= linesn[il],\
-                  color=coll[il])
+                if ptf is None:
+                    plt.plot(vardv[il], varvv[il], linekinds[il], label= linesn[il], \
+                      color=coll[il])
+                else:
+                    plt.plot(vardv[il], varvv[il], linekinds[il], color=coll[il])
+                    plt.plot(vardv[il][::ptf], varvv[il][::ptf], linekinds[il],      \
+                      label= linesn[il], color=coll[il])
 
             minvv = np.min(varvv[il])