Index: LMDZ6/branches/LMDZ_ECRad/DefLists/README
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/DefLists/README	(revision 4366)
+++ LMDZ6/branches/LMDZ_ECRad/DefLists/README	(revision 4482)
@@ -11,2 +11,7 @@
 physiq.def_NPv5.70         IPSL-CM6.0.5
 physiq.def_NPv5.67         IPSL-CM6.0.5 / THC1 (test de sensibilité)
+physiq.def_NPv6.1          IPSL-CM6A
+physiq.def_NPv6.2          IPSL-CM6A for QUEST (without 2 CM6A bugs)
+physiq.def_NPv6.3          IPSL-CM6A + new flags added since CMIP6 end 2018
+physiq.def_NPv6.4          NPv6.3 without 2 CM6A bugs
+physiq.def_LUDOBest2       Ludovic' physic tuned by Frederic 
Index: LMDZ6/branches/LMDZ_ECRad/DefLists/context_lmdz.xml
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/DefLists/context_lmdz.xml	(revision 4366)
+++ LMDZ6/branches/LMDZ_ECRad/DefLists/context_lmdz.xml	(revision 4482)
@@ -63,4 +63,5 @@
     <axis id="time_year" unit="day" />
     <axis id="presnivs" standard_name="Vertical levels" unit="Pa"/>
+    <axis id="presinter" standard_name="Pressure at interface of vertical levels" unit="Pa"/>
     <axis id="Ahyb" standard_name="Ahyb comp of Hyb Cord" unit="Pa"/>
     <axis id="Bhyb" standard_name="Bhyb comp of Hyb Cord" unit=""/>
@@ -75,4 +76,7 @@
     <axis id="axis_lat" standard_name="Latitude axis">
         <reduce_domain operation="average" direction="iDir" />
+    </axis>
+    <axis id="axis_lat_greordered" standard_name="Latitude axis">
+      <reduce_domain operation="average" direction="iDir" />
     </axis>
 
@@ -119,4 +123,13 @@
      </grid>
 
+     <grid id="grid_glo_presinter">
+        <domain domain_ref="dom_glo" />
+        <axis axis_ref="presinter" />
+     </grid>
+     <grid id="grid_out_presinter">
+        <domain domain_ref="dom_out" />
+        <axis axis_ref="presinter" />
+     </grid>
+
      <grid id="grid_out_plev17">
         <domain id="dom_out" />
Index: LMDZ6/branches/LMDZ_ECRad/DefLists/field_def_lmdz.xml
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/DefLists/field_def_lmdz.xml	(revision 4366)
+++ LMDZ6/branches/LMDZ_ECRad/DefLists/field_def_lmdz.xml	(revision 4482)
@@ -576,6 +576,4 @@
         <field id="cldemi"    long_name="Cloud optical emissivity"    unit="1" />
         <field id="tke_max"    long_name="TKE max"    unit="m2/s2" operation="maximum"/>
-        <field id="kz"    long_name="Kz melange"    unit="m2/s" enabled="FALSE" />
-        <field id="kz_max"    long_name="Kz melange max"    unit="m2/s" enabled="FALSE" operation="maximum" />
         <field id="concso4"    long_name="Concentration of Sulfate "    unit="kg/m3" />
         <field id="concno3"    long_name="Concentration of Nitrate "    unit="kg/m3" /> 
@@ -585,6 +583,6 @@
         <field id="concdust"    long_name="Concentration of Dust "    unit="kg/m3" />
         <field id="ec550aer"    long_name="Extinction at 550nm"    unit="m^-1" />
-        <field id="lwcon"    long_name="Cloud liquid water content"    unit="kg/kg" />
-        <field id="iwcon"    long_name="Cloud ice water content"    unit="kg/kg" />
+        <field id="lwcon"    long_name="Cloud liquid water content seen by radiation"    unit="kg/kg" />
+        <field id="iwcon"    long_name="Cloud ice water content seen by radiation"    unit="kg/kg" />
         <field id="temp"    long_name="Air temperature"    unit="K" />
         <field id="theta"    long_name="Potential air temperature"    unit="K" />
@@ -659,5 +657,4 @@
         <field id="wdtrainS"    long_name="precipitation from shedding of AA"    unit="-" />
         <field id="wdtrainM"    long_name="precipitation from mixture"    unit="-" />
-        <field id="Vprecip"    long_name="precipitation vertical profile"    unit="-" />
         <field id="qtaa"    long_name="specific total water in adiabatic ascents"    unit="kg/kg" /> 
         <field id="Clwaa"   long_name="specific condensed water in adiabatic ascents"    unit="kg/kg" />
@@ -687,10 +684,7 @@
         <field id="duthe"    long_name="Thermal du"    unit="m/s2" />
         <field id="dvthe"    long_name="Thermal dv"    unit="m/s2" />
-        <field id="f_th"    long_name="Thermal plume mass flux"    unit="kg/(m2*s)" />
         <field id="e_th"    long_name="Thermal plume entrainment"    unit="K/s" />
-        <field id="w_th"    long_name="Thermal plume vertical velocity"    unit="m/s" />
         <field id="lambda_th"    long_name="Thermal plume vertical velocity"    unit="m/s" />
         <field id="q_th"    long_name="Thermal plume total humidity"    unit="kg/kg" />
-        <field id="a_th"    long_name="Thermal plume fraction"    unit="-" />
         <field id="s_th"    long_name="Thermal plume saturation deficit"    unit="kg/kg" />
         <field id="s_env"    long_name="Environment saturation deficit"    unit="kg/kg" />
@@ -723,14 +717,4 @@
         <field id="dtlif"    long_name="Orography dT"    unit="K/s" />
         <field id="dthin"    long_name="Hines GWD dT"    unit="K/s" />
-        <field id="rsu"    long_name="SW upward radiation"    unit="W m-2" />
-        <field id="rsd"    long_name="SW downward radiation"    unit="W m-2" />
-        <field id="rlu"    long_name="LW upward radiation"    unit="W m-2" />
-        <field id="rld"    long_name="LW downward radiation"    unit="W m-2" />
-        <field id="rsucsaf"  long_name="SW clean (no aerosol) CS upward radiation"    unit="W m-2" />
-        <field id="rsdcsaf"  long_name="SW clean (no aerosol) CS downward radiation"    unit="W m-2" />
-        <field id="rsucs"    long_name="SW CS upward radiation"    unit="W m-2" />
-        <field id="rsdcs"    long_name="SW CS downward radiation"    unit="W m-2" />
-        <field id="rlucs"    long_name="LW CS upward radiation"    unit="W m-2" />
-        <field id="rldcs"    long_name="LW CS downward radiation"    unit="W m-2" />
         <field id="tnt"    long_name="Tendency of air temperature"    unit="K s-1" />
         <field id="tntc"    long_name="Tendency of air temperature due to Moist Convection"    unit="K s-1" />
@@ -740,5 +724,4 @@
         <field id="tnhusc"    long_name="Tendency of specific humidity due to convection"    unit="s-1" />
         <field id="tnhusscpbl"    long_name="Tendency of Specific humidity due to ST cl, precip and BL mixing"    unit="s-1" />
-        <field id="evu"    long_name="Eddy viscosity coefficient for Momentum Variables"    unit="m2 s-1" />
         <field id="h2o"    long_name="Mass Fraction of Water"    unit="1" />
         <field id="mcd"    long_name="Downdraft COnvective Mass Flux"    unit="kg/(m2*s)" />
@@ -746,12 +729,4 @@
         <field id="ref_liq"    long_name="Effective radius of convective cloud liquid water particle"    unit="m" />
         <field id="ref_ice"    long_name="Effective radius of startiform cloud ice particle"    unit="m" />
-        <field id="rsu4co2"    long_name="Upwelling SW 4xCO2 atmosphere"    unit="W/m2" />
-        <field id="rlu4co2"    long_name="Upwelling LW 4xCO2 atmosphere"    unit="W/m2" />
-        <field id="rsucs4co2"    long_name="Upwelling CS SW 4xCO2 atmosphere"    unit="W/m2" />
-        <field id="rlucs4co2"    long_name="Upwelling CS LW 4xCO2 atmosphere"    unit="W/m2" />
-        <field id="rsd4co2"    long_name="Downwelling SW 4xCO2 atmosphere"    unit="W/m2" />
-        <field id="rld4co2"    long_name="Downwelling LW 4xCO2 atmosphere"    unit="W/m2" />
-        <field id="rsdcs4co2"    long_name="Downwelling CS SW 4xCO2 atmosphere"    unit="W/m2" />
-        <field id="rldcs4co2"    long_name="Downwelling CS LW 4xCO2 atmosphere"    unit="W/m2" />
         <field id="stratomask"    long_name="Stratospheric fraction"    unit="-" />
         <field id="heat_volc"    long_name="SW heating rate from volcano"    unit="K/s" />
@@ -783,4 +758,32 @@
     </field_group>
 
+    <field_group id="fields_3Dkp1" grid_ref="grid_glo_presinter" >
+        <field id="a_th"    long_name="Thermal plume fraction"    unit="-" />
+        <field id="f_th"    long_name="Thermal plume mass flux"    unit="kg/(m2*s)" />
+        <field id="w_th"    long_name="Thermal plume vertical velocity"    unit="m/s" />
+        <field id="rsucs"    long_name="SW CS upward radiation"    unit="W m-2" />
+        <field id="rsdcs"    long_name="SW CS downward radiation"    unit="W m-2" />
+        <field id="rlucs"    long_name="LW CS upward radiation"    unit="W m-2" />
+        <field id="rldcs4co2"    long_name="Downwelling CS LW 4xCO2 atmosphere"    unit="W/m2" />
+        <field id="rlucs4co2"    long_name="Upwelling CS LW 4xCO2 atmosphere"    unit="W/m2" />
+        <field id="rsdcs4co2"    long_name="Downwelling CS SW 4xCO2 atmosphere"    unit="W/m2" />
+        <field id="rsucs4co2"    long_name="Upwelling CS SW 4xCO2 atmosphere"    unit="W/m2" />
+        <field id="rld4co2"    long_name="Downwelling LW 4xCO2 atmosphere"    unit="W/m2" />
+        <field id="rsd4co2"    long_name="Downwelling SW 4xCO2 atmosphere"    unit="W/m2" />
+        <field id="rlu4co2"    long_name="Upwelling LW 4xCO2 atmosphere"    unit="W/m2" />
+        <field id="rsu4co2"    long_name="Upwelling SW 4xCO2 atmosphere"    unit="W/m2" />
+        <field id="rsdcsaf"  long_name="SW clean (no aerosol) CS downward radiation"    unit="W m-2" />
+        <field id="rsucsaf"  long_name="SW clean (no aerosol) CS upward radiation"    unit="W m-2" />
+        <field id="Vprecip"    long_name="precipitation vertical profile"    unit="-" />
+        <field id="kz_max"    long_name="Kz melange max"    unit="m2/s" enabled="FALSE" operation="maximum" />
+        <field id="rldcs"    long_name="LW CS downward radiation"    unit="W m-2" />
+        <field id="rsu"    long_name="SW upward radiation"    unit="W m-2" />
+        <field id="rsd"    long_name="SW downward radiation"    unit="W m-2" />
+        <field id="rlu"    long_name="LW upward radiation"    unit="W m-2" />
+        <field id="rld"    long_name="LW downward radiation"    unit="W m-2" />
+        <field id="kz"    long_name="Kz melange"    unit="m2/s" enabled="FALSE" />
+        <field id="evu"    long_name="Eddy viscosity coefficient for Momentum Variables"    unit="m2 s-1" />
+    </field_group>
+    
     <field_group id="fields_strataer_trac_3D" grid_ref="grid_glo_presnivs" operation="average"/>
     <field_group id="fields_strataer_trac_2D" grid_ref="grid_glo" operation="average"/>
Index: LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histLES_lmdz.xml
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histLES_lmdz.xml	(revision 4366)
+++ LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histLES_lmdz.xml	(revision 4482)
@@ -454,6 +454,4 @@
                 <field field_ref="cldemi" level="10" />
                 <field field_ref="tke_max" level="10" operation="maximum" />
-                <field field_ref="kz" level="10" />
-                <field field_ref="kz_max" level="10" operation="maximum" />
                 <field field_ref="concso4" level="10" />
                 <field field_ref="concoa" level="10" />
@@ -533,5 +531,4 @@
                 <field field_ref="wdtrainA" level="1" />
                 <field field_ref="wdtrainM" level="1" />
-                <field field_ref="Vprecip" level="10" />
                 <field field_ref="ftd" level="10" />
                 <field field_ref="fqd" level="10" />
@@ -557,10 +554,7 @@
                 <field field_ref="ratqs" level="10" />
                 <field field_ref="dtthe" level="10" />
-                <field field_ref="f_th" level="10" />
                 <field field_ref="e_th" level="10" />
-                <field field_ref="w_th" level="10" />
                 <field field_ref="lambda_th" level="10" />
                 <field field_ref="q_th" level="10" />
-                <field field_ref="a_th" level="10" />
                 <field field_ref="s_th" level="10" />
                 <field field_ref="s_env" level="10" />
@@ -591,12 +585,4 @@
                 <field field_ref="dtlif" level="10" />
                 <field field_ref="dthin" level="10" />
-                <field field_ref="rsu" level="10" />
-                <field field_ref="rsd" level="10" />
-                <field field_ref="rlu" level="10" />
-                <field field_ref="rld" level="10" />
-                <field field_ref="rsucs" level="10" />
-                <field field_ref="rsdcs" level="10" />
-                <field field_ref="rlucs" level="10" />
-                <field field_ref="rldcs" level="10" />
                 <field field_ref="tnt" level="10" />
                 <field field_ref="tntc" level="10" />
@@ -606,5 +592,4 @@
                 <field field_ref="tnhusc" level="10" />
                 <field field_ref="tnhusscpbl" level="10" />
-                <field field_ref="evu" level="10" />
                 <field field_ref="h2o" level="10" />
                 <field field_ref="mcd" level="10" />
@@ -612,12 +597,29 @@
                 <field field_ref="ref_liq" level="10" />
                 <field field_ref="ref_ice" level="10" />
+            </field_group>
+            <field_group operation="average" grid_ref="grid_out_presinter">
+                <field field_ref="a_th" level="9" />
+                <field field_ref="f_th" level="7" />
+                <field field_ref="w_th" level="7" />
+                <field field_ref="rsucs" level="10" />
+                <field field_ref="rsdcs" level="10" />
+                <field field_ref="rlucs" level="10" />
+                <field field_ref="rldcs" level="10" />
+                <field field_ref="rldcs4co2" level="10" />
+                <field field_ref="rlucs4co2" level="10" />
+                <field field_ref="rsdcs4co2" level="10" />
+                <field field_ref="rsucs4co2" level="10" />
                 <field field_ref="rsu4co2" level="10" />
                 <field field_ref="rlu4co2" level="10" />
-                <field field_ref="rsucs4co2" level="10" />
-                <field field_ref="rlucs4co2" level="10" />
                 <field field_ref="rsd4co2" level="10" />
                 <field field_ref="rld4co2" level="10" />
-                <field field_ref="rsdcs4co2" level="10" />
-                <field field_ref="rldcs4co2" level="10" />
+                <field field_ref="Vprecip" level="11" />
+                <field field_ref="rsu" level="5" />
+                <field field_ref="rsd" level="5" />
+                <field field_ref="rlu" level="5" />
+                <field field_ref="rld" level="5" />
+                <field field_ref="kz" level="4" />
+                <field field_ref="kz_max" level="4" operation="maximum" />
+                <field field_ref="evu" level="10" />
             </field_group>
           </field_group>
Index: LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histday_lmdz.xml
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histday_lmdz.xml	(revision 4366)
+++ LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histday_lmdz.xml	(revision 4482)
@@ -196,5 +196,5 @@
                 <field field_ref="cdrh" level="10" />
                 <field field_ref="cldl" level="1" />
-                <field field_ref="cumCO2" level="5" />
+                <field field_ref="cumCO2" level="5" />  <!-- Added PC -->
                 <field field_ref="cldm" level="1" />
                 <field field_ref="cldh" level="1" />
@@ -245,4 +245,11 @@
                 <field field_ref="colO3_strat" level="6" />     <!-- Added ThL -->
                 <field field_ref="colO3_trop"  level="6" />     <!-- Added ThL -->
+                <field field_ref="flx_co2_ocean"  level="5" /> <!-- Added PC -->
+                <field field_ref="flx_co2_land"   level="5" /> <!-- Added PC -->
+                <field field_ref="flx_co2_ocean_cor" level="5" /> <!-- Added PC -->
+                <field field_ref="flx_co2_land_cor"  level="5" /> <!-- Added PC -->
+                <field field_ref="flx_co2_ff"  level="5" /> <!-- Added PC -->
+                <field field_ref="flx_co2_bb"  level="5" /> <!-- Added PC -->
+
 
                 <field_group operation="average" detect_missing_value=".true.">
