Changeset 877

Timestamp:

Feb 11, 2013, 5:21:29 PM (12 years ago)

Author:

aslmd

Message:

UTIL PYTHON. A bug fix for previous commit. Ensure that what is coming from getfieldred has not changed dimension.

Location:

trunk/UTIL/PYTHON

Files:

• myplot.py (modified) (2 diffs)
• planetoplot.py (modified) (2 diffs)

trunk/UTIL/PYTHON/myplot.py

@@ -97 +97 @@
     dimension = len(nc.variables[var].dimensions) 
     ## this allows to get much faster and use much less memory esp. with large datasets
-    if dimension == 2:    field = nc.variables[var][indextime,indexlon]
-    elif dimension == 3:  field = nc.variables[var][indextime,indexlat,indexlon]
-    elif dimension == 4:  field = nc.variables[var][indextime,indexvert,indexlat,indexlon]
-    elif dimension == 1:  field = nc.variables[var][indextime]
+    print "   Opening variable",var," with", dimension, "dimensions ..."
+    if dimension == 2:    
+        field = nc.variables[var][indextime,indexlon]
+        field = np.reshape(field,(len(indextime),len(indexlon)))
+    elif dimension == 3:  
+        field = nc.variables[var][indextime,indexlat,indexlon]
+        field = np.reshape(field,(len(indextime),len(indexlat),len(indexlon)))
+    elif dimension == 4:  
+        field = nc.variables[var][indextime,indexvert,indexlat,indexlon]
+        field = np.reshape(field,(len(indextime),len(indexvert),len(indexlat),len(indexlon)))
+    elif dimension == 1:  
+        field = nc.variables[var][indextime]
+        field = np.reshape(field,(len(indextime)))
     return field
 
@@ -1358 +1367 @@
    shape = what_I_plot.shape
    if indextime is None and len(time) > 1:
-      print "AXIS is time"
+      #print "AXIS is time"
       x = time
       count = count+1
    if indexlon is None and len(lon) > 1 and redope not in ['edge_x1','edge_x2']:
-      print "AXIS is lon"
+      #print "AXIS is lon"
       if count == 0: x = lon
       else: y = lon
       count = count+1
    if indexlat is None and len(lat) > 1 and redope not in ['edge_y1','edge_y2']:
-      print "AXIS is lat"
+      #print "AXIS is lat"
       if count == 0: x = lat
       else: y = lat
       count = count+1
    if indexvert is None and len(vert) > 1 and ((dim0 == 4) or (y is None)):
-      print "AXIS is vert"
+      #print "AXIS is vert"
       if vertmode == 0: # vertical axis is as is (GCM grid)
          if count == 0: x=range(len(vert))

trunk/UTIL/PYTHON/planetoplot.py

@@ -388 +388 @@
         else:                  itime = range(len(time))
 
-        all_time[k] = time[itime]
-        all_vert[k] = vert[ivert]
-        all_lat[k]  = lat[ilat]
-        all_lon[k]  = lon[ilon]
-
         all_var[k] = myplot.getfieldred(nc,all_varname[k],ilon,ilat,ivert,itime)
         if var2:   all_var2[k] = myplot.getfieldred(nc,var2,ilon,ilat,ivert,itime)
@@ -399 +394 @@
             all_windv[k] = myplot.getfield(nc,vchar,ilon,ilat,ivert,itime)
         plot_x[k] = None ; plot_y[k] = None
+        
+        all_time[k] = time[itime]
+        all_vert[k] = vert[ivert]
+        all_lat[k]  = lat[ilat]
+        all_lon[k]  = lon[ilon]
 
       else: