Changeset 381 in lmdz_wrf for trunk/tools/drawing.py

Timestamp:

Mar 23, 2015, 11:30:25 AM (10 years ago)

Author:

lfita

Message:

More correct search for values of the dimensions

File:

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

trunk/tools/drawing.py

@@ -378 +378 @@
         [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
+        [dimx/yvn]: names of the variables with the values of the dimensions for the plot
         [colorbar]: name of the color bar
         [ckind]: kind of contours 
@@ -519 +519 @@
     odimyu = objdimy.getncattr('units')
 
-    if len(objdimx.shape) <= 2:
-#        odimxv = objdimx[valshad.shape]
-#        odimyv = objdimy[valshad.shape]
-        odimxv = objdimx[:]
-        odimyv = objdimy[:]
-
-    elif len(objdimx.shape) == 3:
-#        dimcut = [0, slice(0,valshad.shape[0]), slice(0,valshad.shape[1])]
-#        odimxv = objdimx[tuple(dimcut)]
-#        odimyv = objdimy[tuple(dimcut)]
-        odimxv = objdimx[0,:]
-        odimyv = objdimy[0,:]
-    else:
-        print errormsg
-        print '  ' + fname + ': shape of dimension variable:', objdimx.shape,        \
-          ' not ready!!'
-        quit(-1)
+# Getting only tat dimensions with coincident names
+    dimnvx = objdimx.dimensions
+    cutslice = []
+    for idimn in objdimx.dimensions:
+        if idimn == dimxvn:
+            cutslice.append(slice(0,len(objsf.dimensions(idimn))))
+        else:
+            cutslice.append(0)
+
+    odimxv = objdimx[tuple(cutslice)]
+
+    dimnvy = objdimy.dimensions
+    cutslice = []
+    for idimn in objdimy.dimensions:
+        if idimn == dimyvn:
+            cutslice.append(slice(0,len(objsf.dimensions(idimn))))
+        else:
+            cutslice.append(0)
+
+    odimyv = objdimy[tuple(cutslice)]
+
+#    if len(objdimx.shape) <= 2:
+#        odimxv = objdimx[:]
+#        odimyv = objdimy[:]
+#    elif len(objdimx.shape) == 3:
+#        odimxv = objdimx[0,:]
+#        odimyv = objdimy[0,:]
+#    else:
+#        print errormsg
+#        print '  ' + fname + ': shape of dimension variable:', objdimx.shape,        \
+#          ' not ready!!'
+#        quit(-1)
 
     if countlabelfmt == 'None':