--- trunk/Sources/phylmd/cv_driver.f	2015/04/29 15:47:56	134
+++ trunk/Sources/phylmd/cv_driver.f	2015/06/18 13:49:26	150
@@ -309,7 +309,7 @@
     ! --- CONVECTIVE FEED
 
     if (iflag_con == 3) then
-       CALL cv3_feed(klon, klev, t1, q1, qs1, p1, ph1, hm1, gz1, nk1, icb1, &
+       CALL cv3_feed(klon, klev, t1, q1, qs1, p1, ph1, gz1, nk1, icb1, &
             icbmax, iflag1, tnk1, qnk1, gznk1, plcl1) ! klev->na
     else
        ! iflag_con == 4
@@ -381,11 +381,11 @@
 
        if (iflag_con == 3) then
           CALL cv3_undilute2(klon, ncum, klev, icb, icbs, nk, tnk, qnk, gznk, &
-               t, q, qs, gz, p, h, tv, lv, pbase, buoybase, plcl, inb, tp, &
+               t, qs, gz, p, h, tv, lv, pbase, buoybase, plcl, inb, tp, &
                tvp, clw, hp, ep, sigp, buoy) !na->klev
        else
           ! iflag_con == 4
-          CALL cv_undilute2(klon, ncum, klev, icb, nk, tnk, qnk, gznk, t, q, &
+          CALL cv_undilute2(klon, ncum, klev, icb, nk, tnk, qnk, gznk, t, &
                qs, gz, p, dph, h, tv, lv, inb, inbis, tp, tvp, clw, hp, ep, &
                sigp, frac)
        endif
@@ -404,9 +404,9 @@
        ! --- MIXING
 
        if (iflag_con == 3) then
-          CALL cv3_mixing(klon, ncum, klev, klev, icb, nk, inb, ph, t, q, &
-               qs, u, v, h, lv, qnk, hp, tv, tvp, ep, clw, m, sig, ment, &
-               qent, uent, vent, nent, sij, elij, ments, qents)
+          CALL cv3_mixing(klon, ncum, klev, klev, icb, nk, inb, t, q, qs, u, &
+               v, h, lv, hp, ep, clw, m, sig, ment, qent, uent, vent, nent, &
+               sij, elij, ments, qents)
        else
           ! iflag_con == 4
           CALL cv_mixing(klon, ncum, klev, icb, nk, inb, inbis, ph, t, q, qs, &
@@ -448,8 +448,7 @@
 
        ! --- passive tracers
 
-       if (iflag_con == 3) CALL cv3_tracer(klon, klon, ncum, klev, klev, &
-            ment, sij, da, phi)
+       if (iflag_con == 3) CALL cv3_tracer(klon, ncum, klev, ment, sij, da, phi)
 
        ! --- UNCOMPRESS THE FIELDS