Changeset 336 in lmdz_wrf for trunk

Timestamp:

Feb 27, 2015, 6:28:02 PM (10 years ago)

Author:

lfita

Message:

Fixing the same issue when 2D

File:

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

trunk/tools/nc_var_tools.py

@@ -10959 +10959 @@
                     rvarvalst = np.ones((dimz,Nrad*2+1,Nrad*2+1),dtype=np.float)*    \
                       fillValue
-                    print 'Lluis cslicev:',cslicev,'cslice2D:',cslice2D
                     rvarvalst[tuple(cslice2D)] = varobj[tuple(cslicev)]
                     for iz in range(dimz):
@@ -11187 +11186 @@
 # Circle values
                 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(cyrangeslice[it][0],cyrangeslice[it][1]))
-                    cslicev.append(slice(cxrangeslice[it][0],cxrangeslice[it][1]))
+                if gtrajvals[it,2]-Nrad < 0 or gtrajvals[it,2]+Nrad + 1 >= dimy      \
+                  or gtrajvals[it,1]-Nrad < 0 or gtrajvals[it,1]+Nrad + 1 >= dimx:
+                    maxx = np.min([cxrangeslice[it][1], dimx])
+                    maxy = np.min([cyrangeslice[it][1], dimy])
+                    cslicev.append(slice(cyrangeslice[it][0],maxy))
+                    cslicev.append(slice(cxrangeslice[it][0],maxx))
 
                     cslicevnoT.append(slice(cyrangeslice[it][0],cyrangeslice[it][1]))
                     cslicevnoT.append(slice(cxrangeslice[it][0],cxrangeslice[it][1]))
 
-                    cslice2D.append(slice(0,cyrangeslice[it][1]-cyrangeslice[it][0]))
-                    cslice2D.append(slice(0,cxrangeslice[it][1]-cxrangeslice[it][0]))
+                    cslice2D.append(slice(0,maxy - cyrangeslice[it][0]))
+                    cslice2D.append(slice(0,maxx - cxrangeslice[it][0]))
 
                     rvarvalst = np.ones((Nrad*2+1,Nrad*2+1),dtype=np.float)*fillValue