--- trunk/Sources/phylmd/ini_histins.f	2017/02/27 15:44:55	213
+++ trunk/phylmd/ini_histins.f	2018/03/06 16:19:52	259
@@ -6,7 +6,7 @@
 
 contains
 
-  subroutine ini_histins(dtime)
+  subroutine ini_histins(dtime, ok_newmicro)
 
     ! From phylmd/ini_histins.h, version 1.2, 2005/05/25 13:10:09
 
@@ -26,7 +26,8 @@
     USE ymds2ju_m, only: ymds2ju
 
     REAL, intent(in):: dtime ! pas temporel de la physique (s)
-
+    logical, intent(in):: ok_newmicro
+    
     ! Local:
     real zjulian, zsto, zout
     integer nhori, nvert, nsrf, iq, it
@@ -35,7 +36,7 @@
 
     print *, 'Call sequence information: ini_histins'
 
-    IF (ok_instan) THEN
+    test_ok_instan: IF (ok_instan) THEN
        zsto = dtime * ecrit_ins
        zout = dtime * ecrit_ins
        CALL ymds2ju(annee_ref, 1, day_ref, 0.0, zjulian)
@@ -47,7 +48,7 @@
        CALL histvert(nid_ins, "presnivs", "Vertical levels", "mb", &
             presnivs/100., nvert)
        
-       CALL histdef(nid_ins, "phis", "Surface geop. height", "-", &
+       CALL histdef(nid_ins, "phis", "surface geopotential", "m2 s-2", &
             iim, (jjm + 1), nhori, 1, 1, 1, -99, &
             "once", zsto, zout)
        CALL histdef(nid_ins, "aire", "Grid area", "-", &
@@ -129,6 +130,8 @@
        CALL histdef(nid_ins, "dtsvdfi", "Boundary-layer dTs(g)", "K/s", &
             iim, (jjm + 1), nhori, 1, 1, 1, -99,  &
             "inst(X)", zsto, zout)
+       CALL histdef(nid_ins, "msnow", "surface snow amount", "kg/m2", &
+            iim, jjm + 1, nhori, 1, 1, 1, -99, "inst(X)", zsto, zout)
 
        DO nsrf = 1, nbsrf
           call histdef(nid_ins, "pourc_"//clnsurf(nsrf),  &
@@ -167,6 +170,14 @@
                "rugosite "//clnsurf(nsrf), "-",   &
                iim, (jjm + 1), nhori, 1, 1, 1, -99, &
                "inst(X)", zsto, zout)
+          call histdef(nid_ins, "u10m_"//clnsurf(nsrf),  &
+               "zonal wind 10 m "//clnsurf(nsrf), "m s-1",   &
+               iim, (jjm + 1), nhori, 1, 1, 1, -99, &
+               "inst(X)", zsto, zout)
+          call histdef(nid_ins, "v10m_"//clnsurf(nsrf),  &
+               "meridional wind 10 m "//clnsurf(nsrf), "m s-1",   &
+               iim, (jjm + 1), nhori, 1, 1, 1, -99, &
+               "inst(X)", zsto, zout)
        END DO
 
        CALL histdef(nid_ins, "rugs", "rugosity", "-", &
@@ -185,8 +196,9 @@
        CALL histdef(nid_ins, "s_lcl", "Condensation level", "m", &
             iim, (jjm + 1), nhori, 1, 1, 1, -99, &
             "inst(X)", zsto, zout)
-       CALL histdef(nid_ins, "s_capCL", "Conv avlbl pot ener for ABL", "J/m2", &
-            iim, (jjm + 1), nhori, 1, 1, 1, -99, &
+       CALL histdef(nid_ins, "s_capCL", &
+            "Convective available potential energy for atmospheric boundary " &
+            // "layer", "J/m2", iim, (jjm + 1), nhori, 1, 1, 1, -99, &
             "inst(X)", zsto, zout)
        CALL histdef(nid_ins, "s_oliqCL", "Liq Water in BL", "kg/m2", &
             iim, (jjm + 1), nhori, 1, 1, 1, -99, &
@@ -197,13 +209,7 @@
        CALL histdef(nid_ins, "s_therm", "Exces du thermique", "K", &
             iim, (jjm + 1), nhori, 1, 1, 1, -99, &
             "inst(X)", zsto, zout)
-       CALL histdef(nid_ins, "s_trmb1", "deep_cape(HBTM2)", "J/m2", &
-            iim, (jjm + 1), nhori, 1, 1, 1, -99, &
-            "inst(X)", zsto, zout)
-       CALL histdef(nid_ins, "s_trmb2", "inhibition (HBTM2)", "J/m2", &
-            iim, (jjm + 1), nhori, 1, 1, 1, -99, &
-            "inst(X)", zsto, zout)
-       CALL histdef(nid_ins, "s_trmb3", "Point Omega (HBTM2)", "m", &
+       CALL histdef(nid_ins, "qsurf", "Surface Air humidity", "", &
             iim, (jjm + 1), nhori, 1, 1, 1, -99, &
             "inst(X)", zsto, zout)
 
@@ -256,6 +262,15 @@
             "K/s", iim, jjm + 1, nhori, llm, 1, llm, nvert, "inst(X)", &
             zsto, zout)
 
+       if (ok_newmicro) then
+          CALL histdef(nid_ins, "re", "cloud droplet effective radius", &
+               "micrometer", iim, jjm + 1, nhori, llm, 1, llm, nvert, &
+               "inst(X)", zsto, zout)
+          CALL histdef(nid_ins, "fl", &
+               "denominator of Cloud droplet effective radius", "", iim, &
+               jjm + 1, nhori, llm, 1, llm, nvert, "inst(X)", zsto, zout)
+       end if
+
        DO it = 1, nqmx - 2
           ! champ 2D
           iq=it+2
@@ -279,7 +294,7 @@
        ENDDO
 
        CALL histend(nid_ins)
-    ENDIF
+    ENDIF test_ok_instan
 
   end subroutine ini_histins