--- trunk/Sources/phylmd/ini_histins.f	2015/04/29 15:47:56	134
+++ trunk/Sources/phylmd/ini_histins.f	2016/03/16 14:42:58	183
@@ -4,12 +4,13 @@
 
 contains
 
-  subroutine ini_histins(dtime, ok_instan, nid_ins)
+  subroutine ini_histins(dtime, ok_instan, nid_ins, itau_phy)
 
     ! From phylmd/ini_histins.h, v 1.2 2005/05/25 13:10:09
 
     use clesphys, only: ecrit_ins
-    use dimens_m, only: iim, jjm, llm
+    use clesphys2, only: conv_emanuel
+    use dimens_m, only: iim, jjm, llm, nqmx
     use dimphy, only: klon
     use disvert_m, only: presnivs
     use dynetat0_m, only: day_ref, annee_ref
@@ -18,22 +19,23 @@
     USE histend_m, ONLY : histend
     USE histvert_m, ONLY : histvert
     use indicesol, only: nbsrf, clnsurf
+    use iniadvtrac_m, only: tname, ttext
     use phyetat0_m, only: rlon, rlat
-    use temps, only: itau_phy
     USE ymds2ju_m, only: ymds2ju
 
     REAL, intent(in):: dtime ! pas temporel de la physique (s)
     logical, intent(in):: ok_instan
     integer, intent(out):: nid_ins
+    integer, intent(in):: itau_phy
 
+    ! Local:
     REAL zx_lon(iim, jjm + 1), zx_lat(iim, jjm + 1)
     real zjulian, zsto, zout
-    integer i, nhori, nvert, nsrf
+    integer i, nhori, nvert, nsrf, iq, it
 
     !-------------------------------------------------------------------
 
     IF (ok_instan) THEN
-
        zsto = dtime * ecrit_ins
        zout = dtime * ecrit_ins
 
@@ -217,12 +219,7 @@
        CALL histdef(nid_ins, "albs", "Surface albedo", "-", &
             iim, (jjm + 1), nhori, 1, 1, 1, -99,  &
             "inst(X)", zsto, zout)
-       CALL histdef(nid_ins, "albslw", "Surface albedo LW", "-", &
-            iim, (jjm + 1), nhori, 1, 1, 1, -99,  &
-            "inst(X)", zsto, zout)
 
-       !IM cf. AM 081204 BEG
-       ! HBTM2
        CALL histdef(nid_ins, "s_pblh", "Boundary Layer Height", "m", &
             iim, (jjm + 1), nhori, 1, 1, 1, -99, &
             "inst(X)", zsto, zout)
@@ -264,7 +261,8 @@
             iim, (jjm + 1), nhori, 1, 1, 1, -99, &
             "inst(X)", zsto, zout)
 
-       !IM cf. AM 081204 END
+       if (conv_emanuel) CALL histdef(nid_ins, "ptop", "cloud top pressure", &
+            "Pa", iim, jjm + 1, nhori, 1, 1, 1, -99, "inst(X)", zsto, zout)
 
        ! Champs 3D:
 
@@ -296,6 +294,40 @@
             iim, (jjm + 1), nhori, llm, 1, llm, nvert, &
             "inst(X)", zsto, zout)
 
+       CALL histdef(nid_ins, "zmasse", "column density of air in cell", &
+            "kg m-2", iim, jjm + 1, nhori, llm, 1, llm, nvert, "inst(X)", &
+            zsto, zout)
+
+       CALL histdef(nid_ins, "rhum", "Relative humidity", &
+            "", iim, jjm + 1, nhori, llm, 1, llm, nvert, "inst(X)", &
+            zsto, zout)
+
+       DO it = 1, nqmx - 2
+          ! champ 2D
+          iq=it+2
+          CALL histdef(nid_ins, tname(iq), ttext(iq), "U/kga", iim, jjm+1, &
+               nhori, llm, 1, llm, nvert, "inst(X)", zsto, zout)
+          CALL histdef(nid_ins, "fl"//tname(iq), "Flux "//ttext(iq), &
+               "U/m2/s", iim, jjm+1, nhori, llm, 1, llm, nvert, &
+               "inst(X)", zsto, zout)
+
+          !---Ajout Olivia
+          CALL histdef(nid_ins, "d_tr_th_"//tname(iq), &
+               "tendance thermique"// ttext(iq), "?", &
+               iim, jjm+1, nhori, llm, 1, llm, nvert, &
+               "inst(X)", zsto, zout)
+          CALL histdef(nid_ins, "d_tr_cv_"//tname(iq), &
+               "tendance convection"// ttext(iq), "?", &
+               iim, jjm+1, nhori, llm, 1, llm, nvert, &
+               "inst(X)", zsto, zout)
+          CALL histdef(nid_ins, "d_tr_cl_"//tname(iq), &
+               "tendance couche limite"// ttext(iq), "?", &
+               iim, jjm+1, nhori, llm, 1, llm, nvert, &
+               "inst(X)", zsto, zout)
+          !---fin Olivia
+
+       ENDDO
+
        CALL histend(nid_ins)
     ENDIF