Changeset 1525 in lmdz_wrf for trunk/tools/nc_var_tools.py

Timestamp:

Apr 13, 2017, 12:32:54 AM (8 years ago)

Author:

lfita

Message:

Fixing `maskvar' and including the option to use an already masked variable

File:

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

trunk/tools/nc_var_tools.py

@@ -3921 +3921 @@
     """ Function to mask a variable using another variable to mask it. Only need to share 
       at least 1 dimension with the same size (no need same name)
-    values= [maskfilename]:[maskvarn]:[dimsmask]:[timename]
+    values= [maskfilename]:[maskvarn]:[dimsmask]:[maskvalue]
       [maskfilename]= file with the mask
       [maskvarn]= name of the variable with the mask
@@ -3931 +3931 @@
           * [beg]@[end] slice from [beg] to [end]
         * NOTE: no value provided is for all dimension range
-      [maskvalue]= value to use for maskking
+      [maskvalue]= value to use for maskking ('mask' value for using an already masked variable)
     filename= netCF file name
     varparameters= [varn]|[dimsmask]
@@ -3944 +3944 @@
         quit()
 
-    expectargs = '[maskfilename]:[maskvarn]:[dimsmask]:[timename]'
+    expectargs = '[maskfilename]:[maskvarn]:[dimsmask]:[maskvalue]'
     gen.check_arguments(fname,values,expectargs,':')
 
@@ -4033 +4033 @@
         quit(-1)
 
-    maskval = gen.retype(maskvalue,varinf.dtype)
+    if maskvalue != 'mask':
+        maskval = gen.retype(maskvalue,varinf.dtype)
+    else:
+        print infmsg
+        print '  ' + fname + ': maskgin with already masked variable'
+        varmaskv = maskvalues.mask
+
     newvar = ncfnew.createVariable(varn, varinf.dtype, varinf.dimns,                 \
       fill_value=fillValue)
@@ -4040 +4046 @@
             attr = newvar.setncattr(attrn, varobj.getncattr(attrn))
 
-    attr = newvar.setncattr('mask', 'variable masked using ' + values.split(':')[2] +\
+    attr = newvar.setncattr('mask', 'variable masked using ' + values.split(':')[2]+ \
       ' of variable ' + maskvarn + ' from file ' + maskfilename)
     newvar[:] = varobj[:]
@@ -4063 +4069 @@
     # Masking following that dimensions which are not coincident with the mask
 
-    slices = gen.provide_slices(varinf.dimns, varinf.dims, list(varmaskinf.dimns))
-
-    maskTOuse = ma.masked_equal(maskvalues, maskval)
+    # Check if there are some coincident dimensional names between both variables
+    vdimns = varinf.dimns
+    mdimns = maskdims
+
+    for dimn in vdimns:
+        if gen.searchInlist(maskdims,dimn): mdimns.remove(dimn)
+
+    #slices = gen.provide_slices(varinf.dimns, varinf.dims, list(varmaskinf.dimns))
+    slices = gen.provide_slices(varinf.dimns, varinf.dims, list(maskdims))
+
+    if maskvalue != 'mask':
+        maskTOuse = ma.masked_equal(maskvalues, maskval)
+        maskTOusev = maskTOuse.mask
+    else:
+        maskTOusev = maskvalues.mask
 
     for ir in range(runningsize):
         islice = slices[ir]
         varvals = varobj[tuple(islice)]
-        maskvarvals = np.where(maskTOuse.mask, fillValue, varvals)
+        maskvarvals = np.where(maskTOusev, fillValue, varvals)
         newvar[tuple(islice)] = maskvarvals
 
@@ -4109 +4127 @@
     filexist(newfile, ermsg, 'new')
 
-    print 'origfile: ',origfile
     ncofile = NetCDFFile(origfile,'a')
     varinfile(ncofile, origfile, ermsg, 'change', varN)