Changeset 5840 for LMDZ6/trunk/libf/phylmd/cv3p_mixing.f90

Timestamp:

Sep 25, 2025, 10:57:40 AM (2 months ago)

Author:

jyg

Message:

Getting rid of tracer arrays within cva_driver.
Lot of comments to be cleared later.

File:

• LMDZ6/trunk/libf/phylmd/cv3p_mixing.f90 (modified) (9 diffs)

LMDZ6/trunk/libf/phylmd/cv3p_mixing.f90

@@ -8 +8 @@
 END SUBROUTINE cv3p_mixing_pre
 
-SUBROUTINE cv3p_mixing(nloc, ncum, nd, na, ntra, icb, nk, inb, &
-                       ph, t, rr, rs, u, v, tra, h, lv, lf, frac, qta, &
+!!SUBROUTINE cv3p_mixing(nloc, ncum, nd, na, ntra, icb, nk, inb, &                        !jyg: get rid of ntra
+SUBROUTINE cv3p_mixing(nloc, ncum, nd, na, icb, nk, inb, &
+!!                       ph, t, rr, rs, u, v, tra, h, lv, lf, frac, qta, &                !jyg: get rid of ntra
+                       ph, t, rr, rs, u, v, h, lv, lf, frac, qta, &
                        unk, vnk, hp, tv, tvp, ep, clw, sig, &
                        Ment, Qent, hent, uent, vent, nent, &
-                       Sigij, elij, supmax, Ments, Qents, traent)
+!!                       Sigij, elij, supmax, Ments, Qents, traent)                       !jyg: get rid of ntra
+                       Sigij, elij, supmax, Ments, Qents)
 ! **************************************************************
 ! *
@@ -33 +36 @@
 
 !inputs:
-  INTEGER, INTENT (IN)                               :: ncum, nd, na
-  INTEGER, INTENT (IN)                               :: ntra, nloc
+  INTEGER, INTENT (IN)                               :: ncum, nd, na                      
+!!  INTEGER, INTENT (IN)                               :: ntra, nloc                      !jyg: get rid of ntra
+  INTEGER, INTENT (IN)                               :: nloc
   INTEGER, DIMENSION (nloc), INTENT (IN)             :: icb, inb, nk
   REAL, DIMENSION (nloc, nd), INTENT (IN)            :: sig
@@ -42 +46 @@
   REAL, DIMENSION (nloc, nd), INTENT (IN)            :: t, rr, rs
   REAL, DIMENSION (nloc, nd), INTENT (IN)            :: u, v
-  REAL, DIMENSION (nloc, nd, ntra), INTENT (IN)      :: tra ! input of convect3
+!!  REAL, DIMENSION (nloc, nd, ntra), INTENT (IN)      :: tra ! input of convect3         !jyg: get rid of ntra
   REAL, DIMENSION (nloc, na), INTENT (IN)            :: lv
   REAL, DIMENSION (nloc, na), INTENT (IN)            :: lf
@@ -57 +61 @@
   REAL, DIMENSION (nloc, na), INTENT (OUT)           :: supmax           ! Highest mixing fraction of mixed
                                                                          ! updraughts with the sign of (h-hp)
-  REAL, DIMENSION (nloc, nd, nd, ntra), INTENT (OUT) :: traent
+!!  REAL, DIMENSION (nloc, nd, nd, ntra), INTENT (OUT) :: traent                          !jyg: get rid of ntra
   REAL, DIMENSION (nloc, nd, nd), INTENT (OUT)       :: Ments, Qents
   REAL, DIMENSION (nloc, nd, nd), INTENT (OUT)       :: hent
@@ -147 +151 @@
   Sigij(1:ncum, 1:nd, 1:nd) = 0.0
 !ym 
-
-!jyg!  DO k = 1, ntra
-!jyg!    DO j = 1, nd ! instead nlp
-!jyg!      DO i = 1, nd ! instead nlp
-!jyg!        DO il = 1, ncum
-!jyg!          traent(il, i, j, k) = tra(il, j, k)
-!jyg!        END DO
-!jyg!      END DO
-!jyg!    END DO
-!jyg!  END DO
 
 ! =====================================================================
@@ -264 +258 @@
     END DO
   END DO ! i = minorig + 1, nl
-
-!jyg!  DO j = 1, ntra
-!jyg!    DO i = minorig + 1, nl
-!jyg!      DO il = 1, ncum
-!jyg!        IF (i>=icb(il) .AND. i<=inb(il) .AND. nent(il,i)==0) THEN
-!jyg!          traent(il, i, i, j) = tra(il, nk(il), j)
-!jyg!        END IF
-!jyg!      END DO
-!jyg!    END DO
-!jyg!  END DO
 
   DO j = minorig, nl
@@ -577 +561 @@
         END IF
       END DO
-!jyg!      DO k = 1, ntra
-!jyg!        DO il = 1, ncum
-!jyg!          IF ((i>=icb(il)) .AND. (i<=inb(il)) .AND. &
-!jyg!              (j>=(icb(il)-1)) .AND. (j<=inb(il)) .AND. &
-!jyg!              lwork(il)) THEN
-!jyg!            IF (Sij(il,i,j)>0.0) THEN
-!jyg!              traent(il, i, j, k) = Sigij(il, i, j)*tra(il, i, k) + &
-!jyg!                                    (1.-Sigij(il,i,j))*tra(il, nk(il), k)
-!jyg!            END IF
-!jyg!          END IF
-!jyg!        END DO
-!jyg!      END DO
 
 ! --    If I=J (detrainement and entrainement at the same level), then only the
@@ -612 +584 @@
           END IF
         END DO
-!jyg!        DO k = 1, ntra
-!jyg!          DO il = 1, ncum
-!jyg!            IF ((i>=icb(il)) .AND. (i<=inb(il)) .AND. &
-!jyg!                (j>=(icb(il)-1)) .AND. (j<=inb(il)) .AND. &
-!jyg!                lwork(il)) THEN
-!jyg!              IF (Sij(il,i,j)>0.0) THEN
-!jyg!                traent(il, i, i, k) = tra(il, nk(il), k)
-!jyg!              END IF
-!jyg!            END IF
-!jyg!          END DO
-!jyg!        END DO
-
-      END IF
+      END IF   !(i==j)
 
 ! ---------------------------------------------------------------
@@ -682 +642 @@
     END DO ! il
 
-!jyg!    DO j = 1, ntra
-!jyg!      DO il = 1, ncum
-!jyg!        IF (i>=icb(il) .AND. i<=inb(il) .AND. lwork(il) .AND. csum(il,i)<1.) THEN
-!jyg!! cc     :     .and. csum(il,i).lt.m(il,i) ) then
-!jyg!          traent(il, i, i, j) = tra(il, nk(il), j)
-!jyg!        END IF
-!jyg!      END DO
-!jyg!    END DO
-
 ! ---------------------------------------------------------------
 END DO  !ym label 789             ! End loop on origin level "i"