--- trunk/Sources/phylmd/phytrac.f	2015/09/29 19:48:59	171
+++ trunk/Sources/phylmd/phytrac.f	2016/03/16 11:11:27	182
@@ -10,7 +10,7 @@
   SUBROUTINE phytrac(itap, lmt_pas, julien, gmtime, firstcal, lafin, pdtphys, &
        t_seri, paprs, pplay, pmfu, pmfd, pde_u, pen_d, coefh, fm_therm, &
        entr_therm, yu1, yv1, ftsol, pctsrf, frac_impa, frac_nucl, da, phi, &
-       mp, upwd, dnwd, tr_seri, zmasse, ncid_startphy, nid_ins)
+       mp, upwd, dnwd, tr_seri, zmasse, ncid_startphy, nid_ins, itau_phy)
 
     ! From phylmd/phytrac.F, version 1.15 2006/02/21 08:08:30 (SVN revision 679)
 
@@ -28,7 +28,7 @@
 
     use abort_gcm_m, only: abort_gcm
     use clesphys, only: ecrit_tra
-    use clesphys2, only: iflag_con
+    use clesphys2, only: conv_emanuel
     use cltrac_m, only: cltrac
     use cltracrn_m, only: cltracrn
     use ctherm, only: iflag_thermals
@@ -102,7 +102,7 @@
     real, intent(in):: zmasse(:, :) ! (klon, llm)
     ! (column-density of mass of air in a cell, in kg m-2)
 
-    integer, intent(in):: ncid_startphy, nid_ins
+    integer, intent(in):: ncid_startphy, nid_ins, itau_phy
 
     ! Local:
 
@@ -230,14 +230,12 @@
     if (convection) then
        ! Calcul de l'effet de la convection
        DO it=1, nqmx - 2
-          if (iflag_con == 2) then
-             ! Tiedke
-             CALL nflxtr(pdtphys, pmfu, pmfd, pde_u, pen_d, paprs, &
-                  tr_seri(:, :, it), d_tr_cv(:, :, it))
-          else if (iflag_con == 3) then
-             ! Emanuel
+          if (conv_emanuel) then
              call cvltr(pdtphys, da, phi, mp, paprs, tr_seri(:, :, it), upwd, &
                   dnwd, d_tr_cv(:, :, it))
+          else
+             CALL nflxtr(pdtphys, pmfu, pmfd, pde_u, pen_d, paprs, &
+                  tr_seri(:, :, it), d_tr_cv(:, :, it))
           endif
 
           DO k = 1, llm
@@ -410,13 +408,8 @@
 
       ! From phylmd/write_histrac.h, version 1.9 2006/02/21 08:08:30
 
-      use dimens_m, only: iim, jjm, llm
-      use histsync_m, only: histsync
       use histwrite_m, only: histwrite
-      use temps, only: itau_phy
       use iniadvtrac_m, only: tname
-      use dimphy, only: klon
-      use grid_change, only: gr_phy_write_2d
       use gr_phy_write_3d_m, only: gr_phy_write_3d
 
       logical, intent(in):: lessivage