Changeset 673 in lmdz_wrf

Timestamp:

Jan 15, 2016, 4:40:14 PM (9 years ago)

Author:

lfita

Message:

Fixing a lot of errors on `draw_TimeSeires'

Location:

trunk/tools

Files:

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

trunk/tools/drawing.py

@@ -2535 +2535 @@
     draw_timeSeries(filen, values, variable):
       filen= name of the file
-      values= [gvarname]:[timetit]:[tkind]:[timefmt]:[title]:[locleg]:[gkind]
+      values= [gvarname]:[timetit]:[tkind]:[timefmt]:[title]:[locleg]:[gkind]:[colorlines]:[pointtype]
       [gvarname]: name of the variable to appear in the graph
       [timetit]: title of the time axis (assumed x-axis, '|' for spaces)
@@ -2551 +2551 @@
         9: 'upper center', 10: 'center'
       [gkind]: kind of graphical output
+      [colorlines]: ',' list of colors for the lines, None for automatic, single
+          value all the same
+      [pointtype]: ',' list of type of points for the lines, None for automatic, single
+          value all the same
       variables= [varname],[timename] names of variable and variable with times
       draw_timeSeries('wrfout_d01_1979-12-01_00:00:00_bottom_top_B6-E6-I1_south_north_B3-E3-I1_west_east_B26-E26-I1.nc', 'dt_con:time|($[DD]^{[HH]}$):exct,12,h:$%d^{%H}$:time|evolution|at|-1|6|3|26:1:pdf', 'LDQCON,time')
@@ -2563 +2567 @@
 
     expectargs = ['[gvarname]', '[timetit]', '[tkind]', '[timefmt]', '[title]',      \
-      '[locleg]', '[gkind]']
+      '[locleg]', '[gkind]', '[colorlines]', '[pointtype]']
  
     drw.check_arguments(fname,len(expectargs),values,':',expectargs)
@@ -2574 +2578 @@
     locleg = int(values.split(':')[5])
     gkind = values.split(':')[6]
+    colorlines = values.split(':')[7]
+    pointtype = values.split(':')[8]
     
     ncobj = NetCDFFile(filen, 'r')
@@ -2607 +2613 @@
     tseriesvals.append(varvals)
 
+    if colorlines == 'None': 
+        collines = None
+    else:
+        collines = colorlines.split(',')
+    if pointtype == 'None': 
+        pttype = None
+    else:
+        pttype = pointtype.split(',')
+
     drw.plot_TimeSeries(tseriesvals, Spot + drw.units_lunits(gunits), tunits,        \
       'TimeSeries', gvarname, timetit, tkind, timefmt, title,      \
-      gvarname.replace('_','\_'), locleg, gkind)
+      gvarname.replace('_','\_'), locleg, gkind, collines, pttype)
 
     return
 
-#draw_timeSeries('wrfout_d01_1979-12-01_00:00:00_bottom_top_B6-E6-I1_south_north_B3-E3-I1_west_east_B26-E26-I1.nc', 'dt_con:time|($[DD]^{[HH]}$):exct,12,h:$%d^{%H}$:time|evolution|at|-1|6|3|26:1:pdf', 'LDQCON,time')
+#draw_timeSeries('wrfout_d01_1979-12-01_00:00:00_bottom_top_B6-E6-I1_south_north_B3-E3-I1_west_east_B26-E26-I1.nc', 'dt_con:time|($[DD]^{[HH]}$):exct,12,h:$%d^{%H}$:time|evolution|at|-1|6|3|26:1:pdf:None:None', 'LDQCON,time')
 
 def draw_trajectories(trjfilens, values, observations):

trunk/tools/drawing_tools.py

@@ -96 +96 @@
     timeT = np.zeros((3), dtype=int)
 
-    print 'Lluis:',StringDT
 #    quit()
 
@@ -1904 +1903 @@
         Srefdate = txtunits[Ntxtunits - 2]
 
-    print 'Lluis Srefdate:',Srefdate, 'txtunits:',txtunits,'units:',units
     if not trefT == -1:
 #        print '  ' + fname + ': refdate with time!'
@@ -2067 +2065 @@
             day = firstTvec[2]
  
-            Iunits = np.mod(hour,Nunits)
+            Iunits = np.mod(day,Nunits)
             if np.sum(firstTvec[2:5]) > 0:
                 firstTdt = dt.datetime(yr, mon, day+1, 0, 0, 0)
@@ -2490 +2488 @@
         quit()
 
-    Nlines = len(linesn)
+    Nlines = len(valtimes)
 # Canging line kinds every 7 lines (end of standard colors)
     linekinds = []
     if ptl is None:
         linekindsauto=['.-','x-','o-']
-        for ptype in range(4):
+        for ptype in range(3):
             for ip in range(7):
                 linekinds.append(linekindsauto[ptype])
@@ -2539 +2537 @@
             if vmin < ymin: ymin = vmin
             if vmax > ymax: ymax = vmax
-        print il,'Lluis: ymin;',ymin,'ymax;',ymax
 
     dx = np.max(Ntimes)
@@ -2570 +2567 @@
     timevals = np.arange(xmin,xmax)*1.
 
-    print 'Lluis tunits:',tunits
     tpos, tlabels = CFtimes_plot(timevals, tunits, tkind, tformat)
 
@@ -2579 +2575 @@
     plt.xticks(tpos, tlabels)
 #    plt.Axes.set_xticklabels(tlabels)
+
 
     plt.legend(loc=lloc)
@@ -4803 +4800 @@
     fname = 'dxdy_lonlatDIMS'
 
-    print 'Lluis dd:',dd
-
     slicex = []
     ipos=0