--- trunk/Sources/phylmd/concvl.f	2016/03/15 17:07:47	180
+++ trunk/phylmd/concvl.f90	2019/06/13 14:40:06	328
@@ -4,36 +4,34 @@
 
 contains
 
-  SUBROUTINE concvl(dtime, paprs, play, t, q, u, v, sig1, w01, d_t, d_q, d_u, &
-       d_v, rain, snow_con, kbas, itop_con, upwd, dnwd, dnwd0, ma, cape, &
-       iflag, qcondc, wd, pmflxr, da, phi, mp)
+  SUBROUTINE concvl(paprs, play, t, q, u, v, sig1, w01, d_t, d_q, d_u, d_v, &
+       rain, kbas, itop_con, upwd, dnwd, ma, cape, iflag, qcondc, pmflxr, da, &
+       phi, mp)
 
     ! From phylmd/concvl.F, version 1.3, 2005/04/15 12:36:17
     ! Author: Z. X. Li (LMD/CNRS)
     ! Date: 1993 August 18
     ! Objet : schéma de convection d'Emanuel (1991), interface
-    ! (driver commun aux versions 3 et 4)
 
+    use comconst, only: dtphys
     use cv_driver_m, only: cv_driver
     USE dimphy, ONLY: klev, klon
     USE fcttre, ONLY: foeew
     USE suphec_m, ONLY: retv, rtt
     USE yoethf_m, ONLY: r2es
 
-    REAL, INTENT (IN):: dtime ! pas d'integration (s)
     REAL, INTENT (IN):: paprs(klon, klev + 1)
     REAL, INTENT (IN):: play(klon, klev)
-    REAL, intent(in):: t(klon, klev)
-    real, intent(in):: q(klon, klev) ! vapeur d'eau (en kg / kg)
+    REAL, intent(in):: t(klon, klev) ! temperature (K)
+    real, intent(in):: q(klon, klev) ! fraction massique de vapeur d'eau
     real, INTENT (IN):: u(klon, klev), v(klon, klev)
     REAL, intent(inout):: sig1(klon, klev), w01(klon, klev)
     REAL, intent(out):: d_t(klon, klev)
-    REAL, intent(out):: d_q(klon, klev) ! increment de la vapeur d'eau
+    REAL, intent(out):: d_q(klon, klev) ! incr\'ement de la vapeur d'eau
     REAL, intent(out):: d_u(klon, klev), d_v(klon, klev)
     REAL, intent(out):: rain(klon) ! pluie (mm / s)
-    REAL, intent(out):: snow_con(klon) ! neige (mm / s)
     INTEGER, intent(out):: kbas(klon)
-    integer itop_con(klon)
+    integer, intent(inout):: itop_con(klon)
 
     REAL, intent(out):: upwd(klon, klev)
     ! saturated updraft mass flux (kg / m2 / s)
@@ -41,33 +39,25 @@
     real, intent(out):: dnwd(klon, klev)
     ! saturated downdraft mass flux (kg / m2 / s)
 
-    real, intent(out):: dnwd0(klon, klev)
-    ! unsaturated downdraft mass flux (kg / m2 / s)
-
     REAL ma(klon, klev)
     real cape(klon) ! output (J / kg)
-    INTEGER iflag(klon)
-    REAL qcondc(klon, klev)
-    REAL wd(klon)
-    REAL pmflxr(klon, klev + 1)
-    REAL, intent(inout):: da(klon, klev), phi(klon, klev, klev), mp(klon, klev)
+    INTEGER, intent(out):: iflag(klon)
+    REAL, intent(out):: qcondc(klon, klev) ! in-cloud water content
+    REAL, intent(out):: pmflxr(klon, klev + 1)
+    REAL, intent(out):: da(:, :) ! (klon, klev)
+    REAL, intent(out):: phi(:, :, :) ! (klon, klev, klev)
+
+    REAL, intent(out):: mp(:, :) ! (klon, klev) Mass flux of the
+    ! unsaturated downdraft, defined positive downward, in kg m-2
+    ! s-1. M_p in Emanuel (1991 928).
 
     ! Local:
     REAL zx_qs, cor
     INTEGER i, k
     REAL qs(klon, klev)
-    REAL, save:: cbmf(klon)
-    INTEGER:: ifrst = 0
 
     !-----------------------------------------------------------------
 
-    snow_con = 0.
-
-    IF (ifrst == 0) THEN
-       ifrst = 1
-       cbmf = 0.
-    END IF
-
     DO k = 1, klev
        DO i = 1, klon
           zx_qs = min(0.5, r2es * foeew(t(i, k), rtt >= t(i, k)) / play(i, k))
@@ -77,14 +67,13 @@
     END DO
 
     CALL cv_driver(t, q, qs, u, v, play / 100., paprs / 100., iflag, d_t, &
-         d_q, d_u, d_v, rain, pmflxr, cbmf, sig1, w01, kbas, itop_con, dtime, &
-         ma, upwd, dnwd, dnwd0, qcondc, wd, cape, da, phi, mp)
-
+         d_q, d_u, d_v, rain, pmflxr, sig1, w01, kbas, itop_con, ma, upwd, &
+         dnwd, qcondc, cape, da, phi, mp)
     rain = rain / 86400.
-    d_t = dtime * d_t
-    d_q = dtime * d_q
-    d_u = dtime * d_u
-    d_v = dtime * d_v
+    d_t = dtphys * d_t
+    d_q = dtphys * d_q
+    d_u = dtphys * d_u
+    d_v = dtphys * d_v
 
   END SUBROUTINE concvl