Changeset 1522 in lmdz_wrf

Timestamp:

Apr 12, 2017, 2:10:27 AM (8 years ago)

Author:

lfita

Message:

Fixing wrong selection of range values! in `DataSetSection_multivars'

File:

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

trunk/tools/nc_var_tools.py

@@ -14122 +14122 @@
             valsdims = ovar.dimensions
             varns.append(vn)
-            begvs[ivar] = gen.retype(val.split(',')[1], ovar.dtype)
-            endvs[ivar] = gen.retype(val.split(',')[2], ovar.dtype)
-            intvs[ivar] = -1
+            begvs = gen.retype(val.split(',')[1], ovar.dtype)
+            endvs = gen.retype(val.split(',')[2], ovar.dtype)
+            intvs = -1
             fbegvs[ivar] = np.float(val.split(',')[1])
             fendvs[ivar] = np.float(val.split(',')[2])
             fintvs[ivar] = np.float(val.split(',')[3])
 
-            if endvs[ivar] == -1: endvs[ivar] = np.max(vals)
-            maskinf = ma.masked_less(vals, begvs[ivar])
-            masksup = ma.masked_greater(vals, endvs[ivar])
+            if endvs == -1: endvs = np.max(vals)
+            maskinf = ma.masked_less(vals, begvs)
+            masksup = ma.masked_greater(vals, endvs)
+
+            # For all masked or not, ma.masked returns a single value...
+            if len(maskinf.mask.flatten()) == 1:
+                if maskinf.mask:
+                    maskinfv = np.ones((vals.shape), dtype=bool)
+                else:
+                    maskinfv = np.zeros((vals.shape), dtype=bool)
+            else:
+                maskinfv = maskinf.mask
+
+            if len(masksup.mask.flatten()) == 1:
+                if masksup.mask:
+                    masksupv = np.ones((vals.shape), dtype=bool)
+                else:
+                    masksupv = np.zeros((vals.shape), dtype=bool)
+            else:
+                masksupv = masksup.mask
+
+#            if  and len(masksup.mask.flatten()) == 1:
+#                    if not maskinf.mask*maskinf.mask:
+#                        finalmask = np.ones()
+#            else:
+#                finalmask = maskinf.mask + masksup.mask
 
             #if intvs[ivar] != -1:
@@ -14137 +14160 @@
             #    print '  ' + fname + ': non-consecutive slices not ready!!'
             #    quit(-1)
-            finalmask = maskinf.mask + masksup.mask
             # Indices of the found values
+            finalmask = maskinfv + masksupv
+            # Single value
+            if val.split(',')[3] == '0':
+                print infmsg
+                print '  ' + fname + ": single value for variable '" + vn + "' =",   \
+                  begvs
+                finalmask = np.where(vals == begvs, False, finalmask)
+
             iDistmindist = gen.multi_index_mat(finalmask, False)
 
             print '    found:', len(iDistmindist),"values in variable '" + vn +      \
-              "' as; beginning:", begvs[ivar], 'ending:', endvs[ivar], 'interval:',  \
-              intvs[ivar]
+              "' as; beginning:", begvs, 'ending:', endvs, 'interval:', intvs
             iid = 0
             for dimn in valsdims:
@@ -14167 +14196 @@
                     dimvals[dimn] = dvvs
 
-            if intvs[ivar] != -1:
-                slicevalS = slicevalS + varns[ivar] + ' (' + str(fbegvs[ivar]) + ',' +   \
-                  str(fendvs[ivar]) + ',' + str(fintvs[ivar]) + '); '
+            if intvs != -1:
+                slicevalS = slicevalS + varns[ivar] + ' (' + str(begvs) + ',' +          \
+                  str(fendvs) + ',' + str(fintvs) + '); '
             else:
-                slicevalS = slicevalS + varns[ivar] + ' (' + str(fbegvs[ivar]) + ',' +   \
-                  str(fendvs[ivar]) + ',1); '
+                slicevalS = slicevalS + varns[ivar] + ' (' + str(fbegvs) + ',' +   \
+                  str(fendvs) + ',1); '
 
     print infmsg