Changeset 2521 in lmdz_wrf

Timestamp:

May 9, 2019, 1:18:48 AM (6 years ago)

Author:

lfita

Message:

Removing print tests

File:

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

trunk/tools/nc_var_tools.py

@@ -29908 +29908 @@
             rankABC = len(shapes)
 
-#        dxB = osliceNAB.shape[1]
-#        dyB = osliceNAB.shape[0]
-#        dxA = osliceNAB.shape[3]
-#        dyA = osliceNAB.shape[2]
-#        dxyAB = osliceinAB.shape[1]
-#        dxC = osliceNC.shape[1]
-#        dyC = osliceNC.shape[0]
-#        dxyC = osliceinC.shape[1]
-
-
             NABdims = osliceNAB.dimensions
             inABdims = osliceinAB.dimensions
@@ -29929 +29919 @@
             Spgrid = [dn+'gridin'] + Srgrid
     
-#        NpointsABC = np.zeros((dyC,dxC,dyB,dxB,dyA,dxA), dtype=int)
-#        pointsABC = np.zeros((2,dxyAB,dyC,dxC,dyB,dxB,dyA,dxA), dtype=int)
-#        inpointsAB = np.zeros((dxyAB,dyC,dxC,dyB,dxB,dyA,dxA), dtype=int)
-#        NpointsA = np.zeros((dyC,dxC,dyB,dxB,dyA,dxA), dtype=int)
-#        NpointsB = np.zeros((dyC,dxC,dyB,dxB,dyA,dxA), dtype=int)
-#        inpointsA = np.zeros((dxyAB,dyC,dxC,dyB,dxB,dyA,dxA), dtype=int)
-#        inpointsB = np.zeros((dxyAB,dyC,dxC,dyB,dxB,dyA,dxA), dtype=int)
-#        inpointsC = np.zeros((dxyAB,dyC,dxC,dyB,dxB,dyA,dxA), dtype=int)
             NpointsABC = np.zeros(tuple(shapes), dtype=int)
             pointsABC = np.zeros(tuple(shapesptnew), dtype=int)
@@ -29945 +29927 @@
             inpointsB = np.zeros(tuple(shapesnew), dtype=int)
             inpointsC = np.zeros(tuple(shapesnew), dtype=int)
-
-            print '        Lluis shapes dims_______'
-            print '        NpointsABC:', shapes, Srgrid
-            print '        pointsABC:', shapesptnew, Sigrid
-            print '        inpointsABC:', shapesnew, Spgrid
 
             # Getting the slices to find the coincident points. It must be 2D
@@ -29964 +29941 @@
                 runpdims.append(NABdims[iid])
 
-            print '         Lluis rundims _______', runpdims
-            
             NABslices = gen.provide_slices(NABdims, NABshape, runNABdims)
             inABslices = gen.provide_slices(inABdims, inABshape, runinABdims)
@@ -29971 +29946 @@
             islices = gen.provide_slices(Sigrid, shapesptnew, runrdims)
             pslices = gen.provide_slices(Spgrid, shapesnew, runrdims)
-
-            print '    Lluis number of slices: NAB', len(NABslices), 'inAB',         \
-              len(inABslices), 'r', len(rslices), 'i', len(islices), 'p', len(pslices)
-
-#        # Following B-slices
-#        for j in range(dyB):
-#            for i in range(dxB):
-#                sliceNAt = sliceNAB[j,i,:,:].transpose()
-#                sliceinAt = sliceinAB[:,:,j,i,:,:].transpose()
-#                sliceNBt = sliceNC.transpose()
-#                sliceinBt = sliceinC.transpose()
-#                NpointsABt, pointsABt, inpA, inpB = fsci.module_scientific.coincident_gridsin2d( \
-#                  npointsa=sliceNAt, pointsa=sliceinAt, npointsb=sliceNBt, pointsb=sliceinBt,    \
-#                  dxa=dxA, dya=dyA, dxya=dxyAB, dxb=dxC, dyb=dyC, dxyb=dxyC)
-#                NpointsABC[:,:,j,i,:,:] = NpointsABt.transpose()
-#                pointsABC[:,:,:,:,j,i,:,:] = pointsABt.transpose()
-#                inpointsAB[:,:,:,j,i,:,:] = inpA.transpose()
-#                inpointsC[:,:,:,j,i,:,:] = inpB.transpose()
-
-#                # Remembering that it is python (C-like...)
-#                inpointsAB[:,:,:,j,i,:,:] = inpointsAB[:,:,:,j,i,:,:]-1
-#                inpointsC[:,:,:,j,i,:,:] = inpointsC[:,:,:,j,i,:,:]-1
 
             # Following slices
