Changeset 786 in lmdz_wrf for trunk

Timestamp:

May 29, 2016, 7:48:24 PM (9 years ago)

Author:

lfita

Message:

Fixing `sellonlatbox' for files with station-list data

File:

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

trunk/tools/nc_var_tools.py

@@ -5611 +5611 @@
         vardims = varobj.dimensions
 
-        if not searchInlist(list(vardims),dimn):
+        if not gen.searchInlist(list(vardims),dimn):
             varvals = varobj[:]
         else:
@@ -5627 +5627 @@
 ##
         varattrs = varobj.ncattrs()
-        if searchInlist(varattrs, '_FillValue'):
+        if gen.searchInlist(varattrs, '_FillValue'):
             varfil = varobj._FillValue
         else:
@@ -5854 +5854 @@
     gen.check_arguments(fname,values,arguments,',')
 
-
     lonn = values.split(',')[0]
     latn = values.split(',')[1]
@@ -5931 +5930 @@
         dimx = lonv.shape[0]
         dimy = latv.shape[0]
-        malonlat = np.zeros((dimy,dimx), dtype=lonv.dtype)
-        for i in range(dimx):
-            malonlat[:,i] = malon[i] + malat
+        malonlat = malon.mask + malat.mask
+        malonv = ma.array(lonv, mask=malonlat)
+        malatv = ma.array(latv, mask=malonlat)
     elif len(lonv.shape) == 2:
         dlonn = loninf.dimns[1]
@@ -5951 +5950 @@
         dimy = lonv.shape[1]
         malonlat = np.zeros((dimy,dimx), dtype=bool)
-        malonlat = malon.mask[0,:,:] + malat.mask[0,:,:]
-        malonv = ma.array(lonv, mask=malon)
-        malatv = ma.array(latv, mask=malon)
+        malonlat = malon.mask + malat.mask
+        malonv = ma.array(lonv, mask=malonlat)
+        malatv = ma.array(latv, mask=malonlat)
     else:
         print errormsg
@@ -5969 +5968 @@
 
     ilon = dimx
-    for j in range(dimy):
-        for i in range(dimx):
-            if malonlat[j,i] == False and i < ilon: 
-              ilon = i
     elon = 0
-    for j in range(dimy):
-        for i in range(dimx):
-            if malonlat[j,i] == False and i > elon: 
-              elon = i
-
     ilat = dimy
-    for j in range(dimy):
-        for i in range(dimx):
-            if malonlat[j,i] == False and j < ilat: 
-              ilat = j
     elat = 0
-    for j in range(dimy):
-        for i in range(dimx):
-            if malonlat[j,i] == False and j > elat: 
-              elat = j
-
-    newdimx = elon - ilon + 1
-    newdimy = elat - ilat + 1
+    if  len(lonv.shape) > 1:
+        for j in range(dimy):
+            for i in range(dimx):
+                if malonlat[j,i] == False and i < ilon: 
+                    ilon = i
+                if malonlat[j,i] == False and i > elon: 
+                    elon = i
+                if malonlat[j,i] == False and j < ilat: 
+                    ilat = j
+                if malonlat[j,i] == False and j > elat: 
+                    elat = j
+    else:
+        if dimx != dimy:
+            for i in range(dimx):
+                if malonlat[i] == False and i < ilon: 
+                    ilon = i
+                if malonlat[i] == False and i > elon: 
+                    elon = i
+            for j in range(dimy):
+                if malonlat[j] == False and j < ilat: 
+                    ilat = j
+                if malonlat[j] == False and j > elat: 
+                    elat = i
+        else:
+            for i in range(dimx):
+                if malonlat[i] == False and i < ilon: 
+                    ilon = i
+                    ilat = i
+                if malonlat[i] == False and i > elon: 
+                    elon = i
+                    elat = i
+
+    print 'ilon elon ilat elat:', ilon, elon, ilat, elat
+#    newdimx = elon - ilon + 1
+#    newdimy = elat - ilat + 1
+    newdimx = dimx - np.sum(malonv.mask)
+    newdimy = dimy - np.sum(malatv.mask)
 
     if len(malon.shape) == 1:
@@ -6049 +6065 @@
             if not gen.searchInlist(newncobj.dimensions, dimn):
                 newncobj.createDimension(dimn, len(objfile.dimensions[dimn]))
-            if dimn == dlonn:
+# Very special case when we have for example a list of stations (which is the case!)
+            if dimn == dlonn and dimx != dimy: 
                 varslice.append(slice(ilon,elon+1))
-            elif dimn == dlatn:
+            elif dimn == dlatn and dimx != dimy: 
                 varslice.append(slice(ilat,elat+1))
             else:
@@ -6061 +6078 @@
             newvar = newncobj.createVariable(vn, nctype(varinf.dtype), varinf.dimns, \
               fill_value = varinf.FillValue)
-        newvar[:] = varobj[tuple(varslice)]
+
+        if dimx != dimy:
+            newvar[:] = varobj[tuple(varslice)]
+        else:
+# Very special case when we have for example a list of stations (which is the case!)
+            print '  ' + fname + ': woow we are in a stations-list like of file...'
+            inpos0 = 0
+            for i in range(newdimx):
+                inpos = gen.index_vec(malonlat[inpos0:dimx+1], False)
+                inpos = inpos + inpos0
+                inpos0 = inpos + 1
+                varslice = []
+                newvarslice = []
+                for dimn in varinf.dimns:
+                    if not gen.searchInlist(newncobj.dimensions, dimn):
+                        newncobj.createDimension(dimn, len(objfile.dimensions[dimn]))
+# Very special case when we have for example a list of stations (which is the case!)
+                    if dimn == dlonn: 
+                        varslice.append(inpos)
+                        newvarslice.append(i)
+                    else:
+                        varslice.append(slice(0,len(objfile.dimensions[dimn])))
+                        newvarslice.append(slice(0,len(objfile.dimensions[dimn])))
+                newvar[tuple(newvarslice)] = varobj[tuple(varslice)]
 
         for atrn in varinf.attributes: