Changeset 391

Timestamp:

Nov 16, 2011, 3:11:06 PM (13 years ago)

Author:

acolaitis

Message:

PYTHON. Corrected the way missing values are handled for 2D plots. They now don't affect plot boundary computations, do not provok color gradient near plot boundary edges. Moreover, mean function has been modified to return a value when averaging over a missing value and a real value.

Location:

trunk/UTIL/PYTHON

Files:

• mymath.py (modified) (4 diffs)
• myplot.py (modified) (1 diff)
• planetoplot.py (modified) (1 diff)

trunk/UTIL/PYTHON/mymath.py

@@ -12 +12 @@
         import numpy as np
         if field is None: return None
-        else: return np.array(field).mean(axis=axis)
+        else: 
+           if type(field).__name__=='MaskedArray':
+              field.set_fill_value(np.NaN)
+              zout=np.ma.array(field).mean(axis=axis)
+#              np.ma.masked_invalid(zout)
+              zout.set_fill_value(np.NaN)
+              return zout.filled()
+           else: 
+              return np.array(field).mean(axis=axis)
 
 def deg ():
@@ -27 +35 @@
 
 # A.C. routine to compute saturation temperature
+# Be Carefull, when asking for tsat-t, this routine outputs a masked array.
+# To be correctly handled, this call to tsat must be done before the call to
+# reduce_field, which handles correctly masked array with the new mean() function.
 def get_tsat(pressure,temp=None,zlon=None,zlat=None,zalt=None,ztime=None):
     import math as mt
@@ -55 +66 @@
       output=np.zeros(np.array(temp).shape)
       vardim=get_dim(zlon,zlat,zalt,ztime,temp)
-#      m=np.ma.masked_where(temp[temp == -1],temp,copy=False)
-#      print temp
-#      mindex=np.ma.nonzero(m.mask)
-#      print mindex[0]
       if 'altitude' not in vardim.keys():
          print 'no altitude coordinate in temperature field for Tsat computation'
@@ -103 +110 @@
            exit()
         i=i+1
-    m=np.ma.masked_where(temp == 0,temp,copy=False)
-    zoutput=np.ma.array(output,mask=m.mask)#,fill_value=-999999)
-    zout=zoutput.filled()
-    return zout
+    m=np.ma.masked_invalid(temp,copy=False)
+    zoutput=np.ma.array(output,mask=m.mask,fill_value=np.NaN)
+#    zout=zoutput.filled()
+    return zoutput
 
 # A.C. Dirty routine to determine where are the axis of a variable

trunk/UTIL/PYTHON/myplot.py

@@ -128 +128 @@
     from scipy import integrate
     if yint:
-       output = integrate.trapz(input,x=vert,axis=ax)
+       if type(input).__name__=='MaskedArray':
+          input.set_fill_value([np.NaN])
+          output = integrate.trapz(input.filled(),x=vert,axis=ax)
+       else:
+          output = integrate.trapz(input.filled(),x=vert,axis=ax)
     else:
        output = mean(input,axis=ax)

trunk/UTIL/PYTHON/planetoplot.py

@@ -170 +170 @@
           print "computing Tsat-T, I ASSUME Z-AXIS IS PRESSURE"
           tt=getfield(nc,var)
-          tt.set_fill_value([0])
-          all_var[k]=get_tsat(vert,tt,zlon=lon,zlat=lat,zalt=vert,ztime=time)
+          if type(tt).__name__=='MaskedArray':
+             tt.set_fill_value([np.NaN])
+             tinput=tt.filled()
+          else:
+             tinput=tt
+          all_var[k]=get_tsat(vert,tinput,zlon=lon,zlat=lat,zalt=vert,ztime=time)
       else:
          if var: all_var[k] = getfield(nc,var)