Changeset 477 in lmdz_wrf

Timestamp:

Jun 12, 2015, 11:03:07 AM (10 years ago)

Author:

lfita

Message:

Adding `dxdy_lonlatDIMS' to retrieve lon,lat matrices from the 'dimensions' list and values names

Location:

trunk/tools

Files:

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

trunk/tools/drawing.py

@@ -169 +169 @@
         odimyu = '-'
 
-    odimxv, odimyv = dxdy_lonlatDIMS(objdimx[:], objdimy[:], objdimx.dimensions,     \
-      objdimy.dimensions, dimvals)
+    odimxv, odimyv = drw.dxdy_lonlatDIMS(objdimx[:], objdimy[:], objdimx.dimensions,     \
+      objdimy.dimensions, dimvals.replace(':','|').split(','))
+
 
 #    if len(objdimx.shape) <= 2:

trunk/tools/drawing_tools.py

@@ -4548 +4548 @@
     fname = 'dxdy_lonlatDIMS'
 
-    print 'Lluis which dimensions x:',ddx,'y:',ddy
-
     slicex = []
     ipos=0
@@ -4558 +4556 @@
             if dn == dname:
                 if dvalue == -1:
-                    slicex.append(slice(0,len(dxv.shape[ipos])))
+                    slicex.append(slice(0,dxv.shape[ipos]))
                 else:
                     slicex.append(dvalue)
@@ -4572 +4570 @@
             if dn == dname:
                 if dvalue == -1:
-                    slicey.append(slice(0,len(dyv.shape[ipos])))
+                    slicey.append(slice(0,dyv.shape[ipos]))
                 else:
                     slicey.append(dvalue)
@@ -4578 +4576 @@
         ipos = ipos + 1
 
-
-    if len(dxv.shape) > 1:
-        for idim in range(len(dxv.shape)):
-            if idim == ddxx or idim == ddxy:
-                slicex.append(slice(0,dxv.shape[idim]))
-            else:
-                slicex.append(0)
-    else:
-        slicex.append(slice(0,len(dxv)))
-
-    slicey = []
-    if len(dyv.shape) > 1:
-        for idim in range(len(dyv.shape)):
-            if idim == ddyx or idim == ddyy:
-                slicey.append(slice(0,dyv.shape[idim]))
-            else:
-                slicey.append(0)
-    else:
-        slicey.append(slice(0,len(dyv)))
 
     lonv = dxv[tuple(slicex)]