@@ -444,5 +451,5 @@
             <!-- VARS 3D -->
             <field_group operation="average" grid_ref="grid_out_presnivs">
-                <field field_ref="CO2" level="5" />
+                <field field_ref="CO2" level="5" /> <!-- Added PC -->
                 <field field_ref="dCO2_vdf" level="5" />
                 <field field_ref="dCO2_the" level="5" />
@@ -451,6 +458,4 @@
                 <field field_ref="cldemi" level="5" />
                 <field field_ref="tke_max" level="10" operation="maximum" />
-                <field field_ref="kz" level="10" />
-                <field field_ref="kz_max" level="10" operation="maximum" />
                 <field field_ref="concso4" level="6" />
                 <field field_ref="concoa" level="6" />
@@ -529,5 +534,4 @@
                 <field field_ref="wdtrainA" level="1" />
                 <field field_ref="wdtrainM" level="1" />
-                <field field_ref="Vprecip" level="10" />
                 <field field_ref="ftd" level="5" />
                 <field field_ref="fqd" level="5" />
@@ -553,10 +557,7 @@
                 <field field_ref="ratqs" level="10" />
                 <field field_ref="dtthe" level="10" />
-                <field field_ref="f_th" level="10" />
                 <field field_ref="e_th" level="10" />
-                <field field_ref="w_th" level="10" />
                 <field field_ref="lambda_th" level="10" />
                 <field field_ref="q_th" level="10" />
-                <field field_ref="a_th" level="10" />
                 <field field_ref="s_th" level="10" />
                 <field field_ref="s_env" level="10" />
@@ -587,12 +588,4 @@
                 <field field_ref="dtlif" level="10" />
                 <field field_ref="dthin" level="10" />
-                <field field_ref="rsu" level="10" />
-                <field field_ref="rsd" level="10" />
-                <field field_ref="rlu" level="10" />
-                <field field_ref="rld" level="10" />
-                <field field_ref="rsucs" level="10" />
-                <field field_ref="rsdcs" level="10" />
-                <field field_ref="rlucs" level="10" />
-                <field field_ref="rldcs" level="10" />
                 <field field_ref="tnt" level="10" />
                 <field field_ref="tntc" level="10" />
@@ -602,5 +595,4 @@
                 <field field_ref="tnhusc" level="10" />
                 <field field_ref="tnhusscpbl" level="10" />
-                <field field_ref="evu" level="10" />
                 <field field_ref="h2o" level="10" />
                 <field field_ref="mcd" level="10" />
@@ -608,12 +600,4 @@
                 <field field_ref="ref_liq" level="10" />
                 <field field_ref="ref_ice" level="10" />
-                <field field_ref="rsu4co2" level="10" />
-                <field field_ref="rlu4co2" level="10" />
-                <field field_ref="rsucs4co2" level="10" />
-                <field field_ref="rlucs4co2" level="10" />
-                <field field_ref="rsd4co2" level="10" />
-                <field field_ref="rld4co2" level="10" />
-                <field field_ref="rsdcs4co2" level="10" />
-                <field field_ref="rldcs4co2" level="10" />
                 <field field_ref="treedrg_ter" level="6" />
                 <field field_ref="treedrg_lic" level="6" />
@@ -638,27 +622,29 @@
                 <field field_ref="l_mixmin_sic" level="10" />
                 <field field_ref="ozone_daylight" level="10" />
-                <field field_ref="oclr" level="10" />
-                <field field_ref="ocld" level="10" />
-                <field field_ref="oss" level="10" />
-                <field field_ref="ovc" level="10" />
-                <field field_ref="rnebclr" level="10" />
-                <field field_ref="rnebss" level="10" />
-                <field field_ref="rnebseri" level="10" />
-                <field field_ref="gammass" level="10" />
-                <field field_ref="N1ss" level="10" />
-                <field field_ref="N2ss" level="10" />
-                <field field_ref="drnebsub" level="10" />
-                <field field_ref="drnebcon" level="10" />
-                <field field_ref="drnebtur" level="10" />
-                <field field_ref="drnebavi" level="10" />
-                <field field_ref="qsatl" level="10" />
-                <field field_ref="qsats" level="10" />
-                <field field_ref="flightm" level="10" />
-                <field field_ref="flighth2o" level="10" />
-                <field field_ref="fcontrP" level="10" />
-                <field field_ref="fcontrN" level="10" />
-                <field field_ref="qcontr" level="10" />
-                <field field_ref="qcontr2" level="10" />
-                <field field_ref="Tcontr" level="10" />
+            </field_group>
+            <field_group operation="average" grid_ref="grid_out_presinter">
+                <field field_ref="a_th" level="9" />
+                <field field_ref="f_th" level="7" />
+                <field field_ref="w_th" level="7" />
+                <field field_ref="rsucs" level="10" />
+                <field field_ref="rsdcs" level="10" />
+                <field field_ref="rlucs" level="10" />
+                <field field_ref="rldcs" level="10" />
+                <field field_ref="rldcs4co2" level="10" />
+                <field field_ref="rlucs4co2" level="10" />
+                <field field_ref="rsdcs4co2" level="10" />
+                <field field_ref="rsucs4co2" level="10" />
+                <field field_ref="rsu4co2" level="10" />
+                <field field_ref="rlu4co2" level="10" />
+                <field field_ref="rsd4co2" level="10" />
+                <field field_ref="rld4co2" level="10" />
+                <field field_ref="Vprecip" level="11" />
+                <field field_ref="rsu" level="5" />
+                <field field_ref="rsd" level="5" />
+                <field field_ref="rlu" level="5" />
+                <field field_ref="rld" level="5" />
+                <field field_ref="kz" level="4" />
+                <field field_ref="kz_max" level="4" operation="maximum" />
+                <field field_ref="evu" level="10" />
             </field_group>
             
Index: LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histhf_lmdz.xml
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histhf_lmdz.xml	(revision 4366)
+++ LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histhf_lmdz.xml	(revision 4482)
@@ -430,4 +430,11 @@
                 <field field_ref="dqthe2d" level="10" />
                 <field field_ref="dqajs2d" level="10" />
+                <field field_ref="flx_co2_ocean"  level="10" /> <!-- Added PC -->
+                <field field_ref="flx_co2_land"   level="10" /> <!-- Added PC -->
+                <field field_ref="flx_co2_ocean_cor" level="10" /> <!-- Added PC -->
+                <field field_ref="flx_co2_land_cor"  level="10" /> <!-- Added PC -->
+                <field field_ref="flx_co2_ff"  level="10" /> <!-- Added PC -->
+                <field field_ref="flx_co2_bb"  level="10" /> <!-- Added PC -->
+
             </field_group>
 
@@ -464,4 +471,5 @@
             <!-- VARS 3D -->
             <field_group operation="average" grid_ref="grid_out_presnivs">
+                <field field_ref="CO2" level="10" /> <!-- Added PC -->
                 <field field_ref="tke" level="10" />
                 <field field_ref="tke_ter" level="10" />
@@ -488,6 +496,4 @@
                 <field field_ref="cldemi" level="10" />
                 <field field_ref="tke_max" level="10" operation="maximum" />
-                <field field_ref="kz" level="10" />
-                <field field_ref="kz_max" level="10" operation="maximum" />
                 <field field_ref="concso4" level="10" />
                 <field field_ref="concoa" level="10" />
@@ -566,5 +572,4 @@
                 <field field_ref="wdtrainA" level="10" />
                 <field field_ref="wdtrainM" level="10" />
-                <field field_ref="Vprecip" level="10" />
                 <field field_ref="ftd" level="10" />
                 <field field_ref="fqd" level="10" />
@@ -590,10 +595,7 @@
                 <field field_ref="ratqs" level="10" />
                 <field field_ref="dtthe" level="10" />
-                <field field_ref="f_th" level="10" />
                 <field field_ref="e_th" level="10" />
-                <field field_ref="w_th" level="10" />
                 <field field_ref="lambda_th" level="10" />
                 <field field_ref="q_th" level="10" />
-                <field field_ref="a_th" level="10" />
                 <field field_ref="s_th" level="10" />
                 <field field_ref="s_env" level="10" />
@@ -624,12 +626,4 @@
                 <field field_ref="dtlif" level="10" />
                 <field field_ref="dthin" level="10" />
-                <field field_ref="rsu" level="10" />
-                <field field_ref="rsd" level="10" />
-                <field field_ref="rlu" level="10" />
-                <field field_ref="rld" level="10" />
-                <field field_ref="rsucs" level="10" />
-                <field field_ref="rsdcs" level="10" />
-                <field field_ref="rlucs" level="10" />
-                <field field_ref="rldcs" level="10" />
                 <field field_ref="tnt" level="10" />
                 <field field_ref="tntc" level="10" />
