Index: CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/lmdz.card	(revision 2758)
+++ CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/lmdz.card	(revision 2773)
@@ -55,6 +55,6 @@
 
 [InitialStateFiles]
-List=  (${R_IN}/ATM/LMDZ/IPSLCM6/${opa9_UserChoices_ORCA_version}xLMD${RESOL_ATM_3D}/start.nc   , start.nc    ), \
-       (${R_IN}/ATM/LMDZ/IPSLCM6/${opa9_UserChoices_ORCA_version}xLMD${RESOL_ATM_3D}/startphy.nc, startphy.nc )
+List=  (${R_IN}/ATM/LMDZ/IPSLCM6/${config_UserChoices_ORCA_version}xLMD${RESOL_ATM_3D}/start.nc   , start.nc    ), \
+       (${R_IN}/ATM/LMDZ/IPSLCM6/${config_UserChoices_ORCA_version}xLMD${RESOL_ATM_3D}/startphy.nc, startphy.nc )
 
 [BoundaryFiles]
@@ -101,5 +101,5 @@
 
 [OutputText]
-List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, vert.def, used_run.def, iodef.xml, context_lmdz.xml, field_def_lmdz.xml,debug.01,lmdz.prt,out_lmdz.x.err, out_lmdz.x.out)
+List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, used_run.def, iodef.xml, context_lmdz.xml, field_def_lmdz.xml,debug.01,lmdz.prt,out_lmdz.x.err, out_lmdz.x.out)
 
 [OutputFiles]
Index: CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/oasis.card
===================================================================
--- CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/oasis.card	(revision 2758)
+++ CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/oasis.card	(revision 2773)
@@ -8,26 +8,16 @@
 
 [InitialStateFiles]
