Changeset 1558 in lmdz_wrf for trunk/tools/generic_tools.py

Timestamp:

May 9, 2017, 3:48:14 PM (8 years ago)

Author:

lfita

Message:

Adding management of error response in `mask_quantiles'

File:

• trunk/tools/generic_tools.py (modified) (2 diffs)

trunk/tools/generic_tools.py

@@ -19 +19 @@
 main = 'nc_var_tools.py'
 
-errormsg='ERROR -- error -- ERROR -- error'
-warnmsg='WARNING -- warning -- WARNING -- warning'
+errormsg = 'ERROR -- error -- ERROR -- error'
+warnmsg = 'WARNING -- warning -- WARNING -- warning'
+infmsg = 'INFORMATION -- information -- INFORMATION -- information'
 
 fillValue = 1.e20
@@ -3688 +3689 @@
     return pearsonr
 
-def mask_quantiles(maskmat, Nquants):
+def mask_quantiles(maskmat, Nquants, Notenough=True):
     """ Function to provide the quantiles of a masked array 20 for %5 bins (21 in total)
     """
     import numpy.ma as ma
-
-    fillValue = 1.e20
-
+    fname = 'mask_quantiles'
+
+    if type(maskmat) != type(mamat):
+        maskvals = np.zeros((maskmat.shape), dtype=bool)
+    else:
+        maskvals = maskmat.mask
     sortmat = maskmat.flatten().copy()
     sortmat.sort()
     quants = np.zeros(Nquants+1, dtype=type(maskmat[0]))
     Nv = ma.size(maskmat)
-    NoMask=maskmat.count()
+    NoMask=np.sum(~maskvals)
 
     if NoMask < Nquants:
-        quants[:] = fillValue
+        if Notenough:
+            print errormsg
+            print '  ' + fname + ': Not enough data=', NoMask, 'to compute', Nquants,\
+              'quantiles !!'
+            quit(-1)
+        else:
+            quants = gen.fillValueF
     else:
         for iq in range(Nquants):