Changeset 305 in lmdz_wrf

Timestamp:

Feb 25, 2015, 7:44:56 PM (10 years ago)

Author:

lfita

Message:

Everything is time-dimensionated at Ttraj on 'compute_tevolboxtraj'

File:

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

trunk/tools/nc_var_tools.py

@@ -10722 +10722 @@
             rstatvarvals = np.ones(tuple([Ttraj,dimz,6]), dtype=np.float)
 
-            for it0 in range(Ttraj):
-                it = Tbeg + it0
+            for it in range(Ttraj):
+                it0 = Tbeg + it
 
                 slicev = []
@@ -10734 +10734 @@
                 cslicevnoThor = []
 
-                slicev.append(gtrajvals[it0,0])
-                if gtrajvals[it0,2]-box2 < 0 or gtrajvals[it0,2]+box2 + 1 > dimy + 1 \
-                  or gtrajvals[it0,1]-box2 < 0 or gtrajvals[it0,1]+box2 + 1 > dimx +1:
+                slicev.append(gtrajvals[it,0])
+                if gtrajvals[it,2]-box2 < 0 or gtrajvals[it,2]+box2 + 1 > dimy + 1   \
+                  or gtrajvals[it,1]-box2 < 0 or gtrajvals[it,1]+box2 + 1 > dimx +1:
 # box values
                     slicev.append(slice(0,dimz))
-                    slicev.append(slice(yrangeslice[it0][0],yrangeslice[it0][1]))
-                    slicev.append(slice(xrangeslice[it0][0],xrangeslice[it0][1]))
+                    slicev.append(slice(yrangeslice[it0][0],yrangeslice[it][1]))
+                    slicev.append(slice(xrangeslice[it0][0],xrangeslice[it][1]))
 
                     slicevnoT.append(slice(0,dimz))
-                    slicevnoT.append(slice(yrangeslice[it0][0],yrangeslice[it0][1]))
-                    slicevnoT.append(slice(xrangeslice[it0][0],xrangeslice[it0][1]))
+                    slicevnoT.append(slice(yrangeslice[it][0],yrangeslice[it][1]))
+                    slicevnoT.append(slice(xrangeslice[it][0],xrangeslice[it][1]))
 
                     slice2D.append(slice(0,dimz))
-                    slice2D.append(slice(0,yrangeslice[it0][1]-yrangeslice[it0][0]))
-                    slice2D.append(slice(0,xrangeslice[it0][1]-xrangeslice[it0][0]))
+                    slice2D.append(slice(0,yrangeslice[it][1]-yrangeslice[it][0]))
+                    slice2D.append(slice(0,xrangeslice[it][1]-xrangeslice[it][0]))
 
                     rvarvalst = np.ones((dimz, Nrad*2+1, Nrad*2+1),dtype=np.float)*  \
@@ -10769 +10769 @@
                 else:
                     slicev.append(slice(0,dimz))
-                    slicev.append(slice(gtrajvals[it0,2]-box2,                       \
-                      gtrajvals[it0,2]+box2+1))
-                    slicev.append(slice(gtrajvals[it0,1]-box2,                       \
-                      gtrajvals[it0,1]+box2+1))
+                    slicev.append(slice(gtrajvals[it,2]-box2, gtrajvals[it,2]+box2+1))
+                    slicev.append(slice(gtrajvals[it,1]-box2, gtrajvals[it,1]+box2+1))
                     slicevnoT.append(slice(0,dimz))
