Changeset 5791 for LMDZ6/branches/contrails/libf/phylmd/cv3p_mixing.f90

Timestamp:

Jul 28, 2025, 7:23:15 PM (6 days ago)

Author:

aborella

Message:

Merge with trunk r5789

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmd/cv3p_mixing.f90 (modified) (12 diffs)

LMDZ6/branches/contrails/libf/phylmd/cv3p_mixing.f90

@@ +1 @@
+MODULE cv3p_mixing_mod
+  PRIVATE
+  PUBLIC cv3p_mixing
+CONTAINS
+
+SUBROUTINE cv3p_mixing_pre
+
+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, &
@@ -13 +22 @@
 ! **************************************************************
 
-USE yomcst2_mod_h
+USE yomcst2_mod_h, ONLY : Fmax, gammas, scut, qqa1, qqa2 
    USE lmdz_cv_ini, ONLY : cpd,cpv,minorig,nl,rrv
   USE cvflag_mod_h
@@ -76 +85 @@
   INTEGER nstep
 
-  INTEGER,SAVE                                       :: igout=1
-!$OMP THREADPRIVATE(igout)
+  INTEGER,PARAMETER                                       :: igout=1
 
 ! --   Mixing probability distribution functions
 
   REAL Qcoef1, Qcoef2, QFF, QFFF, Qmix, Rmix, Qmix1, Rmix1, Qmix2, Rmix2, F
-
+  REAL :: Qcoef1max,Qcoef2max  !ym WARNING
+                               !ym redefine local variable instead use module variable
+                               !ym to check when refactoring deep convection
+                               !ym => eliminate "first" SAVE variable 
+                               !ym probably all these folowing lines will be removed
   Qcoef1(F) = tanh(F/gammas)
   Qcoef2(F) = (tanh(F/gammas)+gammas*log(cosh((1.-F)/gammas)/cosh(F/gammas)))
@@ -94 +106 @@
   Rmix(F) = qqa1*Rmix1(F) + qqa2*Rmix2(F)
 
-  INTEGER, SAVE :: ifrst
-  DATA ifrst/0/
-!$OMP THREADPRIVATE(ifrst)
 
 
@@ -103 +112 @@
 ! =====================================================================
 
-! -- Initialize mixing PDF coefficients
-  IF (ifrst==0) THEN
-    ifrst = 1
-    Qcoef1max = Qcoef1(Fmax)
-    Qcoef2max = Qcoef2(Fmax)
-!<jyg
-   print*, 'fmax, gammas, qqa1, qqa2, Qcoef1max, Qcoef2max ', &
-            fmax, gammas, qqa1, qqa2, Qcoef1max, Qcoef2max
-!>jyg
-!
-  END IF
-
+  Qcoef1max = Qcoef1(Fmax)
+  Qcoef2max = Qcoef2(Fmax)
 
 ! ori        do 360 i=1,ncum*nlp
   DO j = 1, nl
-    DO i = 1, ncum
-      nent(i, j) = 0
+    DO il = 1, ncum
+      nent(il, j) = 0
 ! in convect3, m is computed in cv3_closure
 ! ori          m(i,1)=0.0
@@ -129 +128 @@
   DO j = 1, nl
     DO k = 1, nl
-      DO i = 1, ncum
-        Qent(i, k, j) = rr(i, j)
-        uent(i, k, j) = u(i, j)
-        vent(i, k, j) = v(i, j) 
-        elij(i, k, j) = 0.0
-        hent(i, k, j) = 0.0
+      DO il = 1, ncum
+        Qent(il, k, j) = rr(il, j)
+        uent(il, k, j) = u(il, j)
+        vent(il, k, j) = v(il, j) 
+        elij(il, k, j) = 0.0
+        hent(il, k, j) = 0.0
 !AC!            Ment(i,k,j)=0.0
 !AC!            Sij(i,k,j)=0.0
@@ -295 +294 @@
 ! =====================================================================
 
-  CALL zilch(csum, nloc*nd)
-
+  csum(:,:) = 0.
+  
   DO il = 1, ncum
     lwork(il) = .FALSE.
@@ -309 +308 @@
       IF (i>=icb(il) .AND. i<=inb(il)) num1 = num1 + 1
     END DO
-    IF (num1<=0) GO TO 789
+!ym    IF (num1<=0) GO TO 789
+    IF (num1<=0) CYCLE
 
 
@@ -389 +389 @@
             lwork(il)) num2 = num2 + 1
       END DO
-      IF (num2<=0) GO TO 175
-
+!ym      IF (num2<=0) GO TO 175
+      IF (num2<=0) CYCLE
 ! -----------------------------------------------
       IF (j>i) THEN
@@ -627 +627 @@
 
 ! ---------------------------------------------------------------
-175 END DO        ! End loop on destination level "j"
+    END DO  !ym label 175      ! End loop on destination level "j"
 ! ---------------------------------------------------------------
 
@@ -692 +692 @@
 
 ! ---------------------------------------------------------------
-789 END DO              ! End loop on origin level "i"
+END DO  !ym label 789             ! End loop on origin level "i"
+
 ! ---------------------------------------------------------------
 
@@ -699 +700 @@
 END SUBROUTINE cv3p_mixing
 
+END MODULE cv3p_mixing_mod