Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZ/CREATE_amip/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZ/CREATE_amip/COMP/lmdz.card	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZ/CREATE_amip/COMP/lmdz.card	(revision 6290)
@@ -74,5 +74,5 @@
 	(${SUBMIT_DIR}/PARAM/run.def, .), \
 	(${SUBMIT_DIR}/PARAM/guide.def, .), \
-	(${SUBMIT_DIR}/PARAM/traceur.def, .)
+	(${SUBMIT_DIR}/PARAM/tracer.def, .)
 
 [RestartFiles]
@@ -80,5 +80,5 @@
 
 [OutputText]
-List=   (physiq.def, gcm.def, vert.def, run.def, config.def, traceur.def, guide.def, context_lmdz.xml, context_input_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml)
+List=   (physiq.def, gcm.def, vert.def, run.def, config.def, tracer.def, guide.def, context_lmdz.xml, context_input_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml)
 
 [OutputFiles]
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZ/CREATE_hadisst/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZ/CREATE_hadisst/COMP/lmdz.card	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZ/CREATE_hadisst/COMP/lmdz.card	(revision 6290)
@@ -74,5 +74,5 @@
 	(${SUBMIT_DIR}/PARAM/run.def, .), \
 	(${SUBMIT_DIR}/PARAM/guide.def, .), \
-	(${SUBMIT_DIR}/PARAM/traceur.def, .)
+	(${SUBMIT_DIR}/PARAM/tracer.def, .)
 
 [RestartFiles]
@@ -80,5 +80,5 @@
 
 [OutputText]