-                    slicevnoT.append(slice(gtrajvals[it0,2]-box2, gtrajvals[it0,2]+  \
+                    slicevnoT.append(slice(gtrajvals[it,2]-box2, gtrajvals[it,2]+    \
                       box2+1))
-                    slicevnoT.append(slice(gtrajvals[it0,1]-box2, gtrajvals[it0,1]+  \
+                    slicevnoT.append(slice(gtrajvals[it,1]-box2, gtrajvals[it,1]+    \
                       box2+1))
                     slice2D.append(slice(0,dimz))
-                    slice2D.append(slice(gtrajvals[it0,2]-box2, gtrajvals[it0,2] +   \
+                    slice2D.append(slice(gtrajvals[it,2]-box2, gtrajvals[it,2] +     \
                       box2 + 1))
-                    slice2D.append(slice(gtrajvals[it0,1]-box2, gtrajvals[it0,1] +   \
+                    slice2D.append(slice(gtrajvals[it,1]-box2, gtrajvals[it,1] +     \
                       box2 + 1))
 
@@ -10803 +10801 @@
 
 # Circle values
-                cslicev.append(gtrajvals[it0,0])
-                if gtrajvals[it0,2]-Nrad < 0 or gtrajvals[it0,2]+Nrad + 1 > dimy + 1 \
-                  or gtrajvals[it0,1]-Nrad < 0 or gtrajvals[it0,1]+Nrad + 1 > dimx +1:
+                cslicev.append(gtrajvals[it,0])
+                if gtrajvals[it,2]-Nrad < 0 or gtrajvals[it,2]+Nrad + 1 > dimy + 1   \
+                  or gtrajvals[it,1]-Nrad < 0 or gtrajvals[it,1]+Nrad + 1 > dimx + 1:
                     cslicev.append(slice(0,dimz))
-                    cslicev.append(slice(cyrangeslice[it0][0],cyrangeslice[it0][1]))
-                    cslicev.append(slice(cxrangeslice[it0][0],cxrangeslice[it0][1]))
+                    cslicev.append(slice(cyrangeslice[it][0],cyrangeslice[it][1]))
+                    cslicev.append(slice(cxrangeslice[it][0],cxrangeslice[it][1]))
 
                     cslicevnoT.append(slice(0,dimz))
-                    cslicevnoT.append(slice(cyrangeslice[it0][0],                    \
-                      cyrangeslice[it0][1]))
-                    cslicevnoT.append(slice(cxrangeslice[it0][0],                    \
-                      cxrangeslice[it0][1]))
+                    cslicevnoT.append(slice(cyrangeslice[it][0], cyrangeslice[it][1]))
+                    cslicevnoT.append(slice(cxrangeslice[it][0], cxrangeslice[it][1]))
 
                     cslice2D.append(slice(0,dimz))
-                    cslice2D.append(slice(0,cyrangeslice[it0][1]-                    \
-                      cyrangeslice[it0][0]))
-                    cslice2D.append(slice(0,cxrangeslice[it0][1]-                    \
-                      cxrangeslice[it0][0]))
-                    cslice2Dhor.append(slice(0, cyrangeslice[it0][1] -               \
-                      cyrangeslice[it0][0]))
-                    cslice2Dhor.append(slice(0, cxrangeslice[it0][1] -               \
-                      cxrangeslice[it0][0]))
+                    cslice2D.append(slice(0,cyrangeslice[it][1]-cyrangeslice[it][0]))
+                    cslice2D.append(slice(0,cxrangeslice[it][1]-cxrangeslice[it][0]))
+                    cslice2Dhor.append(slice(0, cyrangeslice[it][1] -                \
+                      cyrangeslice[it][0]))
+                    cslice2Dhor.append(slice(0, cxrangeslice[it][1] -                \
+                      cxrangeslice[it][0]))
 
                     rvarvalst = np.ones((dimz,Nrad*2+1,Nrad*2+1),dtype=np.float)*    \
@@ -10830 +10824 @@
                     rvarvalst[tuple(cslice2D)] = varobj[tuple(cslicev)]
                     for iz in range(dimz):
-                        tslice = [slice(it0)]+cslice2Dhor
+                        tslice = [slice(it)]+cslice2Dhor
                         rvarvalst[iz,:,:] = np.where(circdist[tuple(tslice)] >       \
                           np.float(Nrad), fillValue, rvarvalst[iz,:,:]) 
@@ -10850 +10844 @@
                 else:
                     cslicev.append(slice(0,dimz))
-                    cslicev.append(slice(gtrajvals[it0,2]-Nrad,gtrajvals[it0,2]+Nrad+\
-                      1))
-                    cslicev.append(slice(gtrajvals[it0,1]-Nrad,gtrajvals[it0,1]+Nrad+\
-                      1))
+                    cslicev.append(slice(gtrajvals[it,2]-Nrad,gtrajvals[it,2]+Nrad+1))
+                    cslicev.append(slice(gtrajvals[it,1]-Nrad,gtrajvals[it,1]+Nrad+1))
                     cslicevnoT.append(slice(0,dimz))
-                    cslicevnoT.append(slice(gtrajvals[it0,2]-Nrad, gtrajvals[it0,2]+ \
+                    cslicevnoT.append(slice(gtrajvals[it,2]-Nrad, gtrajvals[it,2]+   \
                       Nrad+1))
-                    cslicevnoT.append(slice(gtrajvals[it0,1]-Nrad, gtrajvals[it0,1]+ \
+                    cslicevnoT.append(slice(gtrajvals[it,1]-Nrad, gtrajvals[it,1]+   \
                       Nrad+1))
-                    cslicevnoThor.append(slice(gtrajvals[it0,2]-Nrad,                \
-                      gtrajvals[it0,2] + Nrad+1))
-                    cslicevnoThor.append(slice(gtrajvals[it0,1]-Nrad,                \
-                      gtrajvals[it0,1] + Nrad+1))
+                    cslicevnoThor.append(slice(gtrajvals[it,2]-Nrad,                 \
+                      gtrajvals[it,2] + Nrad+1))
+                    cslicevnoThor.append(slice(gtrajvals[it,1]-Nrad,                 \
+                      gtrajvals[it,1] + Nrad+1))
                     cslice2D.append(slice(0,dimz))
-                    cslice2D.append(slice(gtrajvals[it0,2]-Nrad,gtrajvals[it0,2] +   \
+                    cslice2D.append(slice(gtrajvals[it,2]-Nrad,gtrajvals[it,2] +     \
                       Nrad+1))
-                    cslice2D.append(slice(gtrajvals[it0,1]-Nrad,gtrajvals[it0,1] +   \
+                    cslice2D.append(slice(gtrajvals[it,1]-Nrad,gtrajvals[it,1] +     \
                       Nrad+1))
 
@@ -10872 +10864 @@
 # circle values
                     for iz in range(dimz):
-                        tslice = [it0]+cslicevnoThor
+                        tslice = [it]+cslicevnoThor
                         rvarvalst[iz,:,:] = np.where(circdist[tuple(tslice)] >       \
                           np.float(Nrad), fillValue, rvarvalst[iz,:,:]) 
@@ -10975 +10967 @@
             rstatvarvals = np.ones(tuple([Ttraj,6]), dtype=np.float)
 
-            for it0 in range(Ttraj):
-                it = Tbeg + it0
+            for it in range(Ttraj):
+                it0 = Tbeg + it
 
                 slicev = []