--- trunk/phylmd/concvl.f90	2013/11/15 18:45:49	76
+++ trunk/Sources/phylmd/concvl.f	2015/04/29 15:47:56	134
@@ -4,14 +4,13 @@
 
 contains
 
-  SUBROUTINE concvl(dtime, paprs, play, t, q, u, v, tra, sig1, w01, &
-       d_t, d_q, d_u, d_v, d_tra, rain, snow, kbas, ktop, upwd, dnwd, dnwd0, &
-       ma, cape, tvp, iflag, pbase, bbase, dtvpdt1, dtvpdq1, dplcldt, &
-       dplcldr, qcondc, wd, pmflxr, pmflxs, da, phi, mp, ntra)
+  SUBROUTINE concvl(dtime, paprs, play, t, q, u, v, sig1, w01, d_t, d_q, d_u, &
+       d_v, rain, snow, kbas, ktop, upwd, dnwd, dnwd0, ma, cape, iflag, &
+       qcondc, wd, pmflxr, pmflxs, da, phi, mp)
 
     ! From phylmd/concvl.F, version 1.3 2005/04/15 12:36:17
     ! Author: Z. X. Li (LMD/CNRS)
-    ! Date: 1993/08/18
+    ! Date: 1993 August 18
     ! Objet : schéma de convection d'Emanuel (1991), interface
     ! (driver commun aux versions 3 et 4)
 
@@ -23,29 +22,19 @@
     USE suphec_m, ONLY: retv, rtt
     USE yoethf_m, ONLY: r2es
 
-    INTEGER, PARAMETER:: ntrac = nqmx - 2
-
     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 q(klon, klev) ! input vapeur d'eau (en kg/kg)
-    real u(klon, klev), v(klon, klev)
-    REAL, INTENT (IN):: tra(klon, klev, ntrac)
-    INTEGER, intent(in):: ntra ! number of tracers
+    real, intent(in):: q(klon, klev) ! vapeur d'eau (en kg/kg)
+    real, INTENT (IN):: u(klon, klev), v(klon, klev)
     REAL, intent(inout):: sig1(klon, klev), w01(klon, klev)
-    REAL pmflxr(klon, klev+1), pmflxs(klon, klev+1)
-
-    REAL d_t(klon, klev), d_q(klon, klev), d_u(klon, klev), d_v(klon, &
-         klev)
-    ! d_q-----output-R-increment de la vapeur d'eau
-    REAL d_tra(klon, klev, ntrac)
-    REAL rain(klon), snow(klon)
-    ! rain----output-R-la pluie (mm/s)
-    ! snow----output-R-la neige (mm/s)
-
+    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(klon) ! neige (mm/s)
     INTEGER kbas(klon), ktop(klon)
-    REAL em_ph(klon, klev+1), em_p(klon, klev)
 
     REAL, intent(out):: upwd(klon, klev)
     ! saturated updraft mass flux (kg/m**2/s)
@@ -56,21 +45,20 @@
     real, intent(out):: dnwd0(klon, klev)
     ! unsaturated downdraft mass flux (kg/m**2/s)
 
-    REAL ma(klon, klev), cape(klon), tvp(klon, klev)
+    REAL ma(klon, klev), cape(klon)
     ! Cape----output-R-CAPE (J/kg)
-    ! Tvp-----output-R-Temperature virtuelle d'une parcelle soulevee
-    !                  adiabatiquement a partir du niveau 1 (K)
-    REAL da(klon, klev), phi(klon, klev, klev), mp(klon, klev)
+
     INTEGER iflag(klon)
-    REAL pbase(klon), bbase(klon)
-    REAL dtvpdt1(klon, klev), dtvpdq1(klon, klev)
-    REAL dplcldt(klon), dplcldr(klon)
     REAL qcondc(klon, klev)
     REAL wd(klon)
+    REAL pmflxr(klon, klev+1), pmflxs(klon, klev+1)
+    REAL, intent(inout):: da(klon, klev), phi(klon, klev, klev), mp(klon, klev)
 
-    REAL zx_t, zdelta, zx_qs, zcor
+    ! Local:
 
-    INTEGER i, k, itra
+    REAL em_ph(klon, klev+1), em_p(klon, klev)
+    REAL zx_t, zx_qs, zcor
+    INTEGER i, k
     REAL qs(klon, klev)
     REAL, save:: cbmf(klon)
     INTEGER:: ifrst = 0
@@ -104,8 +92,7 @@
        DO k = 1, klev
           DO i = 1, klon
              zx_t = t(i, k)
-             zdelta = max(0., sign(1., rtt-zx_t))
-             zx_qs = min(0.5, r2es*foeew(zx_t, zdelta)/em_p(i, k)/100.0)
+             zx_qs = min(0.5, r2es*foeew(zx_t, rtt >= zx_t)/em_p(i, k)/100.0)
              zcor = 1./(1.-retv*zx_qs)
              qs(i, k) = zx_qs*zcor
           END DO
@@ -116,8 +103,7 @@
        DO k = 1, klev
           DO i = 1, klon
              zx_t = t(i, k)
-             zdelta = max(0., sign(1., rtt-zx_t))
-             zx_qs = r2es*foeew(zx_t, zdelta)/em_p(i, k)/100.0
+             zx_qs = r2es*foeew(zx_t, rtt >= zx_t)/em_p(i, k)/100.0
              zx_qs = min(0.5, zx_qs)
              zcor = 1./(1.-retv*zx_qs)
              zx_qs = zx_qs*zcor
@@ -126,10 +112,9 @@
        END DO
     END IF
 
-    CALL cv_driver(klon, klev, klev+1, ntra, t, q, qs, u, v, tra, em_p, &
-         em_ph, iflag, d_t, d_q, d_u, d_v, d_tra, rain, pmflxr, cbmf, sig1, &
-         w01, kbas, ktop, dtime, ma, upwd, dnwd, dnwd0, qcondc, wd, cape, &
-         da, phi, mp)
+    CALL cv_driver(t, q, qs, u, v, em_p, em_ph, iflag, d_t, d_q, &
+         d_u, d_v, rain, pmflxr, cbmf, sig1, w01, kbas, ktop, dtime, ma, &
+         upwd, dnwd, dnwd0, qcondc, wd, cape, da, phi, mp)
 
     DO i = 1, klon
        rain(i) = rain(i)/86400.
@@ -143,23 +128,6 @@
           d_v(i, k) = dtime*d_v(i, k)
        END DO
     END DO
-    DO itra = 1, ntra
-       DO k = 1, klev
-          DO i = 1, klon
-             d_tra(i, k, itra) = dtime*d_tra(i, k, itra)
-          END DO
-       END DO
-    END DO
-    ! les traceurs ne sont pas mis dans cette version de convect4:
-    IF (iflag_con==4) THEN
-       DO itra = 1, ntra
-          DO k = 1, klev
-             DO i = 1, klon
-                d_tra(i, k, itra) = 0.
-             END DO
-          END DO
-       END DO
-    END IF
 
   END SUBROUTINE concvl