Changeset 5478 for LMDZ6

Timestamp:

Jan 16, 2025, 10:10:56 AM (10 hours ago)

Author:

jyg

Message:

Flag-protect the bug fix of svn 5469 :

keep_bug_indices_cv3_tracer=.TRUE. ==> bug is kept
default is .FALSE.

File:

• LMDZ6/trunk/libf/phylmd/cv3_routines.f90 (modified) (5 diffs)

LMDZ6/trunk/libf/phylmd/cv3_routines.f90

@@ -4938 +4938 @@
    USE lmdz_cv_ini, ONLY : nl
   USE cvflag_mod_h
+  USE ioipsl_getin_p_mod, ONLY : getin_p
   IMPLICIT NONE
 
 
 !inputs:
+!------
   INTEGER, INTENT (IN)                               :: ncum, nd, na, nloc, len
   INTEGER, DIMENSION (len), INTENT (IN)              :: icb, inb
@@ -4949 +4951 @@
   REAL, DIMENSION (len, nd+1), INTENT (IN)           :: Vprecip
 !ouputs:
+!------
   REAL, DIMENSION (len, na, na), INTENT (OUT)        :: phi, phi2, epmlmMm
   REAL, DIMENSION (len, na), INTENT (OUT)            :: da, d1a, dam, eplaMm
 !
+!local variables:
+!---------------
 ! variables pour tracer dans precip de l'AA et des mel
-!local variables:
   INTEGER i, j, k
   REAL epm(nloc, na, na)
+!
+  LOGICAL,SAVE   ::  first=.TRUE.
+  LOGICAL,SAVE   ::  keep_bug_indices_cv3_tracer
+  !$OMP_THREADPRIVATE (first, keep_bug_indices_cv3_tracer)
 
 ! variables d'Emanuel : du second indice au troisieme
@@ -4962 +4970 @@
 ! variables personnelles : du troisieme au second indice
 ! --->    tab(i,j,k) -> de k a j
-! phi, phi2
-
+! phi, phi2, epm, epmlmMm
+
+  IF (first) THEN
+    keep_bug_indices_cv3_tracer = .FALSE.
+    CALL getin_p('keep_bug_indices_cv3_tracer', keep_bug_indices_cv3_tracer)
+    first = .FALSE.
+  ENDIF ! (first)
 ! initialisations
 
@@ -5022 +5035 @@
         d1a(i, j) = d1a(i, j) + ment(i, k, j)*ep(i, k)*(1.-sigij(i,k,j))
         IF (k<=j) THEN
-!!jyg          dam(i, j) = dam(i, j) + ment(i, k, j)*epm(i, k, j)*(1.-ep(i,k))*(1.-sigij(i,k,j))
-          dam(i, j) = dam(i, j) + ment(i, k, j)*epm(i, j, k)*(1.-ep(i,k))*(1.-sigij(i,k,j))
           phi2(i, j, k) = phi(i, j, k)*epm(i, j, k)
         END IF
@@ -5029 +5040 @@
     END DO
   END DO
+
+  IF (keep_bug_indices_cv3_tracer) THEN
+    DO j = 1, nl
+      DO k = 1, nl
+        DO i = 1, ncum
+          IF (k<=j) THEN
+            dam(i, j) = dam(i, j) + ment(i, k, j)*epm(i, k, j)*(1.-ep(i,k))*(1.-sigij(i,k,j))
+          END IF ! (k<=j)
+        END DO
+      END DO
+    END DO
+  ELSE  ! (keep_bug_indices_cv3_tracer)
+    DO j = 1, nl
+      DO k = 1, nl
+        DO i = 1, ncum
+          IF (k<=j) THEN
+            dam(i, j) = dam(i, j) + ment(i, k, j)*epm(i, j, k)*(1.-ep(i,k))*(1.-sigij(i,k,j))
+          END IF ! (k<=j)
+        END DO
+      END DO
+    END DO
+  ENDIF ! (keep_bug_indices_cv3_tracer)
 
   RETURN