Changeset 2726 in lmdz_wrf

Timestamp:

Oct 17, 2019, 2:21:35 PM (6 years ago)

Author:

lfita

Message:

Adding missval

File:

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

trunk/tools/module_generic.f90

@@ -1268 +1268 @@
     ii = 0
     DO ir=1, d1r
-      DO iv=1, d1v
-        IF ( (refv(ir) /= missval) .AND. (vals(iv) == refv(ir)) )THEN
-          ii = ii + 1
-          indices(ii,:) = (/ ir, iv /)
-          samevalues(ii) = refv(ir)
-        END IF
-      END DO
+      IF (refv(ir) /= missval) THEN
+        DO iv=1, d1v
+          IF (vals(iv) == refv(ir)) THEN
+            ii = ii + 1
+            indices(ii,:) = (/ ir, iv /)
+            samevalues(ii) = refv(ir)
+          END IF
+        END DO
+      END IF
     END DO
 
@@ -1281 +1283 @@
   END SUBROUTINE index_samevals1D_RK
 
-  SUBROUTINE index_samevals2D_RK(d1r, d2r, refv, d1v, d2v, d12v, vals, ii, indices, samevalues)
+  SUBROUTINE index_samevals2D_RK(d1r, d2r, refv, d1v, d2v, d12v, vals, ii, indices, missval,          &
+    samevalues)
   ! Subroutine to search for the indices of the same values between 2 2D RK series of values allowing 
   !   repetitions
@@ -1288 +1291 @@
 
     INTEGER, INTENT(in)                                  :: d1r, d2r, d1v, d2v, d12v
+    REAL(r_k), INTENT(in)                                :: missval
     REAL(r_k), DIMENSION(d1r,d2r), INTENT(in)            :: refv
     REAL(r_k), DIMENSION(d1v,d2v), INTENT(in)            :: vals
@@ -1304 +1308 @@
 ! ii: quantity of same values found
 ! indices: output
+! missval: missing value
 ! samevalues: values where coincidence is found
 
@@ -1313 +1318 @@
     DO ir1=1, d1r
       DO ir2=1, d2r
-        DO iv1=1, d1v
-          DO iv2=1, d2v
-            IF (vals(iv1,iv2) == refv(ir1,ir2)) THEN
-              ii = ii + 1
-              indices(ii,1,1) = ir1
-              indices(ii,1,2) = ir2
-              indices(ii,2,1) = iv1
-              indices(ii,2,2) = iv2
-              samevalues(ii) = refv(ir1,ir2)
-            END IF
+        IF (refv(ir1,ir2) /= missval) THEN
+          DO iv1=1, d1v
+            DO iv2=1, d2v
+              IF (vals(iv1,iv2) == refv(ir1,ir2)) THEN
+                ii = ii + 1
+                indices(ii,1,1) = ir1
+                indices(ii,1,2) = ir2
+                indices(ii,2,1) = iv1
+                indices(ii,2,2) = iv2
+                samevalues(ii) = refv(ir1,ir2)
+              END IF
+            END DO
           END DO
-        END DO
+        END IF
       END DO
     END DO