--- trunk/phylmd/phytrac.f	2014/12/18 17:30:24	118
+++ trunk/Sources/phylmd/phytrac.f	2015/04/29 15:47:56	134
@@ -29,8 +29,10 @@
     use abort_gcm_m, only: abort_gcm
     use clesphys, only: ecrit_tra
     use clesphys2, only: iflag_con
+    use cltrac_m, only: cltrac
     use cltracrn_m, only: cltracrn
     use ctherm, only: iflag_thermals
+    use cvltr_m, only: cvltr
     use dimens_m, only: llm, nqmx
     use dimphy, only: klon
     use indicesol, only: nbsrf
@@ -234,8 +236,8 @@
                   tr_seri(:, :, it), d_tr_cv(:, :, it))
           else if (iflag_con == 3) then
              ! Emanuel
-             call cvltr(pdtphys, da, phi, mp, paprs, tr_seri(1, 1, it), upwd, &
-                  dnwd, d_tr_cv(1, 1, it))
+             call cvltr(pdtphys, da, phi, mp, paprs, tr_seri(:, :, it), upwd, &
+                  dnwd, d_tr_cv(:, :, it))
           endif
 
           DO k = 1, llm
@@ -319,10 +321,8 @@
                 source(i) = 0.0 ! pas de source, pour l'instant
              ENDDO
 
-             CALL cltrac(pdtphys, coefh, t_seri, &
-                  tr_seri(1, 1, it), source, &
-                  paprs, pplay, delp, &
-                  d_tr_cl(1, 1, it))
+             CALL cltrac(pdtphys, coefh, t_seri, tr_seri(:, :, it), source, &
+                  paprs, pplay, delp, d_tr_cl(1, 1, it))
              DO k = 1, llm
                 DO i = 1, klon
                    tr_seri(i, k, it) = tr_seri(i, k, it) + d_tr_cl(i, k, it)
@@ -426,7 +426,7 @@
       use histsync_m, only: histsync
       use histwrite_m, only: histwrite
       use temps, only: itau_phy
-      use iniadvtrac_m, only: tnom
+      use iniadvtrac_m, only: tname
       use comgeomphy, only: airephy
       use dimphy, only: klon
       use grid_change, only: gr_phy_write_2d
@@ -450,17 +450,17 @@
       CALL histwrite(nid_tra, "zmasse", itau_w, gr_phy_write_3d(zmasse))
 
       DO it=1, nqmx - 2
-         CALL histwrite(nid_tra, tnom(it+2), itau_w, &
+         CALL histwrite(nid_tra, tname(it+2), itau_w, &
               gr_phy_write_3d(tr_seri(:, :, it)))
          if (lessivage) THEN
-            CALL histwrite(nid_tra, "fl"//tnom(it+2), itau_w, &
+            CALL histwrite(nid_tra, "fl"//tname(it+2), itau_w, &
                  gr_phy_write_3d(flestottr(:, :, it)))
          endif
-         CALL histwrite(nid_tra, "d_tr_th_"//tnom(it+2), itau_w, &
+         CALL histwrite(nid_tra, "d_tr_th_"//tname(it+2), itau_w, &
               gr_phy_write_3d(d_tr_th(:, :, it)))
-         CALL histwrite(nid_tra, "d_tr_cv_"//tnom(it+2), itau_w, &
+         CALL histwrite(nid_tra, "d_tr_cv_"//tname(it+2), itau_w, &
               gr_phy_write_3d(d_tr_cv(:, :, it)))
-         CALL histwrite(nid_tra, "d_tr_cl_"//tnom(it+2), itau_w, &
+         CALL histwrite(nid_tra, "d_tr_cl_"//tname(it+2), itau_w, &
               gr_phy_write_3d(d_tr_cl(:, :, it)))
       ENDDO