Changeset 2268 in lmdz_wrf for trunk/tools

Timestamp:

Dec 26, 2018, 11:16:17 PM (6 years ago)

Author:

lfita

Message:

Getting there ...

Location:

trunk/tools

Files:

• module_scientific.f90 (modified) (5 diffs)
• nc_var_tools.py (modified) (3 diffs)

trunk/tools/module_scientific.f90

@@ -4941 +4941 @@
     IMPLICIT NONE
 
-    INTEGER, INTENT(in)                                  :: dxA, dyA, NAvertexAma, dxB, dyB,          &
+    INTEGER, INTENT(in)                                  :: dxA, dyA, NAvertexmax, dxB, dyB,          &
       NBvertexmax, dxyB
     REAL(r_k), DIMENSION(dxA,dyA), INTENT(in)            :: xCAvals, yCAvals
@@ -4950 +4950 @@
     INTEGER, DIMENSION(dxA,dyA), INTENT(out)             :: Ngridsin
     INTEGER, DIMENSION(dxA,dyA,dxyB,2), INTENT(out)      :: gridsin
-    REAL(r_k), DIMENSION(dxA,dyA,Ngridsin), INTENT(out)  :: percentages
+    REAL(r_k), DIMENSION(dxA,dyA,dxyB), INTENT(out)      :: percentages
 
 ! Local
    INTEGER                                               :: iv, ix, iy
    INTEGER                                               :: Nvertex, NvertexAgrid, Ncoin, Nsort
+   INTEGER, ALLOCATABLE, DIMENSION(:,:)                  :: poinsin
    CHARACTER(len=20)                                     :: DS
    REAL(r_k)                                             :: areapoly, areagpoly, totarea, totpercent
-   REAL(r_k), ALLOCATABLE, DIMENSION(:,:)                :: vertexgrid, poinsin
+   REAL(r_k), ALLOCATABLE, DIMENSION(:,:)                :: vertexgrid
 
 !!!!!!! Variables
@@ -4975 +4976 @@
     fname = 'spacepercen'
 
-    DO ix = 1, dimxA
-      DO iy = 1, dimyA
+    DO ix = 1, dxA
+      DO iy = 1, dyA
 
       ! Getting grid vertices
@@ -4990 +4991 @@
       vertexgrid(:,2) = yBAvals(ix,iy,1:Nvertex)
   