@@ -30002 +29955 @@
                 islcv = islices[isc]
                 pslcv = pslices[isc]
-
-                print isc, '  Lluis slice shape______'
-                print '       NAB', NABslcv, sliceNAB[tuple(NABslcv)].shape
-                print '       inAB', inABslcv, sliceinAB[tuple(inABslcv)].shape
-                print '       r', rslcv, NpointsABC[tuple(rslcv)].shape
-                print '       i', islcv, pointsABC[tuple(islcv)].shape
-                print '       p', pslcv, inpointsAB[tuple(pslcv)].shape
 
                 dxA = NABshape[NABrank-1]
@@ -30033 +29979 @@
                 inpointsC[tuple(pslcv)] = inpointsC[tuple(pslcv)]-1
     
-
             maxNpointsABC = np.max(NpointsABC)
 
@@ -30072 +30017 @@
             pnewvar.setncattr('coordinates',' '.join(Spgrid[::-1]))
 
-#        ixA = -1
-#        iyA = -1
-#        ixB = -1
-#        iyB = -1
-#        ixC = -1
-#        iyC = -1
-#        for jA in range(dyA):
-#            for iA in range(dxA):
-#                for jB in range(dyB):
-#                    for iB in range(dxB):
-#                        for jC in range(dyC):
-#                            for iC in range(dxC):
-#                                Nin = NpointsABC[jC,iC,jB,iB,jA,iA]
-#                                innewvar[:,0:Nin,jC,iC,jB,iB,jA,iA] =                \
-#                                  pointsABC[:,0:Nin,jC,iC,jB,iB,jA,iA]
-#                                aanewvar[jC,iC,jB,iB,jA,iA]= gen.fillValueF
-#                                anewvar[:,jC,iC,jB,iB,jA,iA]= gen.fillValueF
-#                                pnewvar[:,jC,iC,jB,iB,jA,iA]= gen.fillValueF
-#                                slicearea = 0.
-#                                for iv in range(Nin):
-#                                    ivAB = inpointsAB[iv,jC,iC,jB,iB,jA,iA]
-#                                    ivC = inpointsC[iv,jC,iC,jB,iB,jA,iA]
-#                                    pA = oslicepAB[ivAB,jB,iB,jA,iA]
-#                                    pB = oslicepC[ivC,jC,iC]
-#                                    aA = osliceaAB[ivAB,jB,iB,jA,iA]
-#                                    aB = osliceaC[ivC,jC,iC]
-#                                    ixAB = sliceinAB[1,ivAB,jB,iB,jA,iA]
-#                                    iyAB = sliceinAB[0,ivAB,jB,iB,jA,iA]
-#                                    ixC = sliceinC[1,ivC,jC,iC]
-#                                    iyC = sliceinC[0,ivC,jC,iC]
-#                                    anewvar[iv,jC,iC,jB,iB,jA,iA]= aA*pA*pB
-#                                    pnewvar[iv,jC,iC,jB,iB,jA,iA]= pA*pB
-#                                    slicearea = slicearea + aA*pA*pB
-#                                if np.isnan(slicearea):
-#                                    print errormsg
-#                                    print '  ' + fname + ': Nan slice area for slice:',          \
-#                                      jC, iC, jB, iB, jA, iA, 'N grids:', Nin,' !!'
-#                                    print '     #grid AB #grid grid_area ' +         \
-#                                      'grid_percen C # grid grid_area grid_percen____'
-#                                    for iv in range(Nin): 
-#                                        print iv, inpointsAB[iv,jC,iC,jB,iB,jA,iA],  \
-#                                          aA, pA, inpointsC[iv,jC,iC,jB,iB,jA,iA],   \
-#                                          aB, pB
-#                                    quit(-1)
-#                                aanewvar[jC,iC,jB,iB,jA,iA]= slicearea
             # Getting actual slice values
             rslcvals = gen.provide_slices(Srgrid, shapes, Srgrid)