-List=   (physiq.def, gcm.def, vert.def, run.def, config.def, traceur.def, guide.def, context_lmdz.xml, context_input_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml)
+List=   (physiq.def, gcm.def, vert.def, run.def, config.def, tracer.def, guide.def, context_lmdz.xml, context_input_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml)
 
 [OutputFiles]
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZ/clim_noleap/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZ/clim_noleap/COMP/lmdz.card	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZ/clim_noleap/COMP/lmdz.card	(revision 6290)
@@ -78,5 +78,5 @@
         (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \
         (${SUBMIT_DIR}/PARAM/run.def, .),                                   \
-        (${SUBMIT_DIR}/PARAM/traceur.def, .),                               \
+        (${SUBMIT_DIR}/PARAM/tracer.def, .),                               \
         (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \
         (${MODIPSL}/modeles/LMDZ/DefLists/context_input_lmdz.xml, . ),      \
@@ -102,5 +102,5 @@
 
 [OutputText]
-List=   (physiq.def, run.def, traceur.def, guide.def, config.def, vert.def, used_run.def, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt)
+List=   (physiq.def, run.def, tracer.def, guide.def, config.def, vert.def, used_run.def, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt)
 
 [OutputFiles]
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZOR/clim_noleap/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZOR/clim_noleap/COMP/lmdz.card	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZOR/clim_noleap/COMP/lmdz.card	(revision 6290)
@@ -102,5 +102,5 @@
 
 [OutputText]
-List=   (physiq.def, run.def, traceur.def, guide.def, config.def, vert.def, used_run.def, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt)
+List=   (physiq.def, run.def, tracer.def, guide.def, config.def, vert.def, used_run.def, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt)
 
 [OutputFiles]
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZOR/clim_noleap/COMP/orchidee.card
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZOR/clim_noleap/COMP/orchidee.card	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZOR/clim_noleap/COMP/orchidee.card	(revision 6290)
@@ -3,7 +3,17 @@
 
 [UserChoices]
+# VEGET_UPDATE_at_start=y : orchidee.driver will set VEGET_UPDATE=1Y at the first cumul period when starting a new simulation. 
+#                           After the first period, VEGET_UPDATE will be set according to the choice done below.  
+VEGET_UPDATE_at_start=n
+
 # VEGET_UPDATE=0Y : default, do not update the vegetation and woodharvest file except if starting without restart file
 # VEGET_UPDATE=1Y : update the vegetation and woodharvest file 1st of January each year
 VEGET_UPDATE=0Y
+
+# Choice for routing scheme. Set ROUTING below to have following parameters set in orchidee.def : 
+# ROUTING=standard   => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=standard
+# ROUTING=simple     => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=simple
+# ROUTING=off        => in orchidee.def RIVER_ROUTING=n 
+ROUTING=simple
 
 # Specify output level for output files
@@ -33,4 +43,5 @@
 ListNonDel= (${R_IN}/SRF/PFTMAPS/CMIP6/ESA-LUH2v2/historical/15PFT.v2/PFTmap_2000.nc, PFTmap.nc),\
             (${R_IN}/SRF/WOODHARVEST/LUH2v2/historical4/woodharvest_2000.nc,          woodharvest.nc),\
+	    (${R_IN}/SRF/ROUTING/routing_simple.nc, .)
 
 [SmoothFiles]
@@ -46,5 +57,6 @@
 
 [RestartFiles]
-List=	(sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc)
+List=	(sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc) ,\
+        (routing_restart.nc, routing_restart.nc, routing_start.nc)
 
 [OutputText]
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZOR/highresmip/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZOR/highresmip/COMP/lmdz.card	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZOR/highresmip/COMP/lmdz.card	(revision 6290)
@@ -83,5 +83,5 @@
         (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \
         (${SUBMIT_DIR}/PARAM/run.def, .),                                   \
-        (${SUBMIT_DIR}/PARAM/traceur.def, .),                               \
+        (${SUBMIT_DIR}/PARAM/tracer.def, .),                               \
         (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \
         (${MODIPSL}/modeles/LMDZ/DefLists/context_input_lmdz.xml, . ),      \
@@ -107,5 +107,5 @@
 
 [OutputText]
-List=   (physiq.def, run.def, traceur.def, guide.def, config.def, vert.def, used_run.def, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt)
+List=   (physiq.def, run.def, tracer.def, guide.def, config.def, vert.def, used_run.def, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt)
 
 [OutputFiles]
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZOR/highresmip_CMIP6/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZOR/highresmip_CMIP6/COMP/lmdz.card	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/ICOLMDZOR/highresmip_CMIP6/COMP/lmdz.card	(revision 6290)
@@ -84,5 +84,5 @@
         (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \
         (${SUBMIT_DIR}/PARAM/run.def, .),                                   \
-        (${SUBMIT_DIR}/PARAM/traceur.def, .),                               \
+        (${SUBMIT_DIR}/PARAM/tracer.def, .),                               \
         (${SUBMIT_DIR}/PARAM/ping_LMDZ.xml, ping_lmdz.xml),            \
         (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \
@@ -109,5 +109,5 @@
 
 [OutputText]
-List=   (physiq.def, run.def, traceur.def, guide.def, config.def, vert.def, used_run.def, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt)
+List=   (physiq.def, run.def, tracer.def, guide.def, config.def, vert.def, used_run.def, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt)
 
 [OutputFiles]
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/CREATE_amip/config.card
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/CREATE_amip/config.card	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/CREATE_amip/config.card	(revision 6290)
@@ -80,5 +80,4 @@
 #D-- NO Post -
 [Post]
-RebuildFrequency=NONE
 PackFrequency=NONE
 TimeSeriesFrequency=NONE
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/CREATE_clim/config.card
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/CREATE_clim/config.card	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/CREATE_clim/config.card	(revision 6290)
@@ -81,5 +81,4 @@
 #D-- NO Post -
 [Post]
-RebuildFrequency=NONE
 PackFrequency=NONE
 TimeSeriesFrequency=NONE
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/CREATE_clim_360d/config.card
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/CREATE_clim_360d/config.card	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/CREATE_clim_360d/config.card	(revision 6290)
@@ -81,5 +81,4 @@
 #D-- NO Post -
 [Post]
-RebuildFrequency=NONE
 PackFrequency=NONE
 TimeSeriesFrequency=NONE
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/clim_360d/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/clim_360d/COMP/lmdz.card	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/clim_360d/COMP/lmdz.card	(revision 6290)
@@ -95,4 +95,5 @@
         (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \
         (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \
+        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_cosp1.xml, . ),         \
         (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . ),   \
         (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, .),\
@@ -120,5 +121,5 @@
 List=   (histmth.nc,       ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmth.nc,       Post_1M_histmth),       \
         (histmthCOSP.nc,   ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthCOSP.nc,   NONE),                  \
-        (histmthNMC.nc,    ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthNMC.nc,    Post_1M_histmthNMC),    \
+        (histmthNMC.nc,    ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthNMC.nc,    NONE),                  \
         (histday.nc,       ${R_OUT_ATM_O_D}/${PREFIX}_1D_histday.nc,       NONE),                  \
         (histdayCOSP.nc,   ${R_OUT_ATM_O_D}/${PREFIX}_1D_histdayCOSP.nc,   NONE),                  \
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/clim_360d/config.card
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/clim_360d/config.card	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZ/clim_360d/config.card	(revision 6290)
@@ -99,6 +99,4 @@
 #D-- Post -
 [Post]
-#D- RebuildFrequency determines the frequency of rebuild submission
-RebuildFrequency=NONE
 #D- PackFrequency determines the frequency of pack submission
 PackFrequency=1Y
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card	(revision 6290)
@@ -127,5 +127,5 @@
 List=   (histmth.nc,       ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmth.nc,       Post_1M_histmth),       \
         (histmthCOSP.nc,   ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthCOSP.nc,   NONE),                  \
-        (histmthNMC.nc,    ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthNMC.nc,    Post_1M_histmthNMC),    \
+        (histmthNMC.nc,    ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthNMC.nc,    NONE),                  \
         (histday.nc,       ${R_OUT_ATM_O_D}/${PREFIX}_1D_histday.nc,       NONE),                  \
         (histdayCOSP.nc,   ${R_OUT_ATM_O_D}/${PREFIX}_1D_histdayCOSP.nc,   NONE),                  \
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card	(revision 6290)
@@ -7,6 +7,13 @@
 DefSuffix=CWRR
 
+# VEGET_UPDATE=0Y : default, do not update the vegetation and woodharvest file except if starting without restart file
+# VEGET_UPDATE=1Y : update the vegetation and woodharvest file 1st of January each year
 VEGET_UPDATE=1Y
 
+# Choice for routing scheme. Set ROUTING below to have following parameters set in orchidee.def : 
+# ROUTING=standard   => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=standard
+# ROUTING=simple     => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=simple
+# ROUTING=off        => in orchidee.def RIVER_ROUTING=n 
+ROUTING=standard
 
 # Specify output level for output files
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/lmdz.card	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/lmdz.card	(revision 6290)
@@ -122,5 +122,5 @@
 List=   (histmth.nc,       ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmth.nc,       Post_1M_histmth),       \
         (histmthCOSP.nc,   ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthCOSP.nc,   NONE),                  \
-        (histmthNMC.nc,    ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthNMC.nc,    Post_1M_histmthNMC),    \
+        (histmthNMC.nc,    ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthNMC.nc,    NONE),                  \
         (histday.nc,       ${R_OUT_ATM_O_D}/${PREFIX}_1D_histday.nc,       NONE),                  \
         (histdayCOSP.nc,   ${R_OUT_ATM_O_D}/${PREFIX}_1D_histdayCOSP.nc,   NONE),                  \
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/orchidee.card
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/orchidee.card	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/orchidee.card	(revision 6290)
@@ -14,4 +14,10 @@
 # VEGET_UPDATE=1Y : update the vegetation and woodharvest file 1st of January each year
 VEGET_UPDATE=0Y
+
+# Choice for routing scheme. Set ROUTING below to have following parameters set in orchidee.def : 
+# ROUTING=standard   => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=standard
+# ROUTING=simple     => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=simple
+# ROUTING=off        => in orchidee.def RIVER_ROUTING=n 
+ROUTING=standard
 
 # Specify output level for output files
@@ -32,7 +38,7 @@
 
 [InitialStateFiles]
-List=	(${R_IN}/SRF/soils_param.nc, . ), \
+List=	(${R_IN}/SRF/SOIL/soils_param.nc, .), \
 	(${R_IN}/SRF/reftemp.nc, . ), \
-	(${R_IN}/SRF/routing.nc, . ), \
+	(${R_IN}/SRF/ROUTING/routing.nc, . ), \
         (${R_IN}/SRF/albedo/alb_bg_modisopt_2D_ESA_v2.nc, alb_bg.nc ), \
         (${R_IN}/SRF/cartepente2d_15min.nc, .)
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/orchidee.card_routage_simple
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/orchidee.card_routage_simple	(revision 6290)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/orchidee.card_routage_simple	(revision 6290)
@@ -0,0 +1,92 @@
+[Compatibility]
+libIGCM=1.0
+
+[UserChoices]
+# The variable DefSuffix gives the suffix of the orchidee.def file to be used.
+# By default the file orchidee.def_CWRR will be selected.
+DefSuffix=CWRR
+
+# VEGET_UPDATE_at_start=y : orchidee.driver will set VEGET_UPDATE=1Y at the first cumul period when starting a new simulation. 
+#                           After the first period, VEGET_UPDATE will be set according to the choice done below.  
+VEGET_UPDATE_at_start=n
+
+# VEGET_UPDATE=0Y : default, do not update the vegetation and woodharvest file except if starting without restart file
+# VEGET_UPDATE=1Y : update the vegetation and woodharvest file 1st of January each year
+VEGET_UPDATE=0Y
+
+# Choice for routing scheme. Set ROUTING below to have following parameters set in orchidee.def : 
+# ROUTING=standard   => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=standard
+# ROUTING=simple     => in orchidee.def RIVER_ROUTING=y and ROUTING_METHOD=simple
+# ROUTING=off        => in orchidee.def RIVER_ROUTING=n 
+ROUTING=simple
+
+# Specify output level for output files
+# Only the files sechiba_history.nc, sechiba_out_2.nc and sechiba_history_4dim.nc can be set here.
+# output_level_filename=0     : lowest level writing only variables needed for the monitoring
+# output_level_filename=12    : highest level which will output all variables
+# output_level_filename=NONE  : deactivate the file
+output_level_sechiba_history = 11
+output_level_sechiba_out_2 = NONE
+output_level_sechiba_history_4dim = 11
+
+# Specify output frequency for each file [1y, 1mo, 1d, 10800s, 1ts]
+# Settings using WriteFrequency in config.card is not longer used
+output_freq_sechiba_history = 1mo
+output_freq_sechiba_out_2 = 10800s
+output_freq_sechiba_history_4dim = 1mo
+
+
+[InitialStateFiles]
+List=	(${R_IN}/SRF/SOIL/soils_param.nc, .), \
+	(${R_IN}/SRF/reftemp.nc, . ), \
+        (${R_IN}/SRF/albedo/alb_bg_modisopt_2D_ESA_v2.nc, alb_bg.nc ), \
+        (${R_IN}/SRF/cartepente2d_15min.nc, .)
+
+[BoundaryFiles]
+List= ()
+ListNonDel= (${R_IN}/SRF/PFTMAPS/CMIP6/ESA-LUH2v2/historical/15PFT.v1/PFTmap_2000.nc, PFTmap.nc),\
+            (${R_IN}/SRF/ROUTING/routing_simple.nc, .),\
+            (${R_IN}/SRF/WOODHARVEST/LUH2v2/historical/woodharvest_2000.nc,           woodharvest.nc),\
+
+[SmoothFiles]
+List= ()
+
+[ParametersFiles]
+List=	(${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\
+	(${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\
+	(${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\
+	(${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\
+        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_routing_orchidee.xml, .) ,\
+	(${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .)
+
+[RestartFiles]
+List=	(sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc),\
+        (routing_restart.nc, routing_restart.nc, routing_start.nc)
+
+[OutputText]
+List=   (out_orchidee*, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, context_input_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, river_desc.nc)
+
+[OutputFiles]
+List=   (sechiba_history.nc,   ${R_OUT_SRF_O_M}/${PREFIX}_1M_sechiba_history.nc, Post_1M_sechiba_history), \
+        (sechiba_history_4dim.nc,${R_OUT_SRF_O_M}/${PREFIX}_1M_sechiba_history_4dim.nc, NONE), \
+        (diag_routing.nc,        ${R_OUT_SRF_O_D}/${PREFIX}_1D_sechiba_routing.nc, NONE), \
+        (sechiba_out_2.nc,     ${R_OUT_SRF_O_H}/${PREFIX}_HF_sechiba_out_2.nc,   NONE)
+
+[Post_1M_sechiba_history]
+Patches = ()
+GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_centered, time_centered_bounds)
+TimeSeriesVars2D = (nobiofrac, alb_nir, alb_vis, evap, fluxlat, fluxsens, netrad, qair, rain, runoff, snow, snownobio, snowf, frac_snow, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac, TWBR, riverflow, coastalflow, DelSoilMoist_daily, DelIntercept_daily, DelSWE_daily, delstock_routing_daily, snowmelt, LAImean, transpir, evapnu)
+ChunckJob2D = NONE
+TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee)
+ChunckJob3D = NONE
+Seasonal = ON
+
+[Post_HF_sechiba_out_2]
+Patches = ()
+GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_centered, time_centered_bounds)
+TimeSeriesVars2D = (mrsos, mrro)
+ChunckJob2D = 50Y
+TimeSeriesVars3D = (ptn)
+ChunckJob3D = 10Y
+Seasonal = OFF
+
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/lmdz.driver
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/lmdz.driver	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/lmdz.driver	(revision 6290)
@@ -382,18 +382,22 @@
     fi
 
-    if [ X${config_ListOfComponents_CHM} = Xinca ] ; then
+    if [ X${config_UserChoices_ConfigType} = XESMCO2AER ] ; then
+    echo "ESM config, with INCA and CO2i, set type_trac=inco in run.def"
+    IGCM_comp_modifyDefFile blocker run.def type_trac inco
+    IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1
+    elif [ X${config_ListOfComponents_CHM} = Xinca ] ; then
 	echo "Activate coupling to INCA, set type_trac=inca in run.def"
 	IGCM_comp_modifyDefFile blocker run.def type_trac inca
-	IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1
+	IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1  
     elif [ X${config_ListOfComponents_CHM} = Xreprobus ] ; then
 	echo "Activate coupling to REPROBUS, set type_trac=repr in run.def"
 	IGCM_comp_modifyDefFile blocker run.def type_trac repr
         IGCM_comp_modifyDefFile blocker run.def config_inca none
-	IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1
+	IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1  
     elif [ X${config_UserChoices_ConfigType} = XESMCO2 ] ; then 
 	echo "ESM config, set type_trac=co2i in run.def"
 	IGCM_comp_modifyDefFile blocker run.def type_trac co2i
         IGCM_comp_modifyDefFile blocker run.def config_inca none
-	IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1  
+    IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1 
     elif [ X${lmdz_UserChoices_LMDZ_strataero} = Xy ] ; then
         echo "No coupling to chemistry model but it is a LMDZ STRATAER configuration, set type_trac=coag in run.def"
@@ -495,5 +499,5 @@
     fi 
 
-    if [ X${config_UserChoices_ConfigType} = XESMCO2 ] ; then
+    if ( [ X${config_UserChoices_ConfigType} = XESMCO2 ] || [ X${config_UserChoices_ConfigType} = XESMCO2AER ] ) ; then
 	# Set carbon cycle parameters according to parmeters in lmdz.card 
 	IGCM_comp_modifyDefFile blocker config.def level_coupling_esm 2 
@@ -501,4 +505,5 @@
 	IGCM_comp_modifyDefFile blocker config.def carbon_cycle_tr ${lmdz_UserChoices_carbon_cycle_tr}
 	IGCM_comp_modifyDefFile blocker config.def carbon_cycle_rad ${lmdz_UserChoices_carbon_cycle_rad}
+	IGCM_comp_modifyDefFile nonblocker config.def co2_ppm0 ${lmdz_UserChoices_co2_ppm0} 
     else
 	# Take default value set in config.def
@@ -507,4 +512,18 @@
 	IGCM_comp_modifyDefFile nonblocker config.def carbon_cycle_tr DEFAULT
 	IGCM_comp_modifyDefFile nonblocker config.def carbon_cycle_rad DEFAULT
+	IGCM_comp_modifyDefFile nonblocker config.def co2_ppm0 DEFAULT
+    fi
+
+    if ( [ X${config_UserChoices_ConfigType} = XESMCO2 ] ) ; then
+	# Set carbon cycle parameters according to parmeters in lmdz.card 
+	IGCM_comp_modifyDefFile nonblocker config.def read_fco2_ocean_cor ${lmdz_UserChoices_read_fco2_ocean_cor}
+	IGCM_comp_modifyDefFile nonblocker config.def var_fco2_ocean_cor ${lmdz_UserChoices_var_fco2_ocean_cor}
+	IGCM_comp_modifyDefFile nonblocker config.def read_fco2_land_cor ${lmdz_UserChoices_read_fco2_land_cor}
+	IGCM_comp_modifyDefFile nonblocker config.def var_fco2_land_cor ${lmdz_UserChoices_var_fco2_land_cor}
+    else
+	IGCM_comp_modifyDefFile nonblocker config.def read_fco2_ocean_cor DEFAULT
+	IGCM_comp_modifyDefFile nonblocker config.def var_fco2_ocean_cor DEFAULT
+	IGCM_comp_modifyDefFile nonblocker config.def read_fco2_land_cor DEFAULT
+	IGCM_comp_modifyDefFile nonblocker config.def var_fco2_land_cor DEFAULT
     fi
 
@@ -577,5 +596,5 @@
     fi
     # Include xml files for output configuration if running with workflow CMIP6
-    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then
+    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then
 	echo '<context id="LMDZ" src="./ping_lmdz.xml"/>' >> add.tmp
 	echo '<context id="LMDZ" src="./dr2xml_lmdz.xml"/>' >> add.tmp
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/orchidee.driver
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/orchidee.driver	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/orchidee.driver	(revision 6290)
@@ -42,12 +42,13 @@
 	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_level 0
 	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_freq 1mo
-
         IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 enabled .FALSE.
 	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_level 0
 	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_freq 1mo
-
-        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 enabled .FALSE.
-        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_level 0
-        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_freq 1mo
+	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 enabled .FALSE.
+	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_level 0
+	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_freq 1mo
+	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE.
+	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0
+	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo
     fi
 
@@ -70,4 +71,23 @@
     else
         IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE 0Y
+    fi
+
+    # Set parameters related to ROUTING in orchidee.def
+    if [ X${orchidee_UserChoices_ROUTING} = X ] || [ X${orchidee_UserChoices_ROUTING} = Xstandard ]; then
+	# Nothing is set or ROUTING=standard in orchidee.def, default option
+        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING y
+        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  standard
+    elif [ X${orchidee_UserChoices_ROUTING} = Xsimple ]; then
+	# ROUTING=simple is set in orchidee.card
+        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING y
+        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  simple
+    elif [ X${orchidee_UserChoices_ROUTING} = Xhighres ]; then
+	# ROUTING=highres is set in orchidee.card
+        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING y
+        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  highres
+    else
+	# ROUTING=off, routing will be deactivated
+	IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING n
+        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  standard
     fi
 
@@ -120,4 +140,5 @@
 	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba1 output_level ${orchidee_UserChoices_output_level_sechiba_history}
 	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba1 output_freq  ${orchidee_UserChoices_output_freq_sechiba_history}
+	IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_sechiba1 group_ref remap_${orchidee_UserChoices_output_freq_sechiba_history}
     fi
     
@@ -132,4 +153,5 @@
 	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba2 output_level ${orchidee_UserChoices_output_level_sechiba_out_2}
 	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba2 output_freq  ${orchidee_UserChoices_output_freq_sechiba_out_2}
+	IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_sechiba2 group_ref remap_${orchidee_UserChoices_output_freq_sechiba_out_2}		
     fi
     
@@ -144,4 +166,5 @@
 	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba3 output_level ${orchidee_UserChoices_output_level_sechiba_history_4dim}
 	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba3 output_freq  ${orchidee_UserChoices_output_freq_sechiba_history_4dim}
+	IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_sechiba3 group_ref remap_${orchidee_UserChoices_output_freq_sechiba_history_4dim}		
     fi
         
@@ -159,8 +182,14 @@
         echo '<context id="orchidee" src="./context_input_orchidee.xml"/>' >> add.tmp
     fi
+
+    # Add inclusion of file context_routing_orchidee.xml if this file exists
+    if [ -f context_routing_orchidee.xml ] ; then
+        echo '<context id="orchidee" src="./context_routing_orchidee.xml"/>' >> add.tmp
+    fi
+
     # Include xml files for output configuration if running with workflow CMIP6
-    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then
-	echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp
-	echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp
+    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then
+	  echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp
+	  echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp
     fi
     cp iodef.xml iodef.xml.tmp
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/stomate.driver
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/stomate.driver	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/stomate.driver	(revision 6290)
@@ -37,4 +37,5 @@
 	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_level ${stomate_UserChoices_output_level_stomate_history}
 	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_freq  ${stomate_UserChoices_output_freq_stomate_history}
+	IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_stomate1 group_ref remap_${stomate_UserChoices_output_freq_stomate_history}
     fi
     
@@ -49,4 +50,5 @@
 	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_level ${stomate_UserChoices_output_level_stomate_ipcc_history}
 	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_freq  ${stomate_UserChoices_output_freq_stomate_ipcc_history}
+	IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_stomate2 group_ref remap_${stomate_UserChoices_output_freq_stomate_ipcc_history}
     fi
 
@@ -62,4 +64,19 @@
 	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_level ${stomate_UserChoices_output_level_stomate_history_4dim}
 	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_freq  ${stomate_UserChoices_output_freq_stomate_history_4dim}
+	IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_stomate3 group_ref remap_${stomate_UserChoices_output_freq_stomate_history_4dim}
+    fi
+
+
+    if [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = X ] || [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = XNONE ] ; then
+        # output_level_stomate_fixed_dia is not set in stomate.card or it is set to NONE.
+        # Deactivate the file.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo
+    else
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled      .TRUE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level ${stomate_UserChoices_output_level_stomate_fixed_dia}
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq  ${stomate_UserChoices_output_freq_stomate_fixed_dia}
+	IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_stomate4 group_ref remap_${stomate_UserChoices_output_freq_stomate_history_fixed_dia}
     fi
 
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/config.def_actuel
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/config.def_actuel	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/config.def_actuel	(revision 6290)
@@ -8,9 +8,20 @@
 carbon_cycle_rad=_AUTO_ : DEFAULT=n
 
+## read_fco2_ocean_cor : y/n flag d'activation de la correction du flux net de carbone (ocean) 
+read_fco2_ocean_cor=_AUTO_ : DEFAULT=n
+## var_fco2_ocean_cor : valeur de la correction du flux net de carbone (ocean) 
+var_fco2_ocean_cor=_AUTO_: DEFAULT = 0.2576
+## read_fco2_land_cor : y/n flag d'activation de la correction du flux net de carbone (land) 
+read_fco2_land_cor=_AUTO_ : DEFAULT=n
+## var_fco2_land_cor : valeur de la correction du flux net de carbone (land) 
+var_fco2_land_cor=_AUTO_: DEFAULT =-0.2036
+
 ##  Cycle diurne  ou non                 
 iflag_cycle_diurne=1
-##  Soil Model  ou non               
+
+## Soil Model ou non
 soil_model=y
-## Pas de temps de couplage (s).
+
+## Pas de temps de couplage (s)
 t_coupl=_AUTO_
 
@@ -41,4 +52,6 @@
 ### co2_ppm =    taux CO2 en ppm, l'annÃ©e 2000 forcage CMIP6
 co2_ppm = _AUTO_: DEFAULT = 3.6912e+02
+# co2_ppm0 = taux initial du CO2 en ppm, l'annÃ©e 1850 forcage CMIP6 (transport)
+co2_ppm0 = _AUTO_: DEFAULT  = 2.8432e+02
 ### co2_ppm_per =    taux 4xCO2 en ppm (uniqument pour calcul des diags)
 co2_ppm_per = _AUTO_: DEFAULT = 14.7648e+02
@@ -66,5 +79,5 @@
 ###  flag_aerosol = type of coupled aerosol, if aerosol offline 
 ###  0 => no aerosol, 1 => sulfate only, 2 => bc only, 3 => pom only, 4 => seasalt only, 5 => dust only, 6 => all aerosol
-flag_aerosol=_AUTO_ 
+flag_aerosol=_AUTO_
 ### ok_cdnc=y/n   Cloud droplet number concentration
 ok_cdnc=_AUTO_
@@ -79,5 +92,5 @@
 # 2: read two ozone climatologies, the average day and night climatology and the daylight climatology
 read_climoz=_AUTO_
-# 
+#
 # Aerosols stratospheriques utilises par defaut 
 flag_aerosol_strat=_AUTO_ : DEFAULT=2
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/config.def_annuel
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/config.def_annuel	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/config.def_annuel	(revision 6290)
@@ -1,3 +1,3 @@
-# level_coupling_esm : 0(pas d'echange de carbone), 2 (change entre LMDZ/CPL/NEMO et LMDZ/ORCHIDEE)
+## level_coupling_esm : 0(pas d'echange de carbone), 2 (change entre LMDZ/CPL/NEMO et LMDZ/ORCHIDEE)
 level_coupling_esm=  _AUTO_: DEFAULT = 0
 ## carbon_cycle_cpl: couplage des flux de carbone ATM/OCE, ATM/SRF
@@ -8,9 +8,20 @@
 carbon_cycle_rad=_AUTO_ : DEFAULT=n
 
+## read_fco2_ocean_cor : y/n flag d'activation de la correction du flux net de carbone (ocean) 
+read_fco2_ocean_cor=_AUTO_ : DEFAULT=n
+## var_fco2_ocean_cor : valeur de la correction du flux net de carbone (ocean) 
+var_fco2_ocean_cor=_AUTO_: DEFAULT = 0.2576
+## read_fco2_land_cor : y/n flag d'activation de la correction du flux net de carbone (land) 
+read_fco2_land_cor=_AUTO_ : DEFAULT=n
+## var_fco2_land_cor : valeur de la correction du flux net de carbone (land) 
+var_fco2_land_cor=_AUTO_: DEFAULT =-0.2036
+
 ##  Cycle diurne  ou non                 
 iflag_cycle_diurne=1
-##  Soil Model  ou non               
+
+## Soil Model ou non
 soil_model=y
-## Pas de temps de couplage (s).
+
+## Pas de temps de couplage (s)
 t_coupl=_AUTO_
 
@@ -41,4 +52,6 @@
 ### co2_ppm =    taux CO2 en ppm
 co2_ppm = _AUTO_
+# co2_ppm0 = taux initial du CO2 en ppm, l'annÃ©e 1850 forcage CMIP6 (transport)
+co2_ppm0 = _AUTO_: DEFAULT  = 2.8432e+02
 ### co2_ppm_per =    taux 4xCO2 en ppm (uniqument pour calcul des diags)
 co2_ppm_per = _AUTO_
@@ -66,10 +79,9 @@
 ###  flag_aerosol = type of coupled aerosol, if aerosol offline 
 ###  0 => no aerosol, 1 => sulfate only, 2 => bc only, 3 => pom only, 4 => seasalt only, 5 => dust only, 6 => all aerosol
-flag_aerosol=_AUTO_ 
+flag_aerosol=_AUTO_
 ### ok_cdnc=y/n   Cloud droplet number concentration
 ok_cdnc=_AUTO_
 # ok_alw=y flag pour activer l effet LW des poussieres
 ok_alw=y
-#
 #
 # Parametre de lecture de l'ozone
@@ -80,5 +92,5 @@
 # 2: read two ozone climatologies, the average day and night climatology and the daylight climatology
 read_climoz=_AUTO_
-# 
+#
 # Aerosols stratospheriques utilises par defaut 
 flag_aerosol_strat=_AUTO_ : DEFAULT=2
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/config.def_preind
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/config.def_preind	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/config.def_preind	(revision 6290)
@@ -8,12 +8,21 @@
 carbon_cycle_rad=_AUTO_ : DEFAULT=n
 
+## read_fco2_ocean_cor : y/n flag d'activation de la correction du flux net de carbone (ocean) 
+read_fco2_ocean_cor=_AUTO_ : DEFAULT=n
+## var_fco2_ocean_cor : valeur de la correction du flux net de carbone (ocean) 
+var_fco2_ocean_cor=_AUTO_: DEFAULT = 0.2576
+## read_fco2_land_cor : y/n flag d'activation de la correction du flux net de carbone (land) 
+read_fco2_land_cor=_AUTO_ : DEFAULT=n
+## var_fco2_land_cor : valeur de la correction du flux net de carbone (land) 
+var_fco2_land_cor=_AUTO_: DEFAULT =-0.2036
+
 ##  Cycle diurne  ou non                 
 iflag_cycle_diurne=1
 
-## Pas de temps de couplage (s). 
+## Soil Model ou non
+soil_model=y
+
+## Pas de temps de couplage (s)
 t_coupl=_AUTO_
-
-##  Soil Model  ou non               
-soil_model=y
 
 ## Nombre  d'appels des routines de rayonnements ( par jour)                 
@@ -43,4 +52,6 @@
 ### co2_ppm_per =    taux 4xCO2 en ppm (uniqument pour calcul des diags)
 co2_ppm_per = _AUTO_: DEFAULT  =11.3728e+02
+## co2_ppm0 = taux initial du CO2 en ppm, l'annÃ©e 1850 forcage CMIP6 (transport)
+co2_ppm0 = _AUTO_: DEFAULT  = 2.8432e+02
 ### CH4_ppb =    taux CH4 en ppb, l'annÃ©e 1850 forcage CMIP6
 CH4_ppb = _AUTO_: DEFAULT = 8.0825e+02
@@ -81,5 +92,4 @@
 #
 # Aerosols stratospheriques utilises par defaut 
-#
 flag_aerosol_strat=_AUTO_ : DEFAULT=2
 # Diag VolMIP to get volcanic aerosols effects instead of tropospheric ones
@@ -87,4 +97,3 @@
 #
 # COSP
-#
 ok_cosp=_AUTO_
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/file_def_orchidee.xml
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/file_def_orchidee.xml	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/file_def_orchidee.xml	(revision 6290)
@@ -43,5 +43,5 @@
   <file id="sechiba1" name="sechiba_history" output_level="_AUTO_" output_freq="_AUTO_" enabled="_AUTO_">
 
-   <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
+   <field_group id="groupremap_sechiba1" group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
     <!-- level 1 -->
     <field field_ref="areas" level="0"/>
@@ -379,5 +379,5 @@
   <!-- Sechiba file 2 -->
   <file id="sechiba2" name="sechiba_out_2" output_level="_AUTO_" output_freq="_AUTO_" enabled="_AUTO_">
-   <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
+   <field_group id="groupremap_sechiba2" group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
     <!-- level 1 -->
     <field field_ref="areas" level="1"/>
@@ -583,5 +583,5 @@
   <!-- This files contains all variables having more than one vertical axis -->
   <file id="sechiba3" name="sechiba_history_4dim" output_level="_AUTO_" output_freq="_AUTO_" enabled="_AUTO_">
-   <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
+   <field_group id="groupremap_sechiba3" group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
     <field field_ref="areas" level="1"/>
     <field field_ref="contfrac" level="1"/>
@@ -777,5 +777,5 @@
   <!-- Stomate file 1 -->
   <file id="stomate1" name="stomate_history" output_level="_AUTO_" output_freq="_AUTO_" enabled="_AUTO_">
-   <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
+   <field_group id="groupremap_stomate1" group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
      
     <!-- level 1 -->
@@ -919,5 +919,5 @@
   <!-- Stomate file 2 -->
   <file id="stomate2" name="stomate_ipcc_history" output_level="_AUTO_" output_freq="_AUTO_" enabled="_AUTO_">
-   <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
+   <field_group id="groupremap_stomate2" group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
     <!-- level 1 -->
     <field field_ref="RESOLUTION_X" level="1"/>
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/iodef.xml
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/iodef.xml	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/iodef.xml	(revision 6290)
@@ -21,5 +21,5 @@
         <variable_group id="buffer">
             <variable id="optimal_buffer_size" type="string">performance</variable>
-            <variable id="buffer_size_factor" type="double">1.0</variable>
+            <variable id="buffer_size_factor" type="double">2.0</variable>
             <variable id="min_buffer_size" type="int">10000000</variable>
          </variable_group>
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/orchidee.def
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/orchidee.def	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/orchidee.def	(revision 6290)
@@ -41,5 +41,8 @@
 # Activate river routing
 # default = y
-RIVER_ROUTING = n 
+RIVER_ROUTING = _AUTO_
+
+# Choice of routing method: standard or simple
+ROUTING_METHOD = _AUTO_
 
 # Activate creation of river_desc.nc file
@@ -133,5 +136,10 @@
 
 # Activate downregulation for CO2
-DOWNREGULATION_CO2=y
+# Set DOWNREGULATION_CO2_NEW=y to activate new revised version of 
+# downregulation parametrization available in ORCHIDEE_2_0 for 
+# configurations v6.1.11 or later or in ORCHIDEE_2_2 from revision 6393 and later. 
+# When DOWNREGULATION_CO2_NEW=y, 
+# DOWNREGULATION_CO2 will be forced to false by the model.
+DOWNREGULATION_CO2_NEW=y
 DOWNREGULATION_CO2_BASELEVEL=380.
 
@@ -218,5 +226,5 @@
 #************************************************************************
 # CHEMISTRY_OK_BVOC :  Activate chemistry
-CHEMISTRY_BVOC =  n
+CHEMISTRY_BVOC = _AUTO_: DEFAULT=n
 
 # CO2 FOR BVOC - WILKINSON :  CO2 inhibition effect for isoprene based on Wilkinson approach?
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/orchidee.def_CWRR
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/orchidee.def_CWRR	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/PARAM/orchidee.def_CWRR	(revision 6290)
@@ -41,5 +41,8 @@
 # Activate river routing
 # default = y
-RIVER_ROUTING = y
+RIVER_ROUTING = _AUTO_
+
+# Choice of routing method: standard or simple
+ROUTING_METHOD = _AUTO_
 
 # Activate creation of river_desc.nc file
Index: CONFIG/UNIFORM/v7/ICOLMDZOR_v7/compile_icolmdzor.sh
===================================================================
--- CONFIG/UNIFORM/v7/ICOLMDZOR_v7/compile_icolmdzor.sh	(revision 6286)
+++ CONFIG/UNIFORM/v7/ICOLMDZOR_v7/compile_icolmdzor.sh	(revision 6290)
@@ -35,5 +35,7 @@
 full_orch=""
 full_dyna=""
-
+# choose radiative code compilation option 
+rad=rrtm
+opt_rad=""
 # Default netcdf_lib is used for XIOS but can be change by argument
 netcdf_lib=""
@@ -81,4 +83,7 @@
 Example 7: compile only create_etat0_limt for reg 
 ./compile_icolmdzor.sh -ce0l_only
+
+Example 8: choose radiative schema for LMDZ (oldrad/rrtm/ecrad). Default is rrtm
+./compile_icolmdzor.sh -rad ecrad
 
 end_help
@@ -101,4 +106,5 @@
 	"-ce0l_only")       ce0l_only=yes  ; shift ;;
         "-netcdf_lib_seq")  netcdf_lib="--netcdf_lib netcdf4_seq"; shift ;;
+	"-rad")        rad=$2; shift ; shift ;;
 	*)       	    echo "unknown option "$1" , exiting..." ;  exit 
     esac
@@ -136,4 +142,6 @@
 		echo "You used -parallel" $parallel
             fi ;;
+        spirit*)
+            fcm_arch=ifort_MESOIPSL;;
 	ciclad*|climserv*|loholt*|camelot*)
 	    fcm_arch=ifort_CICLAD;;
@@ -154,5 +162,6 @@
     echo " Personal module list before sourcing of ARCH/arch.env file:"    >> $outfile 
     module list   >> $outfile 2>&1
-
+    svn_version=$(module list -t | grep subversion)
+       
     # Make a link to this file, to be used also in config.card
     rm -f ARCH/arch.env
@@ -161,5 +170,7 @@
     # Source the file
     source ARCH/arch.env   >> $outfile 2>&1
-
+    if [ X$svn_version != X ] ; then
+	module load ${svn_version}
+    fi
     echo >> $outfile
     echo " New module list after sourcing of ARCH/arch.env file:"    >> $outfile 
@@ -240,5 +251,6 @@
     echo; echo "NOW COMPILE LMDZ FOR COUPLING TO DYNAMICO"
     echo >> $outfile ; echo " NOW COMPILE LMDZ FOR COUPLING TO DYNAMICO"   >> $outfile 
-
+    # Retrieve the final svn release number, needed for radiative code suffix of executable
+    lmdzsvn=`svnversion . | egrep -o "[0-9]+"  | awk 'NR==1'`
     # Check if the compilation of LMDZ was previsouly interupted prematured. 
     # In that case, the files dimension.h and .lock exist. If the files exist, they are here removed to avoid makelmdz_fcm 
@@ -254,6 +266,17 @@
     fi
 
-    echo ./makelmdz_fcm -p lmd -rrtm true -cosp true -$optmode -mem -parallel $parallel -libphy -v orchidee2.1 -io xios -arch $fcm_arch -j 8 $full_lmdz    >> $outfile 
-    ./makelmdz_fcm -p lmd -rrtm true -cosp true -$optmode -mem -parallel $parallel -libphy -v orchidee2.1 -io xios -arch $fcm_arch -j 8 $full_lmdz    >> $outfile 2>&1
+# Need to define the proper option for radiative code compilation. By default, we use rrtm
+case $rad in
+    oldrad) opt_rad="" ;;
+    rrtm)   if [ $lmdzsvn -le 4185 ] ; then opt_rad="-rrtm true" ; else opt_rad="-rad rrtm" ; fi ;;
+    ecrad)  opt_rad="-rad ecrad" ;;
+    *) echo Only oldrad rrtm ecrad for rad option ; exit
+esac
+
+if [ $lmdzsvn -le 4185 -a $rad = "ecrad" ] ; then echo "ecrad only available for LMDZ rev starting with 4186 " ; exit ; fi
+
+
+    echo ./makelmdz_fcm -p lmd -cosp true $opt_rad -$optmode -mem -parallel $parallel -libphy -v orchidee2.1 -io xios -arch $fcm_arch -j 8 $full_lmdz    >> $outfile 
+    ./makelmdz_fcm -p lmd -cosp true $opt_rad -$optmode -mem -parallel $parallel -libphy -v orchidee2.1 -io xios -arch $fcm_arch -j 8 $full_lmdz    >> $outfile 2>&1
     # Test if compiling finished
     if [[ $? != 0 ]] ; then
@@ -302,8 +325,10 @@
 
 # Find executable suffix
+suffix=_${resol_atm}_phylmd
+if [ $lmdzsvn -ge 4186 ] ; then suffix=${suffix}_${rad} ; fi
 if [ $parallel == seq ] || [ $parallel == none ] ; then
-    suffix=_${resol_atm}_phylmd_seq_orch.e
+    suffix=${suffix}_seq_orch.e
 else
-    suffix=_${resol_atm}_phylmd_para_mem_orch.e
+    suffix=${suffix}_para_mem_orch.e
 fi
 echo gcm suffix = $suffix
@@ -329,6 +354,6 @@
 	rm -f .lock
     fi
-    echo ./makelmdz_fcm -d ${resol_atm} -p lmd -rrtm true -$optmode -mem -parallel $parallel -io xios -v orchidee2.1 -arch $fcm_arch -j 8 $full_lmdz gcm    >> $outfile 
-         ./makelmdz_fcm -d ${resol_atm} -p lmd -rrtm true -$optmode -mem -parallel $parallel -io xios -v orchidee2.1 -arch $fcm_arch -j 8 $full_lmdz gcm    >> $outfile 2>&1
+    echo ./makelmdz_fcm -d ${resol_atm} -p lmd $opt_rad -$optmode -mem -parallel $parallel -io xios -v orchidee2.1 -arch $fcm_arch -j 8 $full_lmdz gcm    >> $outfile 
+         ./makelmdz_fcm -d ${resol_atm} -p lmd $opt_rad -$optmode -mem -parallel $parallel -io xios -v orchidee2.1 -arch $fcm_arch -j 8 $full_lmdz gcm    >> $outfile 2>&1
     # Test if compiling finished
     if [[ $? != 0 ]] ; then