-      CALL grid_within_polygon(Nvertex, vertexgrid, dxB, dyB, dxB*dyB, xBCvals, yBCvals, NBvertexmax, &
+      CALL grid_within_polygon(Nvertex, vertexgrid, dxB, dyB, dxB*dyB, xCBvals, yCBvals, NBvertexmax, &
         xBBvals, yBBvals, Ngridsin(ix,iy), gridsin(ix,iy,:,:))
-      IF (ALLOCATE(poinsin)) DEALLOCATE(poinsin)
+      IF (ALLOCATED(poinsin)) DEALLOCATE(poinsin)
       ALLOCATE(poinsin(Ngridsin(ix,iy),2))
 
       DO iv=1, Ngridsin(ix,iy)
-        poinsin(i,1) = gridsin(ix,iy,iv,1)
-        poinsin(i,2) = gridsin(ix,iy,iv,2)
+        poinsin(iv,1) = gridsin(ix,iy,iv,1)
+        poinsin(iv,2) = gridsin(ix,iy,iv,2)
       END DO
 
@@ -5006 +5007 @@
     END DO
 
+  END SUBROUTINE spacepercen
+
 END MODULE module_scientific

trunk/tools/nc_var_tools.py

@@ -27340 +27340 @@
             ovarybnds = oncref.variables[refvarybndsn]
 
-            refvarx, dims = SliceVarDict(ovarx,slicedict)
-            refvarbndsx, dims = SliceVarDict(ovarxbnds,slicedict)
-            refvary, dims = SliceVarDict(ovary,slicedict)
-            refvarbndsy, dims = SliceVarDict(ovarybnds,slicedict)
-
-            reflon, reflat =  gen.lonlat2D(refvarx, refvary)
+            srefvarx, dims = SliceVarDict(ovarx,slicedict)
+            srefvarbndsx, dims = SliceVarDict(ovarxbnds,slicedict)
+            srefvary, dims = SliceVarDict(ovary,slicedict)
+            srefvarbndsy, dims = SliceVarDict(ovarybnds,slicedict)
+
+            reflon, reflat =  gen.lonlat2D(ovarx[tuple(srefvarx)], ovary[tuple(srefvary)])
+            refvarbndsx = ovarxbnds[tuple(srefvarbndsx)]
+            refvarbndsy = ovarybnds[tuple(srefvarbndsy)]
+
             refdx = reflon.shape[1]
             refdy = reflon.shape[0]
-            refmaxvert = refvarxbnds.shape[2]
+            refmaxvert = refvarbndsx.shape[2]
 
         else:
@@ -27439 +27442 @@
             ovary = oncget.variables[getvaryn]
 
-            getvarx, dims = SliceVarDict(ovarx,slicedict)
-            getvarxbnds, dims = SliceVarDict(ovarxbnds,slicedict)
-            getvary, dims = SliceVarDict(ovary,slicedict)
-            getvarybnds, dims = SliceVarDict(ovarybnds,slicedict)
-
-            getlon, getlat =  gen.lonlat2D(getvarx, getvary)
+            sgetvarx, dims = SliceVarDict(ovarx,slicedict)
+            sgetvarbndsx, dims = SliceVarDict(ovarxbnds,slicedict)
+            sgetvary, dims = SliceVarDict(ovary,slicedict)
+            sgetvarbndsy, dims = SliceVarDict(ovarybnds,slicedict)
+
+            getlon, getlat =  gen.lonlat2D(ovarx[tuple(sgetvarx)], ovary[tuple(sgetvary)])
+            getvarbndsx = ovarxbnds[tuple(sgetvarbndsx)]
+            getvarbndsy = ovarybnds[tuple(sgetvarbndsy)]
             getdx = getlon.shape[1]
             getdy = getlon.shape[0]
-            getmaxvert = getvarxbnds.shape[2]
+            getmaxvert = getvarbndsx.shape[2]
 
         iif = iif + 1
@@ -27453 +27458 @@
     reflont = reflon.transpose()
     reflatt = reflat.transpose()
-    refvarxbndst = refvarxbnds.transpose()
-    refvarybndst = refvarybnds.transpose()
+    refvarxbndst = refvarbndsx.transpose()
+    refvarybndst = refvarbndsy.transpose()
     getlont = getlon.transpose()
     getlatt = getlat.transpose()
-    getvarxbndst = getvarxbnds.transpose()
-    getvarybndst = getvarybnds.transpose()
+    getvarxbndst = getvarbndsx.transpose()
+    getvarybndst = getvarbndsy.transpose()
 
     Ngridsint, gridsint, percenst = fsci.module_scientific.spacepercen(dxa=refdx,    \
-      dya=refdy, xcavals=reflont, ycavals=reflatt, navertmax=refmaxvert,             \
-      xbAvals=refvarxbndst, ybAvals=refvarybndst,                                    \
-      dxb=getdx, dyb=getdy, xcbvals=getlont, ycbvals=getlatt, nbvertmax=getmaxvert,  \
-      xbbvals=getvarxbndst, ybbvals=getvarybndst, strict=strict)
+      dya=refdy, xcavals=reflont, ycavals=reflatt, navertexmax=refmaxvert,           \
+      xbavals=refvarxbndst, ybavals=refvarybndst,                                    \
+      dxb=getdx, dyb=getdy, dxyb=getdx*getdy, xcbvals=getlont, ycbvals=getlatt,      \
+      nbvertexmax=getmaxvert, xbbvals=getvarxbndst, ybbvals=getvarybndst,            \
+      strict=strict)
 
     Ngridsin = Ngridint.transpose()