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

Timestamp:

Feb 25, 2015, 3:43:56 PM (10 years ago)

Author:

lfita

Message:

circdist has a temporal dependence!

File:

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

trunk/tools/nc_var_tools.py

@@ -10370 +10370 @@
     gtrajvals = np.zeros((Ttraj,3), dtype=int)
     trajvals = np.zeros((Ttraj,3), dtype=np.float)
+    circdist = np.zeros((Ttraj, dimy, dimx), dtype=np.float)
 
     it = 0
@@ -10456 +10457 @@
 
 # circle values
-            circdist = radius_dist(dimy, dimx, gtrajvals[it,2], gtrajvals[it,1])
+            circdist[it,:,:] = radius_dist(dimy,dimx,gtrajvals[it,2],gtrajvals[it,1])
 
             if gtrajvals[it,2]-Nrad < 0 or gtrajvals[it,2]+Nrad + 1 > dimy + 1 \
@@ -10538 +10539 @@
         if Nvardims == 4:
 # Too optimistic, but at this stage...
-            dimz = varobj.shape[1]
-
             if not objofile.dimensions.has_key('z'):
                 varzobj = objfile.variables[zn]
@@ -10682 +10681 @@
                     rvarvalst[tuple(cslice2D)] = varobj[tuple(cslicev)]
                     for iz in range(dimz):
-                        zslice = [slice(iz)]+cslice2Dhor
-                        rvarvalst[iz,:,:] = np.where(circdist[tuple(cslice2Dhor)] >  \
+                        tslice = [slice(it)]+cslice2Dhor
+                        rvarvalst[iz,:,:] = np.where(circdist[tuple(tslice)] >       \
                           np.float(Nrad), fillValue, rvarvalst[iz,:,:]) 
 
@@ -10709 +10708 @@
                     cslicevnoT.append(slice(gtrajvals[it,1]-Nrad, gtrajvals[it,1]+   \
                       Nrad+1))
-                    cslicevnoThor.append(slice(gtrajvals[it,2]-Nrad, gtrajvals[it,2]+   \
+                    cslicevnoThor.append(slice(gtrajvals[it,2]-Nrad, gtrajvals[it,2]+\
                       Nrad+1))
-                    cslicevnoThor.append(slice(gtrajvals[it,1]-Nrad, gtrajvals[it,1]+   \
+                    cslicevnoThor.append(slice(gtrajvals[it,1]-Nrad, gtrajvals[it,1]+\
                       Nrad+1))
                     cslice2D.append(slice(0,dimz))
@@ -10720 +10719 @@
 
                     rvarvalst = varobj[tuple(cslicev)]
-                    cdist = circdist[tuple(cslicevnoThor)]
+                    cdist = circdist[tuple([it] + cslicevnoThor)]
 # circle values
                     for iz in range(dimz):
-                        zslice = [slice(iz)]+cslicevnoThor
-                        rvarvalst[iz,:,:] = np.where(circdist[tuple(cslicevnoThor)] >\
+                        tslice = [slice(it)]+cslicevnoThor
+                        rvarvalst[iz,:,:] = np.where(circdist[tuple(tslice)] >       \
                           np.float(Nrad), fillValue, rvarvalst[iz,:,:]) 
 
@@ -10950 +10949 @@
 # circle values
                     rvarvalst = np.where(cdist > np.float(Nrad),fillValue,rvarvalst)
+                    print it,'Lluis: cdist', cdist, 'Nrad:',Nrad
 
                     rvarvals[it,:,:] = rvarvalst