Changeset 1571 in lmdz_wrf

Timestamp:

May 12, 2017, 5:30:09 PM (8 years ago)

Author:

lfita

Message:

Making use of `gen.minmax_range' in 'draw_time_lag'

File:

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

trunk/tools/drawing.py

@@ -7297 +7297 @@
         [futunits]: units of the future-label
         [prerangevals]: Range of the previous axis with the values (single 'None' for 'auto','auto')
-         [vmin],[vmax]: minimum and maximum values
-           'auto': the computed minimumm or maximum of the values  
+          [val1],[val2]: tacking the provided ',' separated list of desired [val1] and [val2]
+          'auto': automatically set up range using minv and maxv
+          'extremescentered': extremes automatically centered on zero by computing from data -absmax, absmax; 
+            absmax=max(abs(minval),maxval)
+          'meancentered': extremes automatically centered on mean by computing from data minv+meanv, maxv-meanv; 
+            meanv=(minval + maxval)/2.
         [futrangevals]: Range of the future axis with the values (single 'None' for 'auto','auto')
-         [vmin],[vmax]: minimum and maximum values
-           'auto': the computed minimumm or maximum of the values  
+          [val1],[val2]: tacking the provided ',' separated list of desired [val1] and [val2]
+          'auto': automatically set up range using minv and maxv
+          'extremescentered': extremes automatically centered on zero by computing from data -absmax, absmax; 
+            absmax=max(abs(minval),maxval)
+          'meancentered': extremes automatically centered on mean by computing from data minv+meanv, maxv-meanv; 
+            meanv=(minval + maxval)/2.
         [timevals]: [timen]|[units]|[kind]|[tfmt] time labels characteristics
           [timen]; name of the time variable
@@ -7408 +7416 @@
         ifile=0
         for fdv in prefutdv:
-            expectargs = '[prefilen];[predslice];[pretvarn];[prevarn]%[futfilen];' + \
-              '[futdslice];[futtvarn];[futvarn]'
+            expectargs = '[pre/fut]filen;[pre/fut]dslice;[pre/fut]tvarn;[pre/fut]varn'
             drw.check_arguments('filevalues: '+fname, fdv, expectargs,';')
             
@@ -7513 +7520 @@
 
     # ranges
-    if prerangevals == 'None':
-        valmin = preminval
-        valmax = premaxval
-    else:
-        if prerangevals.split(',')[0] != 'auto': 
-            valmin = np.float(prerangevals.split(',')[0])
-        else:
-            valmin = preminval
-        if prerangevals.split(',')[1] != 'auto': 
-            valmax = np.float(prerangevals.split(',')[1])
-        else:
-            valmax = premaxval
-    prerng = [valmin, valmax]
-
-    if futrangevals == 'None':
-        valmin = futminval
-        valmax = futmaxval
-    else:
-        if futrangevals.split(',')[0] != 'auto': 
-            valmin = np.float(futrangevals.split(',')[0])
-        else:
-            valmin = futminval
-        if futrangevals.split(',')[1] != 'auto': 
-            valmax = np.float(futrangevals.split(',')[1])
-        else:
-            valmax = futmaxval
-    futrng = [valmin, valmax]
+    prerng = gen.minmax_range(preminval, premaxval, prerangevals)
+    futrng = gen.minmax_range(futminval, futmaxval, futrangevals)
 
     xstyl, xaxf, Nxax, xaxor, ystyl, yaxf, Nyax, yaxor = drw.format_axes(dimxyfmt,',')