Index: LMDZ5/branches/testing/DefLists/field_def_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/field_def_lmdz.xml	(revision 2161)
+++ LMDZ5/branches/testing/DefLists/field_def_lmdz.xml	(revision 2258)
@@ -25,4 +25,5 @@
         <field id="t2m_oce"    long_name="Temp 2m oce"    unit="K" />
         <field id="t2m_sic"    long_name="Temp 2m sic"    unit="K" />
+        <field id="gusts"    long_name="surface gustiness"    unit="m2/s2" />
         <field id="wind10m"    long_name="10-m wind speed"      unit="m/s" />
         <field id="wind10max"  long_name="10m wind speed max"   unit="m/s" />
@@ -107,4 +108,8 @@
         <field id="bils_enthalp"    long_name="Surf. total heat flux"    unit="W/m2" />
         <field id="bils_latent"    long_name="Surf. total heat flux"    unit="W/m2" />
+	<field id="bils_ech"    long_name="peu importe"    unit="W/m2" />
+	<field id="du_gwd_rando"    long_name="peu importe"    unit="W/m2" />
+	<field id="dv_gwd_rando"    long_name="peu importe"    unit="W/m2" />
+	<field id="vstr_gwd_rando"    long_name="peu importe"    unit="W/m2" />
         <field id="sens"    long_name="Sensible heat flux"    unit="W/m2" />
         <field id="fder"    long_name="Heat flux derivation"    unit="W/m2" />
@@ -179,5 +184,5 @@
         <field id="ptop"    long_name="Cld top pressure"    unit="Pa" />
         <field id="fbase"    long_name="Cld base mass flux"    unit="kg/m2/s" />
-        <field id="plcl"    long_name="Lifting Condensation Level"    unit="hPa" />
+        <field id="plcl"    long_name="Lifting Condensation Level"    unit="hPa" enabled=".false." />
         <field id="plfc"    long_name="Level of Free Convection"    unit="hPa" />
         <field id="wbeff"    long_name="Conv. updraft velocity at LFC (inf100)"    unit="m/s" />
@@ -277,4 +282,6 @@
         <field id="dtsvdfi"    long_name="Boundary-layer dTs(g)"    unit="K/s" />
         <field id="rugs"    long_name="rugosity"    unit="-" />
+        <field id="z0m"    long_name="roughness length, momentum"    unit="-" />
+        <field id="z0h"    long_name="roughness length, enthalpy"    unit="-" />
         <field id="topswad"    long_name="ADE at TOA"    unit="W/m2" />
         <field id="topswad0"    long_name="ADE clear-sky at TOA"    unit="W/m2" />
@@ -344,8 +351,20 @@
         <field id="ages_oce"    long_name="Snow age oce"    unit="day" />
         <field id="ages_sic"    long_name="Snow age sic"    unit="day" />
+        <field id="snow_ter"    long_name="Snow"    unit="kg/m2" />
+        <field id="snow_lic"    long_name="Snow"    unit="kg/m2" />
+        <field id="snow_oce"    long_name="Snow"    unit="kg/m2" />
+        <field id="snow_sic"    long_name="Snow"    unit="kg/m2" />
         <field id="rugs_ter"    long_name="Surface roughness ter"    unit="m" />
         <field id="rugs_lic"    long_name="Surface roughness lic"    unit="m" />
         <field id="rugs_oce"    long_name="Surface roughness oce"    unit="m" />
         <field id="rugs_sic"    long_name="Surface roughness sic"    unit="m" />
+        <field id="z0m_ter"    long_name="roughness length, momentum ter"    unit="m" />
+        <field id="z0m_lic"    long_name="roughness length, momentum lic"    unit="m" />
+        <field id="z0m_oce"    long_name="roughness length, momentum oce"    unit="m" />
+        <field id="z0m_sic"    long_name="roughness length, momentum sic"    unit="m" />
+        <field id="z0h_ter"    long_name="roughness length, enthalpy ter"    unit="m" />
+        <field id="z0h_lic"    long_name="roughness length, enthalpy lic"    unit="m" />
+        <field id="z0h_oce"    long_name="roughness length, enthalpy oce"    unit="m" />
+        <field id="z0h_sic"    long_name="roughness length, enthalpy sic"    unit="m" />
         <field id="alb1"    long_name="Surface VIS albedo"    unit="-" />
         <field id="alb2"    long_name="Surface Near IR albedo"    unit="-" />
@@ -375,4 +394,8 @@
         <field id="tke_max_oce"    long_name="Max Turb. Kinetic Energy oce"    unit="-" />
         <field id="tke_max_sic"    long_name="Max Turb. Kinetic Energy sic"    unit="-" />
+        <field id="dltpbltke_ter"    long_name="TKE difference (w - x)"    unit="-" />
+        <field id="dltpbltke_lic"    long_name="TKE difference (w - x)"    unit="-" />
+        <field id="dltpbltke_oce"    long_name="TKE difference (w - x)"    unit="-" />
+        <field id="dltpbltke_sic"    long_name="TKE difference (w - x)"    unit="-" />
         <field id="cldtau"    long_name="Cloud optical thickness"    unit="1" />
         <field id="cldemi"    long_name="Cloud optical emissivity"    unit="1" />
Index: LMDZ5/branches/testing/DefLists/file_def_histLES_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histLES_lmdz.xml	(revision 2161)
+++ LMDZ5/branches/testing/DefLists/file_def_histLES_lmdz.xml	(revision 2258)
@@ -27,4 +27,5 @@
                 <field field_ref="t2m_oce" level="10" />
                 <field field_ref="t2m_sic" level="10" />
+                <field field_ref="gusts" level="10" />
                 <field field_ref="wind10m" level="10" />
                 <field field_ref="wind10max" level="10" operation="maximum" />
@@ -286,4 +287,6 @@
                 <field field_ref="dtsvdfi" level="10" />
                 <field field_ref="rugs" level="10" />
+                <field field_ref="z0m" level="10" />
+                <field field_ref="z0h" level="10" />
                 <field field_ref="topswad" level="10" />
                 <field field_ref="topswad0" level="10" />
@@ -345,8 +348,20 @@
                 <field field_ref="ages_oce" level="10" />
                 <field field_ref="ages_sic" level="10" />
+                <field field_ref="snow_ter" level="10" />
+                <field field_ref="snow_lic" level="10" />
+                <field field_ref="snow_oce" level="10" />
+                <field field_ref="snow_sic" level="10" />
                 <field field_ref="rugs_ter" level="10" />
                 <field field_ref="rugs_lic" level="10" />
                 <field field_ref="rugs_oce" level="10" />
                 <field field_ref="rugs_sic" level="10" />
+                <field field_ref="z0m_ter" level="10" />
+                <field field_ref="z0m_lic" level="10" />
+                <field field_ref="z0m_oce" level="10" />
+                <field field_ref="z0m_sic" level="10" />
+                <field field_ref="z0h_ter" level="10" />
+                <field field_ref="z0h_lic" level="10" />
+                <field field_ref="z0h_oce" level="10" />
+                <field field_ref="z0h_sic" level="10" />
                 <field field_ref="alb1" level="10" />
                 <field field_ref="alb2" level="10" />
Index: LMDZ5/branches/testing/DefLists/file_def_histday_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histday_lmdz.xml	(revision 2161)
+++ LMDZ5/branches/testing/DefLists/file_def_histday_lmdz.xml	(revision 2258)
@@ -1,5 +1,5 @@
 <file_definition>
     <file_group id="defile">
-        <file id="histday" name="Xhistday" output_freq="1d" output_level="5" enabled=".FALSE.">
+        <file id="histday" name="histday" output_freq="1d" output_level="2" enabled=".FALSE.">
             
             <!-- VARS 1D -->
@@ -27,4 +27,5 @@
                 <field field_ref="t2m_oce" level="6" />
                 <field field_ref="t2m_sic" level="6" />
+                <field field_ref="gusts" level="1" />
                 <field field_ref="wind10m" level="1" />
                 <field field_ref="wind10max" level="1" operation="maximum" />
@@ -286,4 +287,6 @@
                 <field field_ref="dtsvdfi" level="10" />
                 <field field_ref="rugs" level="10" />
+                <field field_ref="z0m" level="10" />
+                <field field_ref="z0h" level="10" />
                 <field field_ref="topswad" level="10" />
                 <field field_ref="topswad0" level="10" />
@@ -345,8 +348,20 @@
                 <field field_ref="ages_oce" level="10" />
                 <field field_ref="ages_sic" level="10" />
+                <field field_ref="snow_ter" level="10" />
+                <field field_ref="snow_lic" level="10" />
+                <field field_ref="snow_oce" level="10" />
+                <field field_ref="snow_sic" level="10" />
                 <field field_ref="rugs_ter" level="6" />
                 <field field_ref="rugs_lic" level="6" />
                 <field field_ref="rugs_oce" level="6" />
                 <field field_ref="rugs_sic" level="6" />
