Changeset 1524 in lmdz_wrf

Timestamp:

Apr 12, 2017, 11:08:14 PM (8 years ago)

Author:

lfita

Message:

Improving `draw_2lines' and fixing some mistakes

File:

• trunk/tools/drawing.py (modified) (5 diffs)

trunk/tools/drawing.py

@@ -5300 +5300 @@
        [widths]:[styles]:[sizemarks]:[marks]:[graphtitle]:[labelaxis]:[legvals]:[figname]:[figkind]:[close]
         [commonvardim]: name of the common variable-dimension
-        [varangeA]: ',' separated list of range (min,max) for A values ('None', automatic; 'Extrs' from values extremes)
-        [varangeB]: ',' separated list of range (min,max) for B values ('None', automatic; 'Extrs' from values extremes)
+        [varangeA]: ',' separated list of range (min,max) for A values ('None', automatic from
+          'variable_values.dat'; single 'Extrs' from values extremes)
+        [varangeB]: ',' separated list of range (min,max) for B values ('None', automatic from
+          'variable_values.dat'; single 'Extrs' from values extremes)
         [varangeaxis]: ',' separated list of range (min,max) for common axis values ('None', automatic; 'Extrs' from 
           values extremes)
@@ -5310 +5312 @@
         [styles]: ',' list with the styles of the lines ('None', automatic)
         [sizemarks]: ',' list with the size of the markers of the lines ('None', automatic)
-        [marks]: ',' list with the markers of the lines ('None', automatic)
+        [marks]: ';' list with the markers of the lines ('None', automatic)
         [graphtitle]: title of the figure ('!' for spaces)
         [labelaxis]: label in the figure of the common axis ('!' for spaces)
@@ -5348 +5350 @@
     styles = gen.str_list(values.split(':')[8],',')
     sizemarks = gen.str_list_k(values.split(':')[9],',','np.float')
-    marks = gen.str_list(values.split(':')[10],',')
+    marks = gen.str_list(values.split(':')[10],';')
     graphtitle = values.split(':')[11].replace('!',' ')
     labelaxis = values.split(':')[12].replace('!',' ')
@@ -5379 +5381 @@
     varangeA = np.zeros((2),dtype=np.float)
 
+    valsA = gen.variables_values(invarns[0])
     if gen.searchInlist(objvA.ncattrs(), 'units'):
         varunits.append(drw.units_lunits(objvA.getncattr('units')))
     else:
-        valsA = gen.variables_values(invarns[0])
         varunits.append(drw.units_lunits(valsA[5]))
     if varangeA0 == 'None':
@@ -5419 +5421 @@
     varangeB = np.zeros((2),dtype=np.float)
 
+    valsB = gen.variables_values(invarns[1])
     if gen.searchInlist(objvB.ncattrs(), 'units'):
         varunits.append(drw.units_lunits(objvB.getncattr('units')))
     else:
-        valsB = gen.variables_values(invarns[1])
         varunits.append(drw.units_lunits(valsB[5]))
     if varangeB0 == 'None':
         varangeB = [valsB[2], valsB[3]]
     elif varangeB0 == 'Extrs':
-        varangeA = [np.min(varvalsA), np.max(varvalsA)]
+        varangeB = [np.min(varvalsB), np.max(varvalsB)]
     else:
         for iv in range(2): varangeB[iv] = np.float(varangeB0.split(',')[iv])