--- trunk/libf/phylmd/ini_histrac.f90	2012/09/20 13:00:41	66
+++ trunk/Sources/phylmd/ini_histrac.f	2015/04/29 15:47:56	134
@@ -4,24 +4,24 @@
 
 contains
 
-
   subroutine ini_histrac(nid_tra, pdtphys, nq_phys, lessivage)
 
     ! From phylmd/ini_histrac.h, version 1.10 2006/02/21 08:08:30
 
+    use clesphys, only: ecrit_tra
     use dimens_m, only: iim, jjm, llm
-    USE calendar, only: ymds2ju
-    USE histbeg_totreg_m, ONLY : histbeg_totreg
+    use disvert_m, only: presnivs
+    use dimphy, only: klon
+    use dynetat0_m, only: day_ref, annee_ref
+    use grid_change, only: gr_phy_write_2d
+    USE histbeg_totreg_m, ONLY: histbeg_totreg
     USE histdef_m, ONLY : histdef
     USE histend_m, ONLY : histend
     USE histvert_m, ONLY : histvert
-    use temps, only: annee_ref, day_ref, itau_phy
-    use iniadvtrac_m, only: niadv, tnom, ttext
-    use dimphy, only: klon
-    use clesphys, only: ecrit_tra
-    use grid_change, only: gr_phy_write_2d
+    use iniadvtrac_m, only: tname, ttext
     use phyetat0_m, only: rlon, rlat
-    use disvert_m, only: presnivs
+    use temps, only: itau_phy
+    USE ymds2ju_m, only: ymds2ju
 
     INTEGER, intent(out):: nid_tra
     real, intent(in):: pdtphys  ! pas d'integration pour la physique (s)
@@ -37,7 +37,7 @@
     REAL zx_lat(iim, jjm+1)
     INTEGER nhori, nvert
     REAL zsto, zout
-    integer it, iq, iiq
+    integer it, iq
 
     !---------------------------------------------------------
 
@@ -45,8 +45,7 @@
     zx_lat(:, :) = gr_phy_write_2d(rlat)
     CALL histbeg_totreg("histrac", rlon(2:iim+1), zx_lat(1, :), &
          1, iim, 1, jjm+1, itau_phy, zjulian, pdtphys, nhori, nid_tra)
-    CALL histvert(nid_tra, "presnivs", "Vertical levels", "mb", llm, &
-         presnivs, nvert)
+    CALL histvert(nid_tra, "presnivs", "Vertical levels", "mb", presnivs, nvert)
 
     zsto = pdtphys
     zout = pdtphys * REAL(ecrit_tra)
@@ -64,26 +63,25 @@
     DO it = 1, nq_phys
        ! champ 2D
        iq=it+2
-       iiq=niadv(iq)
-       CALL histdef(nid_tra, tnom(iq), ttext(iiq), "U/kga", iim, jjm+1, &
+       CALL histdef(nid_tra, tname(iq), ttext(iq), "U/kga", iim, jjm+1, &
             nhori, llm, 1, llm, nvert, "ave(X)", zsto, zout)
        if (lessivage) THEN
-          CALL histdef(nid_tra, "fl"//tnom(iq), "Flux "//ttext(iiq), &
+          CALL histdef(nid_tra, "fl"//tname(iq), "Flux "//ttext(iq), &
                "U/m2/s", iim, jjm+1, nhori, llm, 1, llm, nvert, &
                "ave(X)", zsto, zout)
        endif
 
        !---Ajout Olivia
-       CALL histdef(nid_tra, "d_tr_th_"//tnom(iq), &
-            "tendance thermique"// ttext(iiq), "?", &
+       CALL histdef(nid_tra, "d_tr_th_"//tname(iq), &
+            "tendance thermique"// ttext(iq), "?", &
             iim, jjm+1, nhori, llm, 1, llm, nvert, &
             "ave(X)", zsto, zout)
-       CALL histdef(nid_tra, "d_tr_cv_"//tnom(iq), &
-            "tendance convection"// ttext(iiq), "?", &
+       CALL histdef(nid_tra, "d_tr_cv_"//tname(iq), &
+            "tendance convection"// ttext(iq), "?", &
             iim, jjm+1, nhori, llm, 1, llm, nvert, &
             "ave(X)", zsto, zout)
-       CALL histdef(nid_tra, "d_tr_cl_"//tnom(iq), &
-            "tendance couche limite"// ttext(iiq), "?", &
+       CALL histdef(nid_tra, "d_tr_cl_"//tname(iq), &
+            "tendance couche limite"// ttext(iq), "?", &
             iim, jjm+1, nhori, llm, 1, llm, nvert, &
             "ave(X)", zsto, zout)
        !---fin Olivia