+                <field field_ref="z0m_ter" level="6" />
+                <field field_ref="z0m_lic" level="6" />
+                <field field_ref="z0m_oce" level="6" />
+                <field field_ref="z0m_sic" level="6" />
+                <field field_ref="z0h_ter" level="6" />
+                <field field_ref="z0h_lic" level="6" />
+                <field field_ref="z0h_oce" level="6" />
+                <field field_ref="z0h_sic" level="6" />
                 <field field_ref="alb1" level="10" />
                 <field field_ref="alb2" level="10" />
Index: LMDZ5/branches/testing/DefLists/file_def_histhf_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histhf_lmdz.xml	(revision 2161)
+++ LMDZ5/branches/testing/DefLists/file_def_histhf_lmdz.xml	(revision 2258)
@@ -1,5 +1,5 @@
 <file_definition>
     <file_group id="defile">
-        <file id="histhf" name="Xhisthf" output_freq="1h" output_level="5" enabled=".FALSE.">
+        <file id="histhf" name="histhf" output_freq="6h" output_level="5" enabled=".FALSE.">
             
             <!-- VARS 1D -->
@@ -27,4 +27,5 @@
                 <field field_ref="t2m_oce" level="10" />
                 <field field_ref="t2m_sic" level="10" />
+                <field field_ref="gusts" level="10" />
                 <field field_ref="wind10m" level="10" />
                 <field field_ref="wind10max" level="10" operation="maximum" />
@@ -286,4 +287,6 @@
                 <field field_ref="dtsvdfi" level="10" />
                 <field field_ref="rugs" level="10" />
+                <field field_ref="z0m" level="10" />
+                <field field_ref="z0h" level="10" />
                 <field field_ref="topswad" level="10" />
                 <field field_ref="topswad0" level="10" />
@@ -345,8 +348,20 @@
                 <field field_ref="ages_oce" level="10" />
                 <field field_ref="ages_sic" level="10" />
+                <field field_ref="snow_ter" level="10" />
+                <field field_ref="snow_lic" level="10" />
+                <field field_ref="snow_oce" level="10" />
+                <field field_ref="snow_sic" level="10" />
                 <field field_ref="rugs_ter" level="10" />
                 <field field_ref="rugs_lic" level="10" />
                 <field field_ref="rugs_oce" level="10" />
                 <field field_ref="rugs_sic" level="10" />
+                <field field_ref="z0m_ter" level="10" />
+                <field field_ref="z0m_lic" level="10" />
+                <field field_ref="z0m_oce" level="10" />
+                <field field_ref="z0m_sic" level="10" />
+                <field field_ref="z0h_ter" level="10" />
+                <field field_ref="z0h_lic" level="10" />
+                <field field_ref="z0h_oce" level="10" />
+                <field field_ref="z0h_sic" level="10" />
                 <field field_ref="alb1" level="10" />
                 <field field_ref="alb2" level="10" />
Index: LMDZ5/branches/testing/DefLists/file_def_histins_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histins_lmdz.xml	(revision 2161)
+++ LMDZ5/branches/testing/DefLists/file_def_histins_lmdz.xml	(revision 2258)
@@ -27,4 +27,5 @@
                 <field field_ref="t2m_oce" level="10" />
                 <field field_ref="t2m_sic" level="10" />
+                <field field_ref="gusts" level="1" />
                 <field field_ref="wind10m" level="1" />
                 <field field_ref="wind10max" level="10" operation="maximum" />
@@ -286,4 +287,6 @@
                 <field field_ref="dtsvdfi" level="10" />
                 <field field_ref="rugs" level="10" />
+                <field field_ref="z0m" level="10" />
+                <field field_ref="z0h" level="10" />
                 <field field_ref="topswad" level="10" />
                 <field field_ref="topswad0" level="10" />
@@ -345,8 +348,20 @@
                 <field field_ref="ages_oce" level="10" />
                 <field field_ref="ages_sic" level="10" />
+                <field field_ref="snow_ter" level="10" />
+                <field field_ref="snow_lic" level="10" />
+                <field field_ref="snow_oce" level="10" />
+                <field field_ref="snow_sic" level="10" />
                 <field field_ref="rugs_ter" level="10" />
                 <field field_ref="rugs_lic" level="10" />
                 <field field_ref="rugs_oce" level="10" />
                 <field field_ref="rugs_sic" level="10" />
+                <field field_ref="z0m_ter" level="10" />
+                <field field_ref="z0m_lic" level="10" />
+                <field field_ref="z0m_oce" level="10" />
+                <field field_ref="z0m_sic" level="10" />
+                <field field_ref="z0h_ter" level="10" />
+                <field field_ref="z0h_lic" level="10" />
+                <field field_ref="z0h_oce" level="10" />
+                <field field_ref="z0h_sic" level="10" />
                 <field field_ref="alb1" level="10" />
                 <field field_ref="alb2" level="10" />
Index: LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml	(revision 2161)
+++ LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml	(revision 2258)
@@ -1,5 +1,5 @@
 <file_definition>
         <file_group id="defile">
-        <file id="histmth" name="Xhistmth" output_freq="5d" output_level="10"  enabled=".FALSE.">
+        <file id="histmth" name="histmth" output_freq="1d" output_level="5"  enabled=".FALSE.">
 
             <!-- VARS 1D -->
@@ -27,4 +27,5 @@
                 <field field_ref="t2m_oce" level="10" />
                 <field field_ref="t2m_sic" level="10" />
+                <field field_ref="gusts" level="1" />
                 <field field_ref="wind10m" level="1" />
                 <field field_ref="wind10max" level="10" operation="maximum" />
@@ -286,4 +287,6 @@
                 <field field_ref="dtsvdfi" level="10" />
                 <field field_ref="rugs" level="10" />
+                <field field_ref="z0m" level="10" />
+                <field field_ref="z0h" level="10" />
                 <field field_ref="topswad" level="2" />
                 <field field_ref="topswad0" level="2" />
@@ -345,8 +348,20 @@
                 <field field_ref="ages_oce" level="10" />
                 <field field_ref="ages_sic" level="3" />
+                <field field_ref="snow_ter" level="10" />
+                <field field_ref="snow_lic" level="3" />
+                <field field_ref="snow_oce" level="10" />
+                <field field_ref="snow_sic" level="3" />
                 <field field_ref="rugs_ter" level="3" />
                 <field field_ref="rugs_lic" level="3" />
                 <field field_ref="rugs_oce" level="3" />
                 <field field_ref="rugs_sic" level="3" />
+                <field field_ref="z0m_ter" level="3" />
+                <field field_ref="z0m_lic" level="3" />
+                <field field_ref="z0m_oce" level="3" />
+                <field field_ref="z0m_sic" level="3" />
+                <field field_ref="z0h_ter" level="3" />
+                <field field_ref="z0h_lic" level="3" />
+                <field field_ref="z0h_oce" level="3" />
+                <field field_ref="z0h_sic" level="3" />
                 <field field_ref="alb1" level="3" />
                 <field field_ref="alb2" level="3" />
Index: LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml	(revision 2161)
+++ LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml	(revision 2258)
@@ -27,4 +27,5 @@
                 <field field_ref="t2m_oce" level="10" />
                 <field field_ref="t2m_sic" level="10" />
+                <field field_ref="gusts" level="10" />
                 <field field_ref="wind10m" level="10" />
                 <field field_ref="wind10max" level="10" />
@@ -286,4 +287,6 @@
                 <field field_ref="dtsvdfi" level="10" />
                 <field field_ref="rugs" level="10" />
+                <field field_ref="z0m" level="10" />
+                <field field_ref="z0h" level="10" />
                 <field field_ref="topswad" level="10" />
                 <field field_ref="topswad0" level="10" />
@@ -345,8 +348,20 @@
                 <field field_ref="ages_oce" level="10" />
                 <field field_ref="ages_sic" level="10" />
+                <field field_ref="snow_ter" level="10" />
+                <field field_ref="snow_lic" level="10" />
+                <field field_ref="snow_oce" level="10" />
+                <field field_ref="snow_sic" level="10" />
                 <field field_ref="rugs_ter" level="10" />
                 <field field_ref="rugs_lic" level="10" />
                 <field field_ref="rugs_oce" level="10" />
                 <field field_ref="rugs_sic" level="10" />
+                <field field_ref="z0m_ter" level="10" />
+                <field field_ref="z0m_lic" level="10" />
+                <field field_ref="z0m_oce" level="10" />
+                <field field_ref="z0m_sic" level="10" />
+                <field field_ref="z0h_ter" level="10" />
+                <field field_ref="z0h_lic" level="10" />
+                <field field_ref="z0h_oce" level="10" />
+                <field field_ref="z0h_sic" level="10" />
                 <field field_ref="alb1" level="10" />
                 <field field_ref="alb2" level="10" />