Index: LMDZ5/branches/testing/DefLists/conv_param.def
===================================================================
--- LMDZ5/branches/testing/DefLists/conv_param.def	(revision 2488)
+++ LMDZ5/branches/testing/DefLists/conv_param.def	(revision 2488)
@@ -0,0 +1,34 @@
+### Convection
+#altitude, in hPa, above LCL at which buoybase is computed, def = original: -40
+dpbase=-40.
+#altitude, in hPa, above LCL below which Ep=0, def = original: 150, used only if flag_epKEorig=0
+pbcrit=150.0
+#altitude, in hPa, above LCL above which Ep=Epmax, def = original: 500, used only if flag_epKEorig=0
+ptcrit=500.0
+#reference fractional area of precipitating downdraughts, def = original: 0.01
+sigdz=0.01
+#unsaturated fraction of precipitating downdraughts, def = original: 0.15
+spfac=0.15
+#relaxation time of cloud base mass flux, def = original: 8000
+tau=8000.
+#flag for wb (= vert velocity at LFC); 0->wb=wbmax, 1->wb=f(plfc) bounded, 2->wb=f(plfc) linear, def = 1
+flag_wb=1
+#parameter used in the computation of wb, def = 6.
+wbmax=6.
+#
+ok_convstop=.False.
+#
+tau_stop=15000.
+#
+ok_intermittent=.False.
+#shedding coefficient (used when iflag_mix_adiab=1)
+coef_peel=0.25
+#
+### Clouds
+#Conversion cld water->precip: Ep=f(pressure) if 0; Ep=f(temperature) if 1, def=1
+flag_epKEorig=1
+#max condensed water concentration in kg/kg, def=0.0003, original: 0.0011, used only if flag_epKEorig=1
+elcrit=0.0003
+#temperature in degre Celsius, at which Ep=Epmax, def=-55., original: -55, used only if flag_epKEorig=1
+tlcrit=-55.0
+
Index: LMDZ5/branches/testing/DefLists/convection.def
===================================================================
--- LMDZ5/branches/testing/DefLists/convection.def	(revision 2488)
+++ LMDZ5/branches/testing/DefLists/convection.def	(revision 2488)
@@ -0,0 +1,43 @@
+### Convection
+#altitude, in hPa, above LCL at which buoybase is computed, def = original: -40
+dpbase=-40.
+#altitude, in hPa, above LCL below which Ep=0, def = original: 150, used only if flag_epKEorig=0
+pbcrit=150.0
+#altitude, in hPa, above LCL above which Ep=Epmax, def = original: 500, used only if flag_epKEorig=0
+ptcrit=500.0
+#reference fractional area of precipitating downdraughts, def = original: 0.01
+sigdz=0.01
+#unsaturated fraction of precipitating downdraughts, def = original: 0.15
+spfac=0.15
+#relaxation time of cloud base mass flux, def = original: 8000
+tau=8000.
+#flag for wb (= vert velocity at LFC); 0->wb=wbmax, 1->wb=f(plfc) bounded, 2->wb=f(plfc) linear, def = 1
+flag_wb=1
+#parameter used in the computation of wb, def = 6.
+wbmax=6.
+#
+ok_convstop=.False.
+#
+tau_stop=15000.
+#
+ok_intermittent=.False.
+#shedding coefficient (used when iflag_mix_adiab=1)
+coef_peel=0.25
+#
+### Clouds
+#Conversion cld water->precip: Ep=f(pressure) if 0; Ep=f(temperature) if 1, def=1
+flag_epKEorig=1
+#max condensed water concentration in kg/kg, def=0.0003, original: 0.0011, used only if flag_epKEorig=1
+elcrit=0.0003
+#temperature in degre Celsius, at which Ep=Epmax, def=-55., original: -55, used only if flag_epKEorig=1
+tlcrit=-55.0
+
+### Wakes
+#coefficient in Wape->C_star formula: C_star=stark*sqrt(2*Wape), def: 0.33
+stark=0.33
+#lifting efficiency of wakes; Alp=Alpk*Fip, Fip=power provided by wakes, def: 0.25
+alpk=0.25
+#wake density = number of wake centers per m2, def: 8.E-12
+wdens_ref=8.E-12
+#multiplicative factor of the damping by gravity waves, def: 4.
+coefgw=4.
Index: LMDZ5/branches/testing/DefLists/field_def_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/field_def_lmdz.xml	(revision 2471)
+++ LMDZ5/branches/testing/DefLists/field_def_lmdz.xml	(revision 2488)
@@ -311,9 +311,10 @@
         <field id="OD550_AIBCM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
         <field id="OD550_AIPOMM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
-        <field id="OD550_STRAT"    long_name="Aerosol Optical depth at 550 nm "    unit="1" enabled="FALSE" />
+        <field id="OD550_STRAT"    long_name="Aerosol Optical depth at 550 nm "    unit="1" enabled="TRUE" />
         <field id="OD550_SO4"     long_name="Aerosol Optical depth at 550 nm "    unit="1" />
         <field id="OD550_ASNO3M"     long_name="Aerosol Optical depth at 550 nm "    unit="1" />
         <field id="OD550_CSNO3M"     long_name="Aerosol Optical depth at 550 nm "    unit="1" />
         <field id="OD550_CINO3M"     long_name="Aerosol Optical depth at 550 nm "    unit="1" />
+        <field id="OD_10um_STRAT" long_name="Stratospheric Aerosol Optical depth at 10 um" unit="-" />
         <field id="od550aer"    long_name="Total aerosol optical depth at 550nm"    unit="-" />
         <field id="od865aer"    long_name="Total aerosol optical depth at 870nm"    unit="-" />
@@ -379,4 +380,5 @@
         <field id="wake_h"    long_name="wake_h"    unit="-" />
         <field id="wake_s"    long_name="wake_s"    unit="-" />
+        <field id="epmax"    long_name="epmax en fn cape"    unit="su" />
         <field id="plulth"    long_name="Rainfall therm."    unit="K/s" />
         <field id="plulst"    long_name="Rainfall strat."    unit="K/s" />
@@ -389,4 +391,15 @@
         <field id="rsutcs4co2"    long_name="TOA Out CS SW in 4xCO2 atmosphere"    unit="W/m2" />
         <field id="rlutcs4co2"    long_name="TOA Out CS LW in 4xCO2 atmosphere"    unit="W/m2" />
+        <field id="dqphy2d"    long_name="Physics dQ"    unit="(kg/m2)/s" />
+        <field id="dqdyn2d"    long_name="Dynamics dQ"    unit="(kg/m2)/s" />
+        <field id="dqcon2d"    long_name="Convection dQ"    unit="(kg/m2)/s" />
+        <field id="dqwak2d"    long_name="Wake dQ"    unit="(kg/m2)/s" />
+        <field id="dqlsc2d"    long_name="Condensation dQ"    unit="(kg/m2)/s" />
+        <field id="dqvdf2d"    long_name="Boundary-layer dQ"    unit="(kg/m2)/s" />
+        <field id="dqeva2d"    long_name="Reevaporation dQ"    unit="(kg/m2)/s" />
+        <field id="dqlscth2d"    long_name="dQ therm."    unit="(kg/m2)/s" />
+        <field id="dqlscst2d"    long_name="dQ strat."    unit="(kg/m2)/s" />
+        <field id="dqthe2d"    long_name="Thermal dQ"    unit="(kg/m2)/s" />
+        <field id="dqajs2d"    long_name="Dry ajdust dQ"    unit="(kg/m2)/s" />
     </field_group>
 
@@ -440,4 +453,5 @@
         <field id="ozone_daylight"    long_name="Daylight ozone mole fraction"    unit="-" />
         <field id="upwd"    long_name="saturated updraft"    unit="kg/m2/s" />
+        <field id="ep"    long_name="ep"    unit="su" />
         <field id="dtphy"    long_name="Physics dT"    unit="K/s" />
         <field id="dqphy"    long_name="Physics dQ"    unit="(kg/kg)/s" />
Index: LMDZ5/branches/testing/DefLists/file_def_histLES_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histLES_lmdz.xml	(revision 2471)
+++ LMDZ5/branches/testing/DefLists/file_def_histLES_lmdz.xml	(revision 2488)
@@ -371,4 +371,5 @@
                 <field field_ref="wake_h" level="10" />
                 <field field_ref="wake_s" level="10" />
