Changeset 2316 in lmdz_wrf for trunk/tools

Timestamp:

Feb 5, 2019, 2:29:03 PM (6 years ago)

Author:

lfita

Message:

Changing to gridareas as in the same form for gridpercens

File:

• trunk/tools/module_scientific.f90 (modified) (7 diffs)

trunk/tools/module_scientific.f90

@@ -5245 +5245 @@
 
   SUBROUTINE grid_spacepercen(xCAvals, yCAvals, xBAvals, yBAvals, xCBvals, yCBvals, xBBvals, yBBvals, &
-    dxA, dyA, NAvertexmax, dxB, dyB, dxyB, NBvertexmax, strict, Ngridsin, gridsin,  areas, percentages)
+    dxA, dyA, NAvertexmax, dxB, dyB, dxyB, NBvertexmax, strict, Ngridsin, gridsin,  areas2D, areas,   &
+    percentages)
   ! Subroutine to compute the space-percentages of a series of grid cells (B) which lay inside another 
   !   series of grid-cells (A) porviding coincident polygons
@@ -5262 +5263 @@
     INTEGER, DIMENSION(dxA,dyA), INTENT(out)             :: Ngridsin
     INTEGER, DIMENSION(dxA,dyA,dxyB,2), INTENT(out)      :: gridsin
-    REAL(r_k), DIMENSION(dxB,dyB), INTENT(out)           :: areas
-    REAL(r_k), DIMENSION(dxA,dyA,dxyB), INTENT(out)      :: percentages
+    REAL(r_k), DIMENSION(dxB,dyB), INTENT(out)           :: areas2D
+    REAL(r_k), DIMENSION(dxA,dyA,dxyB), INTENT(out)      :: areas,percentages
 
 ! Local
@@ -5270 +5271 @@
    INTEGER, ALLOCATABLE, DIMENSION(:,:)                  :: poinsin
    CHARACTER(len=20)                                     :: IS
-   REAL(r_k), ALLOCATABLE, DIMENSION(:)                  :: pareas
    REAL(r_k), ALLOCATABLE, DIMENSION(:,:)                :: vertexgrid
 
@@ -5285 +5285 @@
 ! Ngridsin: number of grids from grid B with some extension within the grid cell A
 ! gridsin: indices of B grids within the grids of A
-! areas: areas of the grids
+! areas2D: areas of the grids as 2D matrix in the original shape
+! areas: areas of cells B of each of the grids inside the grid cell A
 ! percentages: percentages of area of cells B of each of the grids inside the grid cell A
 
     fname = 'grid_spacepercen'
 
+    areas2D = zeroRK
     areas = zeroRK
+    percentages = zeroRK
 
     DO ix = 1, dxA
@@ -5312 +5315 @@
         IF (ALLOCATED(poinsin)) DEALLOCATE(poinsin)
         ALLOCATE(poinsin(Ngridsin(ix,iy),2))
-        IF (ALLOCATED(pareas)) DEALLOCATE(pareas)
-        ALLOCATE(pareas(Ngridsin(ix,iy)))
 
         DO iv=1, Ngridsin(ix,iy)
@@ -5322 +5323 @@
         Nptin = Ngridsin(ix,iy)
         CALL grid_spacepercen_within_reg(Nvertex, vertexgrid, dxB, dyB, NBvertexmax, xBBvals,        &
-          yBBvals, Ngridsin(ix,iy), poinsin, strict, pareas, percentages(ix,iy,1:Nptin))
+          yBBvals, Ngridsin(ix,iy), poinsin, strict, areas(ix,iy,1:Nptin), percentages(ix,iy,1:Nptin))
 
         ! Filling areas
         DO iv = 1, Ngridsin(ix,iy)
-          IF (areas(poinsin(iv,1), poinsin(iv,2)) == zeroRK) THEN
-            areas(poinsin(iv,1), poinsin(iv,2)) = pareas(iv)
+          IF (areas2D(poinsin(iv,1), poinsin(iv,2)) == zeroRK) THEN
+            areas2D(poinsin(iv,1), poinsin(iv,2)) = areas(ix,iy,iv)
           END IF
         END DO
@@ -5335 +5336 @@
 
     IF (ALLOCATED(vertexgrid)) DEALLOCATE(vertexgrid)
-    IF (ALLOCATED(pareas)) DEALLOCATE(pareas)
     IF (ALLOCATED(poinsin)) DEALLOCATE(poinsin)