Changeset 2302 in lmdz_wrf

Timestamp:

Jan 30, 2019, 1:42:25 PM (6 years ago)

Author:

lfita

Message:

Fixing 'coincident_gridsin2D' !!

• indices for A and B, also rely on the other slices inpA/B = f(A,B)!!

File:

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

trunk/tools/module_scientific.f90 ¶

@@ -6255 +6255 @@
   END SUBROUTINE coincident_list_2Dcoords
 
-  SUBROUTINE coincident_gridsin2D_old(dxA, dyA, dxyA, NpointsA, pointsA, dxB, dyB, dxyB, NpointsB,        &
+  SUBROUTINE coincident_gridsin2D_old(dxA, dyA, dxyA, NpointsA, pointsA, dxB, dyB, dxyB, NpointsB,    &
     pointsB, Npoints, points, inpointsA, inpointsB)
   ! Subroutine to determine which lists of 2D gridsin points of an A list are also found in a B list
@@ -6270 +6270 @@
     INTEGER, DIMENSION(dxA, dyA, dxB, dyB, dxyA, 2),                                                  &
       INTENT(out)                                        :: points
-    INTEGER, DIMENSION(dxA, dyA, dxyA), INTENT(out)      :: inpointsA
-    INTEGER, DIMENSION(dxB, dyB, dxyA), INTENT(out)      :: inpointsB
+    INTEGER, DIMENSION(dxA, dyA, dxB, dyB, dxyA),                                                     &
+      INTENT(out)                                        :: inpointsA
+    INTEGER, DIMENSION(dxA, dyA, dxB, dyB, dxyA),                                                     &
+      INTENT(out)                                        :: inpointsB
 
     ! Local
@@ -6311 +6313 @@
               points(ixA,iyA,ixB,iyB,iv,1) = pts(iv,1)
               points(ixA,iyA,ixB,iyB,iv,2) = pts(iv,2)
-              inpointsA(ixA,iyA,iv) = ptsA(iv)
-              inpointsB(ixB,iyB,iv) = ptsB(iv)
-              IF (Npoints(ixA,iyA,ixB,iyB) == 4) THEN
-                PRINT *,ixA, iyA,ixB,iyB,'________________'
-                DO ii = 1, Npoints(ixA,iyA,ixB,iyB)
-                  PRINT *,'Lluis ii:', ii, points(ixA,iyA,ixB,iyB,ii,:)
-                  PRINT *,'Lluis A:', inpointsA(ixA,iyA,iv), pointsA(ixA,iyA,ptsA(iv),:)
-                  PRINT *,'Lluis B:', inpointsB(ixB,iyB,iv), pointsB(ixB,iyB,ptsB(iv),:)
-                END DO
-              END IF
+              inpointsA(ixA,iyA,ixB,iyB,iv) = ptsA(iv)
+              inpointsB(ixA,iyA,ixB,iyB,iv) = ptsB(iv)
             END DO
           END DO
@@ -6344 +6338 @@
     INTEGER, DIMENSION(dxA, dyA, dxB, dyB, dxyA, 2),                                                  &
       INTENT(out)                                        :: points
-    INTEGER, DIMENSION(dxA, dyA, dxyA), INTENT(out)      :: inpointsA
-    INTEGER, DIMENSION(dxB, dyB, dxyA), INTENT(out)      :: inpointsB
+    INTEGER, DIMENSION(dxA, dyA, dxB, dyB, dxyA),                                                     &
+      INTENT(out)                                        :: inpointsA
+    INTEGER, DIMENSION(dxA, dyA, dxB, dyB, dxyA),                                                     &
+      INTENT(out)                                        :: inpointsB
 
     ! Local
@@ -6387 +6383 @@
                   points(ixA,iyA,ixB,iyB,iv,1) = pointsA(ixA,iyA,iv1,1)
                   points(ixA,iyA,ixB,iyB,iv,2) = pointsA(ixA,iyA,iv1,2)
-                  inpointsA(ixA,iyA,iv) = iv1
-                  inpointsB(ixB,iyB,iv) = iv2
+                  inpointsA(ixA,iyA,ixB,iyB,iv) = iv1
+                  inpointsB(ixA,iyA,ixB,iyB,iv) = iv2
                 END IF
               END DO
@@ -6396 +6392 @@
         END DO
       END DO
-    END DO
+    END DO    
 
   END SUBROUTINE coincident_gridsin2D