Changeset 1129 in lmdz_wrf for trunk

Timestamp:

Oct 3, 2016, 11:39:23 AM (9 years ago)

Author:

lfita

Message:

Introducing `transform' in 'plot_2D_shadow'

File:

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

trunk/tools/drawing_tools.py

@@ -3835 +3835 @@
         quit(-1)
 
-    reva0 = ''
-    if reva.find('|') != 0:
-        revas = reva.split('|')
-    else:
-        revas = [reva]
-        reva0 = reva
-
-    for rev in revas:
-        if reva[0:4] == 'flip':
-            reva0 = 'flip'
-            if len(reva.split('@')) != 2:
-                 print errormsg
-                 print '  ' + fname + ': flip is given', reva, 'but not axis!'
-                 quit(-1)
-
-        if rev == 'transpose':
-            print '  reversing the axes of the figure (x-->y, y-->x)!!'
-            varsv = np.transpose(varsv)
-            dxv = dimyv
-            dyv = dimxv
-            dimxv = dxv
-            dimyv = dyv
+    # Usually axis > x must be the lon, thus...
+    dimxv0 = dimxv.copy()
+    dimyv0 = dimyv.copy()
+    dimxt0 = np.array(pretty_int(dimxv.min(),dimxv.max(),10))
+    dimyt0 = np.array(pretty_int(dimyv.min(),dimyv.max(),10))
+    dimxl0 = []
+    for i in range(len(dimxt0)): dimxl0.append('{:.1f}'.format(dimxt0[i]))
+    dimyl0 = []
+    for i in range(len(dimyt0)): dimyl0.append('{:.1f}'.format(dimyt0[i]))
+    dimxT0 = variables_values(dimn[0])[0] + ' (' + units_lunits(dimxu) + ')'
+    dimyT0 = variables_values(dimn[1])[0] + ' (' + units_lunits(dimyu) + ')'
+
+    if reva is not None:
+        varsv, dimxv, dimyv, dimxt, dimyt, dimxl, dimyl, dimxT, dimyT =              \
+          transform(varsv, reva, dxv=dimxv0, dyv=dimyv0, dxt=dimxt0, dyt=dimyt0,     \
+          dxl=dimxl0, dyl=dimyl0, dxtit=dimxT0, dytit=dimyT0)
+    else:
+        dimxv = dimxv0
+        dimyv = dimyv0
+        dimxt = dimxt0
+        dimyt = dimyt0
+        dimxl = dimxl0
+        dimyl = dimyl0
+        dimxT = dimxT0
+        dimyT = dimyT0
 
     if len(dimxv[:].shape) == 3:
@@ -4028 +4031 @@
         plt.ylabel('S-N')
     else:
-        plt.xlabel(variables_values(dimn[1])[0].replace('_','\_') + ' (' +           \
-          units_lunits(dimxu) + ')')
-        plt.ylabel(variables_values(dimn[0])[0].replace('_','\_') + ' (' +           \
-          units_lunits(dimyu) + ')')
+        plt.xlabel(dimxT)
+        plt.ylabel(dimyT)
 
     txpos = pretty_int(x.min(),x.max(),5)
@@ -4040 +4041 @@
     for i in range(len(tylabels)): tylabels[i] = '{:6g}'.format(tylabels[i])
 
-# set the limits of the plot to the limits of the data
-
-    if searchInlist(revas,'transpose'):
-        x0 = y
-        y0 = x
-        x = x0
-        y = y0
-#    print 'Lluis reva0:',reva0,'x min,max:',x.min(),x.max(),' y min,max:',y.min(),y.max()
-
-    if reva0 == 'flip':
-        if reva.split('@')[1] == 'x':
-            plt.axis([x.max(), x.min(), y.min(), y.max()])
-        elif reva.split('@')[1] == 'y':
-            plt.axis([x.min(), x.max(), y.max(), y.min()])
-        else:
-            plt.axis([x.max(), x.min(), y.max(), y.min()])
-    else:
-        plt.axis([x.min(), x.max(), y.min(), y.max()])
+    plt.axis([x.min(), x.max(), y.min(), y.max()])
 
     if mapv is None: