--- trunk/phylmd/phytrac.f	2014/09/04 10:05:52	104
+++ trunk/Sources/phylmd/phytrac.f	2015/04/29 15:47:56	134
@@ -8,10 +8,9 @@
 contains
 
   SUBROUTINE phytrac(itap, lmt_pas, julien, gmtime, firstcal, lafin, pdtphys, &
-       u, t_seri, paprs, pplay, pmfu, pmfd, pde_u, pen_d, coefh, fm_therm, &
-       entr_therm, yu1, yv1, ftsol, pctsrf, frac_impa, frac_nucl, pphis, &
-       albsol, rh, cldfra, rneb, diafra, cldliq, pmflxr, pmflxs, prfl, psfl, &
-       da, phi, mp, upwd, dnwd, tr_seri, zmasse)
+       t_seri, paprs, pplay, pmfu, pmfd, pde_u, pen_d, coefh, fm_therm, &
+       entr_therm, yu1, yv1, ftsol, pctsrf, frac_impa, frac_nucl, pphis, da, &
+       phi, mp, upwd, dnwd, tr_seri, zmasse)
 
     ! From phylmd/phytrac.F, version 1.15 2006/02/21 08:08:30 (SVN revision 679)
 
@@ -30,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
@@ -54,7 +55,6 @@
     logical, intent(in):: firstcal ! first call to "calfis"
     logical, intent(in):: lafin ! fin de la physique
     real, intent(in):: pdtphys ! pas d'integration pour la physique (s)
-    real, intent(in):: u(klon, llm)
     real, intent(in):: t_seri(klon, llm) ! temperature, in K
 
     real, intent(in):: paprs(klon, llm+1)
@@ -90,17 +90,6 @@
     REAL frac_nucl(klon, llm) ! fraction d'aerosols nuclees
 
     real, intent(in):: pphis(klon)
-    real albsol(klon) ! albedo surface
-    real rh(klon, llm) ! humidite relative
-    real cldfra(klon, llm) ! fraction nuageuse (tous les nuages)
-    real rneb(klon, llm) ! fraction nuageuse (grande echelle)
-
-    real diafra(klon, llm)
-    ! (fraction nuageuse (convection ou stratus artificiels))
-
-    real cldliq(klon, llm) ! eau liquide nuageuse
-    REAL pmflxr(klon, llm+1), pmflxs(klon, llm+1) !--lessivage convection
-    REAL prfl(klon, llm+1), psfl(klon, llm+1) !--lessivage large-scale
 
     ! Kerry Emanuel
     real, intent(in):: da(klon, llm), phi(klon, llm, llm), mp(klon, llm)
@@ -247,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
@@ -332,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)
@@ -439,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
@@ -463,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