Changeset 2330 in lmdz_wrf

Timestamp:

Feb 11, 2019, 7:43:21 PM (6 years ago)

Author:

lfita

Message:

Adding x/y look for continuity (not totally working!)

Location:

trunk/tools

Files:

• module_ForDiagnostics.f90 (modified) (4 diffs)
• module_generic.f90 (modified) (5 diffs)
• nc_var_tools.py (modified) (1 diff)

trunk/tools/module_ForDiagnostics.f90

@@ -977 +977 @@
     INTEGER, DIMENSION(2,d1)                             :: ranges1
     INTEGER, DIMENSION(2,d2)                             :: ranges2
+    INTEGER, DIMENSION(d1,d2)                            :: iranges
 
 !!!!!!! Variables
@@ -1019 +1020 @@
         END DO
         DO i=1, Nranges
-          ranges(ranges1(1,i):ranges1(2,i),j) = i
+          iranges(ranges1(1,i):ranges1(2,i),j) = i
           rangeshgtmax(ranges1(1,i):ranges1(2,i),j) = rangeshgtmax1(i)
           ptrangeshgtmax(irangeshgtmax1(i),j) = 1
@@ -1039 +1040 @@
         END DO
         DO j=1, Nranges
-          ranges(i,ranges2(1,j):ranges2(2,j)) = j
+          iranges(i,ranges2(1,j):ranges2(2,j)) = j
           rangeshgtmax(i,ranges2(1,j):ranges2(2,j)) = rangeshgtmax2(j)
           ptrangeshgtmax(i,irangeshgtmax2(j)) = 1
@@ -1049 +1050 @@
       PRINT *,'    accepted ones: WE, SN'
       STOP
+    END IF
+
+    ! Homogenizing indices of the ranges
+    IF (TRIM(face) == 'WE') THEN
+      CALL xzones_homogenization(d1, d2, iranges, ranges)
+    ELSE IF (TRIM(face) == 'SN') THEN
+      CALL yzones_homogenization(d1, d2, iranges, ranges)
     END IF
 

trunk/tools/module_generic.f90

@@ -18 +18 @@
 ! RangeR_K: Function to provide a range of d1 from 'iniv' to 'endv', of real(r_k) values in a vector
 ! stoprun: Subroutine to stop running and print a message
-! zones_homogenization: Subroutine to homogenize 2D contiguous zones, zones might be contiguous, but 
-!   with different number assigned !
+! xzones_homogenization: Subroutine to homogenize 2D contiguous zones along x-axis. Zones might be 
+!   contiguous, but with different number assigned !
+! yzones_homogenization: Subroutine to homogenize 2D contiguous zones along y-axis. Zones might be 
+!   contiguous, but with different number assigned !
 
   USE module_definitions
@@ -440 +442 @@
   END SUBROUTINE stoprun
 
-  SUBROUTINE zones_homogenization(dx, dy, inzones, outzones)
-! Subroutine to homogenize 2D contiguous zones, zones might be contiguous, but with different number assigned !
+  SUBROUTINE xzones_homogenization(dx, dy, inzones, outzones)
+! Subroutine to homogenize 2D contiguous zones along x-axis, zones might be contiguous, but with 
+!   different number assigned !
 !   Here we have a 2D matrix of integers, with contiguous integer filled zones, zero outside any zone
 !   It might be, that within the same zone, might be lines which do not share the same integer
@@ -459 +462 @@
     INTEGER                                              :: Nmaxzones, TOTzones
     LOGICAL                                              :: assigned
-    INTEGER, DIMENSION(dy)                               :: prevline
-    INTEGER, DIMENSION(dx)                               :: Nyzones
+    INTEGER, DIMENSION(dx)                               :: prevline
+    INTEGER, DIMENSION(dy)                               :: Nxzones
     INTEGER, DIMENSION(:,:,:), ALLOCATABLE               :: zones
 
@@ -468 +471 @@
 ! outzones: zones homogenized
 
-    fname = 'zones_homogenization'
+    fname = 'xzones_homogenization'
+
+    ! Maximum possible number of zones
+    Nmaxzones = INT((dx/2)*(dy/2))
+
+    ! Matrix with [i,j,Nzone,izone/ezone]
+    IF (ALLOCATED(zones)) DEALLOCATE(zones)
+    ALLOCATE(zones(dy,Nmaxzones,3))
+
+    zones = 0
+    Nxzones = 0
+    ! Getting beginning/end of y-bands
+    DO j=1, dy
+      k = 0
+      i = 1
+      IF (inzones(i,j) /= 0) THEN
+        k = k + 1
+        zones(j,k,1) = i
+        zones(j,k,3) = k
+      END IF
+      DO i=2, dx
+        IF ( (inzones(i,j) /= 0) .AND. (inzones(i-1,j) == 0)) THEN
+          k = k+1
+          zones(j,k,1) = i
+          zones(j,k,3) = k
+        ELSE IF ( (inzones(i-1,j) /= 0) .AND. (inzones(i,j) == 0)) THEN
+          zones(j,k,2) = i-1
+          zones(j,k,3) = k
+        END IF
+      END DO
+      IF (k > 0) THEN
+        IF (zones(j,k,2) == 0) zones(j,k,2) = dx
+      END IF
+      Nxzones(j) = k
+    END DO
+
+    ! Homogenizing contigous zones
+    outzones = 0
+    TOTzones = 0
+    j = 1
+    DO k = 1, Nxzones(j)
+      TOTzones = TOTzones + 1
+      DO i=zones(j,k,1), zones(j,k,2)
+        outzones(i,j) = TOTzones
+      END DO
+    END DO
+
+    DO j=2, dy
+      prevline = outzones(:,j-1)
+      DO k = 1, Nxzones(j)
+        assigned = .FALSE.
+        DO i=zones(j,k,1), zones(j,k,2)
+          IF (prevline(i) /= 0) THEN
+            outzones(zones(j,k,1):zones(j,k,2),j) = prevline(i)
+            assigned = .TRUE.
+            EXIT
+          END IF
+        END DO
+        IF (.NOT.assigned) THEN
+          TOTzones = TOTzones + 1
+          DO i=zones(j,k,1), zones(j,k,2)
+            outzones(i,j) = TOTzones
+          END DO
+        END IF
+      END DO
+    END DO
+
+    IF (ALLOCATED(zones)) DEALLOCATE(zones)
+
+  END SUBROUTINE xzones_homogenization
+
+  SUBROUTINE yzones_homogenization(dx, dy, inzones, outzones)
+! Subroutine to homogenize 2D contiguous zones along y-axis, zones might be contiguous, but with 
+!   different number assigned !
+!   Here we have a 2D matrix of integers, with contiguous integer filled zones, zero outside any zone
+!   It might be, that within the same zone, might be lines which do not share the same integer
+!     0 0 0 0 0          0 0 0 0 0 
+!     0 1 1 0 0          0 1 1 0 0
+!     0 2 0 0 1    == >  0 1 0 0 2
+!     0 1 1 0 0          0 1 1 0 0 
+
+    IMPLICIT NONE
+
+    INTEGER, INTENT(in)                                  :: dx, dy
+    INTEGER, DIMENSION(dx,dy), INTENT(in)                :: inzones
+    INTEGER, DIMENSION(dx,dy), INTENT(out)               :: outzones
+
+! Local
+    INTEGER                                              :: i,j,k
+    INTEGER                                              :: Nmaxzones, TOTzones
+    LOGICAL                                              :: assigned
+    INTEGER, DIMENSION(dy)                               :: prevline
+    INTEGER, DIMENSION(dx)                               :: Nyzones
+    INTEGER, DIMENSION(:,:,:), ALLOCATABLE               :: zones
+
+!!!!!!! Variables
+! dx, dy: Shape of the 2D space
+! inzones: zones to homogenize
+! outzones: zones homogenized
+
+    fname = 'yzones_homogenization'
 
     ! Maximum possible number of zones
@@ -537 +640 @@
     IF (ALLOCATED(zones)) DEALLOCATE(zones)
 
-  END SUBROUTINE zones_homogenization
+  END SUBROUTINE yzones_homogenization
 
 END MODULE module_generic

trunk/tools/nc_var_tools.py

@@ -29437 +29437 @@
         quit(-1)
 
+    
+
     onc = NetCDFFile(ncfile, 'r')
     if not onc.variables.has_key(varname):