@@ -639,5 +633,4 @@
                 <field field_ref="tnhusc" level="10" />
                 <field field_ref="tnhusscpbl" level="10" />
-                <field field_ref="evu" level="10" />
                 <field field_ref="h2o" level="10" />
                 <field field_ref="mcd" level="10" />
@@ -645,33 +638,29 @@
                 <field field_ref="ref_liq" level="10" />
                 <field field_ref="ref_ice" level="10" />
+              </field_group>
+              <field_group operation="average" grid_ref="grid_out_presinter">
+                <field field_ref="a_th" level="9" />
+                <field field_ref="f_th" level="7" />
+                <field field_ref="w_th" level="7" />
+                <field field_ref="rsucs" level="10" />
+                <field field_ref="rsdcs" level="10" />
+                <field field_ref="rlucs" level="10" />
+                <field field_ref="rldcs" level="10" />
+                <field field_ref="rldcs4co2" level="10" />
+                <field field_ref="rlucs4co2" level="10" />
+                <field field_ref="rsdcs4co2" level="10" />
+                <field field_ref="rsucs4co2" level="10" />
                 <field field_ref="rsu4co2" level="10" />
                 <field field_ref="rlu4co2" level="10" />
-                <field field_ref="rsucs4co2" level="10" />
-                <field field_ref="rlucs4co2" level="10" />
                 <field field_ref="rsd4co2" level="10" />
                 <field field_ref="rld4co2" level="10" />
-                <field field_ref="rsdcs4co2" level="10" />
-                <field field_ref="rldcs4co2" level="10" />
-                <field field_ref="oclr" level="10" />
-                <field field_ref="ocld" level="10" />
-                <field field_ref="oss" level="10" />
-                <field field_ref="ovc" level="10" />
-                <field field_ref="rnebclr" level="10" />
-                <field field_ref="rnebss" level="10" operation="instant" />
-                <field field_ref="rnebseri" level="10" />
-                <field field_ref="gammass" level="10" />
-                <field field_ref="N1ss" level="10" />
-                <field field_ref="N2ss" level="10" />
-                <field field_ref="drnebsub" level="10" />
-                <field field_ref="drnebcon" level="10" />
-                <field field_ref="drnebtur" level="10" />
-                <field field_ref="drnebavi" level="10" />
-                <field field_ref="qsatl" level="10" />
-                <field field_ref="qsats" level="10" />
-                <field field_ref="fcontrP" level="10" />
-                <field field_ref="fcontrN" level="10" />
-                <field field_ref="qcontr" level="10" operation="instant" />
-                <field field_ref="qcontr2" level="10" operation="instant" />
-                <field field_ref="Tcontr" level="10" operation="instant" />
+                <field field_ref="Vprecip" level="11" />
+                <field field_ref="rsu" level="5" />
+                <field field_ref="rsd" level="5" />
+                <field field_ref="rlu" level="5" />
+                <field field_ref="rld" level="5" />
+                <field field_ref="kz" level="4" />
+                <field field_ref="kz_max" level="4" operation="maximum" />
+                <field field_ref="evu" level="10" />
               </field_group>
 
Index: LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histins_lmdz.xml
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histins_lmdz.xml	(revision 4366)
+++ LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histins_lmdz.xml	(revision 4482)
@@ -460,6 +460,4 @@
                 <field field_ref="cldemi" level="10" />
                 <field field_ref="tke_max" level="10" operation="maximum" />
-                <field field_ref="kz" level="10" />
-                <field field_ref="kz_max" level="10" operation="maximum" />
                 <field field_ref="concso4" level="10" />
                 <field field_ref="concoa" level="10" />
@@ -538,5 +536,4 @@
                 <field field_ref="wdtrainA" level="4" />
                 <field field_ref="wdtrainM" level="4" />
-                <field field_ref="Vprecip" level="10" />
                 <field field_ref="ftd" level="10" />
                 <field field_ref="fqd" level="10" />
@@ -562,10 +559,7 @@
                 <field field_ref="ratqs" level="10" />
                 <field field_ref="dtthe" level="10" />
-                <field field_ref="f_th" level="10" />
                 <field field_ref="e_th" level="10" />
-                <field field_ref="w_th" level="10" />
                 <field field_ref="lambda_th" level="10" />
                 <field field_ref="q_th" level="10" />
-                <field field_ref="a_th" level="10" />
                 <field field_ref="s_th" level="10" />
                 <field field_ref="s_env" level="10" />
@@ -596,12 +590,4 @@
                 <field field_ref="dtlif" level="10" />
                 <field field_ref="dthin" level="10" />
-                <field field_ref="rsu" level="10" />
-                <field field_ref="rsd" level="10" />
-                <field field_ref="rlu" level="10" />
-                <field field_ref="rld" level="10" />
-                <field field_ref="rsucs" level="10" />
-                <field field_ref="rsdcs" level="10" />
-                <field field_ref="rlucs" level="10" />
-                <field field_ref="rldcs" level="10" />
                 <field field_ref="tnt" level="10" />
                 <field field_ref="tntc" level="10" />
@@ -611,5 +597,4 @@
                 <field field_ref="tnhusc" level="10" />
                 <field field_ref="tnhusscpbl" level="10" />
-                <field field_ref="evu" level="10" />
                 <field field_ref="h2o" level="10" />
                 <field field_ref="mcd" level="10" />
@@ -617,13 +602,29 @@
                 <field field_ref="ref_liq" level="10" />
                 <field field_ref="ref_ice" level="10" />
+            </field_group>
+            <field_group operation="instant" freq_op="1ts" grid_ref="grid_out_presinter">
+                <field field_ref="a_th" level="9" />
+                <field field_ref="f_th" level="7" />
+                <field field_ref="w_th" level="7" />
+                <field field_ref="rsucs" level="10" />
+                <field field_ref="rsdcs" level="10" />
+                <field field_ref="rlucs" level="10" />
+                <field field_ref="rldcs" level="10" />
+                <field field_ref="rldcs4co2" level="10" />
+                <field field_ref="rlucs4co2" level="10" />
+                <field field_ref="rsdcs4co2" level="10" />
+                <field field_ref="rsucs4co2" level="10" />
                 <field field_ref="rsu4co2" level="10" />
                 <field field_ref="rlu4co2" level="10" />
-                <field field_ref="rsucs4co2" level="10" />
-                <field field_ref="rlucs4co2" level="10" />
                 <field field_ref="rsd4co2" level="10" />
                 <field field_ref="rld4co2" level="10" />
-                <field field_ref="rsdcs4co2" level="10" />
-                <field field_ref="rldcs4co2" level="10" />
-                <field field_ref="ozone_daylight" level="10" />
+                <field field_ref="Vprecip" level="11" />
+                <field field_ref="rsu" level="5" />
+                <field field_ref="rsd" level="5" />
+                <field field_ref="rlu" level="5" />
+                <field field_ref="rld" level="5" />
+                <field field_ref="kz" level="4" />
+                <field field_ref="kz_max" level="4" operation="maximum" />
+                <field field_ref="evu" level="10" />
             </field_group>
           </field_group>
Index: LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histmth_lmdz.xml
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histmth_lmdz.xml	(revision 4366)
+++ LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histmth_lmdz.xml	(revision 4482)
@@ -234,4 +234,5 @@
                 <field field_ref="cldt" level="1" />
                 <field field_ref="cldq" level="1" />
+                <field field_ref="cumCO2" level="5" />  <!-- Added PC -->
                 <field field_ref="lwp" level="1" />
                 <field field_ref="iwp" level="1" />
@@ -498,4 +499,8 @@
             <!-- VARS 3D -->
             <field_group operation="average" grid_ref="grid_out_presnivs">
+                <field field_ref="CO2" level="5" />  <!-- Added PC -->
+                <field field_ref="dCO2_vdf" level="5" />  <!-- Added PC -->
+                <field field_ref="dCO2_the" level="5" />  <!-- Added PC -->
+                <field field_ref="dCO2_con" level="5" />  <!-- Added PC -->
                 <field field_ref="tke" level="7" />
                 <field field_ref="tke_ter" level="10" />
@@ -524,6 +529,4 @@
                 <field field_ref="cldemi" level="10" />
                 <field field_ref="tke_max" level="4" operation="maximum" />
-                <field field_ref="kz" level="4" />
-                <field field_ref="kz_max" level="4" operation="maximum" />
                 <field field_ref="concso4" level="2" />
                 <field field_ref="concoa" level="2" />
@@ -603,5 +606,4 @@
                 <field field_ref="wdtrainA" level="9" />
                 <field field_ref="wdtrainM" level="9" />
-                <field field_ref="Vprecip" level="11" />
                 <field field_ref="ftd" level="7" />
                 <field field_ref="fqd" level="7" />
@@ -627,10 +629,7 @@
                 <field field_ref="ratqs" level="7" />
                 <field field_ref="dtthe" level="7" />
-                <field field_ref="f_th" level="7" />
                 <field field_ref="e_th" level="9" />
-                <field field_ref="w_th" level="7" />
                 <field field_ref="lambda_th" level="10" />
                 <field field_ref="q_th" level="9" />
-                <field field_ref="a_th" level="9" />
                 <field field_ref="s_th" level="9" />
                 <field field_ref="s_env" level="9" />
@@ -661,12 +660,4 @@
                 <field field_ref="dtlif" level="7" />
                 <field field_ref="dthin" level="7" />
-                <field field_ref="rsu" level="5" />
-                <field field_ref="rsd" level="10" />
-                <field field_ref="rlu" level="10" />
-                <field field_ref="rld" level="10" />
-                <field field_ref="rsucs" level="10" />
-                <field field_ref="rsdcs" level="10" />
-                <field field_ref="rlucs" level="10" />
-                <field field_ref="rldcs" level="10" />
                 <field field_ref="tnt"  level="10" />
                 <field field_ref="tntc" level="10" />
@@ -676,5 +667,4 @@
                 <field field_ref="tnhusc"   level="10" />
                 <field field_ref="tnhusscpbl" level="10" />
-                <field field_ref="evu" level="10" />
                 <field field_ref="h2o" level="10" />
                 <field field_ref="mcd" level="10" />
@@ -682,15 +672,33 @@
                 <field field_ref="ref_liq" level="5" />
                 <field field_ref="ref_ice" level="10" />
-                <field field_ref="rsu4co2" level="10" />
-                <field field_ref="rlu4co2" level="10" />
-                <field field_ref="rsucs4co2" level="10" />
-                <field field_ref="rlucs4co2" level="10" />
-                <field field_ref="rsd4co2" level="10" />
-                <field field_ref="rld4co2" level="10" />
-                <field field_ref="rsdcs4co2" level="10" />
-                <field field_ref="rldcs4co2" level="10" />
                 <field field_ref="stratomask" level="1" />
                 <field field_ref="cool_volc" level="1" />
                 <field field_ref="heat_volc" level="1" />
+            </field_group>
+
+            <field_group operation="average" grid_ref="grid_out_presinter">
+                <field field_ref="a_th" level="9" />
+                <field field_ref="f_th" level="7" />
+                <field field_ref="w_th" level="7" />
+                <field field_ref="rsucs" level="10" />
+                <field field_ref="rsdcs" level="10" />
+                <field field_ref="rlucs" level="10" />
+                <field field_ref="rldcs" level="10" />
+                <field field_ref="rldcs4co2" level="10" />
+                <field field_ref="rlucs4co2" level="10" />
+                <field field_ref="rsdcs4co2" level="10" />
+                <field field_ref="rsucs4co2" level="10" />
+                <field field_ref="rsu4co2" level="10" />
+                <field field_ref="rlu4co2" level="10" />
+                <field field_ref="rsd4co2" level="10" />
+                <field field_ref="rld4co2" level="10" />
+                <field field_ref="Vprecip" level="11" />
+                <field field_ref="rsu" level="5" />
+                <field field_ref="rsd" level="5" />
+                <field field_ref="rlu" level="5" />
+                <field field_ref="rld" level="5" />
+                <field field_ref="kz" level="4" />
+                <field field_ref="kz_max" level="4" operation="maximum" />
+                <field field_ref="evu" level="10" />
             </field_group>
 
Index: LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histstn_lmdz.xml
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histstn_lmdz.xml	(revision 4366)
+++ LMDZ6/branches/LMDZ_ECRad/DefLists/file_def_histstn_lmdz.xml	(revision 4482)
@@ -454,6 +454,4 @@
                 <field field_ref="cldemi" level="10" />
                 <field field_ref="tke_max" level="10" operation="maximum" />
-                <field field_ref="kz" level="10" />
-                <field field_ref="kz_max" level="10" operation="maximum" />
                 <field field_ref="concso4" level="10" />
                 <field field_ref="concoa" level="10" />
@@ -533,5 +531,4 @@
                 <field field_ref="wdtrainA" level="10" />
                 <field field_ref="wdtrainM" level="10" />
-                <field field_ref="Vprecip" level="10" />
                 <field field_ref="ftd" level="10" />
                 <field field_ref="fqd" level="10" />
@@ -557,10 +554,7 @@
                 <field field_ref="ratqs" level="10" />
                 <field field_ref="dtthe" level="10" />
-                <field field_ref="f_th" level="10" />
                 <field field_ref="e_th" level="10" />
-                <field field_ref="w_th" level="10" />
                 <field field_ref="lambda_th" level="10" />
                 <field field_ref="q_th" level="10" />
-                <field field_ref="a_th" level="10" />
                 <field field_ref="s_th" level="10" />
                 <field field_ref="s_env" level="10" />
@@ -591,12 +585,4 @@
                 <field field_ref="dtlif" level="10" />
                 <field field_ref="dthin" level="10" />
-                <field field_ref="rsu" level="10" />
-                <field field_ref="rsd" level="10" />
-                <field field_ref="rlu" level="10" />
-                <field field_ref="rld" level="10" />
-                <field field_ref="rsucs" level="10" />
-                <field field_ref="rsdcs" level="10" />
-                <field field_ref="rlucs" level="10" />
-                <field field_ref="rldcs" level="10" />
                 <field field_ref="tnt" level="10" />
                 <field field_ref="tntc" level="10" />
@@ -606,5 +592,4 @@
                 <field field_ref="tnhusc" level="10" />
                 <field field_ref="tnhusscpbl" level="10" />
-                <field field_ref="evu" level="10" />
                 <field field_ref="h2o" level="10" />
                 <field field_ref="mcd" level="10" />
@@ -612,13 +597,30 @@
                 <field field_ref="ref_liq" level="10" />
                 <field field_ref="ref_ice" level="10" />
+            </field_group>
+            <field_group operation="average" grid_ref="grid_out_presinter">
+                <field field_ref="a_th" level="9" />
+                <field field_ref="f_th" level="7" />
+                <field field_ref="w_th" level="7" />
+                <field field_ref="rsucs" level="10" />
+                <field field_ref="rsdcs" level="10" />
+                <field field_ref="rlucs" level="10" />
+                <field field_ref="rldcs" level="10" />
+                <field field_ref="rldcs4co2" level="10" />
+                <field field_ref="rlucs4co2" level="10" />
+                <field field_ref="rsdcs4co2" level="10" />
+                <field field_ref="rsucs4co2" level="10" />
                 <field field_ref="rsu4co2" level="10" />
                 <field field_ref="rlu4co2" level="10" />
-                <field field_ref="rsucs4co2" level="10" />
-                <field field_ref="rlucs4co2" level="10" />
                 <field field_ref="rsd4co2" level="10" />
                 <field field_ref="rld4co2" level="10" />
-                <field field_ref="rsdcs4co2" level="10" />
-                <field field_ref="rldcs4co2" level="10" />
-            </field_group>
+                <field field_ref="Vprecip" level="11" />
+                <field field_ref="rsu" level="5" />
+                <field field_ref="rsd" level="5" />
+                <field field_ref="rlu" level="5" />
+                <field field_ref="rld" level="5" />
+                <field field_ref="kz" level="4" />
+                <field field_ref="kz_max" level="4" operation="maximum" />
+                <field field_ref="evu" level="10" />
+             </field_group>
           </field_group>
           
Index: LMDZ6/branches/LMDZ_ECRad/DefLists/iso.def
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/DefLists/iso.def	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/DefLists/iso.def	(revision 4482)
@@ -0,0 +1,155 @@
+# paramètres isotopiques principaux
+
+# verif isotopes dans la dynamique?
+ok_iso_verif=y
+
+# lambda: supersaturation: valeurs typiques: 0.002. Range possible: 0 (pas de sursat) à 0.004 (forte sursat)
+lambda=0.002
+
+# thumxt1: gère le fractionnement cinétique lors de la réévaporation des gouttes. Valeur typique: 0.9. Range possible: 0 (rh au contact des gouttes = rh autour des gouttes, fort fractionnement cinétique) à 1 (rh=1 au contact des gouttes, pas de fractionnement cinétique)
+thumxt1=0.9
+
+# h_land_ice: hauteur caractéristique de la glace de terre: la glace de terre à t+1 est égale à h_land_ice de glace de terre à t + la precip neigeuse en t.
+#Valeur typique: 20m. Range possible: proche de 0 (-> la glace de terre prend la composition de la dernière précip neigeuse) à très grand (-> la compo de la glace de terre est constante)
+h_land_ice=20.
+
+# P_veg: fraction de l evaporation continentale provenant de la transpiration sans fractionnement de la végétation, au lieu de l évaporation avec fractionnement de sol nu ou d eau libre. Valeur standard: 1 (comme autres GCMs). Range possible: 0 à 1.
+P_veg=1.0
+
+# bidouille_anti_divergence: si T: on rappel régulièrement l isotope H2O16 vers l eau normale. Si F: pas de rappel. En général, on met T pour être sur, mais on a verifie que ça a peut d importance
+bidouille_anti_divergence=y
+
+# essai_convergence: si T, on fait tout exactement comme pour l eau normale, pour que les 2 versions convergent. Si F, on modifie un peu: ex: initialisations supplémentaires de variables, on zappe l homogénéisation sous le nuage dans cv3_yield...
+essai_convergence=n
+
+# initialisation_iso: la façon dont les isos sont initialisés.
+#   - Lors du lancement de gcm:
+#	Pour la physique:
+#	0: lecture d un fichier, souvent de start (phyiso_etat0_fichier.F)
+#	>0: initialisation des isotopes académique, donnée dans phyiso_etat0_dur.F
+#	Pour la dynamique:
+#	0: lecture d un fichier (dyniso_etat0_fichier.F)
+#	>0: initialisation académique:
+#		1: isos à 0 sauf H2016=eau normale
+#		2: distill de Rayleigh
+#		3: tout est uniforme au SMOW
+#	En général, on met initialisation_iso=0
+#   - Lors du lancement de create_etat0_limit:
+#	Pour la physique: initialisation en dure, toujours
+#	Pour la dynamique: initialisation académique toujours:
+#		1: isos à 0 sauf H2016=eau normale
+#		2 ou 0: distill de Rayleigh
+#		3: tout est uniforme au SMOW
+#	En général, on laisse à initialisation_iso=0
+initialisation_iso=2
+
+# initialisation_isotrac: comment initialiser les traceurs d'eau?
+# 1: idéalisé: on met toute l'eau dans le tag izone_init, 0 ailleurs
+# 0: en lisant dans un fichier. Possible seulement si initialisation_iso=0
+initialisation_isotrac=1
+
+# modif_sst: 0 par defaut, 1 si on veut modifier la sst de manière uniforme
+# si 2, on impose un profil de changement de SST, avec 0 entre sstlatcrit et - sstlatcrit en latitude. Ailleurs: +deltaTtestpoles (rlat(ii)**2-sstlatcrit**2) /(90.0**2-sstlatcrit**2)
+# si 2, on impose changement de SST linéaire par morceau: 0 entre sstlatcrit et - sstlatcrit, deltaTtestpoles poleward of sstlatcrit+dsstlatcrit, et linéaire entre les 2.
+modif_sst=0
+
+# deltaTtest: sensibilité à une variation uniforme de la SST. Utilise seulement si modif_sst=1
+deltaTtest=0.0
+
+deltaTtestpoles=-15.0
+sstlatcrit=30.0
+dsstlatcrit=20.0
+
+# deltaO18_oce: deltaO18 de l'océan: ex: +1.1 au LGM, 0 actuellement. On suppose que le dexcess et O17excess océan sont nuls.
+deltaO18_oce=0.0
+
+# deltaP_BL:  epaisseur de la couche limite avec laquelle l'eau du sol tend à se rééquilibrer. Par défaut: 10mb (optim dans ORCHIDEE_LMDZ)
+deltaP_BL=10.0 
+
+# ruissellement_pluie: qu'est-ce qui ruisselle? si 1: c'est la pluie qui ruisselle. elle ne s'infiltre. elle ne s'infiltre donc jamais dans un sol saturé. si 0: c'est le sol qui ruisselle. La pluie s'inglitre donc dans le sol saturé.
+ruissellement_pluie=1
+
+# alphak_stewart: si 1: alphak=(D/Diso)^nsol. si 0: alphak=1/(1-kcin(vsurf))
+alphak_stewart=1
+
+# tdifexp_sol: tdifexp_sol est l'exposant de D/Diso. Il paramétrise la turbulence. D'abitude, il est de 0.58. Mais d'après Mathieu et Bariac, il est entre 0.67 et 1: 0.67 pour les sols secs et 1 pour les sols saturés.
+tdifexp_sol=0.67
+
+# calendrier_guide: si 1, on fait en sorte que l'année puisse avoir 365 ou 366 jours. Si 0, l'année à 360 jours (c'est LMDZ par défaut).
+# mettre 1 quand on guide, 0 sinon.
+calendrier_guide=0
+
+# cste_surf_cond: si 2, la témprature et la rh de surface sont constantes: rhs=0.7 et Ts=15°=288K. si 1: la rh de surface est conste égale à 0.7. Par défaut, cste_surf_cond=0: tout est explicit.
+cste_surf_cond=0
+
+# lev_histiso
+# niveaux de sorties pour les isotopes et aussi sans les isotopes.
+# Pas encore utilisé
+lev_histiso=1
+
+# lev_histiso_diag
+# ne s applique que si DIAGISO. 1 par defaut. si 0, seul xtvp est outputé
+lev_histiso_diag=1
+
+# valeurs isotopiques aberrantes: si on les dépasse, on plante
+deltalim=1000.0
+dexcess_max=2000
+dexcess_min=-1000
+
+# valeurs aberrantes pour les traceurs
+deltalimtrac=1000000.0
+
+# est-ce qu'on verifie l'O17? 
+O17_verif=y
+o17excess_bas=-1000.0
+o17excess_haut=900.0
+nlevmaxO17=18
+
+# pour que les continents évaporent une compositon constante, pour voir si les cycles de dexcess en Amazonie sont liés à la compo de l''évap sur continent
+# par défaut: evap_cont_cste=0
+# si evap_cont_cste=1, préciser deltaO18 et dexcess de l''évap
+evap_cont_cste=0
+deltaO18_evap_cont=-5.0
+d_evap_cont=14.0
+
+# quand on utilise tag 17, on taggue la vapeur résiduelle quand la fraction condensée est supérieure à seuil_tag_tmin, c'est à dire quand l'évènement de condensation affecte suffisemment la compo de la vapeur résiduelle. Si seuil_tag_tmin=0, le moindre évènement de condensation même très faibel agit sur les tags, et les proportions de sfc, condensat et rev sont presques nulles.
+# par defaut: seuil_tag_tmin=0.01: 1% de condensation <-> 0.1 permil d'effet sur la vapeur résiduelle.
+seuil_tag_tmin=0.01
+
+# idem pour condensation dans LS: par defaut égal à seuil_tag_tmin
+seuil_tag_tmin_ls=0.01
+
+# option_seuil_tag_tmin: si 1, on recolorise la vapeur résiduelle dès que cond/qt>seuil_tag_tmin. Ca taggue bien la vap résiduelle mais le problème est que plus on humidifie par la microphysique, plus le seuil est facilement attent -> plus on retaggue -> au final, on n'a pas plus de tag mcrophysique alors que c'est la sourec d'humdification.
+# dans l'option 2: on taggue si (cond-qmicro)/((qt-qmicro)>seuil
+option_seuil_tag_tmin=2
+
+# desactivier post-condensational exchanges comme dans Field, Jones et Brown à réviewer
+no_pce=0
+
+# latitude de taggage des extra-tropiques quand option de taggage n° 20
+# 35.0 par défaut
+lim_tag20=35.0
+
+# quand tag9, recolorise t'on que le condensat convectif (option 2) ou aussi le condensat starti (otion 1)
+option_cond=2
+
+# quand tag 22, on recolorise la vapeur dans les zones ou precip>lim_precip_tag22
+# 10.0 par défaut
+lim_precip_tag22=10.0
+
+# quand adv 14, saturation limiter tel que on advec min (q,A_satlim*qs)
+# par defaut, A_satlim=1: c'est le code original de Francis Codron
+# ce param n'a d'effet que quand adv 14.
+A_satlim=0.8
+
+# si ok_restrict_A_satlim=1, alors on n'active adv 14 que dans les extra-tropiques
+# si ok_restrict_A_satlim=2, alors on n'active adv 14 que dans les tropiques
+# si ok_restrict_A_satlim=3, alors on n'active adv 14 nulle part
+ok_restrict_A_satlim=0
+
+slope_limiter=2.0
+# defaut: 2; pour adv 10: 0
+
+#on multiplie par 3 ratqs aux extraropiques si modif_ratqs=1.
+modif_ratqs=0
+
Index: LMDZ6/branches/LMDZ_ECRad/DefLists/isotopes_params.def
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/DefLists/isotopes_params.def	(revision 4366)
+++ LMDZ6/branches/LMDZ_ECRad/DefLists/isotopes_params.def	(revision 4482)
@@ -1,49 +1,49 @@
 &H2O
 
