Changeset 2292 in lmdz_wrf for trunk

Timestamp:

Jan 28, 2019, 3:39:22 PM (7 years ago)

Author:

lfita

Message:

Fixing memory issues on the coincident_gridsin2D', coincident_list_2Dcoords': one needs to fully provide where in the matrices value will be located !

File:

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

trunk/tools/module_scientific.f90

@@ -6019 +6019 @@
         IF ( (pointsA(iA,1) == pointsB(iB,1)) .AND. (pointsA(iA,2) == pointsB(iB,2)) ) THEN
           Npoints = Npoints + 1
-          points(Npoints,:) = pointsA(iA,:)
+          points(Npoints,1) = pointsA(iA,1)
+          points(Npoints,2) = pointsA(iA,2)
           inpA(Npoints) = iA
           inpB(Npoints) = iB
@@ -6049 +6050 @@
 
     ! Local
-    INTEGER                                              :: ixA, iyA, ixB, iyB
+    INTEGER                                              :: ixA, iyA, ixB, iyB, iv
     INTEGER                                              :: NA, NB
+    INTEGER, DIMENSION(dxyA)                             :: ptsA, ptsB
+    INTEGER, DIMENSION(dxyA, 2)                          :: pts
+
 
 !!!!!!! Variables
@@ -6077 +6081 @@
           DO iyB=1, dyB
             NB = NpointsB(ixB,iyB)
+            pts = -1
             CALL coincident_list_2Dcoords(NA, pointsA(ixA,iyA,1:NA,:), NB, pointsB(ixB,iyB,1:NB,:),   &
-              Npoints(ixA,iyA,ixB,iyB), points(ixA,iyA,ixB,iyB,:,:), inpointsA(ixA,iyA,:),            &
-              inpointsB(ixB,iyB,:))
+              Npoints(ixA,iyA,ixB,iyB), pts(1:NA,:), ptsA, ptsB)
+            DO iv = 1, Npoints(ixA,iyA,ixB,iyB)
+              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)
+            END DO
           END DO
         END DO