Changeset 947 in lmdz_wrf for trunk/tools

Timestamp:

Jun 24, 2016, 12:46:07 PM (8 years ago)

Author:

lfita

Message:

Fixing months' time units in draw_lines_time'

Location:

trunk/tools

Files:

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

trunk/tools/drawing.py

@@ -1785 +1785 @@
         [valuesaxis]: which axis will be used for the values ('x', or 'y')
         [dimtit]: title for the common dimension ('|' for spaces)
-        [leglabels]: ',' separated list of names for the legend ('None', no legend)
+        [leglabels]: ',' separated list of names for the legend ('None', no legend '!' for spaces)
         [vartit]: name of the variable in the graph
         [title]: title of the plot ('|' for spaces)
@@ -1837 +1837 @@
     valuesaxis = values.split(';')[1]
     dimtit = values.split(';')[2].replace('|',' ')
-    leglabels = values.split(';')[3].replace('_','\_')
+    leglabels = values.split(';')[3].replace('_','\_').replace('!',' ')
     vartit = values.split(';')[4]
     title = values.split(';')[5].replace('|',' ')
@@ -1887 +1887 @@
 # Multiple point types?
     if points0.find(',') != -1:
-        points = points0.split(',')
+        if len(points0) == 1:
+            points = []
+            for ip in range(Nfiles):
+                points.append(points0)
+        else:
+            points = points0.split(',')
     elif points0 == 'None':
         points = None
@@ -1980 +1985 @@
               "' has any variable '", varname, "' !!"
             quit(-1)
-
+        if vdobj.units.find('month') != 1:
+            print warnmsg
+            print '  ' + fname + ": tranforming time units from 'months' to 'days'!!"
+            timevals0, tunits0 = gen.CFmonthU_daysU(vdobj[:], vdobj.units) 
+        else:
+            timevals0 = vdobj[:]
+            tunits0 = str(vdobj.units) 
 
 # Getting period
         if ifn > 0: 
 # Referring all times to the same reference time!
-            reftvals = drw.coincident_CFtimes(vdobj[:], timeunit, vdobj.units)
+            reftvals = drw.coincident_CFtimes(timevals0, timeunit, tunits0)
         else:
-            reftvals = vdobj[:]
+            reftvals = timevals0
 
         dimt = len(vdobj[:])
@@ -2040 +2051 @@
         if mindvals < mintval: mintval = mindvals
         if maxdvals > maxtval: maxtval = maxdvals
-#        print '  ' + fname + ": file '" + filen + "' period:", ibeg, '->', iend,     \
-#            reftvals[ibeg], '->', reftvals[np.min([iend,dimt-1])], timeunit
+        print '  ' + fname + ": file '" + filen + "' period:", mindvals, '->', maxdvals
 
         if ifn == 0:

trunk/tools/drawing_tools.py

@@ -2638 +2638 @@
     tuB = tunitB.split(' ')[0]
 
-    if tuB == 'months':
-        tvalB, tunitB  = gen.CFmonthU_daysU(tvalB, tunitB)
-        tuB = tunitB.split(' ')[0]
+#    if tuB == 'months':
+#        tvalB, tunitB  = gen.CFmonthU_daysU(tvalB, tunitB)
+#        tuB = tunitB.split(' ')[0]
 
     if tuA != tuB:
@@ -2747 +2747 @@
         elif tuA == 'hours':
             tB = tB + diffv/(3600.*10.e6)
-        elif tuA == 'dayss':
+        elif tuA == 'days':
             tB = tB + diffv/(24.*3600.*10.e6)
         else:
@@ -5822 +5822 @@
     else:
         for il in range(Ntraj):
+            Nvals = len(vardv[il])
+            dvals = vardv[il]
+            vvals = varvv[il]
             plt.plot(vardv[il], varvv[il], linekinds[il], marker=pointkinds[il],     \
               label=linesn[il], color=colvalues[il], linewidth=lwidths[il],          \