-  params   deltaO18_oce=0.0        fac_coeff_eq17_liq=0.529                    \
-           fac_enrichoce18=0.0005  fac_coeff_eq17_ice=0.529                    \
-           talph1_O18=1137.        talps1_O18=11.839       tkcin0_O18=0.006    \
-           talph2_O18=-0.4156      talps2_O18=-0.028244    tkcin1_O18=0.000285 \
-           talph3_O18=-2.0667E-3   tdifrel_O18=1./0.9723   tkcin2_O18=0.00082  \
-           alpha_liq_sol_O18=1.00291
+  params deltaO18_oce=0.0        fac_coeff_eq17_liq=0.529                    \
+         fac_enrichoce18=0.0005  fac_coeff_eq17_ice=0.529                    \
+         talph1_O18=1137.        talps1_O18=11.839       tkcin0_O18=0.006    \
+         talph2_O18=-0.4156      talps2_O18=-0.028244    tkcin1_O18=0.000285 \
+         talph3_O18=-2.0667E-3   tdifrel_O18=1./0.9723   tkcin2_O18=0.00082  \
+         alpha_liq_sol_O18=1.00291
 
-  H2[16]O  alpha=1.000            toce=tnat                            \
-           tnat=1.0000            tcorr=1.0                            \
-           talph1=0.0             talps1=0.0               tkcin0=0.0  \
-           talph2=0.0             talps2=0.0               tkcin1=0.0  \
-           talph3=0.0             tdifrel=1.0              tkcin2=0.0  \
-           alpha_liq_sol=1.0      Rdefault=tnat*1.0        Rmethox=1.0
+  H216O  alpha=1.000            toce=tnat                            \
+         tnat=1.0000            tcorr=1.0                            \
+         talph1=0.0             talps1=0.0               tkcin0=0.0  \
+         talph2=0.0             talps2=0.0               tkcin1=0.0  \
+         talph3=0.0             tdifrel=1.0              tkcin2=0.0  \
+         alpha_liq_sol=1.0      Rdefault=tnat*1.0        Rmethox=1.0
 
-  H2[17]O  alpha=1.003            toce=tnat*(1.0+deltaO18_oce/1000.0)^pente_MWL          \
-           tnat=40.000e-6         tcorr=1.0+fac_enrichoce18*pente_MWL                    \
-           talph1=talph1_O18      talps1=talps1_O18        tkcin0=tkcin0_O18*fac_kcin    \
-           talph2=talph2_O18      talps2=talps2_O18        tkcin1=tkcin1_O18*fac_kcin    \
-           talph3=talph3_O18      tdifrel=1./0.98555       tkcin2=tkcin2_O18*fac_kcin    \
-           alpha_liq_sol=alpha_liq_sol_O18^fac_coeff_eq17_liq                            \
-           Rdefault=tnat*(1.0-3.15/1000.)                  Rmethox=tnat*(1.0+230./1000.) \              
-           fac_kcin=(tdifrel-1.0)/(tdifrel_O18-1.0)        pente_MWL=0.528
+  H217O  alpha=1.003            toce=tnat*(1.0+deltaO18_oce/1000.0)^pente_MWL          \
+         tnat=40.000e-6         tcorr=1.0+fac_enrichoce18*pente_MWL                    \
+         talph1=talph1_O18      talps1=talps1_O18        tkcin0=tkcin0_O18*fac_kcin    \
+         talph2=talph2_O18      talps2=talps2_O18        tkcin1=tkcin1_O18*fac_kcin    \
+         talph3=talph3_O18      tdifrel=1./0.98555       tkcin2=tkcin2_O18*fac_kcin    \
+         alpha_liq_sol=alpha_liq_sol_O18^fac_coeff_eq17_liq                            \
+         Rdefault=tnat*(1.0-3.15/1000.)                  Rmethox=tnat*(1.0+230./1000.) \              
+         fac_kcin=(tdifrel-1.0)/(tdifrel_O18-1.0)        pente_MWL=0.528
 
-  H2[18]O  alpha=1.006            toce=tnat*(1.0+deltaO18_oce/1000.0)         \
-           tnat=2005.2e-6         tcorr=1.0+fac_enrichoce18                   \
-           talph1=talph1_O18      talps1=talps1_O18        tkcin0=tkcin0_O18  \
-           talph2=talph2_O18      talps2=talps2_O18        tkcin1=tkcin1_O18  \
-           talph3=talph3_O18      tdifrel=tdifrel_O18      tkcin2=tkcin2_O18  \
-           alpha_liq_sol=alpha_liq_sol_O18                                    \
-           Rdefault=tnat*(1.0-6.00/1000.)                  Rmethox=tnat*(1.0+130./1000.)  
+  H218O  alpha=1.006            toce=tnat*(1.0+deltaO18_oce/1000.0)         \
+         tnat=2005.2e-6         tcorr=1.0+fac_enrichoce18                   \
+         talph1=talph1_O18      talps1=talps1_O18        tkcin0=tkcin0_O18  \
+         talph2=talph2_O18      talps2=talps2_O18        tkcin1=tkcin1_O18  \
+         talph3=talph3_O18      tdifrel=tdifrel_O18      tkcin2=tkcin2_O18  \
+         alpha_liq_sol=alpha_liq_sol_O18                                    \
+         Rdefault=tnat*(1.0-6.00/1000.)                  Rmethox=tnat*(1.0+130./1000.)  
 
-  H[2]HO   alpha=1.010            toce=tnat*(1.0+deltaO18_oce/1000.0*pente_MWL)          \
-           tnat=155.76e-6         tcorr=1.0+fac_enrichoce18*pente_MWL                    \
-           talph1=24844.          talps1=16288.            tkcin0=tkcin0_O18*fac_kcin    \
-           talph2=-76.248         talps2=-0.0934           tkcin1=tkcin1_O18*fac_kcin    \
-           talph3=52.612E-3       tdifrel=1./0.9755        tkcin2=tkcin2_O18*fac_kcin    \
-           alpha_liq_sol=1.0212                                                          \
-           Rdefault=tnat*(1.0+(10.0-6.0*pente_MWL)/1000.)  Rmethox=tnat*(1.0-25.0/1000.) \
-           fac_kcin=(tdifrel-1.0)/(tdifrel_O18-1.0)        pente_MWL=8.0
+  HDO    alpha=1.010            toce=tnat*(1.0+deltaO18_oce/1000.0*pente_MWL)          \
+         tnat=155.76e-6         tcorr=1.0+fac_enrichoce18*pente_MWL                    \
+         talph1=24844.          talps1=16288.            tkcin0=tkcin0_O18*fac_kcin    \
+         talph2=-76.248         talps2=-0.0934           tkcin1=tkcin1_O18*fac_kcin    \
+         talph3=52.612E-3       tdifrel=1./0.9755        tkcin2=tkcin2_O18*fac_kcin    \
+         alpha_liq_sol=1.0212                                                          \
+         Rdefault=tnat*(1.0+(10.0-6.0*pente_MWL)/1000.)  Rmethox=tnat*(1.0-25.0/1000.) \
+         fac_kcin=(tdifrel-1.0)/(tdifrel_O18-1.0)        pente_MWL=8.0
 
-  H[3]HO   alpha=1.000            toce=4.0E-19                               \
-           tnat=0.0000            tcorr=1.0                                  \
-           talph1=46480.          talps1=46480.            tkcin0=0.01056    \
-           talph2=-103.87         talps2=-103.87           tkcin1=0.0005016  \
-           talph3=0.0             tdifrel=1./0.968         tkcin2=0.0014432  \
-           alpha_liq_sol=1.0      Rdefault=0.0             Rmethox=0.0
+  HTO    alpha=1.000            toce=4.0E-19                               \
+         tnat=0.0000            tcorr=1.0                                  \
+         talph1=46480.          talps1=46480.            tkcin0=0.01056    \
+         talph2=-103.87         talps2=-103.87           tkcin1=0.0005016  \
+         talph3=0.0             tdifrel=1./0.968         tkcin2=0.0014432  \
+         alpha_liq_sol=1.0      Rdefault=0.0             Rmethox=0.0
 
