Changeset 427 for trunk/UTIL/PYTHON/mymath.py

Timestamp:

Nov 30, 2011, 10:05:32 AM (13 years ago)

Author:

acolaitis

Message:

PYTHON. Corrected bugs related to contour plots with overlines, and mymath.mean() with no Axis specified. Now working on LES format for pp.py... :)

File:

• trunk/UTIL/PYTHON/mymath.py (modified) (1 diff)

trunk/UTIL/PYTHON/mymath.py

@@ -26 +26 @@
               field.set_fill_value(np.NaN)
               zout=np.ma.array(field).mean(axis=axis)
-              zout.set_fill_value(np.NaN)
-              return zout.filled()
+              if axis is not None:
+                 zout.set_fill_value(np.NaN)
+                 return zout.filled()
+              else:return zout
            elif (np.isnan(np.sum(field)) and (type(field).__name__ not in 'MaskedArray')):
               zout=np.ma.masked_invalid(field).mean(axis=axis)
-              zout.set_fill_value([np.NaN])
-              return zout.filled()
+              if axis is not None:
+                 zout.set_fill_value([np.NaN])
+                 return zout.filled()
+              else:return zout
            else: 
               return np.array(field).mean(axis=axis)