Changeset 350 for trunk/MESOSCALE/LMD_MM_MARS/SRC/PYTHON/myplot.py

Timestamp:

Nov 6, 2011, 9:28:12 PM (13 years ago)

Author:

aslmd

Message:

PYTHON: improvements on handling 1D 2D slices for gcm and meso. a few minor corrections added for the scripts to work better. it might be possible at some point to merge meso.py and gcm.py, wait and see.

File:

• trunk/MESOSCALE/LMD_MM_MARS/SRC/PYTHON/myplot.py (modified) (6 diffs)

trunk/MESOSCALE/LMD_MM_MARS/SRC/PYTHON/myplot.py

@@ -68 +68 @@
     output = input
     error = False
-    ### this is needed to cope the case where d4,d3,d2,d1 are single integers and not arrays
+    #### this is needed to cope the case where d4,d3,d2,d1 are single integers and not arrays
     if d4 is not None and not isinstance(d4, np.ndarray): d4=[d4]
     if d3 is not None and not isinstance(d3, np.ndarray): d3=[d3]
@@ -77 +77 @@
         if   d2 >= shape[0]: error = True
         elif d1 >= shape[1]: error = True
-        elif d1 is not None and d2 is not None:  output = input[d2,d1]
-        elif d1 is not None:         output = input[:,d1]
-        elif d2 is not None:         output = input[d2,:]
+        elif d1 is not None and d2 is not None:  output = mean(input[d2,:],axis=0); output = mean(output[d1],axis=0)
+        elif d1 is not None:         output = mean(input[:,d1],axis=1)
+        elif d2 is not None:         output = mean(input[d2,:],axis=0)
     elif dimension == 3:
         if   max(d4) >= shape[0]: error = True
         elif max(d2) >= shape[1]: error = True
         elif max(d1) >= shape[2]: error = True
-        elif d4 is not None and d2 is not None and d1 is not None:  output = input[d4,d2,d1]
+        elif d4 is not None and d2 is not None and d1 is not None:  
+            output = mean(input[d4,:,:],axis=0); output = mean(output[d2,:],axis=0); output = mean(output[d1],axis=0)
         elif d4 is not None and d2 is not None:    output = mean(input[d4,:,:],axis=0); output=mean(output[d2,:],axis=0)
         elif d4 is not None and d1 is not None:    output = mean(input[d4,:,:],axis=0); output=mean(output[:,d1],axis=1)
@@ -96 +97 @@
         elif max(d2) >= shape[2]: error = True
         elif max(d1) >= shape[3]: error = True
-        elif d4 is not None and d3 is not None and d2 is not None and d1 is not None:  output = input[d4,d3,d2,d1]
-        elif d4 is not None and d3 is not None and d2 is not None:         output = input[d4,d3,d2,:]
-        elif d4 is not None and d3 is not None and d1 is not None:         output = input[d4,d3,:,d1]
-        elif d4 is not None and d2 is not None and d1 is not None:         output = input[d4,:,d2,d1]
-        elif d3 is not None and d2 is not None and d1 is not None:         output = input[:,d3,d2,d1]
+        elif d4 is not None and d3 is not None and d2 is not None and d1 is not None:  
+            output = mean(input[d4,:,:,:],axis=0); output = mean(output[d3,:,:],axis=0); output = mean(output[d2,:],axis=0); output = mean(output[d1],axis=0)
+        elif d4 is not None and d3 is not None and d2 is not None: 
+            output = mean(input[d4,:,:,:],axis=0); output = mean(output[d3,:,:],axis=0); output = mean(output[d2,:],axis=0)
+        elif d4 is not None and d3 is not None and d1 is not None: 
+            output = mean(input[d4,:,:,:],axis=0); output = mean(output[d3,:,:],axis=0); output = mean(output[:,d1],axis=1)
+        elif d4 is not None and d2 is not None and d1 is not None: 
+            output = mean(input[d4,:,:,:],axis=0); output = mean(output[:,d2,:],axis=1); output = mean(output[:,d1],axis=1)
+        elif d3 is not None and d2 is not None and d1 is not None: 
+            output = mean(input[:,d3,:,:],axis=1); output = mean(output[:,d2,:],axis=1); output = mean(output[:,d1],axis=1) 
         elif d4 is not None and d3 is not None:  output = mean(input[d4,:,:,:],axis=0); output = mean(output[d3,:,:],axis=0)
         elif d4 is not None and d2 is not None:  output = mean(input[d4,:,:,:],axis=0); output = mean(output[:,d2,:],axis=1)
@@ -107 +113 @@
         elif d3 is not None and d1 is not None:  output = mean(input[:,d3,:,:],axis=1); output = mean(output[:,:,d1],axis=0)
         elif d2 is not None and d1 is not None:  output = mean(input[:,:,d2,:],axis=2); output = mean(output[:,:,d1],axis=2)
-        elif d1 is not None:                       output = input[:,:,:,d1]
-        elif d2 is not None:                       output = input[:,:,d2,:]
-        elif d3 is not None:                       output = input[:,d3,:,:]
-        elif d4 is not None:                       output = input[d4,:,:,:]
+        elif d1 is not None:                     output = mean(input[:,:,:,d1],axis=3)
+        elif d2 is not None:                     output = mean(input[:,:,d2,:],axis=2)
+        elif d3 is not None:                     output = mean(input[:,d3,:,:],axis=1)
+        elif d4 is not None:                     output = mean(input[d4,:,:,:],axis=0)
     dimension = np.array(output).ndim
     shape = np.array(output).shape
@@ -801 +807 @@
    shape = what_I_plot.shape
    if indextime is None:
+      print "axis is time"
       x = time
       count = count+1
    if indexlon is None:
+      print "axis is lon"
       if count == 0: x = lon
       else: y = lon
       count = count+1
    if indexlat is None:
+      print "axis is lat"
       if count == 0: x = lat
       else: y = lat
       count = count+1
    if indexvert is None and dim0 is 4:
+      print "axis is vert"
       if vertmode == 0: # vertical axis is as is (GCM grid)
          if count == 0: x=range(len(vert))
@@ -822 +832 @@
    x = array(x)
    y = array(y)
+   print "what_I_plot.shape", what_I_plot.shape
+   print "x.shape, y.shape", x.shape, y.shape
    if len(shape) == 1:
-      if shape != len(x):
+      print shape[0]
+      if shape[0] != len(x):
          print "WARNING HERE !!!"
          x = y