Changeset 2224 in lmdz_wrf for trunk/tools

Timestamp:

Nov 9, 2018, 3:41:43 PM (6 years ago)

Author:

lfita

Message:

Final working version of compute_slices_stats

Location:

trunk/tools

Files:

• nc_var.py (modified) (1 diff)
• nc_var_tools.py (modified) (5 diffs)

trunk/tools/nc_var.py

@@ -64 +64 @@
 ## e.g. # nc_var.py -o compute_slice2Dstats -S 'XLAT,-63.,19.,2.,HGT,250.,7000.,500.,Time|Times:west_east|XLONG:south_north|XLAT' -f wrfout_d01_1995-01-01_00:00:00 -v T2,Q2
 ## e.g. # nc_var.py -o same_deltasign -f wrfout_d01_1995-01-01_00:00:00 -S 'Time:0|south_north:60|west_east:-1' -v T2,Q2,XLAT,XLONG
-## e.g. # nc_var.py -o compute_slices_stats -S 'XLONG,-74.,-36.,4.;XLAT,-63.,19.,2.;HGT,250.,7000.,500.@Time|Times:west_east|XLONG:south_north|XLAT@Time' -f wrfout_d01_1995-01-01_00:00:00 -v T2,Q2
+## e.g. # nc_var.py -o compute_slices_stats -S 'XLONG,-74.,-36.,4.;XLAT,-62.,18.,2.;HGT,500.,7000.,500.@Time|Times:west_east|XLONG:south_north|XLAT@Time' -f wrfout_d01_1995-01-01_00:00:00 -v T2,Q2
 
 from optparse import OptionParser

trunk/tools/nc_var_tools.py

@@ -26448 +26448 @@
           maxvar[i]: maximum value to end the slices for variable i
           slcevar[i]: length of slices in variable i
+            NOTE: slices will be:
+               [minvar[i]-slicevar[i]/2., minvar[i]+slicevar[i]/2.), ..., 
+               [maxvar[i]-slicevar[i]/2., maxvar[i]+slicevar[i]/2.)
         [dimvars]: ':' separated list of [dimn]|[vardimn] dimension name [dimn] and 
           its associated dimension-variable to get its values to provide values for 
@@ -26544 +26547 @@
         slcvals = np.zeros((Nslices,2), dtype=np.float)
         varv = ovar[:]
-        for islc in range(Nslices-1):
-            slcvar[islc,] = ma.masked_inside(varv, slices[islc], slices[islc+1]).mask
-            slcvalsc[islc] = (slices[islc+1]+slices[islc+1])/2.
-            slcvals[islc,0] = slices[islc]
-            slcvals[islc,1] = slices[islc+1]
+        print varv.dtype
+        for islc in range(Nslices):
+            slcvalsc[islc] = slices[islc]
+            slcvals[islc,0] = slices[islc]-slicevar/2.
+            slcvals[islc,1] = slices[islc]+slicevar/2.
+            #slcvar[islc,] = ma.masked_inside(varv, slcvals[islc,0], slcvals[islc,1]).mask
+            slcvar[islc,] = ma.masked_outside(varv, slcvals[islc,0], slcvals[islc,1]).mask
 
         slicesinf[varn] = [Nslices, dimnv, slcvar]
@@ -26581 +26586 @@
         slcv = np.zeros(tuple(slcshape), dtype=int)
         for islc in range(Nslices):
-            vvslc = slcvar[islc,]
+            vvslc = ~slcvar[islc,]
             slcv[islc,] = np.where(vvslc, 1, 0)
         newvar = onewnc.createVariable(varn+'sliced', 'i', tuple(slcdims))
@@ -26722 +26727 @@
                 slcnewvar.append(islcN[iv])
                 if iv == 0: newmask = masksv[islcN[iv]]
-                else: newmask = newmask*masksv[islcN[iv]]
+                else: newmask = newmask+masksv[islcN[iv]]
                 iv = iv + 1
 
@@ -26728 +26733 @@
                slcnewvar.append(slice(0,iid))
 
-            mavals = ma.array(varv, mask=~newmask)
+            mavals = ma.array(varv, mask=newmask)
             #newvarNmasked[tuple(slcnewvar)] = mavals.filled(gen.fillValueF)
             newvarNmasked[:] = mavals.filled(gen.fillValueF)