Changeset 1070 in lmdz_wrf

Timestamp:

Aug 31, 2016, 4:08:53 PM (9 years ago)

Author:

lfita

Message:

Fixing axis labels

Location:

trunk/tools

Files:

• drawing.py (modified) (7 diffs)
• drawing_tools.py (modified) (7 diffs)

trunk/tools/drawing.py

@@ -147 +147 @@
 ##                break
 ##        if not cutdim: dimnamesv.append(objvars.dimensions[idd])
-    dimnamesv = [vdimyn, vdimxn]
+    dimnamesv = [vdimxn, vdimyn]
 
     if drw.searchInlist(objvars.ncattrs(),'units'):
@@ -311 +311 @@
     valshad, dimsshad = drw.slice_variable(objvars, dimvals.replace(',','|'))
 
-    dimnamesv = [vdimyn, vdimxn]
+    dimnamesv = [vdimxn, vdimyn]
 
     varunits = objvars.getncattr('units')
@@ -525 +525 @@
 ##                break
 ##        if not cutdim: dimnamesv.append(objvars.dimensions[idd])
-    dimnamesv = [vdimyn, vdimxn]
+    dimnamesv = [vdimxn, vdimyn]
 
     varunits = []
@@ -628 +628 @@
         [dimvals/c]: list of [dimname]|[value] telling at which dimension of the 
           variable a given value is required (no dimension name, all the length)
-        [dimx/yvn]: ',' list with the name of the variables with the values of the dimensions
+        [dimxvn]: name of the variables with the values of the dimension of the x-axis
+        [dimyvn]: name of the variables with the values of the dimension of the y-axis
         [colorbar]: name of the color bar
         [ckind]: kind of contours 
@@ -744 +745 @@
     valcont, dimscont = drw.slice_variable(objvarc, dimvalc.replace(',','|'))
 
-    dimnamesv = [vdimyn, vdimxn]
+    dimnamesv = [vdimxn, vdimyn]
 
     varunits = []
@@ -923 +924 @@
 ##                break
 ##        if not cutdim: dimnamesv.append(objvars.dimensions[idd])
-    dimnamesv = [vdimyn, vdimxn]
+    dimnamesv = [vdimxn, vdimyn]
 
     varunits = objvars.getncattr('units')
@@ -1068 +1069 @@
     valshad, dimsshad = drw.slice_variable(objvars, dimvals.replace(',','|'))
 
-    dimnamesv = [vdimyn, vdimxn]
+    dimnamesv = [vdimxn, vdimyn]
 
     varunits = objvars.getncattr('units')

trunk/tools/drawing_tools.py

@@ -1517 +1517 @@
 
     newvals = vals.copy()
+
+    # values
     wdvx = False
     if dxv != '0':
@@ -1530 +1532 @@
         newdyv = None
 
+    # ticks
     wdtx = False
     if dxt != '0':
@@ -1543 +1546 @@
         newdyt = None
 
+    # label in ticks
     wdlx = False
     if dxl != '0':
@@ -1556 +1560 @@
         newdyl = None
 
+    # axes' title
     wdTx = False
     if dxt != '0':
@@ -1667 +1672 @@
 #xtit = 'Longitude'
 #ytit = 'Latitude'
-#nv, ndxv, ndyv, ndxt, ndyt, dxl, ndyl, ndxT, ndyT = transform(mat, 'transpose', \
+#nv, ndxv, ndyv, ndxt, ndyt, dxl, ndyl, ndxT, ndyT = transform(mat, 'flip@y', \
 #      xvals, yvals, xticks, yticks, xticklab, yticklab, xtit, ytit)
-
+#
 #print nv, ndxv, ndyv, ndxt, ndyt, dxl, ndyl, ndxT, ndyT
 #quit()
@@ -4827 +4832 @@
 # contour
 ##
-    print fname + '; Lluis: shapes x:', x.shape,'y:',y.shape,'varcv:',varcv.shape
     contkind = ckind.split(',')[0]
     if contkind == 'cmap':
@@ -4939 +4943 @@
 
     # Usually axis > x must be the time, thus...
-    dimxv0 = valv.copy()
-    dimyv0 = timv.copy()
-    dimxt0 = np.array(pretty_int(valv.min(),valv.max(),10))
-    dimyt0 = np.array(timpos)
-    dimxl0 = []
-    for i in range(len(dimxt0)): dimxl0.append(str(dimxt0[i]))
-    dimyl0 = list(timlab)
-    dimxT0 = variables_values(dimn[0])[0] + ' (' + units_lunits(valu) + ')'
-    dimyT0 = timeu
+    if axist == 'x':
+        dimxv0 = valv.copy()
+        dimyv0 = timv.copy()
+        dimxt0 = np.array(pretty_int(valv.min(),valv.max(),10))
+        dimyt0 = np.array(timpos)
+        dimxl0 = []
+        for i in range(len(dimxt0)): dimxl0.append(str(dimxt0[i]))
+        dimyl0 = list(timlab)
+        dimxT0 = variables_values(dimn[1])[0] + ' (' + units_lunits(valu) + ')'
+        dimyT0 = timeu
+    else:
+        dimxv0 = timv.copy()
+        dimyv0 = valv.copy()
+        dimxt0 = np.array(timpos)
+        dimyt0 = np.array(pretty_int(valv.min(),valv.max(),10))
+        dimxl0 = list(timlab)
+        dimyl0 = []
+        for i in range(len(dimyt0)): dimyl0.append(str(dimyt0[i]))
+        dimxT0 = timeu
+        dimyT0 = variables_values(dimn[0])[0] + ' (' + units_lunits(valu) + ')'
 
     if axist == 'x':