Changeset 418 for trunk/UTIL/PYTHON/mcs.py

Timestamp:

Nov 23, 2011, 4:39:01 PM (13 years ago)

Author:

acolaitis

Message:

PYTHON. Moved the nolow mode to an option (--nolow) and re-arranged the way -H worked in planetoplot, by introducing a new function (hole_bounds). Bounds is called in normal cases and hole_bounds in -H cases. Minor corrections in mcs.py for missing values comming from zrecast.

File:

• trunk/UTIL/PYTHON/mcs.py (modified) (7 diffs)

trunk/UTIL/PYTHON/mcs.py

@@ -60 +60 @@
                     fields  = varznames, \
                     predifined = 'mcs')[0]
-
+   else:filename=opt.file
    # Files
 
@@ -122 +122 @@
    for zn in varznames:
        load=getfield(nc,zn)
-       if opt.zrecast:
-          load=np.ma.masked_where(load < -1.e-30,load)
-          load.set_fill_value([np.NaN])
-          load=load.filled()
+       load=np.ma.masked_where(load < -1.e-20,load)
+       load.set_fill_value([np.NaN])
+       load=load.filled()
+       load=np.ma.masked_invalid(load)
+       load.set_fill_value([np.NaN])
+       load=load.filled()
        varz.append(load)
+       load=0.
        print "Found: "+zn+" with dimensions: "
        print np.array(varz[n]).shape
@@ -193 +196 @@
               varchk[vv,:,:,:,:]=variable[istart:istop+1,:,:,:]
            vv=vv+1
+       varchk=np.ma.masked_invalid(varchk)
+       varchk.set_fill_value([np.NaN])
        varchktime=time[istart:istop+1]
        ndays=np.floor(varchktime[len(varchktime)-1])-np.floor(varchktime[0])
@@ -199 +204 @@
        ntmichk=ntimemin[i,:,:]
        ntmachk=ntimemax[i,:,:]
-       dtmichk.set_fill_value(np.NaN)
-       dtmachk.set_fill_value(np.NaN)
-       ntmichk.set_fill_value(np.NaN)
-       ntmachk.set_fill_value(np.NaN)
+       dtmichk.set_fill_value([np.NaN])
+       dtmachk.set_fill_value([np.NaN])
+       ntmichk.set_fill_value([np.NaN])
+       ntmachk.set_fill_value([np.NaN])
        dtmichk=dtmichk.filled()
        dtmachk=dtmachk.filled()
@@ -215 +220 @@
        vartmpnight=np.zeros([nzvar,ndays,nz,ny,nx])
        vartmpday=np.zeros([nzvar,ndays,nz,ny,nx])
+       vartmpnight=np.ma.masked_invalid(vartmpnight)
+       vartmpday=np.ma.masked_invalid(vartmpday)
+       vartmpnight.set_fill_value([np.NaN])
+       vartmpday.set_fill_value([np.NaN])
+
        nd=0
        print "     .time indices MCS grid -> diagfi grid."
@@ -239 +249 @@
                        vartmpday[vv,nd,:,iy,ix]=np.NaN
                    elif nitdtmichk > nitdtmachk:
-                       vartmpday[vv,nd,:,iy,ix]=(np.mean(varchk[vv,daystart+nitdtmichk:daystop+1,:,iy,ix],axis=0)+np.mean(varchk[vv,daystart:daystart+nitdtmachk+1,:,iy,ix],axis=0))/2.
+                       vartmpday[vv,nd,:,iy,ix]=(np.ma.mean(varchk[vv,daystart+nitdtmichk:daystop+1,:,iy,ix],axis=0)+np.ma.mean(varchk[vv,daystart:daystart+nitdtmachk+1,:,iy,ix],axis=0))/2.
                    else:
-                       vartmpday[vv,nd,:,iy,ix]=np.mean(varchk[vv,daystart+nitdtmichk:daystart+nitdtmachk+1,:,iy,ix],axis=0)
+                       vartmpday[vv,nd,:,iy,ix]=np.ma.mean(varchk[vv,daystart+nitdtmichk:daystart+nitdtmachk+1,:,iy,ix],axis=0)
                    if ((nitntmichk is np.NaN) or (nitntmachk is np.NaN)):
                        vartmpnight[vv,nd,:,iy,ix]=np.NaN
                    elif nitntmichk > nitntmachk:
-                       vartmpnight[vv,nd,:,iy,ix]=(np.mean(varchk[vv,daystart+nitntmichk:daystop+1,:,iy,ix],axis=0)+np.mean(varchk[vv,daystart:daystart+nitntmachk+1,:,iy,ix],axis=0))/2.
+                       vartmpnight[vv,nd,:,iy,ix]=(np.ma.mean(varchk[vv,daystart+nitntmichk:daystop+1,:,iy,ix],axis=0)+np.ma.mean(varchk[vv,daystart:daystart+nitntmachk+1,:,iy,ix],axis=0))/2.
                    else:                                                            
-                       vartmpnight[vv,nd,:,iy,ix]=np.mean(varchk[vv,daystart+nitntmichk:daystart+nitntmachk+1,:,iy,ix],axis=0)
+                       vartmpnight[vv,nd,:,iy,ix]=np.ma.mean(varchk[vv,daystart+nitntmichk:daystart+nitntmachk+1,:,iy,ix],axis=0)
                 iy=iy+1
              ix=ix+1
@@ -256 +266 @@
        vartmpdaymasked=np.ma.masked_invalid(vartmpday)
        vartmpnightmasked=np.ma.masked_invalid(vartmpnight)
+       vartmpdaymasked.set_fill_value([np.NaN])
+       vartmpnightmasked.set_fill_value([np.NaN])
        for vv in np.arange(nzvar):
           vardayout[vv,i,:,:,:]=np.ma.mean(vartmpdaymasked[vv,:,:,:,:],axis=0)