-List=	(${R_IN}/CPL/IPSLCM6/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/flxat.nc, flxat.nc), \
+List=	(${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/flxat.nc, flxat.nc), \
 	(/ccc/scratch/cont003/dsm/p86mart/ORCA1_BLD/eORCA1.0xLMD144142/RESTARTS/eORCA1.0xLMD14414279/sstocean_P0_0362x0332_CM6.nc, sstoc.nc)
 
 [BoundaryFiles]
 List=	()
-# ListNonDel= (${SCRATCHDIR}/ORCA1_BLD/eORCA1.0xLMD144142/MOZAIC/grids.nc, grids.nc ) ,\
-# 	    (${SCRATCHDIR}/ORCA1_BLD/eORCA1.0xLMD144142/MOZAIC/masks.nc, masks.nc ) ,\
-# 	    (${SCRATCHDIR}/ORCA1_BLD/eORCA1.0xLMD144142/MOZAIC/areas.nc, areas.nc ) ,\
-# 	    (${SCRATCHDIR}/ORCA1_BLD/eORCA1.0xLMD144142/MOZAIC/rmp_torc_to_tlmd_MOSAIC.nc       , rmp_torc_to_tlmd_MOSAIC.nc        ) ,\
-# 	    (${SCRATCHDIR}/ORCA1_BLD/eORCA1.0xLMD144142/MOZAIC/rmp_tlmd_to_torc_MOSAIC.nc       , rmp_tlmd_to_torc_MOSAIC.nc        ) ,\
-# 	    (${SCRATCHDIR}/ORCA1_BLD/eORCA1.0xLMD144142/MOZAIC/rmp_tlmd_to_torc_MOSAIC_calvin.nc, rmp_tlmd_to_torc_MOSAIC_calvin.nc ) ,\
-# 	    (${SCRATCHDIR}/ORCA1_BLD/eORCA1.0xLMD144142/MOZAIC/rmp_tlmd_to_torc_MOSAIC_rivflu.nc, rmp_tlmd_to_torc_MOSAIC_rivflu.nc )
-
-
-
-ListNonDel= (${R_IN}/CPL/IPSLCM6/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/grids.nc, grids.nc),\
-	    (${R_IN}/CPL/IPSLCM6/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/masks.nc, masks.nc),\
-	    (${R_IN}/CPL/IPSLCM6/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/areas.nc, areas.nc),\
-	    (${R_IN}/CPL/IPSLCM6/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_torc_to_tlmd_MOSAIC.nc, rmp_torc_to_tlmd_MOSAIC.nc),\
-	    (${R_IN}/CPL/IPSLCM6/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC.nc, rmp_tlmd_to_torc_MOSAIC.nc),\
-	    (${R_IN}/CPL/IPSLCM6/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC_calvin.nc, rmp_tlmd_to_torc_MOSAIC_calvin.nc),\
-	    (${R_IN}/CPL/IPSLCM6/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC_rivflu.nc, rmp_tlmd_to_torc_MOSAIC_rivflu.nc)
+ListNonDel= (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/grids.nc, grids.nc),\
+	    (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/masks.nc, masks.nc),\
+	    (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/areas.nc, areas.nc),\
+	    (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_torc_to_tlmd_MOSAIC.nc, rmp_torc_to_tlmd_MOSAIC.nc),\
+	    (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC.nc, rmp_tlmd_to_torc_MOSAIC.nc),\
+	    (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC_calvin.nc, rmp_tlmd_to_torc_MOSAIC_calvin.nc),\
+	    (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC_rivflu.nc, rmp_tlmd_to_torc_MOSAIC_rivflu.nc)
 
 [SmoothFiles]
Index: CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card
===================================================================
--- CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card	(revision 2758)
+++ CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card	(revision 2773)
@@ -3,5 +3,5 @@
 
 [UserChoices]
-ORCA_version=eORCA1.0
+ORCA_version=${config_UserChoices_ORCA_version:-eORCA1.1}
 mesh_mask=n
 iceflx="linear"
@@ -10,6 +10,4 @@
 OUTPUT_LEVEL=2
 
-V6=/ccc/scratch/cont003/dsm/p86mart/INPUTS_ORCA1_LIM3_PISCES_V6
-
 [InitialStateFiles]
 List=	()
@@ -19,5 +17,5 @@
 ListNonDel= (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/coordinates.nc                     , .  ), \
             (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/bathy_meter.nc                     , .  ), \
-            (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/runoffs_eORCA1.0_depths.nc         , .  ), \
+            (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/runoffs_${opa9_UserChoices_ORCA_version}_depths.nc    , runoffs_eORCA1.0_depths.nc   ), \
             (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/ahmcoef.nc                         , .  ), \
             (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/mask_itf.nc                        , .  ), \
@@ -70,4 +68,5 @@
         (${config_UserChoices_JobName}_1d_grid_U.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_U.nc, Post_1D_grid_U),\
         (${config_UserChoices_JobName}_1d_grid_V.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_V.nc, Post_1D_grid_V),\
+	(${config_UserChoices_JobName}_1ts_grid_T.nc,${R_OUT_OCE_O_D}/${PREFIX}_1TS_grid_T.nc, NONE),\
         (damping.coeff.nc , ${R_OUT_OCE_O_D}/${PREFIX}_damping.coeff.nc, NONE),\
         (output.abort.nc  , ${R_OUT_OCE_D}/${PREFIX}_output.abort.nc, NONE),\
@@ -88,5 +87,5 @@
 Patches = ()
 GatherWithInternal = (nav_lon, nav_lat, deptht, time_instant, time_counter, time_centered, time_centered_bounds)
-TimeSeriesVars2D = (zos, zossq, tos, sos, tossq, omlmax, mldkz5, mldr10_1, nshfls, rsntds, rsds, friver, wfo, hc300)
+TimeSeriesVars2D = (zos, zossq, tos, sos, tossq, omlmax, mldkz5, mldr10_1, nshfls, rsntds, rsds, friver, hc300)
 ChunckJob2D = NONE
 TimeSeriesVars3D = (e3t, thetao, so)
@@ -173,5 +172,5 @@
 Patches = ()
 GatherWithInternal = (nav_lon, nav_lat, deptht, time_counter, time_centered, time_centered_bounds)
-TimeSeriesVars2D = ( wfo, friver )
+TimeSeriesVars2D = ( )
 ChunckJob2D = NONE
 TimeSeriesVars3D = (thetao, so)
Index: CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/orchidee.card
===================================================================
--- CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/orchidee.card	(revision 2758)
+++ CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/orchidee.card	(revision 2773)
@@ -28,7 +28,12 @@
 [ParametersFiles]
 List=	(${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\
-	(${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\
+        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\
 	(${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\
-	(${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .)
+	(${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) ,\
+	(${R_IN}/SRF/soils_param.nc,        . ), \
+	(${R_IN}/SRF/routing.nc,            . ), \
+	(${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_2000.nc, PFTmap.nc), \
+        (${R_IN}/SRF/cartepente2d_15min.nc, .), \
+	(${R_IN}/SRF/albedo/alb_bg_jrctip.nc                       , .)
 
 [RestartFiles]
