Changeset 489 in lmdz_wrf for trunk/tools

Timestamp:

Jun 12, 2015, 5:47:18 PM (10 years ago)

Author:

lfita

Message:

Adding use of `dxdy_lonlatDIMS' on 'shad_contour'
Removing some residual debug printings...

Location:

trunk/tools

Files:

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

trunk/tools/drawing.py

@@ -530 +530 @@
 
 # Getting only that dimensions with coincident names
-    dimnvx = objdimx.dimensions
-    cutslice = []
-    for idimn in objdimx.dimensions:
-        found = False
-        for dimsn in dimsshad:
-            if idimn == dimsn:
-                cutslice.append(slice(0,len(objsf.dimensions[idimn])))
-                found = True
-        if not found: cutslice.append(0)
-
-    odimxv = objdimx[tuple(cutslice)]
-
-    dimnvy = objdimy.dimensions
-    cutslice = []
-    for idimn in objdimy.dimensions:
-        found = False
-        for dimsn in dimsshad:
-            if idimn == dimsn:
-                cutslice.append(slice(0,len(objsf.dimensions[idimn])))
-                found = True
-        if not found: cutslice.append(0)
-
-    odimyv = objdimy[tuple(cutslice)]
+    odimxv, odimyv = drw.dxdy_lonlatDIMS(objdimx[:], objdimy[:], objdimx.dimensions,     \
+      objdimy.dimensions, dimvals.replace(':','|').split(','))
+
+#    dimnvx = objdimx.dimensions
+#    cutslice = []
+#    for idimn in objdimx.dimensions:
+#        found = False
+#        for dimsn in dimsshad:
+#            if idimn == dimsn:
+#                cutslice.append(slice(0,len(objsf.dimensions[idimn])))
+#                found = True
+#        if not found: cutslice.append(0)
+#
+#    odimxv = objdimx[tuple(cutslice)]
+#
+#    dimnvy = objdimy.dimensions
+#    cutslice = []
+#    for idimn in objdimy.dimensions:
+#        found = False
+#        for dimsn in dimsshad:
+#            if idimn == dimsn:
+#                cutslice.append(slice(0,len(objsf.dimensions[idimn])))
+#                found = True
+#        if not found: cutslice.append(0)
+#
+#    odimyv = objdimy[tuple(cutslice)]
 
 #    if len(objdimx.shape) <= 2:

trunk/tools/drawing_tools.py

@@ -3847 +3847 @@
     fname = 'plot_2D_shadow_contour'
 
-
     if varsv == 'h':
         print fname + '_____________________________________________________________'
@@ -4400 +4399 @@
     fname = 'dxdy_lonlat'
 
-    print 'Lluis which dimensions x:',ddx,'y:',ddy
-
     if ddx.find(',') > -1:
         dxk = 2
@@ -4446 +4443 @@
     else:
         slicey.append(slice(0,len(dyv)))
-
-    print '    ' + fname + ' Lluis shapes dxv:',dxv.shape,'dyv:',dyv.shape 
-    print '    ' + fname + ' Lluis slicex:',slicex,'slicey:',slicey
-    print '    final shapes x:',len(dxv.shape)-len(ddx),'y:',len(dyv.shape)-len(ddy) 
 
     if dxk == 2 and dyk == 2: