Changeset 641 in lmdz_wrf for trunk

Timestamp:

Sep 19, 2015, 12:28:04 PM (10 years ago)

Author:

lfita

Message:

Adding cutting of the values of the axes on 'draw_2D_shad_time'

File:

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

trunk/tools/drawing.py

@@ -340 +340 @@
 
 # Dimensional values
-    dimscut = {}
-    for dv in dimvals:
-        print dv
-        dvn = dv.split(':')[0]
-        dvv = dv.split(':')[1]
-        if dvv.find('@') != -1:
-            dimscut[dvn] = slice(int(dvv.split('@')[0]),int(dvv.split('@')[1]))
-        else:
-            if dvv == -1:
-                dnL = len(objsf.dimensions[dvn]) 
-                dimscut[dvn] = slice(0,dnL)
-            else:
-                dimscut[dvn] = slice(dvv,dvv)
-
-    if not dr.searchInlist(dimscut.keys(), vdimxn):
-        dnL = len(objsf.dimensions[vdimxn]) 
-        dimscut[vdimxn] = slice(0,dnL)
-    if not dr.searchInlist(dimscut.keys(), vdimyn):
-        dnL = len(objsf.dimensions[vdimyn]) 
-        dimscut[vdimyn] = slice(0,dnL)
+    odxv, dimsdxv = drw.slice_variable(objsf.variables[vdimxn], dimvals.replace(',','|'))
+    odyv, dimsdyv = drw.slice_variable(objsf.variables[vdimyn], dimvals.replace(',','|'))
 
     if vdimxn == timename:
-#        odimxv = objsf.variables[vdimxn][:]
-        odimxv = objsf.variables[vdimxn][tuple(dimscut[vdimxn])]
+        odimxv = objsf.variables[vdimxn][:]
         odimxu = timelabel
         timeaxis = 'x'
-        odimyv = objsf.variables[vdimyn][tuple(dimscut[vdimyn])]
+        odimyv = objsf.variables[vdimyn]
         odimyu = odimyv.getncattr('units')
-        timepos, timelabels = drw.CFtimes_plot(odimxv, timeunit, timekind, timefmt)
+        timepos, timelabels = drw.CFtimes_plot(odxv, timeunit, timekind, timefmt)
     elif vdimyn == timename:
-        odimyv = objsf.variables[vdimyn][tuple(dimscut[vdimyn])]
+        odimyv = objsf.variables[vdimyn]
         odimyu = timelabel
         timeaxis = 'y'
-        odimxv = objsf.variables[vdimxn][tuple(dimscut[vdimxn])]
+        odimxv = objsf.variables[vdimxn]
         odimxu = odimxv.getncattr('units')
-        timepos, timelabels = drw.CFtimes_plot(odimyv, timeunit, timekind, timefmt)
+        timepos, timelabels = drw.CFtimes_plot(odyv, timeunit, timekind, timefmt)
     else:
         print errormsg
@@ -394 +375 @@
     closeval = drw.Str_Bool(close)
 
-    drw.plot_2D_shadow_time(valshad, vnamesfig, odimxv, odimyv, odimxu, odimyu,      \
+    drw.plot_2D_shadow_time(valshad, vnamesfig, odxv, odyv, odimxu, odimyu,          \
       dimnamesv, colbarn, shading_nx, varunits, figtitle, figkind, revals, timeaxis, \
       timepos, timelabels, closeval)