Changeset 1415 in lmdz_wrf for trunk/tools

Timestamp:

Jan 18, 2017, 8:06:29 AM (8 years ago)

Author:

lfita

Message:

Adding `masked' variables on 'curve_section'

File:

• trunk/tools/nc_var_tools.py (modified) (4 diffs)

trunk/tools/nc_var_tools.py

@@ -14718 +14718 @@
         quit(-1)
 
-    if gen.searchInlist(varo.ncattrs(), 'missing_value'):
+    varo[:] = newvarvals[:]
+    varattrs = varo.ncattrs()
+    print 'varattrs 1:', varattrs
+
+    if gen.searchInlist(varattrs, 'missing_value'):
         missval = varo.getncattr('missing_value')
         difvals = fval*10.**(-np.log10(valchk)) - missval*10.**(-np.log10(missval))
@@ -14726 +14730 @@
             print '   renaming missing_value'
             varo.delncattr('missing_value')
-            set_attribute(varo, '_FillValue', fval)
-        else:
-            set_attribute(varo, '_FillValue', fval)
+
+    if not gen.searchInlist(varattrs, '_FillValue'):
+        set_attribute(varo, '_FillValue', fval)
     else:
+        varo.delncattr('_FillValue')
         set_attribute(varo, '_FillValue', fval)
-
-    varo[:] = newvarvals
 
     onc.sync()
@@ -18422 +18425 @@
         sortedwgt.sort(reverse=True)
 
-#        print fname + '; Lluis icv:', icv ,' _____', Nwgt[icv]
         for isp in range(Nwgt[icv]):
             dictslice[ydn] = iy + int(ijcurv[icv,0,isp])
@@ -18428 +18430 @@
             varslice, dimvarvals = SliceVarDict(ov, dictslice)
             iwgt = sortedwgt[isp]
-            curvevar[...,icv] = curvevar[...,icv] + ov[tuple(varslice)]*iwgt
-#            print '    isp:', isp, 'iwgt:', iwgt, '<>', iy + int(ijcurv[icv,0,isp]), \
-#              ix + int(ijcurv[icv,1,isp]), 'ival:', ov[tuple(varslice)][0,0], 'curvevar:', curvevar[0,0,icv]
+            vaL = ov[tuple(varslice)]*iwgt
+
+            # Is the variable masked?
+            if type(ov[:]) == type(gen.mamat):
+                curvevar[...,icv] = np.where(ov[:].mask[tuple(varslice)],        \
+                   gen.fillValueF, curvevar[...,icv] + vaL)
+            else:
+                curvevar[...,icv] = curvevar[...,icv] + ov[tuple(varslice)]*iwgt
 
     return curvevar