Changeset 795 in lmdz_wrf

Timestamp:

Jun 1, 2016, 4:45:27 PM (9 years ago)

Author:

lfita

Message:

Fixing `DataSetSection_multivars' by keeping dimensions' modification ranges

Location:

trunk/tools

Files:

• generic_tools.py (modified) (1 diff)
• nc_var_tools.py (modified) (7 diffs)

trunk/tools/generic_tools.py

@@ -21 +21 @@
 # ijlonlat: Function to provide the imin,jmin imax,jmax of a lon,lat box
 # PolyArea: Function to compute the area of the polygon following 'Shoelace formula'
+# significant_decomposition: Function to decompose a given number by its signifcant potencies
 
 def values_line(line, splitv, chars):

trunk/tools/nc_var_tools.py

@@ -12437 +12437 @@
             print '  ' + fname + ": file '" + filen + "' does not have variable '" + \
               vn + "' !!"
-            print '    it has:', nciobj.variables
+            print '    it has:', list(nciobj.variables)
             quit(-1)
 
@@ -12452 +12452 @@
                 print errormsg
                 print '  ' + fname + ": variable '" + val + "' does not have " +     \
-                  "value: '" + strvalue + "' !!"
+                  "value= '" + strvalue + "' !!"
                 print '    values:', strvals
                 quit(-1)
@@ -12470 +12470 @@
               str(endvs[ivar]) + '-I' + str(intvs[ivar])
             if intvs[ivar] != -1:
-                slicevalS = slicevalS + varns[ivar] + ' (' + str(begvs[ivar]) + ',' +    \
-                  str(endvs[ivar]) + ',' + str(intvs[ivar]) + '); '
+                slicevalS = slicevalS + varns[ivar] + ' (' + str(fbegvs[ivar]) + ',' +   \
+                  str(fendvs[ivar]) + ',' + str(fintvs[ivar]) + '); '
             else:
-                slicevalS = slicevalS + varns[ivar] + ' (' + str(begvs[ivar]) + ',' +    \
-                  str(endvs[ivar]) + ',1); '
+                slicevalS = slicevalS + varns[ivar] + ' (' + str(fbegvs[ivar]) + ',' +   \
+                  str(fendvs[ivar]) + ',1); '
 
     ofile = ofile=filen.split('.')[0] + ofiletile + '.nc'
@@ -12492 +12492 @@
 # Looking for limits due to the variables
 ##
+    slicedims = {}
     for ivar in range(Nvars):
         print '  ' + fname + ": masking with '" + varns[ivar] + "':",  begvs[ivar],  \
@@ -12525 +12526 @@
             finalmask[int(begvs[ivar]),:] = False
         elif intvs[ivar] == 0.:
-            vmask = ma.masked_not_equal(vals, fbegvs[ivar])
-            finalmask = vmask.mask
-            if np.all(finalmask == True): 
-                print errormsg
-                print '  ' + fname + ": variable '" + varns[ivar] + "' does not " +  \
-                  'have value=', fbegvs[ivar]
-                quit(-1)
+#           Looking in the non efficient way
+            diffvar = np.abs(vals-fbegvs[ivar])
+            mindiffvar = np.min(diffvar)
+            imindiff = gen.index_mat(diffvar, mindiffvar)
+            if np.all(imindiff == -1): 
+                print errmsg
+                print '  ' + fname + ': no exact value with:',  fbegvs[ivar],        \
+                  'has been found!!'
+                print '    attempting within the range:', potminv, ',', potmaxv
+            finalmask = np.ones(vals.shape, dtype=np.float)
+            finalmask[tuple(imindiff)] = False
         else:
             if endvs[ivar] == -1: endvs[ivar] = np.max(vals)
@@ -12543 +12548 @@
             finalmask = maskinf.mask + masksup.mask
             idn = 0
-
-        slicedims = {}
         
         iidim = 0
@@ -12550 +12553 @@
             ddn = len(nciobj.dimensions[dn])
             dinds = np.arange(ddn)
-            rightvals = np.where(finalmask, False, True)
-
-            if intvs[ivar] == -99.:
-                if iidim == 0:
-                    slicedims[dn]=[int(begvs[ivar]), int(begvs[ivar]), None]
+            rightvals = ~ma.array(vals, mask=finalmask).mask
+
+# Checking if dimension is already cut:
+            if slicedims.has_key(dn):
+                slicedval = slicedims[dn]
+                if slicedval[0] == 0 and slicedval[1] == ddn: 
+                    fulldim = True
                 else:
-                    slicedims[dn]=[0, ddn, None]
-            elif intvs[ivar] == 0.:
-                if np.sum(~finalmask,axis=iidim) == 0:
-                    slicedims[dn]=[0, ddn, None]
-                elif np.sum(~finalmask,axis=iidim) == 1:
-                    ivals = gen.index_mat(finalmask, False)
-                    ival = ivals[iidim]
-                    slicedims[dn]=[ival, ival, None]
+                    fulldim = False
+            else:
+                fulldim = True
+
+            if not slicedims.has_key(dn) or fulldim:
+                if intvs[ivar] == -99.:
+                    if iidim == 0:
+                        slicedims[dn]=[int(begvs[ivar]), int(begvs[ivar]), None]
+                    else:
+                        slicedims[dn]=[0, ddn, None]
+                elif intvs[ivar] == 0.:
+                    if imindiff[iidim] == 0:
+                        slicedims[dn]=[0, ddn, None]
+                    else:
+                        slicedims[dn]=[iidim, iidim, None]
                 else:
-                    print errormsg
-                    print '  ' + fname + ': multiple', np.sum(~finalmask,axis=iidim), \
-                      'possible values!'
-                    print '    I do not know how to proceed'
-                    quit(-1)
-            else:
-                slicedims[dn]=[np.min(dinds[rightvals][0,:]), np.max(dinds[rightvals][0,:])+1, None]
+                    slicedims[dn]=[np.min(dinds[rightvals][0,:]),                    \
+                      np.max(dinds[rightvals][0,:])+1, None]
 
             iidim = iidim + 1