Changeset 638 in lmdz_wrf

Timestamp:

Sep 19, 2015, 11:04:07 AM (9 years ago)

Author:

lfita

Message:

Changing separation character to '~' in 'draw_2D_shad_time'
Starting to add `transform', function to transform the values and axes ('transpose', 'flip', ...)

Location:

trunk/tools

Files:

• drawing.py (modified) (3 diffs)
• drawing_tools.py (modified) (1 diff)

trunk/tools/drawing.py

@@ -216 +216 @@
     draw_2D_shad(ncfile, values, varn)
       ncfile= file to use
-      values=[vnamefs]:[dimvals]:[dimxvn]:[dimyvn]:[colorbar]:[sminv],[smaxv]:[figt]:
-       [kindfig]:[reverse]:[timevals]:[close]
+      values=[vnamefs]~[dimvals]~[dimxvn]~[dimyvn]~[colorbar]~[sminv],[smaxv]~[figt]~
+       [kindfig]~[reverse]~[timevals]~[close]
         [vnamefs]: Name in the figure of the variable to be shaded
         [dimvals]: ',' list of [dimname]|[value] telling at which dimension of the 
-          variable a given value is required (-1, all the length)
+          variable a given value is required (-1, all the length, [beg]@[end] for an interval)
         [dimx/yvn]: name of the variables with the values of the final dimensions (x,y)
         [colorbar]: name of the color bar
@@ -251 +251 @@
            [label]; label at the graph ('!' for spaces)
         [close]: should figure be closed (finished)
-      values='dtcon:Time|-1,bottom_top|-1:presmean:time:seismic:-3.e-6,3.e-6:monthly|'
-        'dtcon:pdf:transpose:time|hours!since!1949-12-01|exct,2,d|%d|date!([DD])|x:True
+      values='dtcon~Time|-1,bottom_top|-1~presmean~time~seismic~-3.e-6,3.e-6~monthly|'
+        'dtcon~pdf~transpose~time|hours!since!1949-12-01|exct,2,d|%d|date!([DD])~True
       varn= [varsn] name of the variable to plot with shading
     """
@@ -264 +264 @@
     farguments = ['[vnamefs]', '[dimvals]', '[dimxvn]', '[dimyvn]', '[colorbar]',     \
       '[sminv],[smaxv]', '[figt]', '[kindfig]', '[reverse]', '[timevals]', '[close]']
-    drw.check_arguments(fname,11,values,':',farguments)
-
-    vnamesfig = values.split(':')[0]
-    dimvals= values.split(':')[1].replace('|',':')
-    vdimxn = values.split(':')[2]
-    vdimyn = values.split(':')[3]
-    colbarn = values.split(':')[4]
-    shadminmax = values.split(':')[5]
-    figtitle = values.split(':')[6].replace('|',' ')
-    figkind = values.split(':')[7]
-    revals = values.split(':')[8]
-    timevals = values.split(':')[9]
-    close = values.split(':')[10]
+    drw.check_arguments(fname,11,values,'~',farguments)
+
+    vnamesfig = values.split('~')[0]
+    dimvals= values.split('~')[1].replace('|',':')
+    vdimxn = values.split('~')[2]
+    vdimyn = values.split('~')[3]
+    colbarn = values.split('~')[4]
+    shadminmax = values.split('~')[5]
+    figtitle = values.split('~')[6].replace('|',' ')
+    figkind = values.split('~')[7]
+    revals = values.split('~')[8]
+    timevals = values.split('~')[9]
+    close = values.split('~')[10]
 
     ncfiles = ncfile

trunk/tools/drawing_tools.py

@@ -3721 +3721 @@
 #quit()
 
+def transform(vals, dxv, dyv, dxt, dyt, dxl, dyl, dxtit, dytit, trans):
+    """ Function to transform the values and the axes
+      vals= values to transform
+      d[x/y]v= original values for the [x/y]-axis
+      d[x/y]t= original ticks for the [x/y]-axis
+      d[x/y]l= original tick-labels for the [x/y]-axis
+      d[x/y]tit= original titels for the [x/y]-axis
+      trans= '|' separated list of operations of transformation
+        'transpose': Transpose matrix of values (x-->y, y-->x)
+        'flip@[x/y]': Flip the given axis
+    """
+    fname = 'transform'
+
+    return newvals, newdxv, newdyv
+
 def plot_2D_shadow_time(varsv,vnames,dimxv,dimyv,dimxu,dimyu,dimn,colorbar,vs,uts,   \
   vtit,kfig,reva,taxis,tpos,tlabs,ifclose):