+                <field field_ref="epmax" level="10" />
                 <field field_ref="plulth" level="10" />
                 <field field_ref="plulst" level="10" />
@@ -381,4 +382,15 @@
                 <field field_ref="rsutcs4co2" level="10" />
                 <field field_ref="rlutcs4co2" level="10" />
+                <field field_ref="dqphy2d" level="10" />
+                <field field_ref="dqdyn2d" level="10" />
+                <field field_ref="dqcon2d" level="10" />
+                <field field_ref="dqwak2d" level="10" />
+                <field field_ref="dqlsc2d" level="10" />
+                <field field_ref="dqvdf2d" level="10" />
+                <field field_ref="dqeva2d" level="10" />
+                <field field_ref="dqlscth2d" level="10" />
+                <field field_ref="dqlscst2d" level="10" />
+                <field field_ref="dqthe2d" level="10" />
+                <field field_ref="dqajs2d" level="10" />
             </field_group>
 
@@ -418,4 +430,5 @@
                 <field field_ref="ozone" level="10" />
                 <field field_ref="upwd" level="10" />
+                <field field_ref="ep" level="10" />
                 <field field_ref="dtphy" level="10" />
                 <field field_ref="dqphy" level="10" />
Index: LMDZ5/branches/testing/DefLists/file_def_histday_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histday_lmdz.xml	(revision 2471)
+++ LMDZ5/branches/testing/DefLists/file_def_histday_lmdz.xml	(revision 2488)
@@ -371,4 +371,5 @@
                 <field field_ref="wake_h" level="5" />
                 <field field_ref="wake_s" level="5" />
+                <field field_ref="epmax" level="10" />
                 <field field_ref="plulth" level="10" />
                 <field field_ref="plulst" level="10" />
@@ -381,4 +382,15 @@
                 <field field_ref="rsutcs4co2" level="10" />
                 <field field_ref="rlutcs4co2" level="10" />
+                <field field_ref="dqphy2d" level="10" />
+                <field field_ref="dqdyn2d" level="10" />
+                <field field_ref="dqcon2d" level="10" />
+                <field field_ref="dqwak2d" level="10" />
+                <field field_ref="dqlsc2d" level="10" />
+                <field field_ref="dqvdf2d" level="10" />
+                <field field_ref="dqeva2d" level="10" />
+                <field field_ref="dqlscth2d" level="10" />
+                <field field_ref="dqlscst2d" level="10" />
+                <field field_ref="dqthe2d" level="10" />
+                <field field_ref="dqajs2d" level="10" />
             </field_group>
 
@@ -418,4 +430,5 @@
                 <field field_ref="ozone" level="10" />
                 <field field_ref="upwd" level="10" />
+                <field field_ref="ep" level="10" />
                 <field field_ref="dtphy" level="10" />
                 <field field_ref="dqphy" level="10" />
Index: LMDZ5/branches/testing/DefLists/file_def_histhf_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histhf_lmdz.xml	(revision 2471)
+++ LMDZ5/branches/testing/DefLists/file_def_histhf_lmdz.xml	(revision 2488)
@@ -371,4 +371,5 @@
                 <field field_ref="wake_h" level="10" />
                 <field field_ref="wake_s" level="10" />
+                <field field_ref="epmax" level="10" />
                 <field field_ref="plulth" level="10" />
                 <field field_ref="plulst" level="10" />
@@ -381,4 +382,15 @@
                 <field field_ref="rsutcs4co2" level="10" />
                 <field field_ref="rlutcs4co2" level="10" />
+                <field field_ref="dqphy2d" level="10" />
+                <field field_ref="dqdyn2d" level="10" />
+                <field field_ref="dqcon2d" level="10" />
+                <field field_ref="dqwak2d" level="10" />
+                <field field_ref="dqlsc2d" level="10" />
+                <field field_ref="dqvdf2d" level="10" />
+                <field field_ref="dqeva2d" level="10" />
+                <field field_ref="dqlscth2d" level="10" />
+                <field field_ref="dqlscst2d" level="10" />
+                <field field_ref="dqthe2d" level="10" />
+                <field field_ref="dqajs2d" level="10" />
             </field_group>
 
@@ -418,4 +430,5 @@
                 <field field_ref="ozone" level="10" />
                 <field field_ref="upwd" level="10" />
+                <field field_ref="ep" level="10" />
                 <field field_ref="dtphy" level="10" />
                 <field field_ref="dqphy" level="10" />
Index: LMDZ5/branches/testing/DefLists/file_def_histins_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histins_lmdz.xml	(revision 2471)
+++ LMDZ5/branches/testing/DefLists/file_def_histins_lmdz.xml	(revision 2488)
@@ -371,4 +371,5 @@
                 <field field_ref="wake_h" level="10" />
                 <field field_ref="wake_s" level="10" />
+                <field field_ref="epmax" level="10" />
                 <field field_ref="plulth" level="10" />
                 <field field_ref="plulst" level="10" />
@@ -381,4 +382,15 @@
                 <field field_ref="rsutcs4co2" level="10" />
                 <field field_ref="rlutcs4co2" level="10" />
+                <field field_ref="dqphy2d" level="10" />
+                <field field_ref="dqdyn2d" level="10" />
+                <field field_ref="dqcon2d" level="10" />
+                <field field_ref="dqwak2d" level="10" />
+                <field field_ref="dqlsc2d" level="10" />
+                <field field_ref="dqvdf2d" level="10" />
+                <field field_ref="dqeva2d" level="10" />
+                <field field_ref="dqlscth2d" level="10" />
+                <field field_ref="dqlscst2d" level="10" />
+                <field field_ref="dqthe2d" level="10" />
+                <field field_ref="dqajs2d" level="10" />
             </field_group>
 
@@ -418,4 +430,5 @@
                 <field field_ref="ozone" level="10" />
                 <field field_ref="upwd" level="10" />
+                <field field_ref="ep" level="10" />
                 <field field_ref="dtphy" level="10" />
                 <field field_ref="dqphy" level="10" />
Index: LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml	(revision 2471)
+++ LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml	(revision 2488)
@@ -371,4 +371,5 @@
                 <field field_ref="wake_h" level="4" />
                 <field field_ref="wake_s" level="4" />
+                <field field_ref="epmax" level="2" />
                 <field field_ref="plulth" level="10" />
                 <field field_ref="plulst" level="10" />
@@ -381,4 +382,15 @@
                 <field field_ref="rsutcs4co2" level="5" />
                 <field field_ref="rlutcs4co2" level="5" />
+                <field field_ref="dqphy2d" level="2" />
+                <field field_ref="dqdyn2d" level="4" />
+                <field field_ref="dqcon2d" level="4" />
+                <field field_ref="dqwak2d" level="4" />
+                <field field_ref="dqlsc2d" level="4" />
+                <field field_ref="dqvdf2d" level="4" />
+                <field field_ref="dqeva2d" level="4" />
+                <field field_ref="dqlscth2d" level="10" />
+                <field field_ref="dqlscst2d" level="10" />
+                <field field_ref="dqthe2d" level="4" />
+                <field field_ref="dqajs2d" level="4" />
             </field_group>
 
@@ -418,4 +430,5 @@
                 <field field_ref="ozone" level="2" />
                 <field field_ref="upwd" level="2" />
+                <field field_ref="ep" level="2" />
                 <field field_ref="dtphy" level="2" />
                 <field field_ref="dqphy" level="2" />
Index: LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml
===================================================================
--- LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml	(revision 2471)
+++ LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml	(revision 2488)
@@ -371,4 +371,5 @@
                 <field field_ref="wake_h" level="10" />
                 <field field_ref="wake_s" level="10" />
+                <field field_ref="epmax" level="10" />
                 <field field_ref="plulth" level="10" />
                 <field field_ref="plulst" level="10" />
@@ -381,4 +382,15 @@
                 <field field_ref="rsutcs4co2" level="10" />
                 <field field_ref="rlutcs4co2" level="10" />
+                <field field_ref="dqphy2d" level="10" />
+                <field field_ref="dqdyn2d" level="10" />
+                <field field_ref="dqcon2d" level="10" />
+                <field field_ref="dqwak2d" level="10" />
+                <field field_ref="dqlsc2d" level="10" />
+                <field field_ref="dqvdf2d" level="10" />
+                <field field_ref="dqeva2d" level="10" />
+                <field field_ref="dqlscth2d" level="10" />
+                <field field_ref="dqlscst2d" level="10" />
+                <field field_ref="dqthe2d" level="10" />
+                <field field_ref="dqajs2d" level="10" />
             </field_group>
 
@@ -418,4 +430,5 @@
                 <field field_ref="ozone" level="10" />
                 <field field_ref="upwd" level="10" />
+                <field field_ref="ep" level="10" />
                 <field field_ref="dtphy" level="10" />
                 <field field_ref="dqphy" level="10" />
Index: LMDZ5/branches/testing/DefLists/physiq.def_L79_NPv5.5
===================================================================
--- LMDZ5/branches/testing/DefLists/physiq.def_L79_NPv5.5	(revision 2488)
+++ LMDZ5/branches/testing/DefLists/physiq.def_L79_NPv5.5	(revision 2488)
@@ -0,0 +1,191 @@
+##############################################################################
+# 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
+
+ok_strato=y
+ok_hines=n
+sso_gkdrag=0.2
+sso_gfrcri=0.70
+sso_gkwake=0.40
+#
+# Rayonnement
+#*********************
+# activation du nouveau code de rayonnement RRTM
+# 0 : Ancien code et 1 : RRTM (D=0)
+iflag_rrtm=1
+NSW=6
+#
+# Parametres nuages
+#******************
+#seuils de la precipitation des nuages strateformes (D: 2.6e-4 2.6e-4)
+cld_lc_lsc=0.00022
+cld_lc_con=0.00022
+#constante de temps pour eleminer eau lsc et convective (D: 3600. 3600.)
+cld_tau_lsc=1200.
+cld_tau_con=1200.
+#facteurs correctifs sur la vitesse de chute des cristaux de glace (D: 1 1)
+ffallv_lsc=0.67
+ffallv_con=0.67
+#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.999
+#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=1
+#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=278.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 
+
+iflag_cloudth_vert=1
+
+#
+lmixmin=10.
+
+#Bergeron
+iflag_bergeron=1
Index: LMDZ5/branches/testing/DefLists/run.def
===================================================================
--- LMDZ5/branches/testing/DefLists/run.def	(revision 2471)
+++ LMDZ5/branches/testing/DefLists/run.def	(revision 2488)
@@ -3,6 +3,8 @@
 ## Fichier de configuration general
 ## 
+INCLUDEDEF=gcm.def
+INCLUDEDEF=vert.def
 INCLUDEDEF=physiq.def
-INCLUDEDEF=gcm.def
+INCLUDEDEF=convection.def
 INCLUDEDEF=orchidee.def
 INCLUDEDEF=output.def
Index: LMDZ5/branches/testing/DefLists/vert_L79.def
===================================================================
--- LMDZ5/branches/testing/DefLists/vert_L79.def	(revision 2471)
+++ LMDZ5/branches/testing/DefLists/vert_L79.def	(revision 2488)
@@ -33,5 +33,5 @@
 ##  Avec ou sans strato
 ok_strato=y
-ok_hines=y
+ok_hines=n
 #  Couche eponge dans les couches de pression plus faible que 100 fois la pression de la derniere couche
 iflag_top_bound=2
Index: LMDZ5/branches/testing/DefLists/wake_param.def
===================================================================
--- LMDZ5/branches/testing/DefLists/wake_param.def	(revision 2488)
+++ LMDZ5/branches/testing/DefLists/wake_param.def	(revision 2488)
@@ -0,0 +1,9 @@
+### Wakes
+#coefficient in Wape->C_star formula: C_star=stark*sqrt(2*Wape), def: 0.33
+stark=0.33
+#lifting efficiency of wakes; Alp=Alpk*Fip, Fip=power provided by wakes, def: 0.25
+alpk=0.25
+#wake density = number of wake centers per m2, def: 8.E-12
+wdens_ref=8.E-12
+#multiplicative factor of the damping by gravity waves, def: 4.
+coefgw=4.