Changeset 2359 in lmdz_wrf

Timestamp:

Feb 21, 2019, 8:10:14 PM (6 years ago)

Author:

lfita

Message:

Adding `Flike' in different subroutines to take into account indices from non-Fortran origins

File:

• trunk/tools/module_generic.f90 (modified) (12 diffs)

trunk/tools/module_generic.f90

@@ -991 +991 @@
   END SUBROUTINE get_xyconlimits
 
-  SUBROUTINE from_ptlist_2DRKmatrix(Npts, pts, vals, dx, dy, NOval, matrix)
+  SUBROUTINE from_ptlist_2DRKmatrix(Npts, pts, Flike, vals, dx, dy, NOval, matrix)
   ! Subroutine to construct a 2D RK matrix from a list of values accompaigned by a list of grid-point 
   !   coordinates
@@ -998 +998 @@
 
     INTEGER, INTENT(in)                                  :: Npts, dx, dy
+    LOGICAL, INTENT(in)                                  :: Flike
     REAL(r_k), INTENT(in)                                :: NOval
     INTEGER, DIMENSION(Npts,2), INTENT(in)               :: pts
@@ -1009 +1010 @@
 ! Npts: Number of values of the list
 ! pts: 2D matrix coordinates of the values
+! Flike: whether input is Fortran-like (1: x, 2: y) or not (0-based; 1: y, 2: x)
 ! vals: list of values correspondant to the coordinates
 ! dx, dy: shape of the 2D matrix
@@ -1018 +1020 @@
     matrix = NOval
 
-    DO iv=1, Npts
-      i = pts(iv,1)
-      j = pts(iv,2)
-      matrix(i,j) = vals(iv)
-    END DO
+    IF (Flike) THEN
+      DO iv=1, Npts
+        i = pts(iv,1)
+        j = pts(iv,2)
+        matrix(i,j) = vals(iv)
+      END DO
+    ELSE
+      DO iv=1, Npts
+        i = pts(iv,2)+1
+        j = pts(iv,1)+1
+        matrix(i,j) = vals(iv)
+      END DO
+    END IF
 
     RETURN
@@ -1028 +1038 @@
   END SUBROUTINE from_ptlist_2DRKmatrix
 
-  SUBROUTINE from_ptlist_2DRKNmatrix(Npts, pts, Nvals, vals, dx, dy, NOval, Nmatrix)
+  SUBROUTINE from_ptlist_2DRKNmatrix(Npts, pts, Flike, Nvals, vals, dx, dy, NOval, Nmatrix)
   ! Subroutine to construct N 2D RK matrix from a list of values accompaigned by a list of grid-point 
   !   coordinates
@@ -1035 +1045 @@
 
     INTEGER, INTENT(in)                                  :: Npts, dx, dy, Nvals
+    LOGICAL, INTENT(in)                                  :: Flike
     REAL(r_k), INTENT(in)                                :: NOval
     INTEGER, DIMENSION(Npts,2), INTENT(in)               :: pts
@@ -1046 +1057 @@
 ! Npts: Number of values of the list
 ! pts: 2D matrix coordinates of the values
+! Flike: whether input is Fortran-like (1: x, 2: y) or not (0-based; 1: y, 2: x)
 ! Nvals: number of different values
 ! vals: list of N-values correspondant to the coordinates
@@ -1056 +1068 @@
     Nmatrix = NOval
 
-    DO iv=1, Npts
-      i = pts(iv,1)
-      j = pts(iv,2)
-      Nmatrix(i,j,:) = vals(iv,:)
-    END DO
+    IF (Flike) THEN
+      DO iv=1, Npts
+        i = pts(iv,1)
+        j = pts(iv,2)
+        Nmatrix(i,j,:) = vals(iv,:)
+      END DO
+    ELSE
+      DO iv=1, Npts
+        i = pts(iv,2)+1
+        j = pts(iv,1)+1
+        Nmatrix(i,j,:) = vals(iv,:)
+      END DO
+    END IF
 
     RETURN
@@ -1066 +1086 @@
   END SUBROUTINE from_ptlist_2DRKNmatrix
 
-  SUBROUTINE from_coordlist_2DRKmatrix(Npts, coords, xcoord, ycoord, vals, dx, dy, NOval, matrix)
+  SUBROUTINE from_coordlist_2DRKmatrix(Npts, coords, Flike, xcoord, ycoord, vals, dx, dy, NOval,      &
+    matrix)
   ! Subroutine to construct a 2D RK matrix from a list of values accompaigned by a list of coordinates
   !   to find i,j grid-point coordinates by minimum distance
@@ -1073 +1094 @@
 
     INTEGER, INTENT(in)                                  :: Npts, dx, dy
+    LOGICAL, INTENT(in)                                  :: Flike
     REAL(r_k), INTENT(in)                                :: NOval
     REAL(r_k), DIMENSION(Npts,2), INTENT(in)             :: coords
@@ -1088 +1110 @@
 ! Npts: Number of values of the list
 ! coords: 2D coordinates of the values
+! Flike: whether input is Fortran-like (1: x, 2: y) or not (0-based; 1: y, 2: x)
 ! vals: list of values correspondant to the coordinates
 ! xcoord, ycoord: matrix of values correspondant to the each coordinate
@@ -1098 +1121 @@
     matrix = NOval
 
-    DO iv=1, Npts
-      xi = coords(iv,1)
-      yi = coords(iv,2)
-      diff = SQRT((xcoord-xi)**2+(ycoord-yi)**2)
-      minpt = MINLOC(diff)
-      matrix(minpt(1),minpt(2)) = vals(iv)
-    END DO
+    IF (Flike) THEN
+      DO iv=1, Npts
+        xi = coords(iv,1)
+        yi = coords(iv,2)
+        diff = SQRT((xcoord-xi)**2+(ycoord-yi)**2)
+        minpt = MINLOC(diff)
+        matrix(minpt(1),minpt(2)) = vals(iv)
+      END DO
+    ELSE
+      DO iv=1, Npts
+        xi = coords(iv,2)
+        yi = coords(iv,1)
+        diff = SQRT((xcoord-xi)**2+(ycoord-yi)**2)
+        minpt = MINLOC(diff)
+        matrix(minpt(1),minpt(2)) = vals(iv)
+      END DO
+    END IF
 
     RETURN