Index: LMDZ5/branches/testing/DefLists/field_def_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/field_def_lmdz.xml	(revision 2298)
+++ LMDZ5/branches/testing/DefLists/field_def_lmdz.xml	(revision 2408)
@@ -15,4 +15,6 @@
         <field id="flat"    long_name="Latent heat flux"        unit="W/m2" />
         <field id="slp"     long_name="Sea Level Pressure"      unit="Pa" />
+        <field id="ptstar"  long_name="Air Surface Temperature" unit="K" />
+        <field id="pt0"     long_name="Standard Air Surface Temperature"      unit="K" />
         <field id="tsol"    long_name="Surface Temperature"     unit="K" />
         <field id="t2m"        long_name="Temperature 2m" unit="K" />
@@ -111,5 +113,10 @@
 	<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="ustr_gwd_hines"    long_name="zonal wind stress Hines gravity waves"    unit="Pa" />
+	<field id="vstr_gwd_hines"    long_name="meridional wind stress Hines gravity waves"    unit="Pa" />
+	<field id="ustr_gwd_front"    long_name="zonal wind stress fronts gravity waves"    unit="Pa" />
+	<field id="vstr_gwd_front"    long_name="meridional wind stress fronts gravity waves"    unit="Pa" />
+	<field id="ustr_gwd_rando"    long_name="zonal wind stress random gravity waves"    unit="Pa" />
+	<field id="vstr_gwd_rando"    long_name="meridinal wind stress random gravity waves"    unit="Pa" />
         <field id="sens"    long_name="Sensible heat flux"    unit="W/m2" />
         <field id="fder"    long_name="Heat flux derivation"    unit="W/m2" />
@@ -510,6 +517,10 @@
         <field id="dulif"    long_name="Orography dU"    unit="m/s2" />
         <field id="dvlif"    long_name="Orography dV"    unit="m/s2" />
-        <field id="duhin"    long_name="Hines GWD dU"    unit="m/s2" />
-        <field id="dvhin"    long_name="Hines GWD dV"    unit="m/s2" />
+	<field id="du_gwd_hines" long_name="Hines GWD dU" unit="m/s2" />
+	<field id="dv_gwd_hines" long_name="Hines GWD dV" unit="m/s2" />
+	<field id="du_gwd_front" long_name="Fronts GWD dU" unit="m/s2" />
+	<field id="dv_gwd_front" long_name="Fronts GWD dV" unit="m/s2" />
+	<field id="east_gwstress" long_name="Eastward GW Stress" unit="Pa" />
+	<field id="west_gwstress" long_name="Westward GW Stress" unit="Pa" />
         <field id="dtoro"    long_name="Orography dT"    unit="K/s" />
         <field id="dtlif"    long_name="Orography dT"    unit="K/s" />
@@ -693,2 +704,3 @@
 
 </field_definition>
+
Index: LMDZ5/branches/testing/DefLists/file_def_histLES_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histLES_lmdz.xml	(revision 2298)
+++ LMDZ5/branches/testing/DefLists/file_def_histLES_lmdz.xml	(revision 2408)
@@ -19,4 +19,6 @@
                 <field field_ref="flat" level="5" />
                 <field field_ref="slp" level="10" />
+                <field field_ref="ptstar" level="10" />
+                <field field_ref="pt0" level="10" />
                 <field field_ref="tsol" level="10" />
                 <field field_ref="t2m" level="10" />
@@ -491,6 +493,10 @@
                 <field field_ref="dulif" level="10" />
                 <field field_ref="dvlif" level="10" />
-                <field field_ref="duhin" level="10" />
-                <field field_ref="dvhin" level="10" />
+                <field field_ref="du_gwd_hines" level="10" />
+                <field field_ref="dv_gwd_hines" level="10" />
+                <field field_ref="du_gwd_front" level="10" />
+                <field field_ref="dv_gwd_front" level="10" />
+                <field field_ref="east_gwstress" level="10" />
+                <field field_ref="west_gwstress" level="10" />
                 <field field_ref="dtoro" level="10" />
                 <field field_ref="dtlif" level="10" />
Index: LMDZ5/branches/testing/DefLists/file_def_histday_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histday_lmdz.xml	(revision 2298)
+++ LMDZ5/branches/testing/DefLists/file_def_histday_lmdz.xml	(revision 2408)
@@ -19,4 +19,6 @@
                 <field field_ref="flat" level="1" />
                 <field field_ref="slp" level="1" />
+                <field field_ref="ptstar" level="1" />
+                <field field_ref="pt0" level="1" />
                 <field field_ref="tsol" level="1" />
                 <field field_ref="t2m" level="1" />
@@ -491,6 +493,10 @@
                 <field field_ref="dulif" level="10" />
                 <field field_ref="dvlif" level="10" />
-                <field field_ref="duhin" level="10" />
-                <field field_ref="dvhin" level="10" />
+                <field field_ref="du_gwd_hines" level="10" />
+                <field field_ref="dv_gwd_hines" level="10" />
+                <field field_ref="du_gwd_front" level="10" />
+                <field field_ref="dv_gwd_front" level="10" />
+                <field field_ref="east_gwstress" level="10" />
+                <field field_ref="west_gwstress" level="10" />
                 <field field_ref="dtoro" level="10" />
                 <field field_ref="dtlif" level="10" />
Index: LMDZ5/branches/testing/DefLists/file_def_histhf_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histhf_lmdz.xml	(revision 2298)
+++ LMDZ5/branches/testing/DefLists/file_def_histhf_lmdz.xml	(revision 2408)
@@ -19,4 +19,6 @@
                 <field field_ref="flat" level="10" />
                 <field field_ref="slp" level="10" />
+                <field field_ref="ptstar" level="10" />
+                <field field_ref="pt0" level="10" />
                 <field field_ref="tsol" level="5" />
                 <field field_ref="t2m" level="5" />
@@ -491,6 +493,10 @@
                 <field field_ref="dulif" level="10" />
                 <field field_ref="dvlif" level="10" />
-                <field field_ref="duhin" level="10" />
-                <field field_ref="dvhin" level="10" />
+                <field field_ref="du_gwd_hines" level="10" />
+                <field field_ref="dv_gwd_hines" level="10" />
+                <field field_ref="du_gwd_front" level="10" />
+                <field field_ref="dv_gwd_front" level="10" />
+                <field field_ref="east_gwstress" level="10" />
+                <field field_ref="west_gwstress" level="10" />
                 <field field_ref="dtoro" level="10" />
                 <field field_ref="dtlif" level="10" />
Index: LMDZ5/branches/testing/DefLists/file_def_histins_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histins_lmdz.xml	(revision 2298)
+++ LMDZ5/branches/testing/DefLists/file_def_histins_lmdz.xml	(revision 2408)
@@ -19,4 +19,6 @@
                 <field field_ref="flat" level="10" />
                 <field field_ref="slp" level="1" />
+                <field field_ref="ptstar" level="1" />
+                <field field_ref="pt0" level="1" />
                 <field field_ref="tsol" level="1" />
                 <field field_ref="t2m" level="1" />
@@ -491,6 +493,10 @@
                 <field field_ref="dulif" level="10" />
                 <field field_ref="dvlif" level="10" />
-                <field field_ref="duhin" level="10" />
-                <field field_ref="dvhin" level="10" />
+                <field field_ref="du_gwd_hines" level="10" />
+                <field field_ref="dv_gwd_hines" level="10" />
+                <field field_ref="du_gwd_front" level="10" />
+                <field field_ref="dv_gwd_front" level="10" />
+                <field field_ref="east_gwstress" level="10" />
+                <field field_ref="west_gwstress" level="10" />
                 <field field_ref="dtoro" level="10" />
                 <field field_ref="dtlif" level="10" />
Index: LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml	(revision 2298)
+++ LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml	(revision 2408)
@@ -19,4 +19,6 @@
                 <field field_ref="flat"         level="5" />
                 <field field_ref="slp"          level="1" />
+                <field field_ref="ptstar"       level="1" />
+                <field field_ref="pt0"          level="1" />
                 <field field_ref="tsol"         level="1" />
                 <field field_ref="t2m"          level="1" />
@@ -491,6 +493,10 @@
                 <field field_ref="dulif" level="4" />
                 <field field_ref="dvlif" level="4" />
-                <field field_ref="duhin" level="4" />
-                <field field_ref="dvhin" level="4" />
+                <field field_ref="du_gwd_hines" level="4" />
+                <field field_ref="dv_gwd_hines" level="4" />
+                <field field_ref="du_gwd_front" level="4" />
+                <field field_ref="dv_gwd_front" level="4" />
+                <field field_ref="east_gwstress" level="4" />
+                <field field_ref="west_gwstress" level="4" />
                 <field field_ref="dtoro" level="4" />
                 <field field_ref="dtlif" level="4" />
Index: LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml	(revision 2298)
+++ LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml	(revision 2408)
@@ -19,4 +19,6 @@
                 <field field_ref="flat" level="10" />
                 <field field_ref="slp" level="10" />
+                <field field_ref="ptstar" level="10" />
+                <field field_ref="pt0" level="10" />
                 <field field_ref="tsol" level="10" />
                 <field field_ref="t2m" level="10" />
@@ -491,6 +493,10 @@
                 <field field_ref="dulif" level="10" />
                 <field field_ref="dvlif" level="10" />
-                <field field_ref="duhin" level="10" />
-                <field field_ref="dvhin" level="10" />
+                <field field_ref="du_gwd_hines" level="10" />
+                <field field_ref="dv_gwd_hines" level="10" />
+                <field field_ref="du_gwd_front" level="10" />
+                <field field_ref="dv_gwd_front" level="10" />
+                <field field_ref="east_gwstress" level="10" />
+                <field field_ref="west_gwstress" level="10" />
                 <field field_ref="dtoro" level="10" />
                 <field field_ref="dtlif" level="10" />
Index: LMDZ5/branches/testing/DefLists/physiq.def_L39_AR40.0
===================================================================
--- LMDZ5/branches/testing/DefLists/physiq.def_L39_AR40.0	(revision 2298)
+++ LMDZ5/branches/testing/DefLists/physiq.def_L39_AR40.0	(revision 2408)
@@ -1,3 +1,6 @@
-##############################################################################
+#
+# $Id$
+#
+###############################################################################
 # PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
 ##############################################################################
Index: LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv0.0
===================================================================
--- LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv0.0	(revision 2298)
+++ LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv0.0	(revision 2408)
@@ -1,3 +1,6 @@
-##############################################################################
+#
+# $Id$
+#
+###############################################################################
 # PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
 ##############################################################################
Index: LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv1.0
===================================================================
--- LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv1.0	(revision 2298)
+++ LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv1.0	(revision 2408)
@@ -1,3 +1,6 @@
-##############################################################################
+#
+# $Id$
+#
+###############################################################################
 # PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
 ##############################################################################
Index: LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv2.0
===================================================================
--- LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv2.0	(revision 2298)
+++ LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv2.0	(revision 2408)
@@ -1,2 +1,5 @@
+#
+# $Id$
+#
 ##############################################################################
 # PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
Index: LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv3.0
===================================================================
--- LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv3.0	(revision 2298)
+++ LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv3.0	(revision 2408)
@@ -1,3 +1,6 @@
-##############################################################################
+#
+# $Id$
+#
+###############################################################################
 # PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
 ##############################################################################
Index: LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv3.1
===================================================================
--- LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv3.1	(revision 2298)
+++ LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv3.1	(revision 2408)
@@ -1,3 +1,6 @@
-##############################################################################
+#
+# $Id$
+#
+###############################################################################
 # PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
 ##############################################################################
Index: LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv3.2
===================================================================
--- LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv3.2	(revision 2298)
+++ LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv3.2	(revision 2408)
@@ -1,3 +1,6 @@
-##############################################################################
+#
+# $Id$
+#
+###############################################################################
 # PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
 ##############################################################################
Index: LMDZ5/branches/testing/DefLists/physiq.def_L59_NPv4.12
===================================================================
--- LMDZ5/branches/testing/DefLists/physiq.def_L59_NPv4.12	(revision 2298)
+++ LMDZ5/branches/testing/DefLists/physiq.def_L59_NPv4.12	(revision 2408)
@@ -1,3 +1,6 @@
-##############################################################################
+#
+# $Id$
+#
+###############################################################################
 # PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
 ##############################################################################
Index: LMDZ5/branches/testing/DefLists/physiq.def_L79_NPv5.17h
===================================================================
--- LMDZ5/branches/testing/DefLists/physiq.def_L79_NPv5.17h	(revision 2408)
+++ LMDZ5/branches/testing/DefLists/physiq.def_L79_NPv5.17h	(revision 2408)
@@ -0,0 +1,181 @@
+#
+# $Id$
+#
+###############################################################################
+# PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
+##############################################################################
+# D: Valeur par default
+#
+#Parametres Orographiques et cdrags
+#**********************************
+##   Si=.T. ,  lecture du fichier limit avec la bonne annee 
+ok_limitvrai=n
+iflag_albedo=1
+#Cdrags 
+f_cdrag_stable=1.
+f_cdrag_ter=1.
+f_cdrag_oce=0.7
+f_ri_cd_min=0.6
+#cdmmax
+cdmmax=2.5E-3
+#cdhmax
+cdhmax=2.0E-3
+##  Orodr  ou  non   pour l orographie
+ok_orodr=y
+##  Orolf  ou  non   pour l orographie              
+ok_orolf=y
+#Rugoro
+f_rugoro=0.
+#
+### Random gravity waves
+#Activitate the stochastic parameterization of convective GWs (should be equal to ok_strato)
+ok_gwd_rando=y
+# Scale the momentum fluxes due to convective GWs
+gwd_rando_ruwmax=2.5
+#Scale the saturated momentum flux of  convective GWs 
+gwd_rando_sat=0.2
+
+#
+# Rayonnement
+#*********************
+# activation du nouveau code de rayonnement RRTM
+# 0 : Ancien code et 1 : RRTM (D=0)
+iflag_rrtm=0
+#NSW=2
+#
+# Parametres nuages
+#******************
+#seuils de la precipitation des nuages strateformes (D: 2.6e-4 2.6e-4)
+cld_lc_lsc=0.0003
+cld_lc_con=0.0003
+#constante de temps pour eleminer eau lsc et convective (D: 3600. 3600.)
+cld_tau_lsc=1800.
+cld_tau_con=1800.
+#facteurs correctifs sur la vitesse de chute des cristaux de glace (D: 1 1)
+ffallv_lsc=0.66528
+ffallv_con=0.66528
+#coefficient sur la reevaporation de la pluie (D: 2.e-5 n)
+coef_eva=2e-5
+reevap_ice=y
+#calcul des proprietes des nuages convectifs (D:1 0.375 1.e-4) 
+iflag_cldcon=6
+fact_cldcon=1.
+facttemps=0.
+#calcul eau condensee et fraction nuageuse a partir des PDF (D:0, 0:version avec ratqs sinon nouvelles PDFs)  
+iflag_pdf=1
+#calcul epaisseur optique et emmissivite des nuages (D: y 1 0.01 0.3)
+ok_newmicro=y
+iflag_ratqs=4
+ratqsbas=0.002
+ratqshaut=0.312
+#rayon effectif pour les nuages de glace (D:35)
+rad_froid=35
+#rayons effectifs pour les nuages eau liq (tailles des gouttes d eau nuageuse, D: 13 9)
+rad_chau1=12
+rad_chau2=11
+##  Choix ou non  de  New oliq               
+new_oliq=y
+#Rayons min et max effectifs des particules des nuages
+rei_min=16.
+rei_max=61.29
+#
+# Flags Convection 
+#*****************
+#Convection scheme switch (D:2, 1:LMD, 2:Tiedtke, 3:KE New Physics, 30:KE AR4)
+iflag_con=3
+#output level of energy conservation diagnostics
+if_ebil=0
+#maximum efficiency of cld water->precipitation conversion (D: 0.993)
+epmax=0.998
+#dry convective adjustment at beginning of Emanuel convective scheme (D: n 0)
+ok_adj_ema=n
+iflag_clw=0
+#Convective closure (D:1, 0:AR4, 2:ALE and ALP)
+iflag_clos=2
+#Convective entrainment mixing law (D:1, 0:AR4=flat PDF, 1=PDF)
+iflag_mix=0
+#weights of the bell shaped and flat PDF (used only if iflag_mix=1) (D: 1 0)
+qqa1=1.
+qqa2=0.
+#Parameters of the bell shaped PDF; Fmax=center (D= 0.65), Gammas=width (D=0.05)
+cvl_corr=1.0
+#Multiplicative factor of Emanuel convective scheme precipitation (D: 1.)
+Fmax=0.65
+#
+# Flags Couche limite
+#********************
+#shema de CL des thermiques (D:0, 0:ajustement sec,=>1:versions thermiques) 
+iflag_thermals=18
+#pas de temps du spliting pour les thermiques
+nsplit_thermals=1
+tau_thermals=0.
+iflag_thermals_ed=8
+fact_thermals_ed_dz=0.1
+iflag_thermals_optflux=0
+#shema de la couche de surface (D:1, 1:LMD, 8:Mellor-Yamada) 
+iflag_pbl=11
+#diffusion turbulente
+ksta_ter=1.e-7
+ksta=1.e-10
+#ok_kzmin : calcul Kzmin dans la CL de surface
+ok_kzmin=y
+#couplage ou non avec la convection
+iflag_coupl=5 (0:AR4 et 1:nouvelle physique)
+seuil_inversion=-0.08
+#rendement sur la puissance fournie par les thermiques a la convection
+alp_bl_k=0.5
+#
+## temperature dependency of qsat for iterative procedure
+## temporary flag to switch between the old (CMIP5, D=0) and new versions (=1) versions 
+iflag_fisrtilp_qsat=4 
+## Reactivation du calcul d'un zmax continu pour les thermiques
+## reactivation d'une fermeture humide des thermiques  iflag_thermals_closure=2 (D=1)
+iflag_thermals_closure=1
+#
+# Flags wakes
+#************
+#Wake scheme switch (D:0, 0:AR4, 1:New Physics)
+iflag_wake=1
+#Constant value to be added to Alp (D: 0.)
+alp_offset=0.
+
+### nrlmd le 10/04/2012: Declenchement ###
+#Déclelenchement par couche-limite (0: deterministe, 1: stochastique)
+iflag_trig_bl=1
+#Surface critique au LCL
+s_trig=1.2e7
+#Temps de decorrelation entre scenes de cumulus
+tau_trig_shallow=1200
+#Temps de decorrelation entre scenes de cumulonimbus
+tau_trig_deep=1200
+# Pour la stabilisation
+random_notrig_max=0.99
+ok_adjwk=y
+tmax_fonte_cv=288.15
+
+
+### nrlmd le 10/04/2012: Fermeture ###
+#Fermeture par couche-limite (0: deterministe, 1: statistique, 2: statistique+convergence grande échelle)
+iflag_clos_bl=1
+### fin nrlmd le 10/04/2012
+
+## Modification de la plage de temperature pour la phase mixte liquide/glace des nuages
+## Controle par les t_glace_min/max, exposant_glace, iflag_t_glace (D=0)
+t_glace_min=233.13
+t_glace_max=273.13
+exposant_glace=1.
+iflag_t_glace=1
+iflag_ice_thermo=1
+
+#
+## The source terms of the TKE prognostic equation are diagnosed from tendencies (du, dv, dT) 
+## associated with subrgrid scaleamotions and treated as an additional heat source.
+## Controled by a key, iflag_ener_conserv (D=-1):
+## 0 : no conservation, -1 : old adhoc correction for kinetic E only (used for CMIP5) 
+## 1 : conservation, 101 : conversion from kinetic to heat only, 110 conversion from potential to heat only
+iflag_ener_conserv=1
+
+#Activation of corrections for water conservation (D: n). 
+##The default is n for compatibility with earlier versions.
+##generally it should be y.
+ok_conserv_q=y