--- trunk/Sources/phylmd/concvl.f	2016/03/15 17:07:47	180
+++ trunk/Sources/phylmd/concvl.f	2016/03/29 15:20:23	189
@@ -5,14 +5,13 @@
 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)
+       d_v, rain, kbas, itop_con, upwd, dnwd, dnwd0, 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 cv_driver_m, only: cv_driver
     USE dimphy, ONLY: klev, klon
@@ -23,17 +22,16 @@
     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_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)
@@ -48,7 +46,6 @@
     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)
 
@@ -56,18 +53,9 @@
     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,9 +65,8 @@
     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, dtime, ma, &
+         upwd, dnwd, dnwd0, qcondc, cape, da, phi, mp)
     rain = rain / 86400.
     d_t = dtime * d_t
     d_q = dtime * d_q