Index: LMDZ6/branches/LMDZ_ECRad/DefLists/namelist_ecrad
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/DefLists/namelist_ecrad	(revision 4366)
+++ LMDZ6/branches/LMDZ_ECRad/DefLists/namelist_ecrad	(revision 4482)
@@ -12,6 +12,6 @@
  iverbose = 5, 
 
- fractional_std=0.75,                 ! (-)    vertically constant fractional standard deviation of in-cloud liquid water [0, 3]    *0.75*
- overlap_decorr_length=2000,          ! (m)    vertically constant overlap decorrelation length                           [0, 5000] *2000*
+ fractional_std=1.,                 ! (-)    vertically constant fractional standard deviation of in-cloud liquid water [0, 3]    *0.75*
+ overlap_decorr_length=1000,          ! (m)    vertically constant overlap decorrelation length                           [0, 5000] *2000*
                                       !        following Hogan and Illingworth 2000, if overlap_scheme_name=="Exp-Ran" 
                                       !        Ctrue(i,j) = a*Cmax(i,j) + (1-a)*Crand(i,j) ; a = exp(DZ(i,j)/overlap_decorr_length)
@@ -47,5 +47,4 @@
 do_3d_lw_multilayer_effects = true,
 directory_name		= "data",         ! Location of configuration files
-! directory_name		= "../../data",         ! Location of configuration files
 
 liquid_model_name = "SOCRATES",           ! Liquid droplet scattering model: "Monochromatic", "HuStamnes", *"SOCRATES"*, "Slingo"
@@ -53,6 +52,6 @@
 cloud_pdf_shape_name    = "Gamma",        ! To describe liquid water horizontal distribution: *"Gamma"*, "Lognormal"
 
-sw_solver_name          = "SPARTACUS",    ! Solver: "Homogeneous", *"McICA"*, "SPARTACUS", "Tripleclouds"
-lw_solver_name          = "SPARTACUS",    ! enable 3D effects
+sw_solver_name          = "Tripleclouds",    ! Solver: "Homogeneous", *"McICA"*, "SPARTACUS", "Tripleclouds"
+lw_solver_name          = "Tripleclouds",    ! enable 3D effects
 sw_encroachment_name    = "Computed",     ! "Maximum" = old behaviour (also "Minimum"/*"Computed"*)
 overlap_scheme_name     = "Exp-Ran",      ! Cloud overlap: *"Exp-Ran"*, "Max-Ran", "Exp-Exp"
Index: LMDZ6/branches/LMDZ_ECRad/DefLists/physiq.def_LUDOBest2
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/DefLists/physiq.def_LUDOBest2	(revision 4366)
+++ LMDZ6/branches/LMDZ_ECRad/DefLists/physiq.def_LUDOBest2	(revision 4482)
@@ -87,5 +87,5 @@
 
           # Longueur de melange minimum pour Kz
-lmixmin=0.001
+lmixmin=0
 
           #shema de la couche de surface (D:1, 1:LMD, 8:Mellor-Yamada) 
@@ -170,13 +170,4 @@
 iflag_albedo=1
 
-    # Controle de la definition de l'inertie thermique du sol dans le modele "bucket":
-    #   0 (default) : constant
-    #   1 : fonction lineaire de qsol
-    #   2 : 2 fonctions lineaires de qsol :
-    #       une pour "sable" (boite lat/lon pour Sahara), une pour le reste (limons et argile)
-    #   3 : fonction lineaire de qsol, valeurs entre 900 pour qsol=0 et 2000 pour qsol=150
-iflag_inertie=0
-
-
           # Frequence appel convection. Nombre appels par jour
           # (nbapp_cv=0 ==> appel tous les pas de temps)
@@ -241,7 +232,4 @@
 iflag_fisrtilp_qsat=4
 
-          # Activation condensation de grande echelle epuree par E.Vignon : ok_new_lscp=y + ok_icefra_lscp=y
-ok_new_lscp=y
-ok_icefra_lscp=y
 
           #calcul des proprietes des nuages convectifs (D:1 0.375 1.e-4) 
@@ -571,13 +559,4 @@
 iflag_wk_pop_dyn=0
 
-          #Flag for the active wake ratio (D:1):
-          # iflag_wk_act=0: ==> active wake ratio = 0.
-          # iflag_wk_act=1: ==> active wake ratio = 1.
-          # iflag_wk_act=2: ==> active wake ratio = f(Wape)
-          # iflag_wk_act=3: ==> active wake ratio =
-          #     f(wake_dens, wake_radius, wape, Alp_wk, Alp_bl, birth rate fr cu)
-iflag_wk_act=1
-
-
 ####################################################################
 #  Conservation 
@@ -616,4 +595,9 @@
 cdnc_min=10.
 
+          # Activation condensation de grande echelle epuree par E.Vignon : ok_new_lscp=y + ok_icefra_lscp=y
+ok_new_lscp=y
+ok_icefra_lscp=y
+
           # min local intensity for rainfall before decrease of the associated precipitation fraction (mm/s)
+          # rain_int_min is used if iflag_evap_prec=4
 rain_int_min=1.44716149682657
Index: LMDZ6/branches/LMDZ_ECRad/DefLists/physiq.def_NPv6.3
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/DefLists/physiq.def_NPv6.3	(revision 4366)
+++ LMDZ6/branches/LMDZ_ECRad/DefLists/physiq.def_NPv6.3	(revision 4482)
@@ -170,13 +170,4 @@
 iflag_albedo=1
 
-    # Controle de la definition de l'inertie thermique du sol dans le modele "bucket":
-    #   0 (default) : constant
-    #   1 : fonction lineaire de qsol
-    #   2 : 2 fonctions lineaires de qsol :
-    #       une pour "sable" (boite lat/lon pour Sahara), une pour le reste (limons et argile)
-    #   3 : fonction lineaire de qsol, valeurs entre 900 pour qsol=0 et 2000 pour qsol=150
-iflag_inertie=0
-
-
           # Frequence appel convection. Nombre appels par jour
           # (nbapp_cv=0 ==> appel tous les pas de temps)
@@ -526,4 +517,15 @@
 ok_bug_split_th=n
 
+          # contribution of buoyancy to the plume acceleration
+thermals_afact=.66666666666666666666
+
+          # drag term in the plume acceleration
+thermals_fact_epsilon=0.002
+
+          # scaling factor for entrainment and detrainment
+thermals_betalpha=0.9
+
+          # width of the environment subgrid scale water distribution
+cloudth_sigma1s_factor=1.1
 
 ##########################################################
@@ -555,13 +557,4 @@
           # iflag_wk_pop_dyn=1 ==> wake_dens is a prognostic variable
 iflag_wk_pop_dyn=0
-
-          #Flag for the active wake ratio (D:1):
-          # iflag_wk_act=0: ==> active wake ratio = 0.
-          # iflag_wk_act=1: ==> active wake ratio = 1.
-          # iflag_wk_act=2: ==> active wake ratio = f(Wape)
-          # iflag_wk_act=3: ==> active wake ratio =
-          #     f(wake_dens, wake_radius, wape, Alp_wk, Alp_bl, birth rate fr cu)
-iflag_wk_act=1
-
 
 ####################################################################
@@ -600,2 +593,5 @@
           #min cloud droplet number concentration
 cdnc_min=10.
+          # Activation condensation de grande echelle epuree par E.Vignon : ok_new_lscp=y + ok_icefra_lscp=y
+ok_new_lscp=n
+ok_icefra_lscp=n
Index: LMDZ6/branches/LMDZ_ECRad/DefLists/tracer_RN_PB.def_iso
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/DefLists/tracer_RN_PB.def_iso	(revision 4366)
+++ LMDZ6/branches/LMDZ_ECRad/DefLists/tracer_RN_PB.def_iso	(revision 4482)
@@ -1,7 +1,7 @@
 &version=1.0
 &lmdz
-default    type=tracer  phases=g    hadv=10   vadv=10   parent=air
-H2O                                 hadv=14   vadv=14
-H2O                     phases=ls
-H2[18]O,H[2]HO,H2[16]O  phases=gls                      parent=H2O
+default  type=tracer  phases=g    hadv=10   vadv=10   parent=air
+H2O                               hadv=14   vadv=14
+H2O                   phases=ls
+H218O,HDO,H216O       phases=gls                      parent=H2O
 RN,PB
