Changeset 2220 for LMDZ5/branches/testing/libf/phylmd/cv3p1_closure.F90

Timestamp:

Mar 3, 2015, 2:41:13 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2186:2216 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/cv3p1_closure.F90 (modified) (5 diffs)

LMDZ5/branches/testing/libf/phylmd/cv3p1_closure.F90

@@ -3 +3 @@
 
 SUBROUTINE cv3p1_closure(nloc, ncum, nd, icb, inb, pbase, plcl, p, ph, tv, &
-    tvp, buoy, supmax, ok_inhib, ale, alp, sig, w0, ptop2, cape, cin, m, &
+    tvp, buoy, supmax, ok_inhib, ale, alp, omega,sig, w0, ptop2, cape, cin, m, &
     iflag, coef, plim1, plim2, asupmax, supmax0, asupmaxmin, cbmf, plfc, &
     wbeff)
@@ -37 +37 @@
   LOGICAL ok_inhib ! enable convection inhibition by dryness
   REAL ale(nloc), alp(nloc)
+  REAL omega(nloc,nd)
 
   ! input/output:
@@ -52 +53 @@
 
   ! local variables:
-  INTEGER il, i, j, k, icbmax, i0(nloc)
+  INTEGER il, i, j, k, icbmax, i0(nloc), klfc
   REAL deltap, fac, w, amu
   REAL rhodp
@@ -523 +524 @@
   END DO
 
+!CR:Compute k at plfc
+  DO k=1,nl
+     DO il=1,ncum
+        if ((plfc(il).lt.ph(il,k)).and.(plfc(il).ge.ph(il,k+1))) then
+           klfc=k
+        endif
+     ENDDO
+  ENDDO
+!RC
 
   DO il = 1, ncum
@@ -528 +538 @@
     ! c       cbmf1(il) = alp2(il)/(0.5*wb*wb-Cin(il))
     cbmf1(il) = alp2(il)/(2.*wbeff(il)*wbeff(il)-cin(il))
+!CR: Add large-scale component to the mass-flux
+!encore connu sous le nom "Experience du tube de dentifrice"
+    if (coef_clos_ls.gt.0.) then 
+       cbmf1(il) = cbmf1(il) - coef_clos_ls*min(0.,1./RG*omega(il,klfc))
+    endif
+!RC
     IF (cbmf1(il)==0 .AND. alp2(il)/=0.) THEN
       WRITE (lunout, *) 'cv3p1_closure cbmf1=0 and alp NE 0 il alp2 alp cin ' &