--- trunk/Sources/phylmd/phytrac.f	2016/03/15 17:51:30	181
+++ trunk/Sources/phylmd/phytrac.f	2016/03/29 15:20:23	189
@@ -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
@@ -230,15 +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
-             ! iflag_con >= 3
-             ! 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
@@ -413,7 +410,7 @@
 
       use histwrite_m, only: histwrite
       use iniadvtrac_m, only: tname
-      use gr_phy_write_3d_m, only: gr_phy_write_3d
+      use gr_phy_write_m, only: gr_phy_write
 
       logical, intent(in):: lessivage
       integer, intent(in):: itap ! number of calls to "physiq"
@@ -427,21 +424,21 @@
 
       itau_w = itau_phy + itap
 
-      CALL histwrite(nid_ins, "zmasse", itau_w, gr_phy_write_3d(zmasse))
+      CALL histwrite(nid_ins, "zmasse", itau_w, gr_phy_write(zmasse))
 
       DO it=1, nqmx - 2
          CALL histwrite(nid_ins, tname(it+2), itau_w, &
-              gr_phy_write_3d(tr_seri(:, :, it)))
+              gr_phy_write(tr_seri(:, :, it)))
          if (lessivage) THEN
             CALL histwrite(nid_ins, "fl"//tname(it+2), itau_w, &
-                 gr_phy_write_3d(flestottr(:, :, it)))
+                 gr_phy_write(flestottr(:, :, it)))
          endif
          CALL histwrite(nid_ins, "d_tr_th_"//tname(it+2), itau_w, &
-              gr_phy_write_3d(d_tr_th(:, :, it)))
+              gr_phy_write(d_tr_th(:, :, it)))
          CALL histwrite(nid_ins, "d_tr_cv_"//tname(it+2), itau_w, &
-              gr_phy_write_3d(d_tr_cv(:, :, it)))
+              gr_phy_write(d_tr_cv(:, :, it)))
          CALL histwrite(nid_ins, "d_tr_cl_"//tname(it+2), itau_w, &
-              gr_phy_write_3d(d_tr_cl(:, :, it)))
+              gr_phy_write(d_tr_cl(:, :, it)))
       ENDDO
 
     end subroutine write_histrac