Changeset 1334 in lmdz_wrf

Timestamp:

Nov 15, 2016, 9:00:20 PM (9 years ago)

Author:

lfita

Message:

Working copy of `draw_2d_shaw_cont' without need of flip@y for z-figures!

File:

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

trunk/tools/drawing_tools.py

@@ -4538 +4538 @@
     dyx = dimyv.max()
 
+
+    # sens of the original x-axis and y-axis
+    xneg=False
+    if dimxv0[0] > dimxv0[1]: xneg=True
+    yneg=False
+    if dimyv0[0] > dimyv0[1]: yneg=True
+
     if xaxv[0] == 'pretty':
         dimxt0 = np.array(gen.pretty_int(dxn,dxx,xaxv[2]))
+        axxtype='data'
     elif xaxv[0] == 'Nfix':
-        dimxt0 = np.arange(0.,1.,1./xaxv[2])
+        dimxt0 = np.arange(0.,1.,1./(xaxv[2]+1))
         dimxv0 = np.arange(0.,1.,1./varsv.shape[1])
+        axxtype='fixpixel'
     elif xaxv[0] == 'Vfix':
-        dimxt0 = np.arange(0,dxx,xaxv[2])
+        dxnvfix = int(dxn/xaxv[2])
+        dimxt0 = np.arange(dxnvfix*xaxv[2],dxx,xaxv[2])
+        axxtype='data'
     if yaxv[0] == 'pretty':
         dimyt0 = np.array(gen.pretty_int(dyn,dyx,yaxv[2]))
+        axytype='data'
     elif yaxv[0] == 'Nfix':
-        dimyt0 = np.arange(0.,1.,1./yaxv[2])
+        dimyt0 = np.arange(0.,1.,1./(yaxv[2]+1))
         dimyv0 = np.arange(0.,1.,1./varsv.shape[0])
+        axytype='fixpixel'
     elif yaxv[0] == 'Vfix':
-        dimyt0 = np.arange(0,dyx,yaxv[2])
+        dynvfix = int(dyn/yaxv[2])
+        dimyt0 = np.arange(dynvfix*xaxv[2],dyx,yaxv[2])
+        axytype='data'
+
+    if xneg: dimxt0 = dimxt0[::-1]
+    if yneg: dimyt0 = dimyt0[::-1]
 
     dimxl0 = []
@@ -4576 +4594 @@
         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)
+          dxl=dimxl0, dyl=dimyl0, dxtit=dimxT0, dytit=dimyT0, axxkind=axxtype,       \
+          axykind=axytype)
     else:
         dimxv = dimxv0
@@ -4721 +4740 @@
         plt.yticks(dimyt, dimyl, rotation=yaxv[3])
 
-# set the limits of the plot to the limits of the data
-#    plt.axis([x.min(), x.max(), y.min(), y.max()])
+    #set the limits of the plot to the limits of the data
+    plt.axis([x[0,0], x[0,x.shape[1]-1], y[0,0], y[y.shape[0]-1,0]])