Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZ/CREATE_amip/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZ/CREATE_amip/COMP/lmdz.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZ/CREATE_amip/COMP/lmdz.card	(revision 2694)
@@ -5,9 +5,11 @@
 
 [UserChoices]
+# Physics package to use
+LMDZ_Physics=AP
 
 # Do not use XIOS with ce0l program
 XIOS=n
 
-# manage radiative aerosol effect and ozone 
+# Manage radiative aerosol effect and ozone 
 flag_aerosol=6
 ok_ade=y
@@ -21,6 +23,6 @@
 
 [BoundaryFiles]
-List=   (${R_IN}/ATM/AMIP/amipbc_sst_360x180_${year}.nc, amipbc_sst_1x1.nc), \
-	(${R_IN}/ATM/AMIP/amipbc_sic_360x180_${year}.nc, amipbc_sic_1x1.nc), \
+List=   (${R_IN}/ATM/AMIP_2014/amipbc_sst_360x180_${year}.nc, amipbc_sst_1x1.nc), \
+	(${R_IN}/ATM/AMIP_2014/amipbc_sic_360x180_${year}.nc, amipbc_sic_1x1.nc), \
 	(${R_IN}/ATM/Ozone/HYBRIDE/v2.clim/tro3_${year}.new.nc, climoz.nc)
 
@@ -32,10 +34,10 @@
 	(${R_IN}/ATM/landiceref.nc, .)
 ### Please, add the o2a.nc file to fit with the coupled configuration associated
-#	(${R_INIT}/ATM/IPSLCM5A/ORCA2.3x${RESOL_ATM}/o2a.nc, o2a.nc)
+### Note that this file is different for different versions of the coupled model
+#	(${R_IN}/ATM/IPSLCM6/ORCA2.3x9695_v1/o2a.nc, o2a.nc)
 
 [ParametersFiles]
 List=	(${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
 	(${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),    \
-        (${SUBMIT_DIR}/PARAM/output.def_low        ,  output.def),    \
 	(${SUBMIT_DIR}/PARAM/config.def_actuel     ,  config.def),    \
 	(${SUBMIT_DIR}/PARAM/run.def, .), \
@@ -43,10 +45,9 @@
 	(${SUBMIT_DIR}/PARAM/traceur.def, .)
 
-
 [RestartFiles]
 List= (NONE)
 
 [OutputText]
-List=   (physiq.def, gcm.def, run.def, config.def, traceur.def, output.def)
+List=   (physiq.def, gcm.def, run.def, config.def, traceur.def, guide.def)
 
 [OutputFiles]
@@ -56,3 +57,2 @@
 	( startphy.nc,    ${R_OUT_ATM_O}/Restart/${config_UserChoices_JobName}_${year}_startphy.nc,     NONE), \
 	( grilles_gcm.nc, ${R_OUT_ATM_O}/Grid/${config_UserChoices_JobName}_${year}_grilles_gcm.nc,     NONE)
-
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZ/CREATE_amip/config.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZ/CREATE_amip/config.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZ/CREATE_amip/config.card	(revision 2694)
@@ -9,5 +9,4 @@
 [UserChoices]
 #============================
-#D-- (<8 chars MAX for JobName)
 JobName=ELI-${RESOL_ATM_3D}
 LongName="create_etat0_limit for interannuel amip run"
@@ -37,6 +36,6 @@
 #D-- Executable -
 [Executable]
-#D- For each component, Real name of executable, Name of executable for oasis
-ATM= (create_etat0_limit.e, create_etat0_limit.e)
+#D- For each component: Real name of executable, Name of executable in the run directory 
+ATM= (create_etat0_limit.e, create_etat0_limit.e, 1MPI)
 
 #========================================================================
@@ -65,7 +64,4 @@
 RestartJobName=
 RestartPath=
-# Old component name for restart (if empty, use new name)
-OldName=
-
 
 #========================================================================
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZ/CREATE_clim/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZ/CREATE_clim/COMP/lmdz.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZ/CREATE_clim/COMP/lmdz.card	(revision 2694)
@@ -5,8 +5,11 @@
 
 [UserChoices]
+# Physics package to use
+LMDZ_Physics=AP
+
 # Do not use XIOS with ce0l program
 XIOS=n
 
-# manage radiative aerosol effect and ozone 
+# Manage radiative aerosol effect and ozone 
 flag_aerosol=6
 ok_ade=y
@@ -29,13 +32,13 @@
 	(${R_IN}/ATM/landiceref.nc, .) \
 	(${R_IN}/ATM/Ozone/HYBRIDE/v2.clim/tro3_1995.new.nc, climoz.nc), \
-	(${R_IN}/ATM/AMIP/sst_bc_clim.nc, amipbc_sst_1x1.nc), \
-	(${R_IN}/ATM/AMIP/sic_bc_clim.nc, amipbc_sic_1x1.nc)
+	(${R_IN}/ATM/AMIP_2014/sst_bc_clim.nc, amipbc_sst_1x1.nc), \
+	(${R_IN}/ATM/AMIP_2014/sic_bc_clim.nc, amipbc_sic_1x1.nc)
 ### Please, add the o2a.nc file to fit with the coupled configuration associated
-#	(${R_INIT}/ATM/IPSLCM5A/ORCA2.3x${RESOL_ATM}/o2a.nc, o2a.nc)
+### Note that this file is different for different versions of the coupled model
+#	(${R_IN}/ATM/IPSLCM6/ORCA2.3x9695_v1/o2a.nc, o2a.nc)
 
 [ParametersFiles]
 List=	(${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
 	(${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),    \
-        (${SUBMIT_DIR}/PARAM/output.def_low        ,  output.def),    \
 	(${SUBMIT_DIR}/PARAM/config.def_actuel     ,  config.def),    \
 	(${SUBMIT_DIR}/PARAM/run.def, .), \
@@ -43,10 +46,9 @@
 	(${SUBMIT_DIR}/PARAM/traceur.def, .)
 
-
 [RestartFiles]
 List= (NONE)
 
 [OutputText]
-List=   (physiq.def, gcm.def, run.def, config.def, traceur.def, output.def)
+List=   (physiq.def, gcm.def, run.def, config.def, traceur.def, guide.def)
 
 [OutputFiles]
@@ -56,2 +58,3 @@
 	( startphy.nc,    ${R_OUT_ATM_O}/Restart/${config_UserChoices_JobName}_clim_startphy.nc, NONE), \
 	( grilles_gcm.nc, ${R_OUT_ATM_O}/Grid/${config_UserChoices_JobName}_grilles_gcm.nc,      NONE)
+
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZ/CREATE_clim/config.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZ/CREATE_clim/config.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZ/CREATE_clim/config.card	(revision 2694)
@@ -9,5 +9,4 @@
 [UserChoices]
 #============================
-#D-- (<8 chars MAX for JobName)
 JobName= ELC-${RESOL_ATM_3D}
 LongName="create_etat0_limit for climatology run"
@@ -20,4 +19,5 @@
 #D-- Begin and end of job 
 #D-- "YYYY-MM-DD"
+#D-- The dates for this experiement has no significance. Do not change them.
 DateBegin=1979-01-01
 DateEnd=1979-12-30
@@ -35,6 +35,6 @@
 #D-- Executable -
 [Executable]
-#D- For each component, Real name of executable, Name of executable for oasis
-ATM= (create_etat0_limit.e, create_etat0_limit.e)
+#D- For each component: Real name of executable, Name of executable in the run directory 
+ATM= (create_etat0_limit.e, create_etat0_limit.e, 1MPI)
 
 #========================================================================
@@ -63,6 +63,4 @@
 RestartJobName=
 RestartPath=
-# Old component name for restart (if empty, use new name)
-OldName=
 
 
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card	(revision 2694)
@@ -5,7 +5,7 @@
 
 [UserChoices]
-# Physics package to use : 
-# AP for standard/old physics(defalut), can be used with LMDZ4_AR5 or LMDZ5/trunk sources 
-# NPv3.1 for new physics, to be used with LMDZ5/trunk revision 1554 or later
+# Physics package to use :
+# LMDZ_Physics=AP for standard/old physics(defalut), can be used with LMDZ4_AR5 or LMDZ5/trunk sources
+# LMDZ_Physics=NPv3.2 for new physics, to be used with LMDZ5/trunk revision 1554 or later
 LMDZ_Physics=AP
 
@@ -16,23 +16,10 @@
 CREATE=ELI-${RESOL_ATM_3D}
 
-# ByPass_hgardfou_teta=y : modify teta_ parameters for following CumulPeriod only
-ByPass_hgardfou_teta=n
-
-# ByPass_hgardfou_mats=y : set parameter purmats=y for following CumulPeriod only
-ByPass_hgardfou_mats=n
-
-# Number of periods where to set parameter adjust=y before switching to adjust=n
-# For adjust=n, set LMDZ_NbPeriod_ajust=0. 
-LMDZ_NbPeriod_adjust=0
-
-# To force usage of specific Bands file, set LMDZ_NbPeriod_adjust=0 and replace XXXXXXX by Restart Job Name
-# LMDZ_Bands_file_name=${ARCHIVE}/IGCM_OUT/IPSLCM5/XXXXXXX/ATM/Debug/XXXXXXX_Bands_96x95x19_3prc.dat_3
-
-# Set ConfType to choose parameters for aerosols, solar and green house gazes. 
+# Set ConfType to choose parameters for aerosols, solar and green house gazes.
 # The parameter file PARAM/config.def_$ConfType will be used.
 # ConfType=preind/actuel/annuel
 ConfType=annuel
 
-# manage radiative aerosol effect and ozone 
+# Manage radiative aerosol effect and ozone
 flag_aerosol=6
 ok_ade=y
@@ -42,16 +29,29 @@
 ok_cdnc=y
 
-# Set OutLevel to choose the level of output files from LMDZ. The file PARAM/output.def_$OutLevel will be used.
+# ByPass_hgardfou_teta=y : modify teta_ parameters for following CumulPeriod only
+ByPass_hgardfou_teta=n
+
+# ByPass_hgardfou_mats=y : set parameter purmats=y for following CumulPeriod only
+ByPass_hgardfou_mats=n
+
+# Number of periods where to set parameter adjust=y before switching to adjust=n
+# For adjust=n, set LMDZ_NbPeriod_ajust=0.
+LMDZ_NbPeriod_adjust=0
+
+# To force usage of specific Bands file, set LMDZ_NbPeriod_adjust=0 and replace XXXXXXX by Restart experiment
+# LMDZ_Bands_file_name=${ARCHIVE}/IGCM_OUT/IPSLCM5A/DEVT/pdControl/XXXXXX/ATM/Debug/pdControl_XXXXXXX_Bands_96x95x19_3prc.dat_3
+
+# Set OutLevel to choose the level of output for LMDZ. 
 # OutLevel=low/medium/high
 OutLevel=low
 
-# Set COSP activation and Outputs frequency (monthly, daily, HF) = y/n
+# COSP activation and choose of output frequency for COSP (monthly, daily, HF) = y/n
 LMDZ_COSP_OK=n
-LMDZ_COSP_monthly=y
+LMDZ_COSP_monthly=n
 LMDZ_COSP_daily=n
 LMDZ_COSP_hf=n
 
-# Set NMC Outputs frequency (monthly, daily, HF) = y/n
-LMDZ_NMC_monthly=n
+# Set NMC output frequency (monthly, daily, HF) = y/n
+LMDZ_NMC_monthly=y
 LMDZ_NMC_daily=n
 LMDZ_NMC_hf=n
@@ -61,17 +61,13 @@
 ok_guide=n
 
-
 [InitialStateFiles]
 List=	(${ARCHIVE}/IGCM_OUT/LMDZ/${CREATE}/ATM/Output/Restart/${CREATE}_${year}_start.nc,    start.nc),\
-        (${ARCHIVE}/IGCM_OUT/LMDZ/${CREATE}/ATM/Output/Restart/${CREATE}_${year}_startphy.nc, startphy.nc) 
+        (${ARCHIVE}/IGCM_OUT/LMDZ/${CREATE}/ATM/Output/Restart/${CREATE}_${year}_startphy.nc, startphy.nc)
 
 [BoundaryFiles]
-List=()
-#List=
-#      (/dmnfs/cont003/p86ghatt/IGCM_OUT/LMDZOR/NUDGING-CORDEX-AFR/${year}${month}/u.nc, u.nc),\
-#      (/dmnfs/cont003/p86ghatt/IGCM_OUT/LMDZOR/NUDGING-CORDEX-AFR/${year}${month}/v.nc, v.nc)
-
-# With AR5 aerosols (including ASSO4M(=SO4), CSSO4M, AIBCM, ASBCM, AIPOMM, ASPOMM, ASSSM, CSSSM, SSSSM, CIDUSTM)
-# With AR5 ozone(tropo + strato from LMDZOR-INCA-REPROBUS simulations)
+List=   (${ARCHIVE}/IGCM_OUT/LMDZ/${CREATE}/ATM/Output/Boundary/${CREATE}_${year}_limit.nc,       limit.nc),\
+        (${R_IN}/ATM/${RESOL_ATM}/AR5/HISTORIQUE/aerosols_11YearsClim_${year}_v5.nc,              aerosols${year}.nc),\
+        (${ARCHIVE}/IGCM_OUT/LMDZ/${CREATE}/ATM/Output/Boundary/${CREATE}_${year}_climoz_LMDZ.nc, climoz_LMDZ.nc)
+
 ListNonDel= (${R_IN}/ATM/IPCC_AR5/HISTORIQUE/SOLARANDVOLCANOES_1610_2008.txt, SOLARANDVOLCANOES.txt),\
             (${R_IN}/ATM/IPCC_AR5/HISTORIQUE/CO2_1765_2005.txt, CO2.txt),\
@@ -83,63 +79,58 @@
 
 [SmoothFiles]
-# With AR5 aerosols (including ASSO4M(=SO4), CSSO4M, AIBCM, ASBCM, AIPOMM, ASPOMM, ASSSM, CSSSM, SSSSM, CIDUSTM)
-# With AR5 ozone(tropo + strato from LMDZOR-INCA-REPROBUS simulations)
-List=   (${ARCHIVE}/IGCM_OUT/LMDZ/${CREATE}/ATM/Output/Boundary/${CREATE}_${year}_limit.nc,          limit.nc,           1:12:),\
-        (${R_IN}/ATM/${RESOL_ATM}/AR5/HISTORIQUE/aerosols_11YearsClim_${year}_v5.nc, aerosols${year}.nc, 1:12:), \
-        (${ARCHIVE}/IGCM_OUT/LMDZ/${CREATE}/ATM/Output/Boundary/${CREATE}_${year}_climoz_LMDZ.nc,    climoz_LMDZ.nc,     1:12:)
+List=()
 
 [ParametersFiles]
-List=	(${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
-	(${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),    \
-	(${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),    \
-	(${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),    \
-	(${SUBMIT_DIR}/PARAM/output.def_${OutLevel},  output.def),    \
-	(${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),    \
-	(${SUBMIT_DIR}/PARAM/guide.def, .), \
-	(${SUBMIT_DIR}/PARAM/run.def, .), \
-	(${SUBMIT_DIR}/PARAM/traceur.def, .), \
-	(${SUBMIT_DIR}/PARAM/iodef.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . )            ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . )          ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histday_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhf_lmdz.xml, . )    ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histins_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histLES_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstn_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayNMC_lmdz.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfNMC_lmdz.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayCOSP_lmdz.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfCOSP_lmdz.xml, . )
+List=   (${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
+        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),          \
+        (${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),          \
+        (${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),          \
+        (${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),          \
+        (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \
+        (${SUBMIT_DIR}/PARAM/run.def, .),                                   \
+        (${SUBMIT_DIR}/PARAM/traceur.def, .),                               \
+        (${SUBMIT_DIR}/PARAM/iodef.xml, . ),                                \
+        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histmthCOSP_lmdz.xml, .),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histmthNMC_lmdz.xml, . ),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histday_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histdayCOSP_lmdz.xml, .),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histdayNMC_lmdz.xml, . ),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histhf_lmdz.xml, . ),                 \
+        (${SUBMIT_DIR}/PARAM/file_def_histhfCOSP_lmdz.xml, .),              \
+        (${SUBMIT_DIR}/PARAM/file_def_histhfNMC_lmdz.xml, . ),              \
+        (${SUBMIT_DIR}/PARAM/file_def_histstn_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histins_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histLES_lmdz.xml, . ),                \
+        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \
+        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . )
 
 [RestartFiles]
-List=	(restart.nc, restart.nc, start.nc), \
-	(restartphy.nc, restartphy.nc,  startphy.nc)
+List=   (restart.nc, restart.nc, start.nc), \
+        (restartphy.nc, restartphy.nc,  startphy.nc)
 
 [OutputText]
-List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, output.def, used_*, iodef.xml, context_lmdz.xml,field_def_lmdz.xml)
+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, file_def_*lmdz.xml, debug.01, lmdz.prt)
 
 [OutputFiles]
-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,  Post_1M_histmthCOSP), \
-	(histmthNMC.nc,   ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthNMC.nc,   Post_1M_histmthNMC),  \
-	(dynzon.nc,       ${R_OUT_ATM_O_M}/${PREFIX}_1M_dynzon.nc,       Post_1M_dynzon),      \
-	(histday.nc,      ${R_OUT_ATM_O_D}/${PREFIX}_1D_histday.nc,      Post_1D_histday),     \
-	(histdayCOSP.nc,  ${R_OUT_ATM_O_D}/${PREFIX}_1D_histdayCOSP.nc,  Post_1D_histdayCOSP), \
-	(histdayNMC.nc,   ${R_OUT_ATM_O_D}/${PREFIX}_1D_histdayNMC.nc,   Post_1D_histdayNMC),  \
-	(histhf.nc,       ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhf.nc,       Post_HF_histhf),      \
-	(histhfCOSP.nc,   ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhfCOSP.nc,   Post_HF_histhfCOSP),  \
-	(histhfNMC.nc,    ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhfNMC.nc,    Post_HF_histhfNMC),   \
-	(histhf3h.nc,     ${R_OUT_ATM_O_H}/${PREFIX}_3H_histhf3h.nc,     Post_3H_histhf3h),    \
-        (histhf3hm.nc,    ${R_OUT_ATM_O_H}/${PREFIX}_3H_histhf3hm.nc,    Post_3H_histhf3hm)
+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),    \
+        (paramLMDZ_phy.nc, ${R_OUT_ATM_O_M}/${PREFIX}_1M_paramLMDZ_phy.nc, Post_1M_paramLMDZ_phy), \
+        (histday.nc,       ${R_OUT_ATM_O_D}/${PREFIX}_1D_histday.nc,       NONE),                  \
+        (histdayCOSP.nc,   ${R_OUT_ATM_O_D}/${PREFIX}_1D_histdayCOSP.nc,   NONE),                  \
+        (histdayNMC.nc,    ${R_OUT_ATM_O_D}/${PREFIX}_1D_histdayNMC.nc,    NONE),                  \
+        (histhf.nc,        ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhf.nc,        NONE),                  \
+        (histhfCOSP.nc,    ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhfCOSP.nc,    NONE),                  \
+        (histhfNMC.nc,     ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhfNMC.nc,     NONE),                  \
+        (histhf3h.nc,      ${R_OUT_ATM_O_H}/${PREFIX}_3H_histhf3h.nc,      NONE),                  \
+        (histhf3hm.nc,     ${R_OUT_ATM_O_H}/${PREFIX}_3H_histhf3hm.nc,     NONE)
 
 [Post_1M_histmth]
 Patches= ()
 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire)
-TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, ftime_th, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, LWupTOA, LWupTOAclr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, mc, nettop, paprs, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl)
-ChunckJob2D = NONE
-TimeSeriesVars3D = (upwd, lwcon, iwcon, temp, theta, ovap, ovapinit, geop, vitu, vitv, vitw, pres, rneb, rnebcon, rhum, ec550aer, concoa, concbc, concso4, concss, concdust, reffclws, reffclwc)
+TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, nettop, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl, swtoaas_ant, swtoacs_ant, swtoacf_ant, swsrfas_ant, swsrfcs_ant, swsrfcf_ant, swtoaas_nat, swtoacs_nat, swtoacf_nat, swsrfas_nat, swsrfcs_nat, swsrfcf_nat, solswai, solswad, swtoacf_zero, swsrfcf_zero)
+ChunckJob2D = 100Y
+TimeSeriesVars3D = (upwd, lwcon, iwcon, lcc3dcon, lcc3dstra, temp, theta, ovap, ovapinit, geop, vitu, vitv, vitw, pres, rneb, rnebcon, rhum, mc, paprs, scdnc, ec550aer, concoa, concbc, concso4, concss, concdust, reffclws, reffclwc, tnt, dtdyn, dtphy, dtlschr, tntr, tntscpbl, tnhus, dqdyn, dqvdf, tnhusscpbl, dqphy, evu, mcd)
 ChunckJob3D = 100Y
 Seasonal=ON
@@ -147,48 +138,75 @@
 [Post_1M_histmthCOSP]
 Patches = ()
-GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire)
+GatherWithInternal = (lon, lat, pressure2, height, sza, time_counter, time_counter_bounds)
+TimeSeriesVars2D = (cllcalipso, clmcalipso, clhcalipso, cltcalipso, tclisccp, albisccp, ctpisccp)
+ChunckJob2D = OFF
+TimeSeriesVars3D = (clcalipso, clisccp2_c01, clisccp2_c02, clisccp2_c03, clisccp2_c04, clisccp2_c05, clisccp2_c06, clisccp2_c07, parasol_refl)
+ChunckJob3D = OFF
+Seasonal=OFF
+
+[Post_1M_histmthNMC]
+Patches = ()
+GatherWithInternal = (lon, lat, plev, time_counter, time_counter_bounds)
 TimeSeriesVars2D = ()
-ChunckJob2D = NONE 
+ChunckJob2D = NONE
+TimeSeriesVars3D = (ta, tro3, zg, hus, hur, ua, va, wap)
+ChunckJob3D = NONE
+Seasonal=ON
+
+[Post_1M_paramLMDZ_phy]
+Patches=()
+GatherWithInternal = (lon, lat, time_counter, time_counter_bnds)
+TimeSeriesVars2D =(R_ecc,  R_peri, R_incl, solaire, co2_ppm, CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt)
+ChunckJob2D = NONE
 TimeSeriesVars3D = ()
 ChunckJob3D = NONE
 Seasonal=OFF
 
-[Post_1M_histmthNMC]
+[Post_1D_histday]
+Patches= ()
+GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
+TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, precip, pluc, plul, prw, psol, q2m, sens, sicf, slp, soll, sols, snow, SWdnSFC, t2m, t2m_max, t2m_min, topl, tops, tsol, u10m, v10m, wind10m, wind10max)
+ChunckJob2D = 50Y
+TimeSeriesVars3D = (lwcon, iwcon, mc, rhum, rneb, temp, theta, ovap, geop, vitu, vitv, vitw, pres, paprs)
+ChunckJob3D = OFF
+Seasonal=OFF
+
+[Post_1D_histdayCOSP]
+Patches = ()
+GatherWithInternal = (lon, lat, pressure2, height, sza, time_counter, time_counter_bounds)
+TimeSeriesVars2D = (cllcalipso, clmcalipso, clhcalipso, cltcalipso, tclisccp, albisccp, ctpisccp)
+ChunckJob2D = OFF
+TimeSeriesVars3D = (clcalipso, clisccp2_c01, clisccp2_c02, clisccp2_c03, clisccp2_c04, clisccp2_c05, clisccp2_c06, clisccp2_c07, parasol_refl)
+ChunckJob3D = OFF
+Seasonal=OFF
+
+[Post_1D_histdayNMC]
 Patches = ()
 GatherWithInternal = (lon, lat, plev, time_counter, time_counter_bounds)
 TimeSeriesVars2D = ()
 ChunckJob2D = NONE
-TimeSeriesVars3D = (ta, zg, hus, hur, ua, va, wap, psbg, uv, vq, vT, wq, vphi, wT, uxu, vxv, TxT, ozone, ozone_daylight)
-ChunckJob3D = 100Y
-Seasonal=OFF
-
-[Post_1M_dynzon]
-Patches = ()
-GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
-TimeSeriesVars2D = ()
-ChunckJob2D = NONE
-TimeSeriesVars3D = ()
-ChunckJob3D = NONE
-Seasonal=OFF
-
-[Post_1D_histday]
-Patches= ()
-GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
-TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, iwp, lwp, phi500, precip, pluc, plul, prw, psol, rh2m, rh2m_min, rh2m_max, q2m, sens, sicf, slp, soll, sols, LWdnSFC, SWdnSFC, LWupSFCclr,SWupSFC, t2m, t2m_max, t2m_min, topl, tops, tsol, u10m, v10m, wind10m, wind10max, u850, v850, w850, phi850, q850, t850, u700, v700, w700, phi700, q700, t700, u500, v500, w500, phi500, q500, t500, u200, v200, w200, phi200, q200, t200)
-ChunckJob2D = 200Y
-TimeSeriesVars3D = (rhum, temp, theta, ovap, ovapinit, geop, vitu, vitv, vitw, pres)
+TimeSeriesVars3D = (ta, zg, hus, hur, ua, va, wap)
 ChunckJob3D = 10Y
 Seasonal=OFF
 
-[Post_1D_histdayCOSP]
-Patches = ()
-GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire)
-TimeSeriesVars2D = ()
-ChunckJob2D = NONE 
-TimeSeriesVars3D = ()
-ChunckJob3D = NONE
-Seasonal=OFF
-
-[Post_1D_histdayNMC]
+[Post_HF_histhf]
+Patches= ()
+GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
+TimeSeriesVars2D = (cldt, psol, q2m, slp, precip, pluc, plul, t2m, tsol, u10m, v10m)
+ChunckJob2D = 50Y
+TimeSeriesVars3D = (temp, theta, ovap, vitu, vitv)
+ChunckJob3D = OFF
+Seasonal=OFF
+
+[Post_HF_histhfCOSP]
+Patches = ()
+GatherWithInternal = (lon, lat, height, sza, time_counter, time_counter_bounds)
+TimeSeriesVars2D = (cllcalipso, clmcalipso, clhcalipso, cltcalipso)
+ChunckJob2D = OFF
+TimeSeriesVars3D = (clcalipso, parasol_refl, cfad_lidarsr532_c01, cfad_lidarsr532_c02, cfad_lidarsr532_c03, cfad_lidarsr532_c04, cfad_lidarsr532_c05, cfad_lidarsr532_c06, cfad_lidarsr532_c07, cfad_lidarsr532_c08, cfad_lidarsr532_c09, cfad_lidarsr532_c10, cfad_lidarsr532_c11, cfad_lidarsr532_c12, cfad_lidarsr532_c13, cfad_lidarsr532_c14, cfad_lidarsr532_c15)
+ChunckJob3D = OFF
+Seasonal=OFF
+
+[Post_HF_histhfNMC]
 Patches = ()
 GatherWithInternal = (lon, lat, plev, time_counter, time_counter_bounds)
@@ -199,29 +217,11 @@
 Seasonal=OFF
 
-[Post_HF_histhf]
-Patches= ()
-GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
-TimeSeriesVars2D = (cldt, psol, q2m, slp, SWnetOR, SWdownOR, LWdownOR, precip, pluc, plul, t2m, tsol, u10m, v10m, t850, t700, t500, t200, t50, t10, u850, u700, u500, u200, u50, u10, v850, v700, v500, v200, v50, v10, phi850, phi700, phi200, phi50, phi10, w850, w700, w500, w200, w50, w10, q850, q700, q500, q200, q50, q10)
-ChunckJob2D = 50Y
-TimeSeriesVars3D = (temp, theta, ovap, vitu, vitv)
-ChunckJob3D = 10Y
-Seasonal=OFF
-
-[Post_HF_histhfCOSP]
-Patches = ()
-GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire)
-TimeSeriesVars2D = ()
-ChunckJob2D = NONE 
+[Post_3H_histhf3hm]
+Patches= ()
+GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
+TimeSeriesVars2D = (flat, precip, pluc, snow, topl, topl0, SWupTOA, SWupTOAclr, SWdnTOA, SWupSFC, SWupSFCclr, SWdnSFC, SWdnSFCclr, LWupSFC, LWupSFCclr, LWdnSFC, LWdnSFCclr, bils, bils_tke, bils_diss, bils_ec, bils_kinetic, bils_enthalp, bils_latent, sens, cldt, zmax_th)
+ChunckJob2D = OFF
 TimeSeriesVars3D = ()
-ChunckJob3D = NONE
-Seasonal=OFF
-
-[Post_HF_histhfNMC]
-Patches = ()
-GatherWithInternal = (lon, lat, plev, time_counter, time_counter_bounds)
-TimeSeriesVars2D = ()
-ChunckJob2D = NONE
-TimeSeriesVars3D = (ta, zg, hus, hur, ua, va, wap, psbg, uv, vq, vT, wq, vphi, wT, uxu, vxv, TxT)
-ChunckJob3D = 100Y
+ChunckJob3D = OFF
 Seasonal=OFF
 
@@ -229,16 +229,7 @@
 Patches= ()
 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
-TimeSeriesVars2D = (phis, tsol, t2m, q2m, u10m, v10m, psol, topl, bils, cdrh)
-ChunckJob2D = 50Y
+TimeSeriesVars2D = (phis, tsol, t2m, q2m, ustar, u10m, v10m, psol)
+ChunckJob2D = OFF
 TimeSeriesVars3D = ()
 ChunckJob3D = OFF
 Seasonal=OFF
-
-[Post_3H_histhf3hm]
-Patches= ()
-GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
-TimeSeriesVars2D = (precip, flat, sens, LWdnSFC, LWupSFC, SWdnSFC, SWupSFC, pluc, snow, LWdnSFCclr, SWdnSFCclr, LWupSFCclr, cldt)
-ChunckJob2D = 50Y
-TimeSeriesVars3D = ()
-ChunckJob3D = OFF
-Seasonal=OFF
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card	(revision 2694)
@@ -9,57 +9,52 @@
 DefSuffix=Choi
 
-sechiba_LEVEL=11
 VEGET_UPDATE=1Y
 LAND_COVER_CHANGE=y
 
-# Use XIOS as output library
-XIOS=y
-
 [InitialStateFiles]
-List=	(${R_IN}/SRF/soils_param.nc,      . ), \
-	(${R_IN}/SRF/routing.nc,          . ), \
-	(${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year}.nc, PFTmap.nc), \
+List=	(${R_IN}/SRF/soils_param.nc,        . ), \
+	(${R_IN}/SRF/routing.nc,            . ), \
         (${R_IN}/SRF/cartepente2d_15min.nc, .)
 
 [BoundaryFiles]
-List= ()
+List=(${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year}.nc, PFTmap.nc)
 ListNonDel= ()
 
 [SmoothFiles]
-List=(${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
+List= ()
 
 [ParametersFiles]
 List=	(${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\
+	(${SUBMIT_DIR}/PARAM/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/file_def_orchidee.xml, .)
+	(${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .)
 
 [RestartFiles]
-# List restart that have to be saved/restored each loop (file out, saved, and in) :
 List=	(sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc)
 
 [OutputText]
-List=   (out_orchidee, orchidee.def, used_orchidee.def, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml)
+List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_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_out_2.nc, ${R_OUT_SRF_O_H}/${PREFIX}_HF_sechiba_out_2.nc, Post_HF_sechiba_out_2), \
-        (orchidee_watchout.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_watchout.nc, NONE)
+List=   (sechiba_history.nc,   ${R_OUT_SRF_O_M}/${PREFIX}_1M_sechiba_history.nc, Post_1M_sechiba_history), \
+        (sechiba_out_2.nc,     ${R_OUT_SRF_O_H}/${PREFIX}_HF_sechiba_out_2.nc,   NONE),                    \
+        (orchidee_watchout.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_watchout.nc,        NONE)
 
 [Post_1M_sechiba_history]
-Patches= ()
-GatherWithInternal= (lon, lat, veget, time_counter, time_counter_bounds, Areas, Contfrac)
-TimeSeriesVars2D= (nobiofrac, alb_nir, alb_vis, bqsb, evap, fluxlat, fluxsens, gqsb, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac)
-ChunckJob2D= NONE
-TimeSeriesVars3D= (lai, maxvegetfrac, vegetfrac, CO2FLUX, ptn, nee)
-ChunckJob3D= NONE
-Seasonal= ON
+Patches = ()
+GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds)
+TimeSeriesVars2D = (nobiofrac, alb_nir, alb_vis, evap, fluxlat, fluxsens, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac, TWBR)
+ChunckJob2D = NONE
+TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee)
+ChunckJob3D = NONE
+Seasonal = ON
 
 [Post_HF_sechiba_out_2]
-Patches= ()
-GatherWithInternal= (lon, lat, veget, time_counter, time_counter_bounds, Areas, Contfrac)
-TimeSeriesVars2D= (mrsos, mrro)
-ChunckJob2D= 50Y
-TimeSeriesVars3D= (ptn)
-ChunckJob3D= 10Y
-Seasonal= OFF
+Patches = ()
+GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds)
+TimeSeriesVars2D = (mrsos, mrro)
+ChunckJob2D = 50Y
+TimeSeriesVars3D = (ptn)
+ChunckJob3D = 10Y
+Seasonal = OFF
+
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/amip/COMP/stomate.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/amip/COMP/stomate.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/amip/COMP/stomate.card	(revision 2694)
@@ -3,5 +3,4 @@
 
 [UserChoices]
-stomate_LEVEL=10
 
 [InitialStateFiles]
@@ -10,5 +9,5 @@
 [BoundaryFiles]
 List=	()
-ListNonDel= (${R_BC}/SRF/${config_UserChoices_TagName}/reftemp.nc, .)
+ListNonDel= ()
 
 [SmoothFiles]
@@ -19,5 +18,4 @@
 
 [RestartFiles]
-# List restart that have to be saved/restored each loop (file out, saved, and in) :
 List=	(stomate_rest_out.nc, stomate_rest.nc, stomate_rest_in.nc)
 
@@ -26,6 +24,6 @@
 
 [OutputFiles]
-List=	(stomate_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_history.nc, Post_1M_stomate_history) \
-    (stomate_ipcc_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_ipcc_history.nc, Post_1M_stomate_ipcc_history)
+List=   (stomate_history.nc,      ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_history.nc,      Post_1M_stomate_history),    \
+        (stomate_ipcc_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_ipcc_history.nc, Post_1M_stomate_ipcc_history)
 
 [Post_1M_stomate_history]
@@ -34,5 +32,5 @@
 TimeSeriesVars2D= (T2M_MONTH,CONTFRAC,RESOLUTION_X,RESOLUTION_Y,CONVFLUX,CFLUX_PROD10,CFLUX_PROD100,HARVEST_ABOVE)
 ChunckJob2D = NONE
-TimeSeriesVars3D = (CO2FLUX_MONTHLY,LAI,VEGET,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE)
+TimeSeriesVars3D = (CO2FLUX,LAI,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE)
 ChunckJob3D = NONE
 Seasonal=ON
@@ -46,2 +44,3 @@
 ChunckJob3D = NONE
 Seasonal=ON
+
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/amip/config.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/amip/config.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/amip/config.card	(revision 2694)
@@ -1,5 +1,3 @@
 # $Id$
-# This is config.card file for restart with an NEW libIGCM simulation tree.
-#
 #========================================================================
 #D-- Compatibility -
@@ -9,5 +7,4 @@
 [UserChoices]
 #============================
-#-- (<8 chars MAX for JobName)
 JobName=LMDZOR01
 #----- Short Name of Experiment
@@ -25,11 +22,8 @@
 #-- "YYYY-MM-DD"
 DateBegin=1980-01-01
-DateEnd=1980-01-31
+DateEnd=1980-12-31
 #============================
-#-- 1Y, 1M, 5D, 1D Period Length of one trunk of simulation
-PeriodLength=1M
-#============================
-#-- Total Number of Processors
-JobNumProcTot=32
+#-- 1Y, 1M, 5D, 1D Period Length for one execution
+PeriodLength=1Y
 
 #========================================================================
@@ -45,5 +39,5 @@
 #D-- Executable -
 [Executable]
-#D- For each component, Real name of executable, Name of executable for oasis
+#D- For each component: Real name of executable, Name of executable in the run directory 
 ATM= (gcm.e, lmdz.x, 31MPI, 1OMP)
 SRF= ("", "")
@@ -69,6 +63,5 @@
 #D-- ATM -
 [ATM]
-#
-WriteFrequency="1M 1D HF"
+WriteFrequency="1M"
 # If config_Restarts_OverRule == 'n' next 4 params are read
 Restart=n
@@ -78,11 +71,9 @@
 RestartJobName=LMDZOR01
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZOR/DEVT/amip
-# Old component name for restart (if empty, use new name)
-OldName=
 
 #========================================================================
 #D-- SRF -
 [SRF]
-WriteFrequency="1M HF"
+WriteFrequency="1M"
 # If config_Restarts_OverRule == 'n' next 4 params are read
 Restart=n
@@ -92,6 +83,4 @@
 RestartJobName=EXP00
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZOR/DEVT/amip
-#-- Old component name for restart (if empty, use new name)
-OldName=
 
 #========================================================================
@@ -106,6 +95,4 @@
 RestartJobName=EXP00
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZOR/DEVT/amip
-#-- Old component name for restart (if empty, use new name)
-OldName=
 
 #========================================================================
@@ -120,21 +107,17 @@
 RestartJobName=
 RestartPath=
-# Old component name for restart (if empty, use new name)
-OldName=
 
 #========================================================================
 #D-- Post -
 [Post]
-#D- Do we rebuild parallel output, this flag determines
-#D- frequency of rebuild submission (use NONE for DRYRUN=3)
-RebuildFrequency=1Y
-#D- Do we pack restart and debug txt files, this flag determines
-#D- frequency of pack submission (use NONE for DRYRUN=3)
+#D- RebuildFrequency determines the frequency of rebuild submission
+RebuildFrequency=NONE
+#D- PackFrequency determines the frequency of pack submission
 PackFrequency=1Y
-#D- If you want to produce time series, this flag determines
-#D- frequency of post-processing submission (NONE if you don't want)
+#D- TimeSeriesFreqency determines the frequency of post-processing submission
+#D- Set NONE to deactivate the creation of all time series 
 TimeSeriesFrequency=10Y
-#D- If you want to produce seasonal average, this flag determines
-#D- the period of this average (NONE if you don't want)
+#D- SeasonalFrequency determines the length for each seasonal average
+#D- Set NONE to deactivate the creation of all seasonal avereage
 SeasonalFrequency=10Y
 #D- Offset for seasonal average first start dates ; same unit as SeasonalFrequency
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/clim/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/clim/COMP/lmdz.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/clim/COMP/lmdz.card	(revision 2694)
@@ -1,11 +1,9 @@
-# $Id$
-
 [Compatibility]
 libIGCM=1.0
 
 [UserChoices]
-# Physics package to use : 
-# AP for standard/old physics(defalut), can be used with LMDZ4_AR5 or LMDZ5/trunk sources 
-# NPv3.1 for new physics, to be used with LMDZ5/trunk revision 1554 or later
+# Physics package to use :
+# LMDZ_Physics=AP for standard/old physics(defalut), can be used with LMDZ4_AR5 or LMDZ5/trunk sources
+# LMDZ_Physics=NPv3.2 for new physics, to be used with LMDZ5/trunk revision 1554 or later
 LMDZ_Physics=AP
 
@@ -16,23 +14,10 @@
 CREATE=ELC-${RESOL_ATM_3D}
 
-# ByPass_hgardfou_teta=y : modify teta_ parameters for following CumulPeriod only
-ByPass_hgardfou_teta=n
-
-# ByPass_hgardfou_mats=y : set parameter purmats=y for following CumulPeriod only
-ByPass_hgardfou_mats=n
-
-# Number of periods where to set parameter adjust=y before switching to adjust=n
-# For adjust=n, set LMDZ_NbPeriod_ajust=0. 
-LMDZ_NbPeriod_adjust=0
-
-# To force usage of specific Bands file, set LMDZ_NbPeriod_adjust=0 and replace XXXXXXX by Restart Job Name
-# LMDZ_Bands_file_name=${ARCHIVE}/IGCM_OUT/IPSLCM5/XXXXXXX/ATM/Debug/XXXXXXX_Bands_96x95x19_3prc.dat_3
-
-# Set ConfType to choose parameters for aerosols, solar and green house gazes. 
+# Set ConfType to choose parameters for aerosols, solar and green house gazes.
 # The parameter file PARAM/config.def_$ConfType will be used.
 # ConfType=preind/actuel/annuel
 ConfType=actuel
 
-# manage radiative aerosol effect and ozone 
+# Manage radiative aerosol effect and ozone
 flag_aerosol=6
 ok_ade=y
@@ -42,16 +27,29 @@
 ok_cdnc=y
 
-# Set OutLevel to choose the level of output files from LMDZ. The file PARAM/output.def_$OutLevel will be used.
+# ByPass_hgardfou_teta=y : modify teta_ parameters for following CumulPeriod only
+ByPass_hgardfou_teta=n
+
+# ByPass_hgardfou_mats=y : set parameter purmats=y for following CumulPeriod only
+ByPass_hgardfou_mats=n
+
+# Number of periods where to set parameter adjust=y before switching to adjust=n
+# For adjust=n, set LMDZ_NbPeriod_ajust=0.
+LMDZ_NbPeriod_adjust=0
+
+# To force usage of specific Bands file, set LMDZ_NbPeriod_adjust=0 and replace XXXXXXX by Restart experiment
+# LMDZ_Bands_file_name=${ARCHIVE}/IGCM_OUT/IPSLCM5A/DEVT/pdControl/XXXXXX/ATM/Debug/pdControl_XXXXXXX_Bands_96x95x19_3prc.dat_3
+
+# Set OutLevel to choose the level of output for LMDZ. 
 # OutLevel=low/medium/high
 OutLevel=low
 
-# Set COSP activation and Outputs frequency (monthly, daily, HF) = y/n
+# COSP activation and choose of output frequency for COSP (monthly, daily, HF) = y/n
 LMDZ_COSP_OK=n
-LMDZ_COSP_monthly=y
+LMDZ_COSP_monthly=n
 LMDZ_COSP_daily=n
 LMDZ_COSP_hf=n
 
-# Set NMC Outputs frequency (monthly, daily, HF) = y/n
-LMDZ_NMC_monthly=n
+# Set NMC output frequency (monthly, daily, HF) = y/n
+LMDZ_NMC_monthly=y
 LMDZ_NMC_daily=n
 LMDZ_NMC_hf=n
@@ -61,5 +59,4 @@
 ok_guide=n
 
-
 [InitialStateFiles]
 List=	(${ARCHIVE}/IGCM_OUT/LMDZ/${CREATE}/ATM/Output/Restart/${CREATE}_clim_start.nc,    start.nc),\
@@ -68,10 +65,4 @@
 [BoundaryFiles]
 List=()
-#List=
-#      (/dmnfs/cont003/p86ghatt/IGCM_OUT/LMDZOR/NUDGING-CORDEX-AFR/${year}${month}/u.nc, u.nc),\
-#      (/dmnfs/cont003/p86ghatt/IGCM_OUT/LMDZOR/NUDGING-CORDEX-AFR/${year}${month}/v.nc, v.nc)
-
-# With AR5 aerosols (including ASSO4M(=SO4), CSSO4M, AIBCM, ASBCM, AIPOMM, ASPOMM, ASSSM, CSSSM, SSSSM, CIDUSTM)
-# With AR5 ozone(tropo + strato from LMDZOR-INCA-REPROBUS simulations)
 ListNonDel= (${ARCHIVE}/IGCM_OUT/LMDZ/${CREATE}/ATM/Output/Boundary/${CREATE}_clim_limit.nc, limit.nc),\
             (${ARCHIVE}/IGCM_OUT/LMDZ/${CREATE}/ATM/Output/Boundary/${CREATE}_climoz_LMDZ.nc, climoz_LMDZ.nc),\
@@ -80,61 +71,58 @@
 
 [SmoothFiles]
-# With AR5 aerosols (including ASSO4M(=SO4), CSSO4M, AIBCM, ASBCM, AIPOMM, ASPOMM, ASSSM, CSSSM, SSSSM, CIDUSTM)
-# With AR5 ozone(tropo + strato from LMDZOR-INCA-REPROBUS simulations)
 List=()
 
 [ParametersFiles]
-List=	(${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
-	(${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),    \
-	(${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),    \
-	(${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),    \
-	(${SUBMIT_DIR}/PARAM/output.def_${OutLevel},  output.def),    \
-	(${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),    \
-	(${SUBMIT_DIR}/PARAM/guide.def, .), \
-	(${SUBMIT_DIR}/PARAM/run.def, .), \
-	(${SUBMIT_DIR}/PARAM/traceur.def, .), \
-	(${SUBMIT_DIR}/PARAM/iodef.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . )            ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . )          ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histday_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhf_lmdz.xml, . )    ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histins_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histLES_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstn_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayNMC_lmdz.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfNMC_lmdz.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayCOSP_lmdz.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfCOSP_lmdz.xml, . )
+List=   (${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
+        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),          \
+        (${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),          \
+        (${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),          \
+        (${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),          \
+        (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \
+        (${SUBMIT_DIR}/PARAM/run.def, .),                                   \
+        (${SUBMIT_DIR}/PARAM/traceur.def, .),                               \
+        (${SUBMIT_DIR}/PARAM/iodef.xml, . ),                                \
+        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histmthCOSP_lmdz.xml, .),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histmthNMC_lmdz.xml, . ),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histday_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histdayCOSP_lmdz.xml, .),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histdayNMC_lmdz.xml, . ),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histhf_lmdz.xml, . ),                 \
+        (${SUBMIT_DIR}/PARAM/file_def_histhfCOSP_lmdz.xml, .),              \
+        (${SUBMIT_DIR}/PARAM/file_def_histhfNMC_lmdz.xml, . ),              \
+        (${SUBMIT_DIR}/PARAM/file_def_histstn_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histins_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histLES_lmdz.xml, . ),                \
+        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \
+        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . )
 
 [RestartFiles]
-List=	(restart.nc, restart.nc, start.nc), \
-	(restartphy.nc, restartphy.nc,  startphy.nc)
+List=   (restart.nc, restart.nc, start.nc), \
+        (restartphy.nc, restartphy.nc,  startphy.nc)
 
 [OutputText]
-List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, output.def, used_*, iodef.xml, context_lmdz.xml,field_def_lmdz.xml)
+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, file_def_*lmdz.xml, debug.01, lmdz.prt)
 
 [OutputFiles]
-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,  Post_1M_histmthCOSP), \
-	(histmthNMC.nc,   ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmthNMC.nc,   Post_1M_histmthNMC),  \
-	(dynzon.nc,       ${R_OUT_ATM_O_M}/${PREFIX}_1M_dynzon.nc,       Post_1M_dynzon),      \
-	(histday.nc,      ${R_OUT_ATM_O_D}/${PREFIX}_1D_histday.nc,      Post_1D_histday),     \
-	(histdayCOSP.nc,  ${R_OUT_ATM_O_D}/${PREFIX}_1D_histdayCOSP.nc,  Post_1D_histdayCOSP), \
-	(histdayNMC.nc,   ${R_OUT_ATM_O_D}/${PREFIX}_1D_histdayNMC.nc,   Post_1D_histdayNMC),  \
-	(histhf.nc,       ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhf.nc,       Post_HF_histhf),      \
-	(histhfCOSP.nc,   ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhfCOSP.nc,   Post_HF_histhfCOSP),  \
-	(histhfNMC.nc,    ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhfNMC.nc,    Post_HF_histhfNMC),   \
-	(histhf3h.nc,     ${R_OUT_ATM_O_H}/${PREFIX}_3H_histhf3h.nc,     Post_3H_histhf3h),    \
-        (histhf3hm.nc,    ${R_OUT_ATM_O_H}/${PREFIX}_3H_histhf3hm.nc,    Post_3H_histhf3hm)
+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),    \
+        (paramLMDZ_phy.nc, ${R_OUT_ATM_O_M}/${PREFIX}_1M_paramLMDZ_phy.nc, Post_1M_paramLMDZ_phy), \
+        (histday.nc,       ${R_OUT_ATM_O_D}/${PREFIX}_1D_histday.nc,       NONE),                  \
+        (histdayCOSP.nc,   ${R_OUT_ATM_O_D}/${PREFIX}_1D_histdayCOSP.nc,   NONE),                  \
+        (histdayNMC.nc,    ${R_OUT_ATM_O_D}/${PREFIX}_1D_histdayNMC.nc,    NONE),                  \
+        (histhf.nc,        ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhf.nc,        NONE),                  \
+        (histhfCOSP.nc,    ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhfCOSP.nc,    NONE),                  \
+        (histhfNMC.nc,     ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhfNMC.nc,     NONE),                  \
+        (histhf3h.nc,      ${R_OUT_ATM_O_H}/${PREFIX}_3H_histhf3h.nc,      NONE),                  \
+        (histhf3hm.nc,     ${R_OUT_ATM_O_H}/${PREFIX}_3H_histhf3hm.nc,     NONE)
 
 [Post_1M_histmth]
 Patches= ()
 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire)
-TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, ftime_th, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, LWupTOA, LWupTOAclr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, mc, nettop, paprs, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl)
-ChunckJob2D = NONE
-TimeSeriesVars3D = (upwd, lwcon, iwcon, temp, theta, ovap, ovapinit, geop, vitu, vitv, vitw, pres, rneb, rnebcon, rhum, ec550aer, concoa, concbc, concso4, concss, concdust, reffclws, reffclwc)
+TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, nettop, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl, swtoaas_ant, swtoacs_ant, swtoacf_ant, swsrfas_ant, swsrfcs_ant, swsrfcf_ant, swtoaas_nat, swtoacs_nat, swtoacf_nat, swsrfas_nat, swsrfcs_nat, swsrfcf_nat, solswai, solswad, swtoacf_zero, swsrfcf_zero)
+ChunckJob2D = 100Y 
+TimeSeriesVars3D = (upwd, lwcon, iwcon, lcc3dcon, lcc3dstra, temp, theta, ovap, ovapinit, geop, vitu, vitv, vitw, pres, rneb, rnebcon, rhum, mc, paprs, scdnc, ec550aer, concoa, concbc, concso4, concss, concdust, reffclws, reffclwc, tnt, dtdyn, dtphy, dtlschr, tntr, tntscpbl, tnhus, dqdyn, dqvdf, tnhusscpbl, dqphy, evu, mcd)
 ChunckJob3D = 100Y
 Seasonal=ON
@@ -142,48 +130,75 @@
 [Post_1M_histmthCOSP]
 Patches = ()
-GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire)
+GatherWithInternal = (lon, lat, pressure2, height, sza, time_counter, time_counter_bounds)
+TimeSeriesVars2D = (cllcalipso, clmcalipso, clhcalipso, cltcalipso, tclisccp, albisccp, ctpisccp)
+ChunckJob2D = OFF
+TimeSeriesVars3D = (clcalipso, clisccp2_c01, clisccp2_c02, clisccp2_c03, clisccp2_c04, clisccp2_c05, clisccp2_c06, clisccp2_c07, parasol_refl)
+ChunckJob3D = OFF
+Seasonal=OFF
+
+[Post_1M_histmthNMC]
+Patches = ()
+GatherWithInternal = (lon, lat, plev, time_counter, time_counter_bounds)
 TimeSeriesVars2D = ()
-ChunckJob2D = NONE 
+ChunckJob2D = NONE
+TimeSeriesVars3D = (ta, tro3, zg, hus, hur, ua, va, wap)
+ChunckJob3D = NONE
+Seasonal=ON
+
+[Post_1M_paramLMDZ_phy]
+Patches=()
+GatherWithInternal = (lon, lat, time_counter, time_counter_bnds)
+TimeSeriesVars2D =(R_ecc,  R_peri, R_incl, solaire, co2_ppm, CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt)
+ChunckJob2D = NONE
 TimeSeriesVars3D = ()
 ChunckJob3D = NONE
 Seasonal=OFF
 
-[Post_1M_histmthNMC]
+[Post_1D_histday]
+Patches= ()
+GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
+TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, precip, pluc, plul, prw, psol, q2m, sens, sicf, slp, soll, sols, snow, SWdnSFC, t2m, t2m_max, t2m_min, topl, tops, tsol, u10m, v10m, wind10m, wind10max)
+ChunckJob2D = 50Y
+TimeSeriesVars3D = (lwcon, iwcon, mc, rhum, rneb, temp, theta, ovap, geop, vitu, vitv, vitw, pres, paprs)
+ChunckJob3D = OFF
+Seasonal=OFF
+
+[Post_1D_histdayCOSP]
+Patches = ()
+GatherWithInternal = (lon, lat, pressure2, height, sza, time_counter, time_counter_bounds)
+TimeSeriesVars2D = (cllcalipso, clmcalipso, clhcalipso, cltcalipso, tclisccp, albisccp, ctpisccp)
+ChunckJob2D = OFF
+TimeSeriesVars3D = (clcalipso, clisccp2_c01, clisccp2_c02, clisccp2_c03, clisccp2_c04, clisccp2_c05, clisccp2_c06, clisccp2_c07, parasol_refl)
+ChunckJob3D = OFF
+Seasonal=OFF
+
+[Post_1D_histdayNMC]
 Patches = ()
 GatherWithInternal = (lon, lat, plev, time_counter, time_counter_bounds)
 TimeSeriesVars2D = ()
 ChunckJob2D = NONE
-TimeSeriesVars3D = (ta, zg, hus, hur, ua, va, wap, psbg, uv, vq, vT, wq, vphi, wT, uxu, vxv, TxT, ozone, ozone_daylight)
-ChunckJob3D = 100Y
-Seasonal=OFF
-
-[Post_1M_dynzon]
-Patches = ()
-GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
-TimeSeriesVars2D = ()
-ChunckJob2D = NONE
-TimeSeriesVars3D = ()
-ChunckJob3D = NONE
-Seasonal=OFF
-
-[Post_1D_histday]
-Patches= ()
-GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
-TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, iwp, lwp, phi500, precip, pluc, plul, prw, psol, rh2m, rh2m_min, rh2m_max, q2m, sens, sicf, slp, soll, sols, LWdnSFC, SWdnSFC, LWupSFCclr,SWupSFC, t2m, t2m_max, t2m_min, topl, tops, tsol, u10m, v10m, wind10m, wind10max, u850, v850, w850, phi850, q850, t850, u700, v700, w700, phi700, q700, t700, u500, v500, w500, phi500, q500, t500, u200, v200, w200, phi200, q200, t200)
-ChunckJob2D = 200Y
-TimeSeriesVars3D = (rhum, temp, theta, ovap, ovapinit, geop, vitu, vitv, vitw, pres)
+TimeSeriesVars3D = (ta, zg, hus, hur, ua, va, wap)
 ChunckJob3D = 10Y
 Seasonal=OFF
 
-[Post_1D_histdayCOSP]
-Patches = ()
-GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire)
-TimeSeriesVars2D = ()
-ChunckJob2D = NONE 
-TimeSeriesVars3D = ()
-ChunckJob3D = NONE
-Seasonal=OFF
-
-[Post_1D_histdayNMC]
+[Post_HF_histhf]
+Patches= ()
+GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
+TimeSeriesVars2D = (cldt, psol, q2m, slp, precip, pluc, plul, t2m, tsol, u10m, v10m)
+ChunckJob2D = 50Y
+TimeSeriesVars3D = (temp, theta, ovap, vitu, vitv)
+ChunckJob3D = OFF
+Seasonal=OFF
+
+[Post_HF_histhfCOSP]
+Patches = ()
+GatherWithInternal = (lon, lat, height, sza, time_counter, time_counter_bounds)
+TimeSeriesVars2D = (cllcalipso, clmcalipso, clhcalipso, cltcalipso)
+ChunckJob2D = OFF
+TimeSeriesVars3D = (clcalipso, parasol_refl, cfad_lidarsr532_c01, cfad_lidarsr532_c02, cfad_lidarsr532_c03, cfad_lidarsr532_c04, cfad_lidarsr532_c05, cfad_lidarsr532_c06, cfad_lidarsr532_c07, cfad_lidarsr532_c08, cfad_lidarsr532_c09, cfad_lidarsr532_c10, cfad_lidarsr532_c11, cfad_lidarsr532_c12, cfad_lidarsr532_c13, cfad_lidarsr532_c14, cfad_lidarsr532_c15)
+ChunckJob3D = OFF
+Seasonal=OFF
+
+[Post_HF_histhfNMC]
 Patches = ()
 GatherWithInternal = (lon, lat, plev, time_counter, time_counter_bounds)
@@ -194,29 +209,11 @@
 Seasonal=OFF
 
-[Post_HF_histhf]
-Patches= ()
-GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
-TimeSeriesVars2D = (cldt, psol, q2m, slp, SWnetOR, SWdownOR, LWdownOR, precip, pluc, plul, t2m, tsol, u10m, v10m, t850, t700, t500, t200, t50, t10, u850, u700, u500, u200, u50, u10, v850, v700, v500, v200, v50, v10, phi850, phi700, phi200, phi50, phi10, w850, w700, w500, w200, w50, w10, q850, q700, q500, q200, q50, q10)
-ChunckJob2D = 50Y
-TimeSeriesVars3D = (temp, theta, ovap, vitu, vitv)
-ChunckJob3D = 10Y
-Seasonal=OFF
-
-[Post_HF_histhfCOSP]
-Patches = ()
-GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire)
-TimeSeriesVars2D = ()
-ChunckJob2D = NONE 
+[Post_3H_histhf3hm]
+Patches= ()
+GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
+TimeSeriesVars2D = (flat, precip, pluc, snow, topl, topl0, SWupTOA, SWupTOAclr, SWdnTOA, SWupSFC, SWupSFCclr, SWdnSFC, SWdnSFCclr, LWupSFC, LWupSFCclr, LWdnSFC, LWdnSFCclr, bils, bils_tke, bils_diss, bils_ec, bils_kinetic, bils_enthalp, bils_latent, sens, cldt, zmax_th)
+ChunckJob2D = OFF
 TimeSeriesVars3D = ()
-ChunckJob3D = NONE
-Seasonal=OFF
-
-[Post_HF_histhfNMC]
-Patches = ()
-GatherWithInternal = (lon, lat, plev, time_counter, time_counter_bounds)
-TimeSeriesVars2D = ()
-ChunckJob2D = NONE
-TimeSeriesVars3D = (ta, zg, hus, hur, ua, va, wap, psbg, uv, vq, vT, wq, vphi, wT, uxu, vxv, TxT)
-ChunckJob3D = 100Y
+ChunckJob3D = OFF
 Seasonal=OFF
 
@@ -224,16 +221,7 @@
 Patches= ()
 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
-TimeSeriesVars2D = (phis, tsol, t2m, q2m, u10m, v10m, psol, topl, bils, cdrh)
-ChunckJob2D = 50Y
+TimeSeriesVars2D = (phis, tsol, t2m, q2m, ustar, u10m, v10m, psol)
+ChunckJob2D = OFF
 TimeSeriesVars3D = ()
 ChunckJob3D = OFF
 Seasonal=OFF
-
-[Post_3H_histhf3hm]
-Patches= ()
-GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
-TimeSeriesVars2D = (precip, flat, sens, LWdnSFC, LWupSFC, SWdnSFC, SWupSFC, pluc, snow, LWdnSFCclr, SWdnSFCclr, LWupSFCclr, cldt)
-ChunckJob2D = 50Y
-TimeSeriesVars3D = ()
-ChunckJob3D = OFF
-Seasonal=OFF
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/clim/COMP/orchidee.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/clim/COMP/orchidee.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/clim/COMP/orchidee.card	(revision 2694)
@@ -9,15 +9,11 @@
 DefSuffix=Choi
 
-sechiba_LEVEL=11
 VEGET_UPDATE=0Y
 LAND_COVER_CHANGE=n
 
-# Use XIOS as output library
-XIOS=y
-
 [InitialStateFiles]
-List=	(${R_IN}/SRF/soils_param.nc,      . ), \
-	(${R_IN}/SRF/routing.nc,          . ), \
-	(${R_BC}/SRF/${config_UserChoices_TagName}/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_2000.nc, PFTmap.nc), \
+List=	(${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, .)
 
@@ -31,35 +27,35 @@
 [ParametersFiles]
 List=	(${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\
+	(${SUBMIT_DIR}/PARAM/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/file_def_orchidee.xml, .)
+	(${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .)
 
 [RestartFiles]
-# List restart that have to be saved/restored each loop (file out, saved, and in) :
 List=	(sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc)
 
 [OutputText]
-List=   (out_orchidee, orchidee.def, used_orchidee.def, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml)
+List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_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_out_2.nc, ${R_OUT_SRF_O_H}/${PREFIX}_HF_sechiba_out_2.nc, Post_HF_sechiba_out_2), \
-        (orchidee_watchout.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_watchout.nc, NONE)
+List=   (sechiba_history.nc,   ${R_OUT_SRF_O_M}/${PREFIX}_1M_sechiba_history.nc, Post_1M_sechiba_history), \
+        (sechiba_out_2.nc,     ${R_OUT_SRF_O_H}/${PREFIX}_HF_sechiba_out_2.nc,   NONE),                    \
+        (orchidee_watchout.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_watchout.nc,        NONE)
 
 [Post_1M_sechiba_history]
-Patches= ()
-GatherWithInternal= (lon, lat, veget, time_counter, time_counter_bounds, Areas, Contfrac)
-TimeSeriesVars2D= (nobiofrac, alb_nir, alb_vis, bqsb, evap, fluxlat, fluxsens, gqsb, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac)
-ChunckJob2D= NONE
-TimeSeriesVars3D= (lai, maxvegetfrac, vegetfrac, CO2FLUX, ptn, nee)
-ChunckJob3D= NONE
-Seasonal= ON
+Patches = ()
+GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds)
+TimeSeriesVars2D = (nobiofrac, alb_nir, alb_vis, evap, fluxlat, fluxsens, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac, TWBR)
+ChunckJob2D = NONE
+TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee)
+ChunckJob3D = NONE
+Seasonal = ON
 
 [Post_HF_sechiba_out_2]
-Patches= ()
-GatherWithInternal= (lon, lat, veget, time_counter, time_counter_bounds, Areas, Contfrac)
-TimeSeriesVars2D= (mrsos, mrro)
-ChunckJob2D= 50Y
-TimeSeriesVars3D= (ptn)
-ChunckJob3D= 10Y
-Seasonal= OFF
+Patches = ()
+GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds)
+TimeSeriesVars2D = (mrsos, mrro)
+ChunckJob2D = 50Y
+TimeSeriesVars3D = (ptn)
+ChunckJob3D = 10Y
+Seasonal = OFF
+
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/clim/COMP/stomate.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/clim/COMP/stomate.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/clim/COMP/stomate.card	(revision 2694)
@@ -3,5 +3,4 @@
 
 [UserChoices]
-stomate_LEVEL=10
 
 [InitialStateFiles]
@@ -10,5 +9,5 @@
 [BoundaryFiles]
 List=	()
-ListNonDel= (${R_BC}/SRF/${config_UserChoices_TagName}/reftemp.nc, .)
+ListNonDel= ()
 
 [SmoothFiles]
@@ -19,5 +18,4 @@
 
 [RestartFiles]
-# List restart that have to be saved/restored each loop (file out, saved, and in) :
 List=	(stomate_rest_out.nc, stomate_rest.nc, stomate_rest_in.nc)
 
@@ -26,6 +24,6 @@
 
 [OutputFiles]
-List=	(stomate_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_history.nc, Post_1M_stomate_history) \
-    (stomate_ipcc_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_ipcc_history.nc, Post_1M_stomate_ipcc_history)
+List=   (stomate_history.nc,      ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_history.nc,      Post_1M_stomate_history),    \
+        (stomate_ipcc_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_ipcc_history.nc, Post_1M_stomate_ipcc_history)
 
 [Post_1M_stomate_history]
@@ -34,5 +32,5 @@
 TimeSeriesVars2D= (T2M_MONTH,CONTFRAC,RESOLUTION_X,RESOLUTION_Y,CONVFLUX,CFLUX_PROD10,CFLUX_PROD100,HARVEST_ABOVE)
 ChunckJob2D = NONE
-TimeSeriesVars3D = (CO2FLUX_MONTHLY,LAI,VEGET,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE)
+TimeSeriesVars3D = (CO2FLUX,LAI,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE)
 ChunckJob3D = NONE
 Seasonal=ON
@@ -46,2 +44,3 @@
 ChunckJob3D = NONE
 Seasonal=ON
+
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/clim/config.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/clim/config.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZOR/clim/config.card	(revision 2694)
@@ -1,5 +1,3 @@
 # $Id$
-# This is config.card file for restart with an NEW libIGCM simulation tree.
-#
 #========================================================================
 #D-- Compatibility -
@@ -9,5 +7,4 @@
 [UserChoices]
 #============================
-#-- (<8 chars MAX for JobName)
 JobName=LMDZOR01
 #----- Short Name of Experiment
@@ -25,11 +22,8 @@
 #-- "YYYY-MM-DD"
 DateBegin=1980-01-01
-DateEnd=1980-01-30
+DateEnd=1980-12-30
 #============================
-#-- 1Y, 1M, 5D, 1D Period Length of one trunk of simulation
-PeriodLength=1M
-#============================
-#-- Total Number of Processors
-JobNumProcTot=32
+#-- 1Y, 1M, 5D, 1D Period Length for one execution
+PeriodLength=1Y
 
 #========================================================================
@@ -37,7 +31,7 @@
 [ListOfComponents]
 #D- For each component, Name of component, Tag of component
-ATM= (lmdz, LMDZ4_AR5)
-SRF= (orchidee, ORCHIDEE_1_9_5)
-SBG= (stomate, ORCHIDEE_1_9_5)
+ATM= (lmdz, LMDZ)
+SRF= (orchidee, ORCHIDEE)
+SBG= (stomate, ORCHIDEE)
 IOS= (xios, XIOS)
 
@@ -45,5 +39,5 @@
 #D-- Executable -
 [Executable]
-#D- For each component, Real name of executable, Name of executable for oasis
+#D- For each component: Real name of executable, Name of executable in the run directory 
 ATM= (gcm.e, lmdz.x, 31MPI, 1OMP)
 SRF= ("", "")
@@ -69,6 +63,5 @@
 #D-- ATM -
 [ATM]
-#
-WriteFrequency="1M 1D HF"
+WriteFrequency="1M"
 # If config_Restarts_OverRule == 'n' next 4 params are read
 Restart=n
@@ -78,11 +71,9 @@
 RestartJobName=LMDZOR01
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZOR/DEVT/amip
-# Old component name for restart (if empty, use new name)
-OldName=
 
 #========================================================================
 #D-- SRF -
 [SRF]
-WriteFrequency="1M HF"
+WriteFrequency="1M"
 # If config_Restarts_OverRule == 'n' next 4 params are read
 Restart=n
@@ -92,6 +83,4 @@
 RestartJobName=EXP00
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZOR/DEVT/amip
-#-- Old component name for restart (if empty, use new name)
-OldName=
 
 #========================================================================
@@ -106,6 +95,4 @@
 RestartJobName=EXP00
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZOR/DEVT/amip
-#-- Old component name for restart (if empty, use new name)
-OldName=
 
 #========================================================================
@@ -120,21 +107,17 @@
 RestartJobName=
 RestartPath=
-# Old component name for restart (if empty, use new name)
-OldName=
 
 #========================================================================
 #D-- Post -
 [Post]
-#D- Do we rebuild parallel output, this flag determines
-#D- frequency of rebuild submission (use NONE for DRYRUN=3)
-RebuildFrequency=1Y
-#D- Do we pack restart and debug txt files, this flag determines
-#D- frequency of pack submission (use NONE for DRYRUN=3)
+#D- RebuildFrequency determines the frequency of rebuild submission
+RebuildFrequency=NONE
+#D- PackFrequency determines the frequency of pack submission
 PackFrequency=1Y
-#D- If you want to produce time series, this flag determines
-#D- frequency of post-processing submission (NONE if you don't want)
+#D- TimeSeriesFreqency determines the frequency of post-processing submission
+#D- Set NONE to deactivate the creation of all time series 
 TimeSeriesFrequency=10Y
-#D- If you want to produce seasonal average, this flag determines
-#D- the period of this average (NONE if you don't want)
+#D- SeasonalFrequency determines the length for each seasonal average
+#D- Set NONE to deactivate the creation of all seasonal avereage
 SeasonalFrequency=10Y
 #D- Offset for seasonal average first start dates ; same unit as SeasonalFrequency
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/COMP/lmdz.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/COMP/lmdz.card	(revision 2694)
@@ -4,7 +4,7 @@
 
 [UserChoices]
-# Physics package to use : 
-# AP for standard/old physics(defalut), can be used with LMDZ4_AR5 or LMDZ5/trunk sources 
-# NPv3.1 for new physics, to be used with LMDZ5/trunk revision 1554 or later
+# Physics package to use :
+# LMDZ_Physics=AP for standard/old physics(defalut), can be used with LMDZ4_AR5 or LMDZ5/trunk sources
+# LMDZ_Physics=NPv3.2 for new physics, to be used with LMDZ5/trunk revision 1554 or later
 LMDZ_Physics=AP
 #LMDZ_Physics=NPv3.1
@@ -24,5 +24,5 @@
 
 # Number of periods where to set parameter adjust=y before switching to adjust=n
-# For adjust=n, set LMDZ_NbPeriod_ajust=0. 
+# For adjust=n, set LMDZ_NbPeriod_ajust=0.
 LMDZ_NbPeriod_adjust=0
 # LMDZ_NbPeriod_adjust=0
@@ -43,9 +43,9 @@
 ok_cdnc=y
 
-# Set OutLevel to choose the level of output files from LMDZ. The file PARAM/output.def_$OutLevel will be used.
+# Set OutLevel to choose the level of output for LMDZ. 
 # OutLevel=low/medium/high
 OutLevel=low
 
-# Set COSP activation and Outputs frequency (monthly, daily, HF) = y/n
+# COSP activation and choose of output frequency for COSP (monthly, daily, HF) = y/n
 LMDZ_COSP_OK=n
 LMDZ_COSP_monthly=n
@@ -82,28 +82,26 @@
 
 [ParametersFiles]
-List=	(${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
-	(${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),    \
-	(${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),    \
-	(${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),    \
-	(${SUBMIT_DIR}/PARAM/output.def_${OutLevel},  output.def),    \
-	(${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),    \
-	(${SUBMIT_DIR}/PARAM/guide.def, .), \
-	(${SUBMIT_DIR}/PARAM/run.def, .), \
-	(${SUBMIT_DIR}/PARAM/traceur.def, .), \
-	(${SUBMIT_DIR}/PARAM/iodef.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . )            ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . )          ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histday_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhf_lmdz.xml, . )    ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histins_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histLES_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstn_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayNMC_lmdz.xml, . ),\
- 	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfNMC_lmdz.xml, . ),\
- 	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, . ),\
- 	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayCOSP_lmdz.xml, . ),\
- 	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfCOSP_lmdz.xml, . )
+List=   (${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
+        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),          \
+        (${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),          \
+        (${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),          \
+        (${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),          \
+        (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \
+        (${SUBMIT_DIR}/PARAM/run.def, .),                                   \
+        (${SUBMIT_DIR}/PARAM/iodef.xml, . ),                                \
+        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histmthCOSP_lmdz.xml, .),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histmthNMC_lmdz.xml, . ),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histday_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histdayCOSP_lmdz.xml, .),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histdayNMC_lmdz.xml, . ),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histhf_lmdz.xml, . ),                 \
+        (${SUBMIT_DIR}/PARAM/file_def_histhfCOSP_lmdz.xml, .),              \
+        (${SUBMIT_DIR}/PARAM/file_def_histhfNMC_lmdz.xml, . ),              \
+        (${SUBMIT_DIR}/PARAM/file_def_histstn_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histins_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histLES_lmdz.xml, . ),                \
+        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \
+        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . )
 
 [RestartFiles]
@@ -112,5 +110,5 @@
 
 [OutputText]
-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)
+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, file_def_*lmdz.xml, debug.01, lmdz.prt)
 
 [OutputFiles]
@@ -120,6 +118,7 @@
 Patches= ()
 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire)
-TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux_ter, taux_sic, taux_lic, taux_oce, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic)
-ChunckJob2D = NONE
-TimeSeriesVars3D = ()
-ChunckJob3D = NONE
+TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, nettop, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl, swtoaas_ant, swtoacs_ant, swtoacf_ant, swsrfas_ant, swsrfcs_ant, swsrfcf_ant, swtoaas_nat, swtoacs_nat, swtoacf_nat, swsrfas_nat, swsrfcs_nat, swsrfcf_nat, solswai, solswad, swtoacf_zero, swsrfcf_zero)
+ChunckJob2D = 100Y
+TimeSeriesVars3D = (upwd, lwcon, iwcon, lcc3dcon, lcc3dstra, temp, theta, ovap, ovapinit, geop, vitu, vitv, vitw, pres, rneb, rnebcon, rhum, mc, paprs, scdnc, ec550aer, concoa, concbc, concso4, concss, concdust, reffclws, reffclwc, tnt, dtdyn, dtphy, dtlschr, tntr, tntscpbl, tnhus, dqdyn, dqvdf, tnhusscpbl, dqphy, evu, mcd)
+ChunckJob3D = 100Y
+Seasonal=ON
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/COMP/orchidee.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/COMP/orchidee.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/COMP/orchidee.card	(revision 2694)
@@ -9,21 +9,12 @@
 DefSuffix=Choi
 
-sechiba_LEVEL=11
 VEGET_UPDATE=0Y
 LAND_COVER_CHANGE=n
 
-# Use XIOS as output library
-XIOS=y
-
 [InitialStateFiles]
-List=	(${R_IN}/SRF/soils_param.nc,      . ), \
-	(${R_IN}/SRF/routing.nc,          . ), \
-	(${R_IN}/SRF/cartepente2d_15min.nc, .), \
-	(${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year}.nc, PFTmap.nc)
-## Pour les annees 2006-2100 suivant le RCP 
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP8.5_MESSAGE/PFTmap_IPCC_${year}.nc, PFTmap.nc)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP4.5_MiniCAM//PFTmap_IPCC_${year}.nc, PFTmap.nc)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP6.0_AIM//PFTmap_IPCC_${year}.nc, PFTmap.nc)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP3-PD_IMAGE//PFTmap_IPCC_${year}.nc, PFTmap.nc)
+List=	(${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, .)
 
 [BoundaryFiles]
@@ -32,44 +23,39 @@
 
 [SmoothFiles]
-List=(${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
-## Pour les annees 2006-2100 suivant le RCP 
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP8.5_MESSAGE/PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP4.5_MiniCAM//PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP6.0_AIM//PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP3-PD_IMAGE//PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
+List= ()
 
 [ParametersFiles]
 List=	(${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\
+	(${SUBMIT_DIR}/PARAM/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/file_def_orchidee.xml, .)
+	(${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .)
 
 [RestartFiles]
-# List restart that have to be saved/restored each loop (file out, saved, and in) :
 List=	(sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc)
 
 [OutputText]
-List=   (out_orchidee, orchidee.def, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml)
+List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_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_out_2.nc, ${R_OUT_SRF_O_H}/${PREFIX}_HF_sechiba_out_2.nc, Post_HF_sechiba_out_2), \
-        (orchidee_watchout.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_watchout.nc, NONE)
+List=   (sechiba_history.nc,   ${R_OUT_SRF_O_M}/${PREFIX}_1M_sechiba_history.nc, Post_1M_sechiba_history), \
+        (sechiba_out_2.nc,     ${R_OUT_SRF_O_H}/${PREFIX}_HF_sechiba_out_2.nc,   NONE),                    \
+        (orchidee_watchout.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_watchout.nc,        NONE)
 
 [Post_1M_sechiba_history]
-Patches= ()
-GatherWithInternal= (lon, lat, veget, time_counter, time_counter_bounds, Areas, Contfrac)
-TimeSeriesVars2D= (nobiofrac, alb_nir, alb_vis, bqsb, evap, fluxlat, fluxsens, gqsb, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac)
-ChunckJob2D= NONE
-TimeSeriesVars3D= (lai, maxvegetfrac, vegetfrac, CO2FLUX, ptn, nee)
-ChunckJob3D= NONE
-Seasonal= ON
+Patches = ()
+GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds)
+TimeSeriesVars2D = (nobiofrac, alb_nir, alb_vis, evap, fluxlat, fluxsens, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac, TWBR)
+ChunckJob2D = NONE
+TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee)
+ChunckJob3D = NONE
+Seasonal = ON
 
 [Post_HF_sechiba_out_2]
-Patches= ()
-GatherWithInternal= (lon, lat, veget, time_counter, time_counter_bounds, Areas, Contfrac)
-TimeSeriesVars2D= (mrsos, mrro)
-ChunckJob2D= 50Y
-TimeSeriesVars3D= (ptn)
-ChunckJob3D= 10Y
-Seasonal= OFF
+Patches = ()
+GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds)
+TimeSeriesVars2D = (mrsos, mrro)
+ChunckJob2D = 50Y
+TimeSeriesVars3D = (ptn)
+ChunckJob3D = 10Y
+Seasonal = OFF
+
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/COMP/stomate.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/COMP/stomate.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/COMP/stomate.card	(revision 2694)
@@ -3,5 +3,4 @@
 
 [UserChoices]
-stomate_LEVEL=10
 
 [InitialStateFiles]
@@ -10,5 +9,5 @@
 [BoundaryFiles]
 List=	()
-ListNonDel= (${R_BC}/SRF/LMDZORINCA/reftemp.nc, .)
+ListNonDel= ()
 
 [SmoothFiles]
@@ -19,5 +18,4 @@
 
 [RestartFiles]
-# List restart that have to be saved/restored each loop (file out, saved, and in) :
 List=	(stomate_rest_out.nc, stomate_rest.nc, stomate_rest_in.nc)
 
@@ -26,6 +24,6 @@
 
 [OutputFiles]
-List=	(stomate_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_history.nc, Post_1M_stomate_history) \
-    (stomate_ipcc_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_ipcc_history.nc, Post_1M_stomate_ipcc_history)
+List=   (stomate_history.nc,      ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_history.nc,      Post_1M_stomate_history),    \
+        (stomate_ipcc_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_ipcc_history.nc, Post_1M_stomate_ipcc_history)
 
 [Post_1M_stomate_history]
@@ -34,5 +32,5 @@
 TimeSeriesVars2D= (T2M_MONTH,CONTFRAC,RESOLUTION_X,RESOLUTION_Y,CONVFLUX,CFLUX_PROD10,CFLUX_PROD100,HARVEST_ABOVE)
 ChunckJob2D = NONE
-TimeSeriesVars3D = (CO2FLUX_MONTHLY,LAI,VEGET,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE)
+TimeSeriesVars3D = (CO2FLUX,LAI,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE)
 ChunckJob3D = NONE
 Seasonal=ON
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/config.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/config.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/config.card	(revision 2694)
@@ -80,5 +80,5 @@
 SeasonalFrequency=NONE
 #D- Offset for seasonal average first start dates ; same unit as SeasonalFrequency
-#D- Usefull if you do not want to consider the first X simulation's years
+#D- Usefull if you do not want to consider the first X simulation s years
 SeasonalFrequencyOffset=0
 
@@ -95,7 +95,4 @@
 RestartJobName=JobName
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZORINCA/NMHC_AER
-# Old component name for restart (if empty, use new name)
-OldName=""
-
 
 #========================================================================
@@ -109,6 +106,4 @@
 RestartJobName=JobName
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZORINCA/NMHC_AER
-#-- Old component name for restart (if empty, use new name)
-OldName=""
 
 #========================================================================
@@ -123,6 +118,4 @@
 RestartJobName=EXP00
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZOR/DEVT/amip
-#-- Old component name for restart (if empty, use new name)
-OldName=
 
 #========================================================================
@@ -136,6 +129,4 @@
 RestartJobName=JobName
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZORINCA/NMHC_AER
-#D-- Old component name for restart (if empty, use new name)
-OldName=""
 
 #========================================================================
@@ -150,6 +141,4 @@
 RestartJobName=
 RestartPath=
-# Old component name for restart (if empty, use new name)
-OldName=
 
 #========================================================================
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/DUST/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/DUST/COMP/lmdz.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/DUST/COMP/lmdz.card	(revision 2694)
@@ -4,7 +4,7 @@
 
 [UserChoices]
-# Physics package to use : 
-# AP for standard/old physics(defalut), can be used with LMDZ4_AR5 or LMDZ5/trunk sources 
-# NPv3.1 for new physics, to be used with LMDZ5/trunk revision 1554 or later
+# Physics package to use :
+# LMDZ_Physics=AP for standard/old physics(defalut), can be used with LMDZ4_AR5 or LMDZ5/trunk sources
+# LMDZ_Physics=NPv3.2 for new physics, to be used with LMDZ5/trunk revision 1554 or later
 LMDZ_Physics=AP
 #LMDZ_Physics=NPv3.1
@@ -24,5 +24,5 @@
 
 # Number of periods where to set parameter adjust=y before switching to adjust=n
-# For adjust=n, set LMDZ_NbPeriod_ajust=0. 
+# For adjust=n, set LMDZ_NbPeriod_ajust=0.
 LMDZ_NbPeriod_adjust=0
 # LMDZ_NbPeriod_adjust=0
@@ -43,9 +43,9 @@
 ok_cdnc=y
 
-# Set OutLevel to choose the level of output files from LMDZ. The file PARAM/output.def_$OutLevel will be used.
+# Set OutLevel to choose the level of output for LMDZ. 
 # OutLevel=low/medium/high
 OutLevel=low
 
-# Set COSP activation and Outputs frequency (monthly, daily, HF) = y/n
+# COSP activation and choose of output frequency for COSP (monthly, daily, HF) = y/n
 LMDZ_COSP_OK=n
 LMDZ_COSP_monthly=n
@@ -79,28 +79,26 @@
 
 [ParametersFiles]
-List=	(${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
-	(${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),    \
-	(${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),    \
-	(${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),    \
-	(${SUBMIT_DIR}/PARAM/output.def_${OutLevel},  output.def),    \
-	(${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),    \
-	(${SUBMIT_DIR}/PARAM/guide.def, .), \
-	(${SUBMIT_DIR}/PARAM/run.def, .), \
-	(${SUBMIT_DIR}/PARAM/traceur.def, .), \
-	(${SUBMIT_DIR}/PARAM/iodef.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . )            ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . )          ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histday_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhf_lmdz.xml, . )    ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histins_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histLES_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstn_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayNMC_lmdz.xml, . ),\
- 	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfNMC_lmdz.xml, . ),\
- 	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, . ),\
- 	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayCOSP_lmdz.xml, . ),\
- 	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfCOSP_lmdz.xml, . )
+List=   (${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
+        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),          \
+        (${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),          \
+        (${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),          \
+        (${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),          \
+        (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \
+        (${SUBMIT_DIR}/PARAM/run.def, .),                                   \
+        (${SUBMIT_DIR}/PARAM/iodef.xml, . ),                                \
+        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histmthCOSP_lmdz.xml, .),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histmthNMC_lmdz.xml, . ),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histday_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histdayCOSP_lmdz.xml, .),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histdayNMC_lmdz.xml, . ),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histhf_lmdz.xml, . ),                 \
+        (${SUBMIT_DIR}/PARAM/file_def_histhfCOSP_lmdz.xml, .),              \
+        (${SUBMIT_DIR}/PARAM/file_def_histhfNMC_lmdz.xml, . ),              \
+        (${SUBMIT_DIR}/PARAM/file_def_histstn_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histins_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histLES_lmdz.xml, . ),                \
+        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \
+        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . )
 
 [RestartFiles]
@@ -109,5 +107,5 @@
 
 [OutputText]
-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)
+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, file_def_*lmdz.xml, debug.01, lmdz.prt)
 
 [OutputFiles]
@@ -117,6 +115,7 @@
 Patches= ()
 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire)
-TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux_ter, taux_sic, taux_lic, taux_oce, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic)
-ChunckJob2D = NONE
-TimeSeriesVars3D = ()
-ChunckJob3D = NONE
+TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, nettop, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl, swtoaas_ant, swtoacs_ant, swtoacf_ant, swsrfas_ant, swsrfcs_ant, swsrfcf_ant, swtoaas_nat, swtoacs_nat, swtoacf_nat, swsrfas_nat, swsrfcs_nat, swsrfcf_nat, solswai, solswad, swtoacf_zero, swsrfcf_zero)
+ChunckJob2D = 100Y
+TimeSeriesVars3D = (upwd, lwcon, iwcon, lcc3dcon, lcc3dstra, temp, theta, ovap, ovapinit, geop, vitu, vitv, vitw, pres, rneb, rnebcon, rhum, mc, paprs, scdnc, ec550aer, concoa, concbc, concso4, concss, concdust, reffclws, reffclwc, tnt, dtdyn, dtphy, dtlschr, tntr, tntscpbl, tnhus, dqdyn, dqvdf, tnhusscpbl, dqphy, evu, mcd)
+ChunckJob3D = 100Y
+Seasonal=ON
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/DUST/COMP/orchidee.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/DUST/COMP/orchidee.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/DUST/COMP/orchidee.card	(revision 2694)
@@ -9,21 +9,12 @@
 DefSuffix=Choi
 
-sechiba_LEVEL=11
 VEGET_UPDATE=0Y
 LAND_COVER_CHANGE=n
 
-# Use XIOS as output library
-XIOS=y
-
 [InitialStateFiles]
-List=	(${R_BC}/SRF/soils_param.nc,      . ), \
-	(${R_BC}/SRF/routing.nc,          . ), \
-	(${R_BC}/SRF/cartepente2d_15min.nc, .), \
-	(${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year}.nc, PFTmap.nc)
-## Pour les annees 2006-2100 suivant le RCP 
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP8.5_MESSAGE/PFTmap_IPCC_${year}.nc, PFTmap.nc)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP4.5_MiniCAM//PFTmap_IPCC_${year}.nc, PFTmap.nc)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP6.0_AIM//PFTmap_IPCC_${year}.nc, PFTmap.nc)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP3-PD_IMAGE//PFTmap_IPCC_${year}.nc, PFTmap.nc)
+List=	(${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, .)
 
 [BoundaryFiles]
@@ -32,44 +23,39 @@
 
 [SmoothFiles]
-List=(${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
-## Pour les annees 2006-2100 suivant le RCP 
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP8.5_MESSAGE/PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP4.5_MiniCAM//PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP6.0_AIM//PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP3-PD_IMAGE//PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
+List= ()
 
 [ParametersFiles]
 List=	(${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\
+	(${SUBMIT_DIR}/PARAM/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/file_def_orchidee.xml, .)
+	(${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .)
 
 [RestartFiles]
-# List restart that have to be saved/restored each loop (file out, saved, and in) :
 List=	(sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc)
 
 [OutputText]
-List=   (out_orchidee, orchidee.def, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml)
+List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_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_out_2.nc, ${R_OUT_SRF_O_H}/${PREFIX}_HF_sechiba_out_2.nc, Post_HF_sechiba_out_2), \
-        (orchidee_watchout.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_watchout.nc, NONE)
+List=   (sechiba_history.nc,   ${R_OUT_SRF_O_M}/${PREFIX}_1M_sechiba_history.nc, Post_1M_sechiba_history), \
+        (sechiba_out_2.nc,     ${R_OUT_SRF_O_H}/${PREFIX}_HF_sechiba_out_2.nc,   NONE),                    \
+        (orchidee_watchout.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_watchout.nc,        NONE)
 
 [Post_1M_sechiba_history]
-Patches= ()
-GatherWithInternal= (lon, lat, veget, time_counter, time_counter_bounds, Areas, Contfrac)
-TimeSeriesVars2D= (nobiofrac, alb_nir, alb_vis, bqsb, evap, fluxlat, fluxsens, gqsb, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac)
-ChunckJob2D= NONE
-TimeSeriesVars3D= (lai, maxvegetfrac, vegetfrac, CO2FLUX, ptn, nee)
-ChunckJob3D= NONE
-Seasonal= ON
+Patches = ()
+GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds)
+TimeSeriesVars2D = (nobiofrac, alb_nir, alb_vis, evap, fluxlat, fluxsens, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac, TWBR)
+ChunckJob2D = NONE
+TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee)
+ChunckJob3D = NONE
+Seasonal = ON
 
 [Post_HF_sechiba_out_2]
-Patches= ()
-GatherWithInternal= (lon, lat, veget, time_counter, time_counter_bounds, Areas, Contfrac)
-TimeSeriesVars2D= (mrsos, mrro)
-ChunckJob2D= 50Y
-TimeSeriesVars3D= (ptn)
-ChunckJob3D= 10Y
-Seasonal= OFF
+Patches = ()
+GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds)
+TimeSeriesVars2D = (mrsos, mrro)
+ChunckJob2D = 50Y
+TimeSeriesVars3D = (ptn)
+ChunckJob3D = 10Y
+Seasonal = OFF
+
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/DUST/COMP/stomate.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/DUST/COMP/stomate.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/DUST/COMP/stomate.card	(revision 2694)
@@ -3,5 +3,4 @@
 
 [UserChoices]
-stomate_LEVEL=10
 
 [InitialStateFiles]
@@ -10,5 +9,5 @@
 [BoundaryFiles]
 List=	()
-ListNonDel= (${R_BC}/SRF/LMDZORINCA/reftemp.nc, .)
+ListNonDel= ()
 
 [SmoothFiles]
@@ -19,5 +18,4 @@
 
 [RestartFiles]
-# List restart that have to be saved/restored each loop (file out, saved, and in) :
 List=	(stomate_rest_out.nc, stomate_rest.nc, stomate_rest_in.nc)
 
@@ -26,6 +24,6 @@
 
 [OutputFiles]
-List=	(stomate_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_history.nc, Post_1M_stomate_history) \
-    (stomate_ipcc_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_ipcc_history.nc, Post_1M_stomate_ipcc_history)
+List=   (stomate_history.nc,      ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_history.nc,      Post_1M_stomate_history),    \
+        (stomate_ipcc_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_ipcc_history.nc, Post_1M_stomate_ipcc_history)
 
 [Post_1M_stomate_history]
@@ -34,5 +32,5 @@
 TimeSeriesVars2D= (T2M_MONTH,CONTFRAC,RESOLUTION_X,RESOLUTION_Y,CONVFLUX,CFLUX_PROD10,CFLUX_PROD100,HARVEST_ABOVE)
 ChunckJob2D = NONE
-TimeSeriesVars3D = (CO2FLUX_MONTHLY,LAI,VEGET,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE)
+TimeSeriesVars3D = (CO2FLUX,LAI,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE)
 ChunckJob3D = NONE
 Seasonal=ON
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/DUST/config.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/DUST/config.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/DUST/config.card	(revision 2694)
@@ -80,5 +80,5 @@
 SeasonalFrequency=NONE
 #D- Offset for seasonal average first start dates ; same unit as SeasonalFrequency
-#D- Usefull if you do not want to consider the first X simulation's years
+#D- Usefull if you do not want to consider the first X simulation s years
 SeasonalFrequencyOffset=0
 
@@ -95,7 +95,4 @@
 RestartJobName=JobName
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZORINCA/NMHC_AER
-# Old component name for restart (if empty, use new name)
-OldName=""
-
 
 #========================================================================
@@ -109,6 +106,4 @@
 RestartJobName=JobName
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZORINCA/NMHC_AER
-#-- Old component name for restart (if empty, use new name)
-OldName=""
 
 #========================================================================
@@ -123,6 +118,4 @@
 RestartJobName=EXP00
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZOR/DEVT/amip
-#-- Old component name for restart (if empty, use new name)
-OldName=
 
 #========================================================================
@@ -136,6 +129,4 @@
 RestartJobName=JobName
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZORINCA/NMHC_AER
-#D-- Old component name for restart (if empty, use new name)
-OldName=""
 
 #========================================================================
@@ -150,6 +141,4 @@
 RestartJobName=
 RestartPath=
-# Old component name for restart (if empty, use new name)
-OldName=
 
 #========================================================================
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/GES/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/GES/COMP/lmdz.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/GES/COMP/lmdz.card	(revision 2694)
@@ -4,7 +4,7 @@
 
 [UserChoices]
-# Physics package to use : 
-# AP for standard/old physics(defalut), can be used with LMDZ4_AR5 or LMDZ5/trunk sources 
-# NPv3.1 for new physics, to be used with LMDZ5/trunk revision 1554 or later
+# Physics package to use :
+# LMDZ_Physics=AP for standard/old physics(defalut), can be used with LMDZ4_AR5 or LMDZ5/trunk sources
+# LMDZ_Physics=NPv3.2 for new physics, to be used with LMDZ5/trunk revision 1554 or later
 LMDZ_Physics=AP
 #LMDZ_Physics=NPv3.1
@@ -43,9 +43,9 @@
 ok_cdnc=y
 
-# Set OutLevel to choose the level of output files from LMDZ. The file PARAM/output.def_$OutLevel will be used.
+# Set OutLevel to choose the level of output for LMDZ. 
 # OutLevel=low/medium/high
 OutLevel=low
 
-# Set COSP activation and Outputs frequency (monthly, daily, HF) = y/n
+# COSP activation and choose of output frequency for COSP (monthly, daily, HF) = y/n
 LMDZ_COSP_OK=n
 LMDZ_COSP_monthly=n
@@ -79,28 +79,26 @@
 
 [ParametersFiles]
-List=	(${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
-	(${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),    \
-	(${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),    \
-	(${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),    \
-	(${SUBMIT_DIR}/PARAM/output.def_${OutLevel},  output.def),    \
-	(${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),    \
-	(${SUBMIT_DIR}/PARAM/guide.def, .), \
-	(${SUBMIT_DIR}/PARAM/run.def, .), \
-	(${SUBMIT_DIR}/PARAM/traceur.def, .), \
-	(${SUBMIT_DIR}/PARAM/iodef.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . )            ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . )          ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histday_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhf_lmdz.xml, . )    ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histins_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histLES_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstn_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayNMC_lmdz.xml, . ),\
- 	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfNMC_lmdz.xml, . ),\
- 	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, . ),\
- 	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayCOSP_lmdz.xml, . ),\
- 	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfCOSP_lmdz.xml, . )
+List=   (${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
+        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),          \
+        (${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),          \
+        (${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),          \
+        (${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),          \
+        (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \
+        (${SUBMIT_DIR}/PARAM/run.def, .),                                   \
+        (${SUBMIT_DIR}/PARAM/iodef.xml, . ),                                \
+        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histmthCOSP_lmdz.xml, .),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histmthNMC_lmdz.xml, . ),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histday_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histdayCOSP_lmdz.xml, .),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histdayNMC_lmdz.xml, . ),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histhf_lmdz.xml, . ),                 \
+        (${SUBMIT_DIR}/PARAM/file_def_histhfCOSP_lmdz.xml, .),              \
+        (${SUBMIT_DIR}/PARAM/file_def_histhfNMC_lmdz.xml, . ),              \
+        (${SUBMIT_DIR}/PARAM/file_def_histstn_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histins_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histLES_lmdz.xml, . ),                \
+        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \
+        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . )
 
 [RestartFiles]
@@ -109,5 +107,5 @@
 
 [OutputText]
-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)
+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, file_def_*lmdz.xml, debug.01, lmdz.prt)
 
 [OutputFiles]
@@ -117,6 +115,7 @@
 Patches= ()
 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire)
-TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux_ter, taux_sic, taux_lic, taux_oce, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic)
-ChunckJob2D = NONE
-TimeSeriesVars3D = ()
-ChunckJob3D = NONE
+TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, nettop, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl, swtoaas_ant, swtoacs_ant, swtoacf_ant, swsrfas_ant, swsrfcs_ant, swsrfcf_ant, swtoaas_nat, swtoacs_nat, swtoacf_nat, swsrfas_nat, swsrfcs_nat, swsrfcf_nat, solswai, solswad, swtoacf_zero, swsrfcf_zero)
+ChunckJob2D = 100Y
+TimeSeriesVars3D = (upwd, lwcon, iwcon, lcc3dcon, lcc3dstra, temp, theta, ovap, ovapinit, geop, vitu, vitv, vitw, pres, rneb, rnebcon, rhum, mc, paprs, scdnc, ec550aer, concoa, concbc, concso4, concss, concdust, reffclws, reffclwc, tnt, dtdyn, dtphy, dtlschr, tntr, tntscpbl, tnhus, dqdyn, dqvdf, tnhusscpbl, dqphy, evu, mcd)
+ChunckJob3D = 100Y
+Seasonal=ON
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/GES/COMP/orchidee.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/GES/COMP/orchidee.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/GES/COMP/orchidee.card	(revision 2694)
@@ -9,21 +9,12 @@
 DefSuffix=Choi
 
-sechiba_LEVEL=11
 VEGET_UPDATE=0Y
 LAND_COVER_CHANGE=n
 
-# Use XIOS as output library
-XIOS=y
-
 [InitialStateFiles]
-List=	(${R_IN}/SRF/soils_param.nc,      . ), \
-	(${R_IN}/SRF/routing.nc,          . ), \
-	(${R_IN}/SRF/cartepente2d_15min.nc, .), \
-	(${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year}.nc, PFTmap.nc)
-## Pour les annees 2006-2100 suivant le RCP 
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP8.5_MESSAGE/PFTmap_IPCC_${year}.nc, PFTmap.nc)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP4.5_MiniCAM//PFTmap_IPCC_${year}.nc, PFTmap.nc)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP6.0_AIM//PFTmap_IPCC_${year}.nc, PFTmap.nc)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP3-PD_IMAGE//PFTmap_IPCC_${year}.nc, PFTmap.nc)
+List=	(${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, .)
 
 [BoundaryFiles]
@@ -32,44 +23,39 @@
 
 [SmoothFiles]
-List=(${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
-## Pour les annees 2006-2100 suivant le RCP 
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP8.5_MESSAGE/PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP4.5_MiniCAM//PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP6.0_AIM//PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP3-PD_IMAGE//PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
+List= ()
 
 [ParametersFiles]
 List=	(${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\
+	(${SUBMIT_DIR}/PARAM/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/file_def_orchidee.xml, .)
+	(${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .)
 
 [RestartFiles]
-# List restart that have to be saved/restored each loop (file out, saved, and in) :
 List=	(sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc)
 
 [OutputText]
-List=   (out_orchidee, orchidee.def, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml)
+List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_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_out_2.nc, ${R_OUT_SRF_O_H}/${PREFIX}_HF_sechiba_out_2.nc, Post_HF_sechiba_out_2), \
-        (orchidee_watchout.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_watchout.nc, NONE)
+List=   (sechiba_history.nc,   ${R_OUT_SRF_O_M}/${PREFIX}_1M_sechiba_history.nc, Post_1M_sechiba_history), \
+        (sechiba_out_2.nc,     ${R_OUT_SRF_O_H}/${PREFIX}_HF_sechiba_out_2.nc,   NONE),                    \
+        (orchidee_watchout.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_watchout.nc,        NONE)
 
 [Post_1M_sechiba_history]
-Patches= ()
-GatherWithInternal= (lon, lat, veget, time_counter, time_counter_bounds, Areas, Contfrac)
-TimeSeriesVars2D= (nobiofrac, alb_nir, alb_vis, bqsb, evap, fluxlat, fluxsens, gqsb, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac)
-ChunckJob2D= NONE
-TimeSeriesVars3D= (lai, maxvegetfrac, vegetfrac, CO2FLUX, ptn, nee)
-ChunckJob3D= NONE
-Seasonal= ON
+Patches = ()
+GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds)
+TimeSeriesVars2D = (nobiofrac, alb_nir, alb_vis, evap, fluxlat, fluxsens, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac, TWBR)
+ChunckJob2D = NONE
+TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee)
+ChunckJob3D = NONE
+Seasonal = ON
 
 [Post_HF_sechiba_out_2]
-Patches= ()
-GatherWithInternal= (lon, lat, veget, time_counter, time_counter_bounds, Areas, Contfrac)
-TimeSeriesVars2D= (mrsos, mrro)
-ChunckJob2D= 50Y
-TimeSeriesVars3D= (ptn)
-ChunckJob3D= 10Y
-Seasonal= OFF
+Patches = ()
+GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds)
+TimeSeriesVars2D = (mrsos, mrro)
+ChunckJob2D = 50Y
+TimeSeriesVars3D = (ptn)
+ChunckJob3D = 10Y
+Seasonal = OFF
+
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/GES/COMP/stomate.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/GES/COMP/stomate.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/GES/COMP/stomate.card	(revision 2694)
@@ -3,5 +3,4 @@
 
 [UserChoices]
-stomate_LEVEL=10
 
 [InitialStateFiles]
@@ -10,5 +9,5 @@
 [BoundaryFiles]
 List=	()
-ListNonDel= (${R_BC}/SRF/LMDZORINCA/reftemp.nc, .)
+ListNonDel= ()
 
 [SmoothFiles]
@@ -19,5 +18,4 @@
 
 [RestartFiles]
-# List restart that have to be saved/restored each loop (file out, saved, and in) :
 List=	(stomate_rest_out.nc, stomate_rest.nc, stomate_rest_in.nc)
 
@@ -26,6 +24,6 @@
 
 [OutputFiles]
-List=	(stomate_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_history.nc, Post_1M_stomate_history) \
-    (stomate_ipcc_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_ipcc_history.nc, Post_1M_stomate_ipcc_history)
+List=   (stomate_history.nc,      ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_history.nc,      Post_1M_stomate_history),    \
+        (stomate_ipcc_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_ipcc_history.nc, Post_1M_stomate_ipcc_history)
 
 [Post_1M_stomate_history]
@@ -34,5 +32,5 @@
 TimeSeriesVars2D= (T2M_MONTH,CONTFRAC,RESOLUTION_X,RESOLUTION_Y,CONVFLUX,CFLUX_PROD10,CFLUX_PROD100,HARVEST_ABOVE)
 ChunckJob2D = NONE
-TimeSeriesVars3D = (CO2FLUX_MONTHLY,LAI,VEGET,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE)
+TimeSeriesVars3D = (CO2FLUX,LAI,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE)
 ChunckJob3D = NONE
 Seasonal=ON
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/GES/config.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/GES/config.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/GES/config.card	(revision 2694)
@@ -80,5 +80,5 @@
 SeasonalFrequency=NONE
 #D- Offset for seasonal average first start dates ; same unit as SeasonalFrequency
-#D- Usefull if you do not want to consider the first X simulation's years
+#D- Usefull if you do not want to consider the first X simulation s years
 SeasonalFrequencyOffset=0
 
@@ -95,6 +95,4 @@
 RestartJobName=JobName
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZORINCA/NMHC_AER
-# Old component name for restart (if empty, use new name)
-OldName=""
 
 
@@ -109,6 +107,4 @@
 RestartJobName=JobName
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZORINCA/NMHC_AER
-#-- Old component name for restart (if empty, use new name)
-OldName=""
 
 #========================================================================
@@ -123,6 +119,4 @@
 RestartJobName=EXP00
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZOR/DEVT/amip
-#-- Old component name for restart (if empty, use new name)
-OldName=
 
 #========================================================================
@@ -136,6 +130,4 @@
 RestartJobName=JobName
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZORINCA/NMHC_AER
-#D-- Old component name for restart (if empty, use new name)
-OldName=""
 
 #========================================================================
@@ -150,6 +142,4 @@
 RestartJobName=
 RestartPath=
-# Old component name for restart (if empty, use new name)
-OldName=
 
 #========================================================================
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/lmdz.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/lmdz.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/lmdz.card	(revision 2694)
@@ -4,9 +4,10 @@
 
 [UserChoices]
-# Physics package to use : 
-# AP for standard/old physics(defalut), can be used with LMDZ4_AR5 or LMDZ5/trunk sources 
-# NPv3.1 for new physics, to be used with LMDZ5/trunk revision 1554 or later
+# Physics package to use :
+# LMDZ_Physics=AP for standard/old physics(defalut), can be used with LMDZ4_AR5 or LMDZ5/trunk sources
+# LMDZ_Physics=NPv3.2 for new physics, to be used with LMDZ5/trunk revision 1554 or later
 LMDZ_Physics=AP
 #LMDZ_Physics=NPv3.1
+#LMDZ_Physics=NPv3.2
 
 # Use XIOS as output library
@@ -23,7 +24,7 @@
 
 # Number of periods where to set parameter adjust=y before switching to adjust=n
-# For adjust=n, set LMDZ_NbPeriod_ajust=0. Need to be zero with OpenMP
+# For adjust=n, set LMDZ_NbPeriod_ajust=0.
 LMDZ_NbPeriod_adjust=0
-# LMDZ_NbPeriod_adjust=3
+# LMDZ_NbPeriod_adjust=0
 # To force usage of this Bands file, put LMDZ_NbPeriod_adjust=0 and replace XXXXXXX by Restart Job Name
 #LMDZ_Bands_file_name=/ccc/store/cont003/dsm/p86cozic/IGCM_OUT/LMDZORINCA/NMHC_AER/L4OI3NA_39_Bands/ATM/Debug/L4OI3NA_39_Bands_Bands_96x95x39_32prc.dat_1
@@ -42,9 +43,9 @@
 ok_cdnc=y
 
-# Set OutLevel to choose the level of output files from LMDZ. The file PARAM/output.def_$OutLevel will be used.
+# Set OutLevel to choose the level of output for LMDZ. 
 # OutLevel=low/medium/high
 OutLevel=low
 
-# Set COSP activation and Outputs frequency (monthly, daily, HF) = y/n
+# COSP activation and choose of output frequency for COSP (monthly, daily, HF) = y/n
 LMDZ_COSP_OK=n
 LMDZ_COSP_monthly=n
@@ -65,6 +66,6 @@
 [InitialStateFiles]
 # start and startphy are the clim files computed with CLIM_CREATE (create_etat0_limit) job
-List= 	(${R_IN}/CHM/INCA${RESOL_CHM}/start.nc	, start.nc	) \
-	(${R_IN}/CHM/INCA${RESOL_CHM}/startphy.nc	, startphy.nc	)
+List= 	(${R_IN}/CHM/INCA${RESOL_CHM}/start_nitrate.nc	, start.nc	) \
+	(${R_IN}/CHM/INCA${RESOL_CHM}/startphy_nitrate.nc	, startphy.nc	)
 
 
@@ -78,28 +79,26 @@
 
 [ParametersFiles]
-List=	(${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
-	(${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),    \
-	(${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),    \
-	(${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),    \
-	(${SUBMIT_DIR}/PARAM/output.def_${OutLevel},  output.def),    \
-	(${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),    \
-	(${SUBMIT_DIR}/PARAM/guide.def, .), \
-	(${SUBMIT_DIR}/PARAM/run.def, .), \
-	(${SUBMIT_DIR}/PARAM/traceur.def, .), \
-	(${SUBMIT_DIR}/PARAM/iodef.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . )            ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . )          ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histday_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhf_lmdz.xml, . )    ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histins_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histLES_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstn_lmdz.xml, . )   ,\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\
-	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayNMC_lmdz.xml, . ),\
- 	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfNMC_lmdz.xml, . ),\
- 	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, . ),\
- 	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayCOSP_lmdz.xml, . ),\
- 	(${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfCOSP_lmdz.xml, . )
+List=   (${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
+        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),          \
+        (${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),          \
+        (${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),          \
+        (${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),          \
+        (${SUBMIT_DIR}/PARAM/guide.def, .),                                 \
+        (${SUBMIT_DIR}/PARAM/run.def, .),                                   \
+        (${SUBMIT_DIR}/PARAM/iodef.xml, . ),                                \
+        (${SUBMIT_DIR}/PARAM/file_def_histmth_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histmthCOSP_lmdz.xml, .),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histmthNMC_lmdz.xml, . ),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histday_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histdayCOSP_lmdz.xml, .),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histdayNMC_lmdz.xml, . ),             \
+        (${SUBMIT_DIR}/PARAM/file_def_histhf_lmdz.xml, . ),                 \
+        (${SUBMIT_DIR}/PARAM/file_def_histhfCOSP_lmdz.xml, .),              \
+        (${SUBMIT_DIR}/PARAM/file_def_histhfNMC_lmdz.xml, . ),              \
+        (${SUBMIT_DIR}/PARAM/file_def_histstn_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histins_lmdz.xml, . ),                \
+        (${SUBMIT_DIR}/PARAM/file_def_histLES_lmdz.xml, . ),                \
+        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \
+        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . )
 
 [RestartFiles]
@@ -108,5 +107,5 @@
 
 [OutputText]
-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)
+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, file_def_*lmdz.xml, debug.01, lmdz.prt)
 
 [OutputFiles]
@@ -116,6 +115,7 @@
 Patches= ()
 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds, aire)
-TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux_ter, taux_sic, taux_lic, taux_oce, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic)
-ChunckJob2D = NONE
-TimeSeriesVars3D = ()
-ChunckJob3D = NONE
+TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, nettop, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl, swtoaas_ant, swtoacs_ant, swtoacf_ant, swsrfas_ant, swsrfcs_ant, swsrfcf_ant, swtoaas_nat, swtoacs_nat, swtoacf_nat, swsrfas_nat, swsrfcs_nat, swsrfcf_nat, solswai, solswad, swtoacf_zero, swsrfcf_zero)
+ChunckJob2D = 100Y
+TimeSeriesVars3D = (upwd, lwcon, iwcon, lcc3dcon, lcc3dstra, temp, theta, ovap, ovapinit, geop, vitu, vitv, vitw, pres, rneb, rnebcon, rhum, mc, paprs, scdnc, ec550aer, concoa, concbc, concso4, concss, concdust, reffclws, reffclwc, tnt, dtdyn, dtphy, dtlschr, tntr, tntscpbl, tnhus, dqdyn, dqvdf, tnhusscpbl, dqphy, evu, mcd)
+ChunckJob3D = 100Y
+Seasonal=ON
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/orchidee.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/orchidee.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/orchidee.card	(revision 2694)
@@ -9,21 +9,12 @@
 DefSuffix=Choi
 
-sechiba_LEVEL=11
 VEGET_UPDATE=0Y
 LAND_COVER_CHANGE=n
 
-# Use XIOS as output library
-XIOS=y
-
 [InitialStateFiles]
-List=	(${R_IN}/SRF/soils_param.nc,      . ), \
-	(${R_IN}/SRF/routing.nc,          . ), \
-	(${R_IN}/SRF/cartepente2d_15min.nc, .), \
-	(${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year}.nc, PFTmap.nc)
-## Pour les annees 2006-2100 suivant le RCP 
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP8.5_MESSAGE/PFTmap_IPCC_${year}.nc, PFTmap.nc)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP4.5_MiniCAM//PFTmap_IPCC_${year}.nc, PFTmap.nc)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP6.0_AIM//PFTmap_IPCC_${year}.nc, PFTmap.nc)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP3-PD_IMAGE//PFTmap_IPCC_${year}.nc, PFTmap.nc)
+List=	(${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, .)
 
 [BoundaryFiles]
@@ -32,44 +23,39 @@
 
 [SmoothFiles]
-List=(${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
-## Pour les annees 2006-2100 suivant le RCP 
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP8.5_MESSAGE/PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP4.5_MiniCAM//PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP6.0_AIM//PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
-#(${R_IN}/SRF/PFTmap_2006to2100_AR5_RCP3-PD_IMAGE//PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
+List= ()
 
 [ParametersFiles]
 List=	(${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\
+	(${SUBMIT_DIR}/PARAM/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/file_def_orchidee.xml, .)
+	(${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .)
 
 [RestartFiles]
-# List restart that have to be saved/restored each loop (file out, saved, and in) :
 List=	(sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc)
 
 [OutputText]
-List=   (out_orchidee, orchidee.def, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml)
+List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_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_out_2.nc, ${R_OUT_SRF_O_H}/${PREFIX}_HF_sechiba_out_2.nc, Post_HF_sechiba_out_2), \
-        (orchidee_watchout.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_watchout.nc, NONE)
+List=   (sechiba_history.nc,   ${R_OUT_SRF_O_M}/${PREFIX}_1M_sechiba_history.nc, Post_1M_sechiba_history), \
+        (sechiba_out_2.nc,     ${R_OUT_SRF_O_H}/${PREFIX}_HF_sechiba_out_2.nc,   NONE),                    \
+        (orchidee_watchout.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_watchout.nc,        NONE)
 
 [Post_1M_sechiba_history]
-Patches= ()
-GatherWithInternal= (lon, lat, veget, time_counter, time_counter_bounds, Areas, Contfrac)
-TimeSeriesVars2D= (nobiofrac, alb_nir, alb_vis, bqsb, evap, fluxlat, fluxsens, gqsb, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac)
-ChunckJob2D= NONE
-TimeSeriesVars3D= (lai, maxvegetfrac, vegetfrac, CO2FLUX, ptn, nee)
-ChunckJob3D= NONE
-Seasonal= ON
+Patches = ()
+GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds)
+TimeSeriesVars2D = (nobiofrac, alb_nir, alb_vis, evap, fluxlat, fluxsens, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage,mrsos, mrso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, treeFrac, grassFrac, cropFrac, baresoilFrac, residualFrac, TWBR)
+ChunckJob2D = NONE
+TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee)
+ChunckJob3D = NONE
+Seasonal = ON
 
 [Post_HF_sechiba_out_2]
-Patches= ()
-GatherWithInternal= (lon, lat, veget, time_counter, time_counter_bounds, Areas, Contfrac)
-TimeSeriesVars2D= (mrsos, mrro)
-ChunckJob2D= 50Y
-TimeSeriesVars3D= (ptn)
-ChunckJob3D= 10Y
-Seasonal= OFF
+Patches = ()
+GatherWithInternal = (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds)
+TimeSeriesVars2D = (mrsos, mrro)
+ChunckJob2D = 50Y
+TimeSeriesVars3D = (ptn)
+ChunckJob3D = 10Y
+Seasonal = OFF
+
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/stomate.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/stomate.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/stomate.card	(revision 2694)
@@ -3,5 +3,4 @@
 
 [UserChoices]
-stomate_LEVEL=10
 
 [InitialStateFiles]
@@ -10,5 +9,5 @@
 [BoundaryFiles]
 List=	()
-ListNonDel= (${R_BC}/SRF/LMDZORINCA/reftemp.nc, .)
+ListNonDel= ()
 
 [SmoothFiles]
@@ -19,5 +18,4 @@
 
 [RestartFiles]
-# List restart that have to be saved/restored each loop (file out, saved, and in) :
 List=	(stomate_rest_out.nc, stomate_rest.nc, stomate_rest_in.nc)
 
@@ -26,6 +24,6 @@
 
 [OutputFiles]
-List=	(stomate_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_history.nc, Post_1M_stomate_history) \
-    (stomate_ipcc_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_ipcc_history.nc, Post_1M_stomate_ipcc_history)
+List=   (stomate_history.nc,      ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_history.nc,      Post_1M_stomate_history),    \
+        (stomate_ipcc_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_ipcc_history.nc, Post_1M_stomate_ipcc_history)
 
 [Post_1M_stomate_history]
@@ -34,5 +32,5 @@
 TimeSeriesVars2D= (T2M_MONTH,CONTFRAC,RESOLUTION_X,RESOLUTION_Y,CONVFLUX,CFLUX_PROD10,CFLUX_PROD100,HARVEST_ABOVE)
 ChunckJob2D = NONE
-TimeSeriesVars3D = (CO2FLUX_MONTHLY,LAI,VEGET,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE)
+TimeSeriesVars3D = (CO2FLUX,LAI,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE)
 ChunckJob3D = NONE
 Seasonal=ON
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/config.card
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/config.card	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/config.card	(revision 2694)
@@ -80,5 +80,5 @@
 SeasonalFrequency=NONE
 #D- Offset for seasonal average first start dates ; same unit as SeasonalFrequency
-#D- Usefull if you do not want to consider the first X simulation's years
+#D- Usefull if you do not want to consider the first X simulation s years
 SeasonalFrequencyOffset=0
 
@@ -95,7 +95,4 @@
 RestartJobName=JobName
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZORINCA/NMHC_AER
-# Old component name for restart (if empty, use new name)
-OldName=""
-
 
 #========================================================================
@@ -109,6 +106,4 @@
 RestartJobName=JobName
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZORINCA/NMHC_AER
-#-- Old component name for restart (if empty, use new name)
-OldName=""
 
 #========================================================================
@@ -123,6 +118,4 @@
 RestartJobName=EXP00
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZOR/DEVT/amip
-#-- Old component name for restart (if empty, use new name)
-OldName=
 
 #========================================================================
@@ -136,6 +129,4 @@
 RestartJobName=JobName
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDZORINCA/NMHC_AER
-#D-- Old component name for restart (if empty, use new name)
-OldName=""
 
 #========================================================================
@@ -150,6 +141,4 @@
 RestartJobName=
 RestartPath=
-# Old component name for restart (if empty, use new name)
-OldName=
 
 #========================================================================
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/lmdz.driver
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/lmdz.driver	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/lmdz.driver	(revision 2694)
@@ -13,20 +13,4 @@
     RESOL_ATM_Y=$( echo ${RESOL_ATM_3D} | awk "-Fx" '{print $2}' )
     RESOL_ATM_XY="${RESOL_ATM_X}x${RESOL_ATM_Y}"
-
-    ##-- Calendar type for LMDZ and create_etat0_limit
-    case ${config_UserChoices_CalendarType} in
-        leap|gregorian)
-            CalendarTypeForLmdz=earth_366d
-	    CalendarTypeForCreate=gregorian;;
-        noleap)
-            CalendarTypeForLmdz=earth_365d
-            CalendarTypeForCreate=${CalendarTypeForLmdz};;
-        360d)
-            CalendarTypeForLmdz=earth_360d
-            CalendarTypeForCreate=${CalendarTypeForLmdz};;
-        *)
-            CalendarTypeForLmdz=earth_360d
-            CalendarTypeForCreate=${CalendarTypeForLmdz}
-    esac
 
     ##- LMDZ physics version
@@ -63,34 +47,34 @@
     ##-- Output frequency purpose ....
     ##--  Initialisation  ....
-    ok_mensuel=n
-    ok_journe=n
-    ok_hf=n
-    ok_hf3h=n
-    ok_hf3hm=n
-    ok_stn=n
+    ok_mensuel=.FALSE.
+    ok_journe=.FALSE.
+    ok_hf=.FALSE.
+    ok_hf3h=.FALSE.
+    ok_hf3hm=.FALSE.
+    ok_stn=.FALSE.
 
     case ${config_UserChoices_PeriodLength} in
-	1Y|1y|1M|1m) ok_mensuel=y ;;
-	5D|5d|1D|1d) ok_journe=y ;;
+	1Y|1y|1M|1m) ok_mensuel=.TRUE. ;;
+	5D|5d|1D|1d) ok_journe=.TRUE. ;;
     esac
 
     for frequency in ${config_ATM_WriteFrequency} ; do
 	case ${frequency} in
-	    1M|1m) ok_mensuel=y ;;
+	    1M|1m) ok_mensuel=.TRUE. ;;
 	esac
 	case ${frequency} in
-	    5D|5d|1D|1d) ok_journe=y ;;
+	    5D|5d|1D|1d) ok_journe=.TRUE. ;;
 	esac
 	case ${frequency} in
-	    HF|hf) ok_hf=y ;;
+	    HF|hf) ok_hf=.TRUE. ;;
 	esac
 	case ${frequency} in 
-	    HF3h|hf3h) ok_hf3h=y ;;
+	    HF3h|hf3h) ok_hf3h=.TRUE. ;;
 	esac
 	case ${frequency} in 
-	    HF3hm|hf3hm) ok_hf3hm=y ;;
+	    HF3hm|hf3hm) ok_hf3hm=.TRUE. ;;
 	esac
 	case ${frequency} in
-	    STN|stn) ok_stn=y ;;
+	    STN|stn) ok_stn=.TRUE. ;;
 	esac
     done
@@ -110,49 +94,52 @@
 
     ##  Read LMDZ_COSP_OK in lmdz.card
-    if [ ! X${lmdz_UserChoices_LMDZ_COSP_OK} = X ] ; then
-	LMDZ_COSP_OK=${lmdz_UserChoices_LMDZ_COSP_OK}
-    else
-	LMDZ_COSP_OK=n
-    fi
-    ##  Read LMDZ_COSP_monthly in lmdz.card
-    if [ ! X${lmdz_UserChoices_LMDZ_COSP_monthly} = X ] ; then
-	LMDZ_COSP_monthly=${lmdz_UserChoices_LMDZ_COSP_monthly}
-    else
-	LMDZ_COSP_monthly=n
-    fi
-    ##  Read LMDZ_COSP_daily in lmdz.card
-    if [ ! X${lmdz_UserChoices_LMDZ_COSP_daily} = X ] ; then
-	LMDZ_COSP_daily=${lmdz_UserChoices_LMDZ_COSP_daily}
-    else
-	LMDZ_COSP_daily=n
-    fi
-    ##  Read LMDZ_COSP_hf in lmdz.card
-    if [ ! X${lmdz_UserChoices_LMDZ_COSP_hf} = X ] ; then
-	LMDZ_COSP_hf=${lmdz_UserChoices_LMDZ_COSP_hf}
-    else
-	LMDZ_COSP_hf=n
-    fi
+    if [ X${lmdz_UserChoices_LMDZ_COSP_OK} = Xy ] ; then
+	##  LMDZ_COSP_OK=y, now read all other COSP variables
+	##  Read LMDZ_COSP_monthly in lmdz.card
+	if [ X${lmdz_UserChoices_LMDZ_COSP_monthly} = Xy ] ; then
+	    LMDZ_COSP_monthly=.TRUE.
+	else
+	    LMDZ_COSP_monthly=.FALSE.
+	fi
+        ##  Read LMDZ_COSP_daily in lmdz.card
+	if [ X${lmdz_UserChoices_LMDZ_COSP_daily} = Xy ] ; then
+	    LMDZ_COSP_daily=.TRUE.
+	else
+	    LMDZ_COSP_daily=.FALSE.
+	fi
+        ##  Read LMDZ_COSP_hf in lmdz.card
+	if [ X${lmdz_UserChoices_LMDZ_COSP_hf} = Xy ] ; then
+	    LMDZ_COSP_hf=.TRUE.
+	else
+	    LMDZ_COSP_hf=.FALSE.
+	fi
+    else
+	# LMDZ_COSP_OK=n : All cosp output are deactivated
+	LMDZ_COSP_monthly=.FALSE.
+	LMDZ_COSP_daily=.FALSE.
+	LMDZ_COSP_hf=.FALSE.
+    fi	
 
     ##  Read LMDZ_NMC_monthly in lmdz.card
-    if [ ! X${lmdz_UserChoices_LMDZ_NMC_monthly} = X ] ; then
-	LMDZ_NMC_monthly=${lmdz_UserChoices_LMDZ_NMC_monthly}
-    else
-	LMDZ_NMC_monthly=n
-    fi
-
+    if [ X${lmdz_UserChoices_LMDZ_NMC_monthly} = Xy ] ; then
+	LMDZ_NMC_monthly=.TRUE.
+    else
+	LMDZ_NMC_monthly=.FALSE.
+    fi
+    
     ## Read LMDZ_NMC_daily in lmdz.card
-    if [ ! X${lmdz_UserChoices_LMDZ_NMC_daily} = X ] ; then
-	LMDZ_NMC_daily=${lmdz_UserChoices_LMDZ_NMC_daily}
-    else
-	LMDZ_NMC_daily=n
+    if [ X${lmdz_UserChoices_LMDZ_NMC_daily} = Xy ] ; then
+	LMDZ_NMC_daily=.TRUE.
+    else
+	LMDZ_NMC_daily=.FALSE.
     fi
     
     ## Read LMDZ_NMC_hf in lmdz.card
-    if [ ! X${lmdz_UserChoices_LMDZ_NMC_hf} = X ] ; then
-	LMDZ_NMC_hf=${lmdz_UserChoices_LMDZ_NMC_hf}
-    else
-	LMDZ_NMC_hf=n
-    fi
-
+    if [ X${lmdz_UserChoices_LMDZ_NMC_hf} = Xy ] ; then
+	LMDZ_NMC_hf=.TRUE.
+    else
+	LMDZ_NMC_hf=.FALSE.
+    fi
+    
 
     IGCM_debug_PopStack "ATM_Initialize"
@@ -164,26 +151,4 @@
     IGCM_debug_PushStack "ATM_Update"
 
-
-    case ${config_UserChoices_PeriodLength} in
-        *Y|*y) 
-               LMDZ_ecrit_ISCCP=30.
-               LMDZ_periodav=30.
-               if [ "${config_UserChoices_CalendarType}" != "360d" ] ; then
-                  echo Do not consider following warning if your running create_etat0_limit :
-                  echo WARNING !!! For lmdz : calendartype in config.card. PeriodLength=1Y allowed only for CalendarType=360d 
-	       fi
-               ;;
-        *)
-               LMDZ_ecrit_ISCCP=${PeriodLengthInDays}.
-               LMDZ_periodav=${PeriodLengthInDays}.
-               ;;
-    esac
-  
-    ##-- Remise ou non a zero de la date initiale de LMDZ pour le fichier run.def
-    if [ ${CumulPeriod} -eq 1 ] ; then
-	RAZ_DATE=1
-    else
-	RAZ_DATE=0
-    fi
 
     ## Algorithme for special treatment for Bands_xxx file
@@ -322,120 +287,46 @@
     ##   COSP daily output for years 1979 and later (mandatory for historical CMIP5 run).
     if ([ X"${lmdz_UserChoices_LMDZ_COSP_daily1979}" = X"y" ] &&  [ ${year} -ge 1979 ]) ; then
-	LMDZ_COSP_daily=y
-    fi
-
-
-    ## output.def parameters
-    #  columns in phys_output_filekeys refer to the filenames given in phys_out_filenames in output.def :  
-    #                                            histmth       histday        histhf    histhf3h   histhf3hm   histstn
-    IGCM_comp_modifyDefFile nonblocker output.def phys_out_filekeys "${ok_mensuel} ${ok_journe}   ${ok_hf}  ${ok_hf3h} ${ok_hf3hm} ${ok_stn}"
-    IGCM_comp_modifyDefFile nonblocker output.def ecrit_ISCCP ${LMDZ_ecrit_ISCCP}
-    IGCM_comp_modifyDefFile nonblocker output.def ok_cosp     ${LMDZ_COSP_OK}
-    IGCM_comp_modifyDefFile nonblocker output.def ok_mensuelCOSP  ${LMDZ_COSP_monthly}
-    IGCM_comp_modifyDefFile nonblocker output.def ok_journeCOSP   ${LMDZ_COSP_daily}
-    IGCM_comp_modifyDefFile nonblocker output.def ok_hfCOSP   ${LMDZ_COSP_hf}
-    IGCM_comp_modifyDefFile nonblocker output.def ok_histNMC  "${LMDZ_NMC_monthly} ${LMDZ_NMC_daily} ${LMDZ_NMC_hf}"
-
-    # XIOS XML definition
-    if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then
-    # Default init : files are desactivated
-	IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth enabled .FALSE. 
-	IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday enabled .FALSE. 
-	IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf enabled .FALSE.
-#	IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h enabled .FALSE.
-#	IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm enabled .FALSE.
-	IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn enabled .FALSE.
-	IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC enabled .FALSE.
-	IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC enabled .FALSE.
-	IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC enabled .FALSE.
-	IGCM_comp_modifyXmlFile force file_def_histmthCOSP_lmdz.xml histmthCOSP enabled .FALSE.
-	IGCM_comp_modifyXmlFile force file_def_histdayCOSP_lmdz.xml histdayCOSP enabled .FALSE.
-	IGCM_comp_modifyXmlFile force file_def_histhfCOSP_lmdz.xml histhfCOSP enabled .FALSE.
-
-    # Default output level : 5
-	IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth output_level 5 
-	IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday output_level 5 
-	IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf output_level 5
-#	IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h output_level 5
-#	IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm output_level 5
-	IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn output_level 5
-	IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC output_level 5
-	IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC output_level 5
-	IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC output_level 5
-        IGCM_comp_modifyXmlFile force file_def_histmthCOSP_lmdz.xml histmthCOSP output_level 5
-        IGCM_comp_modifyXmlFile force file_def_histdayCOSP_lmdz.xml histdayCOSP output_level 5
-        IGCM_comp_modifyXmlFile force file_def_histhfCOSP_lmdz.xml histhfCOSP output_level 5
-     # Filling of XML files 
-	if [ X${ok_mensuel} = Xy ] ; then
-	    IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth enabled .TRUE. 
-	    IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth output_freq 1mo
-	    IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth name histmth
-	fi
-	if [ X${ok_journe} = Xy ] ; then	
-	    IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday enabled .TRUE. 
-	    IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday output_freq 1d
-	    IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday name histday
-	    if [ X${OutLevel} = Xlow ] || [ X${OutLevel} = Xmedium ] ; then
-		IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday output_level 2
-	    fi
-	fi
-	if [ X${ok_hf} = Xy ] ; then
-	    IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf enabled .TRUE. 
-	    IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf output_freq 6h
-	    IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf name histhf
-	    if [ X${OutLevel} = Xlow ] ; then
-		IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf output_level 2
-	    fi
-	fi	
-#	if [ X${ok_hf3h} = Xy ] ; then
-#	    IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h enabled .TRUE. 
-#	    IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h output_freq 3h
-#	    IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h name histhf3h
-#	fi	
-#	if [ X${ok_hf3hm} = Xy ] ; then
-#	    IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm enabled .TRUE. 
-#	    IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm output_freq 3h
-#	    IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm name histhf3hm
-#	fi
-	if [ X${ok_stn} = Xy ] ; then
-	    IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn enabled .TRUE. 
-	    IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn output_freq 1800s
-	    IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn name histstn
-	fi
-	if [ X${LMDZ_NMC_monthly} = Xy ] ; then
-	    IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC enabled .TRUE. 
-	    IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC output_freq 1mo
-	    IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC name histmthNMC
-	fi
-	if [ X${LMDZ_NMC_daily} = Xy ] ; then
-	    IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC enabled .TRUE. 
-	    IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC output_freq 1d
-	    IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC name histdayNMC
-	fi
-	if [ X${LMDZ_NMC_hf} = Xy ] ; then
-	    IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC enabled .TRUE. 
-	    IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC output_freq 6h
-	    IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC name histhfNMC
-	fi
-
-	if [  X${LMDZ_COSP_OK} = Xy ] ; then
-            if [ X${LMDZ_COSP_monthly} = Xy ] ; then
-		IGCM_comp_modifyXmlFile force file_def_histmthCOSP_lmdz.xml histmthCOSP enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_histmthCOSP_lmdz.xml histmthCOSP output_freq 1mo
-		IGCM_comp_modifyXmlFile force file_def_histmthCOSP_lmdz.xml histmthCOSP name histmthCOSP
-	    fi
-	    if [ X${LMDZ_COSP_daily} = Xy ] ; then
-		IGCM_comp_modifyXmlFile force file_def_histdayCOSP_lmdz.xml histdayCOSP enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_histdayCOSP_lmdz.xml histdayCOSP output_freq 1d
-		IGCM_comp_modifyXmlFile force file_def_histdayCOSP_lmdz.xml histdayCOSP name histdayCOSP
-	    fi
-	    if [ X${LMDZ_COSP_hf} = Xy ] ; then
-		IGCM_comp_modifyXmlFile force file_def_histhfCOSP_lmdz.xml histhfCOSP enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_histhfCOSP_lmdz.xml histhfCOSP output_freq 6h
-		IGCM_comp_modifyXmlFile force file_def_histhfCOSP_lmdz.xml histhfCOSP name histhfCOSP
-	    fi
-	fi
-
-    fi
+	LMDZ_COSP_daily=.TRUE.
+    fi
+
+    ## Modifiy 
+    IGCM_comp_modifyXmlFile nonblocker file_def_histmth_lmdz.xml histmth enabled ${ok_mensuel}
+    
+    IGCM_comp_modifyXmlFile nonblocker file_def_histday_lmdz.xml histday enabled ${ok_journe}
+    
+    if [ X${OutLevel} = Xlow ] || [ X${OutLevel} = Xmedium ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_histday_lmdz.xml histday output_level 2
+    else
+	IGCM_comp_modifyXmlFile nonblocker file_def_histday_lmdz.xml histday output_level 5
+    fi
+    
+    IGCM_comp_modifyXmlFile nonblocker file_def_histhf_lmdz.xml histhf enabled ${ok_hf}
+    
+    if [ X${OutLevel} = Xlow ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_histhf_lmdz.xml histhf output_level 5
+    elif [ X${OutLevel} = Xmedium ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_histhf_lmdz.xml histhf output_level 6
+    elif [ X${OutLevel} = Xhigh ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_histhf_lmdz.xml histhf output_level 7
+    fi
+    	
+#       IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h enabled ${ok_hf3h}
+#	IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h output_freq 3h
+#	IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h name histhf3h
+
+#       IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm enabled ${ok_hf3hm}
+#	IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm output_freq 3h
+#	IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm name histhf3hm
+
+    IGCM_comp_modifyXmlFile nonblocker file_def_histstn_lmdz.xml histstn enabled ${ok_stn}
+
+    IGCM_comp_modifyXmlFile nonblocker file_def_histmthNMC_lmdz.xml histmthNMC enabled ${LMDZ_NMC_monthly}
+    IGCM_comp_modifyXmlFile nonblocker file_def_histdayNMC_lmdz.xml histdayNMC enabled ${LMDZ_NMC_daily}
+    IGCM_comp_modifyXmlFile nonblocker file_def_histhfNMC_lmdz.xml histhfNMC enabled ${LMDZ_NMC_hf}
+    
+    IGCM_comp_modifyXmlFile nonblocker file_def_histmthCOSP_lmdz.xml histmthCOSP enabled ${LMDZ_COSP_monthly}
+    IGCM_comp_modifyXmlFile nonblocker file_def_histdayCOSP_lmdz.xml histdayCOSP enabled ${LMDZ_COSP_daily}
+    IGCM_comp_modifyXmlFile nonblocker file_def_histhfCOSP_lmdz.xml histhfCOSP enabled ${LMDZ_COSP_hf}
+        
 
     ## gcm.def parameters : 
@@ -481,17 +372,34 @@
 
     ## run.def parameters
-    IGCM_comp_modifyDefFile blocker run.def dayref   ${InitDay}
-    IGCM_comp_modifyDefFile blocker run.def nday     ${PeriodLengthInDays}
-    IGCM_comp_modifyDefFile blocker run.def raz_date ${RAZ_DATE}
-    IGCM_comp_modifyDefFile blocker run.def periodav ${LMDZ_periodav}
-    IGCM_comp_modifyDefFile nonblocker run.def adjust   ${LMDZ_adjust}
+
+
+    ##-- Remise ou non a zero de la date initiale de LMDZ pour le fichier run.def
+    if [ ${CumulPeriod} -eq 1 ] ; then
+	IGCM_comp_modifyDefFile blocker run.def raz_date  1
+    else
+	IGCM_comp_modifyDefFile blocker run.def raz_date  0
+    fi
+
+    ##-- Calendar type for LMDZ and create_etat0_limit
+    case ${config_UserChoices_CalendarType} in
+        leap|gregorian)
+	    IGCM_comp_modifyDefFile blocker run.def calend  gregorian ;;
+        noleap)
+	    IGCM_comp_modifyDefFile blocker run.def calend  earth_365d ;;
+        360d)
+	    IGCM_comp_modifyDefFile blocker run.def calend  earth_360d ;;
+        *)
+	    IGCM_comp_modifyDefFile blocker run.def calend  earth_360d ;;
+    esac
+
+    IGCM_comp_modifyDefFile blocker run.def dayref    ${InitDay}
+    IGCM_comp_modifyDefFile blocker run.def nday      ${PeriodLengthInDays}
+    IGCM_comp_modifyDefFile nonblocker run.def adjust ${LMDZ_adjust}
 
     # Set anneeref different for gcm and ce0l
-    # Variable calend is different for a run with create_etat0_limit and the gcm
     # Test if executable create_etat0_limit is present and lmdz.x is not present
     if [ -f create_etat0_limit* ] || [ -f ce0l* ] && [ ! -f lmdz.x ] ; then
 	# for case ce0l : always take current year
 	IGCM_comp_modifyDefFile blocker run.def anneeref ${year}
-	IGCM_comp_modifyDefFile blocker run.def calend   ${CalendarTypeForCreate}
 
         # Temporary, set use_filtre_fft=n because we now use dyn3d for ce0l version where fft is not implemented. 
@@ -501,12 +409,4 @@
 	# for case gcm : take first year of simulation
 	IGCM_comp_modifyDefFile blocker run.def anneeref ${InitYear}
-	IGCM_comp_modifyDefFile blocker run.def calend   ${CalendarTypeForLmdz}
-    fi
-
-    # Activate creation of file grilles_gcm.nc only at first period
-    if [ ${CumulPeriod} -eq 1 ] ; then
-	IGCM_comp_modifyDefFile nonblocker run.def grilles_gcm_netcdf y
-    else
-	IGCM_comp_modifyDefFile nonblocker run.def grilles_gcm_netcdf n
     fi
 
@@ -623,18 +523,17 @@
 
     if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then
-    # Add include of LMDZ context in iodef.xml
-    # In iodef.xml add on next line after "COMPONENT CONTEXT"
-    #  <context id="LMDZ" src="./context_lmdz.xml"/>
-	echo '<context id="LMDZ" src="./context_lmdz.xml"/>' > add.tmp
-	cp iodef.xml iodef.xml.tmp
-	sed -e "/COMPONENT CONTEXT/r add.tmp" \
-	    iodef.xml.tmp > iodef.xml
-	rm iodef.xml.tmp add.tmp
+        # Add include of LMDZ context in iodef.xml
+        # In iodef.xml add on next line after "COMPONENT CONTEXT"
+        #  <context id="LMDZ" src="./context_lmdz.xml"/>
+        echo '<context id="LMDZ" src="./context_lmdz.xml"/>' > add.tmp
+        cp iodef.xml iodef.xml.tmp
+        sed -e "/COMPONENT CONTEXT/r add.tmp" iodef.xml.tmp > iodef.xml
+        rm iodef.xml.tmp add.tmp
 
         # Set ok_all_xml=y in run.def
-	IGCM_comp_modifyDefFile nonblocker run.def ok_all_xml y
-    else
-	# Deactivate ok_all_xml in run.def
-	IGCM_comp_modifyDefFile nonblocker run.def ok_all_xml n
+        IGCM_comp_modifyDefFile nonblocker run.def ok_all_xml y
+    else
+        # Deactivate ok_all_xml in run.def
+        IGCM_comp_modifyDefFile nonblocker run.def ok_all_xml n
     fi
     
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/orchidee.driver
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/orchidee.driver	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/orchidee.driver	(revision 2694)
@@ -6,19 +6,11 @@
     IGCM_debug_PushStack "SRF_Initialize"
 
-    RESOL_SRF=ALL
-
-    for frequency in ${config_SRF_WriteFrequency} ; do
-        case ${frequency} in
-            HF|hf) SRF_ok_hf=y ;;
-        esac
-    done
-
     ##- Define variable DefSuffix set in orchidee.card
-    ##  This variable is used in orchidee.card to choose 
-    ##  parameter file(orchidee.def_DefSuffix). 
+    ##  This variable is used in orchidee.card to choose
+    ##  parameter file(orchidee.def_DefSuffix).
     if [ ! X${orchidee_UserChoices_DefSuffix} = X ] ; then
-	DefSuffix=${orchidee_UserChoices_DefSuffix}
+        DefSuffix=${orchidee_UserChoices_DefSuffix}
     else
-	DefSuffix=Choi
+        DefSuffix=Choi
     fi
 
@@ -31,162 +23,93 @@
     IGCM_debug_PushStack "SRF_Update"
 
+    ## 1. Modifications in orchidee.def parameter file
+
     # Activate STOMATE if the compontent SBG=stomate is set in config.card
     if [ X${config_ListOfComponents_SBG} = Xstomate ] ; then
-	IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_OK_STOMATE y
+	# Activate stomate in orchidee.def
+        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_OK_STOMATE y
     else
-	IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_OK_STOMATE n
+	# Deactivate stomate in orchidee.def
+        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_OK_STOMATE n
+	# Deactivate output files for stomate
+	IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 enabled .FALSE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 enabled .FALSE.
     fi
 
-    typeset SECHIBA_WRITE_STEP
-
-    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-	IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .FALSE. 
-	IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba2 enabled .FALSE. 
-	IGCM_comp_modifyDefFile nonblocker orchidee.def XIOS_ORCHIDEE_OK y
+    # Define in orchidee.def if restart file should be used
+    if ( [ ${CumulPeriod} -ne 1 ] || [ "${config_SRF_Restart}" != "n" ] ) ; then
+        IGCM_comp_modifyDefFile blocker orchidee.def SECHIBA_restart_in sechiba_rest_in.nc
     else
-	IGCM_comp_modifyDefFile nonblocker orchidee.def XIOS_ORCHIDEE_OK n
-    fi    
-
-    SRF_WriteFrequency=$( echo ${config_SRF_WriteFrequency} | sed -e 's/\([0-9]*[yYmMdDs]\).*/\1/' ) 
-    case ${SRF_WriteFrequency} in
-	*Y|*y) 
-	    WriteInYears=$( echo ${SRF_WriteFrequency} | awk -F '[yY]' '{print $1}' )
-	    PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | awk -F '[yY]' '{print $1}' )
-	    (( SECHIBA_WRITE_STEP = PeriodLengthInDays * WriteInYears / PeriodLengthInYears * 86400 )) 
-	    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq ${WriteInYears}y
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history 
-	    fi
-	    ;;
-	1M)
-	    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq 1mo
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history 
-	    fi
-	    case ${config_UserChoices_PeriodLength} in
-	    *Y|*y)
-		SECHIBA_WRITE_STEP=-1.
-		;;
-	    *M|*m)
-		SECHIBA_WRITE_STEP=-1.
-		;;
-	    *)
-		(( SECHIBA_WRITE_STEP = $( IGCM_date_DaysInMonth $year $month ) * 86400 ))
-		;;
-	    esac
-	    ;;
-	*M|*m) 
-	    WriteInMonths=$( echo ${SRF_WriteFrequency} | awk -F '[mM]' '{print $1}' )
-	    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq ${WriteInMonths}mo
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history 
-	    fi
-	    case ${config_UserChoices_PeriodLength} in
-	    *Y|*y)
-		PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | awk -F '[yY]' '{print $1}' )
-		(( SECHIBA_WRITE_STEP = PeriodLengthInDays * 86400 / PeriodLengthInYears / 12  ))
-		;;
-	    *M|*m)
-		PeriodLengthInMonths=$( echo ${config_UserChoices_PeriodLength} | awk -F '[mM]' '{print $1}' )
-		(( SECHIBA_WRITE_STEP = PeriodLengthInDays * WriteInMonths  * 86400 / PeriodLengthInMonths  ))
-		;;
-	    *)
-		(( SECHIBA_WRITE_STEP = $( IGCM_date_DaysInMonth $year $month ) * 86400 ))
-		if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-		    IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE. 
-		    IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq ${SECHIBA_WRITE_STEP}s
-		    IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history
-		fi
-		;;
-	    esac
-	    ;;
-	5D|5d) 
-	    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq 5d
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history 
-	    fi
-	    (( SECHIBA_WRITE_STEP = 5 * 86400 )) 
-	    ;;
-	1D|1d) 
-	    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq 1d
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history 
-	    fi
-	    (( SECHIBA_WRITE_STEP = 86400 )) 
-	    ;;
-	*s)
-	    WriteInSeconds=$( echo ${SRF_WriteFrequency} | awk -F '[s]' '{print $1}' )
-	    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq ${WriteInSeconds}s
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history 
-	    fi
-	    (( SECHIBA_WRITE_STEP = WriteInSeconds )) ;;
-	*) 
-	    IGCM_debug_Exit "SRF_Update " ${SRF_WriteFrequency} " invalid WriteFrequency : choose in 1Y, 1M, 5D, 1D." 
-	    IGCM_debug_Verif_Exit ;;
-    esac
-
-#Use of XIOS ouputs only
-
-    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-	(( SECHIBA_WRITE_STEP = 0 ))
-    fi
-    IGCM_comp_modifyDefFile nonblocker orchidee.def WRITE_STEP ${SECHIBA_WRITE_STEP}
-    IGCM_comp_modifyDefFile nonblocker orchidee.def SECHIBA_HISTLEVEL ${orchidee_UserChoices_sechiba_LEVEL}
-
-    # Outputs HF in HISTFILE2 if required
-    if [ X${SRF_ok_hf} = Xy ] ; then
-	IGCM_comp_modifyDefFile nonblocker orchidee.def SECHIBA_HISTFILE2 y
-	if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-	    IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba2 enabled .TRUE. 
-	    IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba2 output_freq 10800s
-	    IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba2 name sechiba_out_2
-	fi
-    else
-	IGCM_comp_modifyDefFile nonblocker orchidee.def SECHIBA_HISTFILE2 n
-    fi
-    IGCM_comp_modifyDefFile nonblocker orchidee.def SECHIBA_HISTLEVEL2 1
-    IGCM_comp_modifyDefFile nonblocker orchidee.def WRITE_STEP2 10800.0
-
-    if ( [ ${CumulPeriod} -ne 1 ] || [ "${config_SRF_Restart}" != "n" ] ) ; then
-	IGCM_comp_modifyDefFile blocker orchidee.def SECHIBA_restart_in sechiba_rest_in.nc
-    else
-	IGCM_comp_modifyDefFile blocker orchidee.def SECHIBA_restart_in NONE
+        IGCM_comp_modifyDefFile blocker orchidee.def SECHIBA_restart_in NONE
     fi
 
-# Modify in orchidee.def VEGET_UPDATE and LAND_COVER_CHANGE if they are set in orchidee.card section UserChoices
+    # Modify in orchidee.def VEGET_UPDATE and LAND_COVER_CHANGE if they are set in orchidee.card section UserChoices
     if [ ! X${orchidee_UserChoices_VEGET_UPDATE} = X ] ; then
-	IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE   ${orchidee_UserChoices_VEGET_UPDATE}
+        IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE   ${orchidee_UserChoices_VEGET_UPDATE}
     else
-	IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE 0Y
+        IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE 0Y
     fi
     if [ ! X${orchidee_UserChoices_LAND_COVER_CHANGE} = X ] ; then
-	IGCM_comp_modifyDefFile nonblocker orchidee.def LAND_COVER_CHANGE ${orchidee_UserChoices_LAND_COVER_CHANGE}
+        IGCM_comp_modifyDefFile nonblocker orchidee.def LAND_COVER_CHANGE ${orchidee_UserChoices_LAND_COVER_CHANGE}
     else
-	IGCM_comp_modifyDefFile nonblocker orchidee.def LAND_COVER_CHANGE n
+        IGCM_comp_modifyDefFile nonblocker orchidee.def LAND_COVER_CHANGE n
     fi
 
-    #IGCM_sys_Cp ${RUN_DIR}/orchidee.def ${RUN_DIR}/run.def
-    #IGCM_sys_Put_Out ${RUN_DIR}/run.def ${R_SAVE}/${PREFIX}_run.def
+    # Activate creation of river description file only for the first period
+    if [ ${CumulPeriod} -eq 1 ] ; then
+        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_DESC y
+    else
+        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_DESC n
+    fi
 
-#Temporary way to fix bug on cimean variable
-    IGCM_comp_modifyXmlFile force field_def_orchidee.xml cimean enabled .FALSE. 
 
-    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
+    ## 2. Mangement of output and modifications of related xml files
+
+    # Set default values for sechiba1_enabled, sechiba1_freq and sechiba2_enabled.
+    sechiba1_enabled=.FALSE.
+    sechiba2_enabled=.FALSE.
+    sechiba1_freq=0s
+
+    # Get WriteFrenquecies from config.card for SECHIBA
+    # Note that it is only possible to have one HF and one other option. 
+    # If more options are set in config.card only the latest will be used.
+    for frequency in ${config_SRF_WriteFrequency} ; do
+	case ${frequency} in
+	    *Y|*y) 
+		NbYears=$( echo ${frequency} | awk -F '[yY]' '{print $1}' )
+		NbDaysYear=$( IGCM_date_DaysInYear ${year} )
+		sechiba1_enabled=.TRUE.
+		sechiba1_freq=${NbYears}y ;;
+	    *M|*m)
+		NbMonths=$( echo ${frequency} | awk -F '[mM]' '{print $1}' )
+		sechiba1_enabled=.TRUE.
+		sechiba1_freq=${NbMonths}mo ;;
+	    *D|*d)
+		NbDays=$( echo ${frequency} | awk -F '[dD]' '{print $1}' )
+		sechiba1_enabled=.TRUE.
+		sechiba1_freq=${NbDays}d ;;
+	    *s)
+		WriteInSeconds=$( echo ${frequency} | awk -F '[s]' '{print $1}' )
+		sechiba1_enabled=.TRUE.
+		sechiba1_freq=${WriteInSeconds}s ;;
+            HF|hf) 
+		sechiba2_enabled=.TRUE. ;;
+	    *) 
+		IGCM_debug_Exit "SRF WriteFrequency=${frequency} is invalid. Choose between xY, xM, xD, xs and HF for Sechiba." ;;
+	esac
+    done
+
+    # Do the modifications in file_def_orchidee.xml
+    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba1 enabled ${sechiba1_enabled}
+    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba1 output_freq ${sechiba1_freq}
+    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba2 enabled ${sechiba2_enabled}
+
     # Add include of orchidee context in iodef.xml
     # In iodef.xml add on next line after "COMPONENT CONTEXT"
     #  <context id="orchidee" src="./context_orchidee.xml"/>
-	echo '<context id="orchidee" src="./context_orchidee.xml"/>' > add.tmp
-	cp iodef.xml iodef.xml.tmp
-	sed -e "/COMPONENT CONTEXT/r add.tmp" \
-	    iodef.xml.tmp > iodef.xml
-	rm iodef.xml.tmp add.tmp
-    fi
+    echo '<context id="orchidee" src="./context_orchidee.xml"/>' > add.tmp
+    cp iodef.xml iodef.xml.tmp
+    sed -e "/COMPONENT CONTEXT/r add.tmp" iodef.xml.tmp > iodef.xml
+    rm iodef.xml.tmp add.tmp
 
     IGCM_debug_PopStack "SRF_Update"
@@ -198,8 +121,4 @@
     IGCM_debug_PushStack "SRF_Finalize"
 
-    #IGCM_sys_Put_Out ${RUN_DIR}/used_run.def ${R_SAVE}/${PREFIX}_used_run.def
-
-    echo FINALIZE SRF !!!
-
     IGCM_debug_PopStack "SRF_Finalize"
 }
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/stomate.driver
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/stomate.driver	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/stomate.driver	(revision 2694)
@@ -1,5 +1,5 @@
 #!/bin/ksh
 
-#D- Driver du script pour ORCHIDEE
+#D- Driver pour ORCHIDEE stomate component
 
 #-----------------------------------------------------------------
@@ -8,6 +8,4 @@
     IGCM_debug_PushStack "SBG_Initialize"
 
-    RESOL_SBG=ALL
-    
     IGCM_debug_PopStack "SBG_Initialize"
 }
@@ -17,131 +15,47 @@
 {
     IGCM_debug_PushStack "SBG_Update"
+    
+    # Output management
 
-    typeset STOMATE_WRITE_STEP
+    # Set default values for stomate output files.
+    stomate_enabled=.FALSE.
+    stomate_freq=0s
 
-    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-	IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .FALSE. 
-	IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .FALSE. 
-    fi   
-    case ${config_SBG_WriteFrequency} in
-	*Y|*y) 
-	    WriteInYears=$( echo ${config_SBG_WriteFrequency} | awk -F '[yY]' '{print $1}' )
-	    PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | awk -F '[yY]' '{print $1}' )
-	    (( STOMATE_WRITE_STEP = PeriodLengthInDays * WriteInYears / PeriodLengthInYears )) 
-	    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq ${WriteInYears}y
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq ${WriteInYears}y
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history 
+    # Read WriteFrequency set in config.card section SBG. 
+    # Only one choice can be set as WriteFrequency. The same choice will be used for 
+    # both stomate_history and stomate_ipcc_history files. 
+    for frequency in ${config_SBG_WriteFrequency} ; do
+	case ${frequency} in
+	    *Y|*y) 
+		NbYears=$( echo ${frequency} | awk -F '[yY]' '{print $1}' )
+		NbDaysYear=$( IGCM_date_DaysInYear ${year} )
+		stomate_enabled=.TRUE.
+		stomate_freq=${NbYears}y ;;
+	    *M|*m) 
+		NbMonths=$( echo ${frequency} | awk -F '[mM]' '{print $1}' )
+		stomate_enabled=.TRUE.
+		stomate_freq=${NbMonths}mo ;;
+	    *D|*d)
+		NbDays=$( echo ${frequency} | awk -F '[dD]' '{print $1}' )
+		stomate_enabled=.TRUE.
+		stomate_freq=${NbDays}d ;;
+	    *) 
+		IGCM_debug_Exit "SBG WriteFrequency=${frequency} is invalid. Choose between xY, xM and xD for Stomate." ;;
+	esac
+    done
 
-	    fi
-	    ;;
-	1M|1m) 
-	    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq 1mo
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq 1mo
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history 
-	    fi
-	    case ${config_UserChoices_PeriodLength} in
-	    *Y|*y)
-		STOMATE_WRITE_STEP=-1.
-		;;
-	    *M|*m)
-		STOMATE_WRITE_STEP=-1.
-		;;
-	    *)
-		(( STOMATE_WRITE_STEP = $( IGCM_date_DaysInMonth $year $month ) )) ;;
-	    esac
-	    ;;
-	*M|*m) 
-	    WriteInMonths=$( echo ${config_SBG_WriteFrequency} | awk -F '[mM]' '{print $1}' )
-	    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq ${WriteInMonths}mo
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq ${WriteInMonths}mo
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history 
-	    fi
-	    case ${config_UserChoices_PeriodLength} in
-	    *Y|*y)
-		PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | awk -F '[yY]' '{print $1}' )
-		(( STOMATE_WRITE_STEP = 30 ))
-		;;
-	    *M|*m)
-		PeriodLengthInMonths=$( echo ${config_UserChoices_PeriodLength} | awk -F '[mM]' '{print $1}' )
-		(( STOMATE_WRITE_STEP = PeriodLengthInDays * WriteInMonths / PeriodLengthInMonths ))
-		;;
-	    *)
-		(( STOMATE_WRITE_STEP = $( IGCM_date_DaysInMonth $year $month ) )) 
-		if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-		    IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE. 
-		    IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq ${STOMATE_WRITE_STEP}s
-		    IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history
-		    IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE. 
-		    IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq ${STOMATE_WRITE_STEP}s
-		    IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history
-		fi
-		;;
-	    esac
-	    ;;
-	5D|5d) 
-	    (( STOMATE_WRITE_STEP = 5 ))
-	    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq 5d
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq 5d
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history 
-	    fi
-	    ;;
-	1D|1d) 
-	    (( STOMATE_WRITE_STEP = 1 )) 
-	    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq 1d
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq 1d
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history 
-	    fi
-	    ;;
-	*s)
-	    WriteInSeconds=$( echo ${config_SBG_WriteFrequency} | awk -F '[s]' '{print $1}' )
-	    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq ${WriteInSeconds}s
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE. 
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq ${WriteInSeconds}s
-		IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history 
-	    fi
-	    (( STOMATE_WRITE_STEP = 1 )) ;;
-	*) 
-	    IGCM_debug_Exit "SBG_Update " ${config_SBG_WriteFrequency} " invalid WriteFrequency : choose in 1Y, 1M, 5D, 1D." 
-	    IGCM_debug_Verif_Exit ;;
-    esac
+    # Modify file_def_orchidee.xml
+    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 enabled ${stomate_enabled}
+    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_freq ${stomate_freq}
+    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 enabled ${stomate_enabled}
+    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_freq ${stomate_freq}
+    
 
-
-#Use of XIOS library only
-
-    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then
-	(( STOMATE_WRITE_STEP = 0 ))
-    fi
-
-    IGCM_comp_modifyDefFile nonblocker orchidee.def STOMATE_HIST_DT ${STOMATE_WRITE_STEP}
-    IGCM_comp_modifyDefFile nonblocker orchidee.def STOMATE_HISTLEVEL ${stomate_UserChoices_stomate_LEVEL}
-
+    # Define in orchidee.def if restart file should be used
     if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then
-	echo "STOMATE : without restart"
-	IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_RESTART_FILEIN NONE
+        echo "STOMATE : without restart"
+        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_RESTART_FILEIN NONE
     else
-	IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_RESTART_FILEIN stomate_rest_in.nc
+        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_RESTART_FILEIN stomate_rest_in.nc
     fi
 
@@ -152,14 +66,6 @@
 function SBG_Finalize
 {
-#set -vx
     IGCM_debug_PushStack "SBG_Finalize"
-
-    if [ $( IGCM_date_DaysBetweenGregorianDate ${PeriodDateEnd} ${year}1230 ) -ge 0 ] ; then
-	IGCM_sys_Put_Out stomate_Cforcing.nc ${R_OUT_SBG_R}/${config_UserChoices_JobName}_${PeriodDateEnd}_stomate_Cforcing.nc
-	IGCM_sys_Put_Out stomate_forcing.nc  ${R_OUT_SBG_R}/${config_UserChoices_JobName}_${PeriodDateEnd}_stomate_forcing.nc
-# 	rm -f stomate_Cforcing.nc
-# 	rm -f stomate_forcing.nc
-    fi
-
+    
     IGCM_debug_PopStack "SBG_Finalize"
 }
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/xios.driver
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/xios.driver	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/xios.driver	(revision 2694)
@@ -18,8 +18,5 @@
 # Activate server mode
     IGCM_comp_modifyXmlFile force iodef.xml using_server NONE true
-# If lmdz_UserChoices_XIOS=y add LMDZ as component id :
-    if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then
-	IGCM_comp_modifyXmlFile force iodef.xml oasis_codes_id NONE LMDZ,oceanx
-    fi 
+
     if [ -f namcouple ] ; then
 	sed -e "s/2  LMDZ oceanx/3 LMDZ oceanx ${config_Executable_IOS[1]}/" namcouple > namcouple.tmp 
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histLES_lmdz.xml
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histLES_lmdz.xml	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histLES_lmdz.xml	(revision 2694)
@@ -0,0 +1,531 @@
+<!-- This file corresponds to the LMDZ5 testing rev 2314. It might not be compatible  -->
+<!-- with older or newer revisions of LMDZ source code.                               -->
+
+<file_definition>
+    <file_group id="defile">
+        <file id="histLES" name="XhistLES" output_freq="1h" output_level="5" enabled=".FALSE.">
+            
+            <!-- VARS 1D -->
+<!--            <field_group operation="once">    -->
+<!--              <field field_ref="Ap" level="1" />    -->
+<!--              <field field_ref="Bp" level="1" />    -->
+<!--              <field field_ref="Alt" level="1" />    -->
+<!--            </field_group>    -->
+        
+            <!-- VARS 2D -->
+            <field_group operation="average" freq_op="1ts">
+                <field field_ref="phis" level="1" />
+                <field field_ref="aire" level="1" operation="once" />
+                <field field_ref="contfracATM" level="10" operation="once" />
+                <field field_ref="contfracOR" level="10" />
+                <field field_ref="aireTER" level="10" />
+                <field field_ref="flat" level="5" />
+                <field field_ref="slp" level="10" />
+                <field field_ref="tsol" level="10" />
+                <field field_ref="t2m" level="10" />
+                <field field_ref="t2m_min" level="10" operation="minimum" />
+                <field field_ref="t2m_max" level="10" operation="maximum" />
+                <field field_ref="t2m_ter" level="10" />
+                <field field_ref="t2m_lic" level="10" />
+                <field field_ref="t2m_oce" level="10" />
+                <field field_ref="t2m_sic" level="10" />
+                <field field_ref="gusts" level="10" />
+                <field field_ref="wind10m" level="10" />
+                <field field_ref="wind10max" level="10" operation="maximum" />
+                <field field_ref="sicf" level="10" />
+                <field field_ref="q2m" level="10" />
+                <field field_ref="ustar" level="10" />
+                <field field_ref="u10m" level="10" />
+                <field field_ref="v10m" level="10" />
+                <field field_ref="psol" level="10" />
+                <field field_ref="qsurf" level="10" />
+                <field field_ref="ustar_ter" level="10" />
+                <field field_ref="ustar_lic" level="10" />
+                <field field_ref="ustar_oce" level="10" />
+                <field field_ref="ustar_sic" level="10" />
+                <field field_ref="wstar_ter" level="10" />
+                <field field_ref="wstar_lic" level="10" />
+                <field field_ref="wstar_oce" level="10" />
+                <field field_ref="wstar_sic" level="10" />
+                <field field_ref="wstar" level="10" />
+                <field field_ref="u10m_ter" level="10" />
+                <field field_ref="u10m_lic" level="10" />
+                <field field_ref="u10m_oce" level="10" />
+                <field field_ref="u10m_sic" level="10" />
+                <field field_ref="v10m_ter" level="10" />
+                <field field_ref="v10m_lic" level="10" />
+                <field field_ref="v10m_oce" level="10" />
+                <field field_ref="v10m_sic" level="10" />
+                <field field_ref="qsol" level="10" />
+                <field field_ref="ndayrain" level="10" operation="instant" />
+                <field field_ref="precip" level="5" />
+                <field field_ref="plul" level="10" />
+                <field field_ref="pluc" level="5" />
+                <field field_ref="snow" level="5" />
+                <field field_ref="evap" level="10" />
+                <field field_ref="evap_ter" level="10" />
+                <field field_ref="evap_lic" level="10" />
+                <field field_ref="evap_oce" level="10" />
+                <field field_ref="evap_sic" level="10" />
+                <field field_ref="msnow" level="10" />
+                <field field_ref="fsnow" level="10" />
+                <field field_ref="tops" level="10" />
+                <field field_ref="tops0" level="10" />
+                <field field_ref="topl" level="10" />
+                <field field_ref="topl0" level="10" />
+                <field field_ref="SWupTOA" level="10" />
+                <field field_ref="SWupTOAclr" level="10" />
+                <field field_ref="SWdnTOA" level="10" />
+                <field field_ref="SWdnTOAclr" level="10" />
+                <field field_ref="nettop" level="10" />
+                <field field_ref="SWup200" level="10" />
+                <field field_ref="SWup200clr" level="10" />
+                <field field_ref="SWdn200" level="10" />
+                <field field_ref="SWdn200clr" level="10" />
+                <field field_ref="LWup200" level="10" />
+                <field field_ref="LWup200clr" level="10" />
+                <field field_ref="LWdn200" level="10" />
+                <field field_ref="LWdn200clr" level="10" />
+                <field field_ref="sols" level="10" />
+                <field field_ref="sols0" level="10" />
+                <field field_ref="soll" level="10" />
+                <field field_ref="soll0" level="10" />
+                <field field_ref="radsol" level="10" />
+                <field field_ref="SWupSFC" level="5" />
+                <field field_ref="SWupSFCclr" level="5" />
+                <field field_ref="SWdnSFC" level="5" />
+                <field field_ref="SWdnSFCclr" level="5" />
+                <field field_ref="LWupSFC" level="5" />
+                <field field_ref="LWupSFCclr" level="5" />
+                <field field_ref="LWdnSFC" level="5" />
+                <field field_ref="LWdnSFCclr" level="5" />
+                <field field_ref="bils" level="10" />
+                <field field_ref="bils_tke" level="10" />
+                <field field_ref="bils_diss" level="10" />
+                <field field_ref="bils_ec" level="10" />
+                <field field_ref="bils_kinetic" level="10" />
+                <field field_ref="bils_enthalp" level="10" />
+                <field field_ref="bils_latent" level="10" />
+                <field field_ref="sens" level="5" />
+                <field field_ref="fder" level="10" />
+                <field field_ref="ffonte" level="10" />
+                <field field_ref="fqcalving" level="10" />
+                <field field_ref="fqfonte" level="10" />
+                <field field_ref="taux" level="10" />
+                <field field_ref="tauy" level="10" />
+                <field field_ref="taux_ter" level="10" />
+                <field field_ref="taux_lic" level="10" />
+                <field field_ref="taux_oce" level="10" />
+                <field field_ref="taux_sic" level="10" />
+                <field field_ref="tauy_ter" level="10" />
+                <field field_ref="tauy_lic" level="10" />
+                <field field_ref="tauy_oce" level="10" />
+                <field field_ref="tauy_sic" level="10" />
+                <field field_ref="pourc_ter" level="10" />
+                <field field_ref="pourc_lic" level="10" />
+                <field field_ref="pourc_oce" level="10" />
+                <field field_ref="pourc_sic" level="10" />
+                <field field_ref="fract_ter" level="10" />
+                <field field_ref="fract_lic" level="10" />
+                <field field_ref="fract_oce" level="10" />
+                <field field_ref="fract_sic" level="10" />
+                <field field_ref="tsol_ter" level="10" />
+                <field field_ref="tsol_lic" level="10" />
+                <field field_ref="tsol_oce" level="10" />
+                <field field_ref="tsol_sic" level="10" />
+                <field field_ref="evappot_ter" level="10" />
+                <field field_ref="evappot_lic" level="10" />
+                <field field_ref="evappot_oce" level="10" />
+                <field field_ref="evappot_sic" level="10" />
+                <field field_ref="sens_ter" level="10" />
+                <field field_ref="sens_lic" level="10" />
+                <field field_ref="sens_oce" level="10" />
+                <field field_ref="sens_sic" level="10" />
+                <field field_ref="lat_ter" level="10" />
+                <field field_ref="lat_lic" level="10" />
+                <field field_ref="lat_oce" level="10" />
+                <field field_ref="lat_sic" level="10" />
+                <field field_ref="flw_ter" level="10" />
+                <field field_ref="flw_lic" level="10" />
+                <field field_ref="flw_oce" level="10" />
+                <field field_ref="flw_sic" level="10" />
+                <field field_ref="fsw_ter" level="10" />
+                <field field_ref="fsw_lic" level="10" />
+                <field field_ref="fsw_oce" level="10" />
+                <field field_ref="fsw_sic" level="10" />
+                <field field_ref="wbils_ter" level="10" />
+                <field field_ref="wbils_lic" level="10" />
+                <field field_ref="wbils_oce" level="10" />
+                <field field_ref="wbils_sic" level="10" />
+                <field field_ref="wbilo_ter" level="10" />
+                <field field_ref="wbilo_lic" level="10" />
+                <field field_ref="wbilo_oce" level="10" />
+                <field field_ref="wbilo_sic" level="10" />
+                <field field_ref="cdrm" level="10" />
+                <field field_ref="cdrh" level="10" />
+                <field field_ref="cldl" level="10" />
+                <field field_ref="cldm" level="10" />
+                <field field_ref="cldh" level="10" />
+                <field field_ref="cldt" level="5" />
+                <field field_ref="cldq" level="10" />
+                <field field_ref="lwp" level="10" />
+                <field field_ref="iwp" level="10" />
+                <field field_ref="ue" level="10" />
+                <field field_ref="ve" level="10" />
+                <field field_ref="uq" level="10" />
+                <field field_ref="vq" level="10" />
+                <field field_ref="cape" level="10" />
+                <field field_ref="pbase" level="10" />
+                <field field_ref="ptop" level="10" />
+                <field field_ref="fbase" level="10" />
+                <field field_ref="plcl" level="10" />
+                <field field_ref="plfc" level="10" />
+                <field field_ref="wbeff" level="10" />
+                <field field_ref="prw" level="10" />
+                <field field_ref="s_pblh" level="10" />
+                <field field_ref="s_pblt" level="10" />
+                <field field_ref="s_lcl" level="10" />
+                <field field_ref="s_therm" level="10" />
+                <field field_ref="slab_bils_oce" level="10" />
+                <field field_ref="ale_bl" level="10" />
+                <field field_ref="alp_bl" level="10" />
+                <field field_ref="ale_wk" level="10" />
+                <field field_ref="alp_wk" level="10" />
+                <field field_ref="ale" level="10" />
+                <field field_ref="alp" level="10" />
+                <field field_ref="cin" level="10" />
+                <field field_ref="wape" level="10" />
+                <field field_ref="n2" level="10" />
+                <field field_ref="s2" level="10" />
+                <field field_ref="proba_notrig" level="10" />
+                <field field_ref="random_notrig" level="10" />
+                <field field_ref="ale_bl_stat" level="10" />
+                <field field_ref="ale_bl_trig" level="10" />
+                <field field_ref="alp_bl_det" level="10" />
+                <field field_ref="alp_bl_fluct_m" level="10" />
+                <field field_ref="alp_bl_fluct_tke" level="10" />
+                <field field_ref="alp_bl_conv" level="10" />
+                <field field_ref="alp_bl_stat" level="10" />
+
+                <field_group operation="average" freq_op="1ts" detect_missing_value=".true.">
+                    <field field_ref="u850" level="10" />
+                    <field field_ref="u700" level="10" />
+                    <field field_ref="u500" level="10" />
+                    <field field_ref="u200" level="10" />
+                    <field field_ref="u100" level="10" />
+                    <field field_ref="u50" level="10" />
+                    <field field_ref="u10" level="10" />
+                    <field field_ref="v850" level="10" />
+                    <field field_ref="v700" level="10" />
+                    <field field_ref="v500" level="10" />
+                    <field field_ref="v200" level="10" />
+                    <field field_ref="v100" level="10" />
+                    <field field_ref="v50" level="10" />
+                    <field field_ref="v10" level="10" />
+                    <field field_ref="w850" level="10" />
+                    <field field_ref="w700" level="10" />
+                    <field field_ref="w500" level="10" />
+                    <field field_ref="w200" level="10" />
+                    <field field_ref="w100" level="10" />
+                    <field field_ref="w50" level="10" />
+                    <field field_ref="w10" level="10" />
+                    <field field_ref="t850" level="10" />
+                    <field field_ref="t700" level="10" />
+                    <field field_ref="t500" level="10" />
+                    <field field_ref="t200" level="10" />
+                    <field field_ref="t100" level="10" />
+                    <field field_ref="t50" level="10" />
+                    <field field_ref="t10" level="10" />
+                    <field field_ref="q850" level="10" />
+                    <field field_ref="q700" level="10" />
+                    <field field_ref="q500" level="10" />
+                    <field field_ref="q200" level="10" />
+                    <field field_ref="q100" level="10" />
+                    <field field_ref="q50" level="10" />
+                    <field field_ref="q10" level="10" />
+                    <field field_ref="z850" level="10" />
+                    <field field_ref="z700" level="10" />
+                    <field field_ref="z500" level="10" />
+                    <field field_ref="z200" level="10" />
+                    <field field_ref="z100" level="10" />
+                    <field field_ref="z50" level="10" />
+                    <field field_ref="z10" level="10" />
+                </field_group>
+
+                <field field_ref="t_oce_sic" level="10" />
+                <field field_ref="weakinv" level="10" />
+                <field field_ref="dthmin" level="10" />
+                <field field_ref="u10_ter" level="10" />
+                <field field_ref="u10_lic" level="10" />
+                <field field_ref="u10_oce" level="10" />
+                <field field_ref="u10_sic" level="10" />
+                <field field_ref="v10_ter" level="10" />
+                <field field_ref="v10_lic" level="10" />
+                <field field_ref="v10_oce" level="10" />
+                <field field_ref="v10_sic" level="10" />
+                <field field_ref="rh2m" level="10" />
+                <field field_ref="rh2m_min" level="10" operation="minimum" />
+                <field field_ref="rh2m_max" level="10" operation="maximum" />
+                <field field_ref="qsat2m" level="10" />
+                <field field_ref="tpot" level="10" />
+                <field field_ref="tpote" level="10" />
+                <field field_ref="tke" level="10" />
+                <field field_ref="tke_ter" level="10" />
+                <field field_ref="tke_lic" level="10" />
+                <field field_ref="tke_oce" level="10" />
+                <field field_ref="tke_sic" level="10" />
+                <field field_ref="tke_max_ter" level="10" operation="maximum" />
+                <field field_ref="tke_max_lic" level="10" operation="maximum" />
+                <field field_ref="tke_max_oce" level="10" operation="maximum" />
+                <field field_ref="tke_max_sic" level="10" operation="maximum" />
+                <field field_ref="SWnetOR" level="10" />
+                <field field_ref="SWdownOR" level="10" />
+                <field field_ref="LWdownOR" level="10" />
+                <field field_ref="snowl" level="10" />
+                <field field_ref="cape_max" level="10" operation="maximum" />
+                <field field_ref="solldown" level="10" />
+                <field field_ref="dtsvdfo" level="10" />
+                <field field_ref="dtsvdft" level="10" />
+                <field field_ref="dtsvdfg" level="10" />
+                <field field_ref="dtsvdfi" level="10" />
+                <field field_ref="rugs" level="10" />
+                <field field_ref="z0m" level="10" />
+                <field field_ref="z0h" level="10" />
+                <field field_ref="topswad" level="10" />
+                <field field_ref="topswad0" level="10" />
+                <field field_ref="topswai" level="10" />
+                <field field_ref="solswad" level="10" />
+                <field field_ref="solswad0" level="10" />
+                <field field_ref="solswai" level="10" />
+                <field field_ref="OD550_ASBCM" level="10" />
+                <field field_ref="OD550_ASPOMM" level="10" />
+                <field field_ref="OD550_ASSO4M" level="10" />
+                <field field_ref="OD550_CSSO4M" level="10" />
+                <field field_ref="OD550_SSSSM" level="10" />
+                <field field_ref="OD550_ASSSM" level="10" />
+                <field field_ref="OD550_CSSSM" level="10" />
+                <field field_ref="OD550_CIDUSTM" level="10" />
+                <field field_ref="OD550_AIBCM" level="10" />
+                <field field_ref="OD550_AIPOMM" level="10" />
+                <field field_ref="OD550_STRAT" level="10" />
+                <field field_ref="od550aer" level="10" />
+                <field field_ref="od865aer" level="10" />
+                <field field_ref="absvisaer" level="10" />
+                <field field_ref="od550lt1aer" level="10" />
+                <field field_ref="sconcso4" level="10" />
+                <field field_ref="sconcoa" level="10" />
+                <field field_ref="sconcbc" level="10" />
+                <field field_ref="sconcss" level="10" />
+                <field field_ref="sconcdust" level="10" />
+                <field field_ref="loadso4" level="10" />
+                <field field_ref="loadoa" level="10" />
+                <field field_ref="loadbc" level="10" />
+                <field field_ref="loadss" level="10" />
+                <field field_ref="loaddust" level="10" />
+                <field field_ref="swtoaas_nat" level="10" />
+                <field field_ref="swsrfas_nat" level="10" />
+                <field field_ref="swtoacs_nat" level="10" />
+                <field field_ref="swsrfcs_nat" level="10" />
+                <field field_ref="swtoaas_ant" level="10" />
+                <field field_ref="swsrfas_ant" level="10" />
+                <field field_ref="swtoacs_ant" level="10" />
+                <field field_ref="swsrfcs_ant" level="10" />
+                <field field_ref="swtoacf_nat" level="10" />
+                <field field_ref="swsrfcf_nat" level="10" />
+                <field field_ref="swtoacf_ant" level="10" />
+                <field field_ref="swsrfcf_ant" level="10" />
+                <field field_ref="swtoacf_zero" level="10" />
+                <field field_ref="swsrfcf_zero" level="10" />
+                <field field_ref="cldncl" level="10" />
+                <field field_ref="reffclwtop" level="10" />
+                <field field_ref="cldnvi" level="10" />
+                <field field_ref="lcc" level="10" />
+                <field field_ref="wvapp" level="10" />
+                <field field_ref="ozone_daylight" level="10" />
+                <field field_ref="albe_ter" level="10" />
+                <field field_ref="albe_lic" level="10" />
+                <field field_ref="albe_oce" level="10" />
+                <field field_ref="albe_sic" level="10" />
+                <field field_ref="ages_ter" level="10" />
+                <field field_ref="ages_lic" level="10" />
+                <field field_ref="ages_oce" level="10" />
+                <field field_ref="ages_sic" level="10" />
+                <field field_ref="snow_ter" level="10" />
+                <field field_ref="snow_lic" level="10" />
+                <field field_ref="snow_oce" level="10" />
+                <field field_ref="snow_sic" level="10" />
+                <field field_ref="rugs_ter" level="10" />
+                <field field_ref="rugs_lic" level="10" />
+                <field field_ref="rugs_oce" level="10" />
+                <field field_ref="rugs_sic" level="10" />
+                <field field_ref="z0m_ter" level="10" />
+                <field field_ref="z0m_lic" level="10" />
+                <field field_ref="z0m_oce" level="10" />
+                <field field_ref="z0m_sic" level="10" />
+                <field field_ref="z0h_ter" level="10" />
+                <field field_ref="z0h_lic" level="10" />
+                <field field_ref="z0h_oce" level="10" />
+                <field field_ref="z0h_sic" level="10" />
+                <field field_ref="alb1" level="10" />
+                <field field_ref="alb2" level="10" />
+                <field field_ref="ftime_con" level="10" operation="instant" />
+                <field field_ref="wake_h" level="10" />
+                <field field_ref="wake_s" level="10" />
+                <field field_ref="plulth" level="10" />
+                <field field_ref="plulst" level="10" />
+                <field field_ref="lmaxth" level="10" />
+                <field field_ref="ftime_th" level="10" />
+                <field field_ref="f0_th" level="10" />
+                <field field_ref="zmax_th" level="10" />
+                <field field_ref="rsut4co2" level="10" />
+                <field field_ref="rlut4co2" level="10" />
+                <field field_ref="rsutcs4co2" level="10" />
+                <field field_ref="rlutcs4co2" level="10" />
+            </field_group>
+
+            <!-- VARS 3D -->
+            <field_group operation="average" freq_op="1ts" axis_ref="presnivs">
+                <field field_ref="cldtau" level="10" />
+                <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" />
+                <field field_ref="concbc" level="10" />
+                <field field_ref="concss" level="10" />
+                <field field_ref="concdust" level="10" />
+                <field field_ref="ec550aer" level="10" />
+                <field field_ref="lwcon" level="10" />
+                <field field_ref="iwcon" level="10" />
+                <field field_ref="temp" level="10" />
+                <field field_ref="theta" level="10" />
+                <field field_ref="ovap" level="10" />
+                <field field_ref="ovapinit" level="10" />
+                <field field_ref="oliq" level="10" />
+                <field field_ref="geop" level="10" />
+                <field field_ref="vitu" level="10" />
+                <field field_ref="vitv" level="10" />
+                <field field_ref="vitw" level="10" />
+                <field field_ref="pres" level="10" />
+                <field field_ref="paprs" level="10" />
+                <field field_ref="mass" level="10" />
+                <field field_ref="zfull" level="10" />
+                <field field_ref="zhalf" level="10" />
+                <field field_ref="rneb" level="10" />
+                <field field_ref="rnebcon" level="10" />
+                <field field_ref="rnebls" level="10" />
+                <field field_ref="rhum" level="10" />
+                <field field_ref="ozone" level="10" />
+                <field field_ref="upwd" level="10" />
+                <field field_ref="dtphy" level="10" />
+                <field field_ref="dqphy" level="10" />
+                <field field_ref="pr_con_l" level="10" />
+                <field field_ref="pr_con_i" level="10" />
+                <field field_ref="pr_lsc_l" level="10" />
+                <field field_ref="pr_lsc_i" level="10" />
+                <field field_ref="re" level="10" />
+                <field field_ref="fl" level="10" />
+                <field field_ref="scdnc" level="10" />
+                <field field_ref="reffclws" level="10" />
+                <field field_ref="reffclwc" level="10" />
+                <field field_ref="lcc3d" level="10" />
+                <field field_ref="lcc3dcon" level="10" />
+                <field field_ref="lcc3dstra" level="10" />
+                <field field_ref="clwcon" level="10" />
+                <field field_ref="Ma" level="10" />
+                <field field_ref="dnwd" level="10" />
+                <field field_ref="dnwd0" level="10" />
+                <field field_ref="mc" level="10" />
+                <field field_ref="dtdyn" level="10" />
+                <field field_ref="dqdyn" level="10" />
+                <field field_ref="dudyn" level="10" />
+                <field field_ref="dvdyn" level="10" />
+                <field field_ref="dtcon" level="10" />
+                <field field_ref="ducon" level="10" />
+                <field field_ref="dvcon" level="10" />
+                <field field_ref="dqcon" level="10" />
+                <field field_ref="dtwak" level="10" />
+                <field field_ref="dqwak" level="10" />
+                <field field_ref="wake_deltat" level="10" />
+                <field field_ref="wake_deltaq" level="10" />
+                <field field_ref="wake_omg" level="10" />
+                <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" />
+                <field field_ref="dtlsc" level="10" />
+                <field field_ref="dtlschr" level="10" />
+                <field field_ref="dqlsc" level="10" />
+                <field field_ref="beta_prec" level="10" />
+                <field field_ref="dtvdf" level="10" />
+                <field field_ref="dtdis" level="10" />
+                <field field_ref="dqvdf" level="10" />
+                <field field_ref="dteva" level="10" />
+                <field field_ref="dqeva" level="10" />
+                <field field_ref="dqlscth" level="10" />
+                <field field_ref="dqlscst" level="10" />
+                <field field_ref="dtlscth" level="10" />
+                <field field_ref="dtlscst" level="10" />
+                <field field_ref="ptconvth" level="10" />
+                <field field_ref="ptconv" level="10" />
+                <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="d_th" level="10" />
+                <field field_ref="dqthe" level="10" />
+                <field field_ref="dtajs" level="10" />
+                <field field_ref="dqajs" level="10" />
+                <field field_ref="dtswr" level="10" />
+                <field field_ref="dtsw0" level="10" />
+                <field field_ref="dtlwr" level="10" />
+                <field field_ref="dtlw0" level="10" />
+                <field field_ref="dtec" level="10" />
+                <field field_ref="duvdf" level="10" />
+                <field field_ref="dvvdf" level="10" />
+                <field field_ref="duoro" level="10" />
+                <field field_ref="dvoro" level="10" />
+                <field field_ref="dulif" level="10" />
+                <field field_ref="dvlif" level="10" />
+                <field field_ref="dtoro" level="10" />
+                <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" />
+                <field field_ref="tntr" level="10" />
+                <field field_ref="tntscpbl" level="10" />
+                <field field_ref="tnhus" level="10" />
+                <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" />
+                <field field_ref="dmc" level="10" />
+                <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_group>
+        </file>
+    </file_group>
+</file_definition>
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histdayCOSP_lmdz.xml
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histdayCOSP_lmdz.xml	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histdayCOSP_lmdz.xml	(revision 2694)
@@ -0,0 +1,80 @@
+<!-- This file corresponds to the LMDZ5 testing rev 2314. It might not be compatible  -->
+<!-- with older or newer revisions of LMDZ source code.                               -->
+
+<file_definition>
+     <file_group id="defile">
+        <file id="histdayCOSP" name="histdayCOSP" output_freq="1d" output_level="5"  enabled="_AUTO_">
+
+            <!-- VARS 2D -->
+            <field_group operation="average" freq_op="3h">
+                <field field_ref="cllcalipso"         level="1" />
+                <field field_ref="clmcalipso"         level="1" />
+                <field field_ref="clhcalipso"         level="1" />
+                <field field_ref="cltcalipso"         level="1" />
+                <field field_ref="clcalipso"  level="1" axis_ref="presnivs" />
+                <field field_ref="parasol_refl"  level="1" axis_ref="sza" />
+                <field field_ref="parasol_crefl"  level="1" axis_ref="sza" />
+                <field field_ref="Ncrefl"  level="1" axis_ref="sza" />
+		<field field_ref="c01_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c02_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c03_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c04_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c05_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c06_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c07_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c08_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c09_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c10_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c11_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c12_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c13_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c14_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c15_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c16_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c17_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c18_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c19_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c20_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+                <field field_ref="c01_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c02_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c03_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c04_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c05_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c06_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c07_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c08_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c09_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c10_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c11_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c12_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c13_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c14_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c15_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c16_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c17_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c18_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c19_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c20_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="beta_mol532" level="10" axis_ref="height_mlev" />
+                <field field_ref="sunlit" level="1" />
+                <field field_ref="c01_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c02_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c03_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c04_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c05_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c06_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c07_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="boxtauisccp" level="10" axis_ref="column" />
+                <field field_ref="boxptopisccp" level="10" axis_ref="column" />
+                <field field_ref="tclisccp" level="1" />
+                <field field_ref="ctpisccp" level="10" />
+                <field field_ref="tauisccp" level="10" /> 
+                <field field_ref="albisccp" level="10" />
+                <field field_ref="meantbisccp" level="10" />
+                <field field_ref="meantbclrisccp" level="10" />
+            </field_group>
+
+        </file>
+     </file_group>
+</file_definition>
+   
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histdayNMC_lmdz.xml
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histdayNMC_lmdz.xml	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histdayNMC_lmdz.xml	(revision 2694)
@@ -0,0 +1,33 @@
+<!-- This file corresponds to the LMDZ5 testing rev 2314. It might not be compatible  -->
+<!-- with older or newer revisions of LMDZ source code.                               -->
+
+<file_definition>
+    <file_group id="defile">
+        <file id="histdayNMC" name="histdayNMC" output_freq="1d" output_level="5" enabled="_AUTO_">
+
+            <!-- VARS 3D -->
+            <field_group operation="average" freq_op="1ts" detect_missing_value=".true.">
+<!--            <field field_ref="tnondef" level="5" /> -->
+                <field field_ref="ta" level="1" />
+                <field field_ref="zg" level="5" />
+                <field field_ref="hus" level="5" />
+                <field field_ref="hur" level="5" />
+                <field field_ref="ua" level="5" />
+                <field field_ref="va" level="5" />
+                <field field_ref="wap" level="5" />
+<!--            <field field_ref="psbg" level="5" /> -->
+                <field field_ref="tro3" level="5" />
+                <field field_ref="tro3_daylight" level="5" />
+                <field field_ref="uv" level="6" />
+                <!-- <field field_ref="vq" level="6" /> -->
+                <field field_ref="vT" level="6" />
+                <field field_ref="wq" level="6" />
+                <field field_ref="vphi" level="6" />
+                <field field_ref="wT" level="6" />
+                <field field_ref="u2" level="6" />
+                <field field_ref="v2" level="6" />
+                <field field_ref="T2" level="6" />
+            </field_group>
+        </file>
+    </file_group>
+</file_definition>
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histday_lmdz.xml
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histday_lmdz.xml	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histday_lmdz.xml	(revision 2694)
@@ -0,0 +1,531 @@
+<!-- This file corresponds to the LMDZ5 testing rev 2314. It might not be compatible  -->
+<!-- with older or newer revisions of LMDZ source code.                               -->
+
+<file_definition>
+    <file_group id="defile">
+        <file id="histday" name="histday" output_freq="1d" output_level="_AUTO_" enabled="_AUTO_">
+            
+            <!-- VARS 1D -->
+<!--            <field_group operation="once">  -->
+<!--              <field field_ref="Ap" level="1" />  -->
+<!--              <field field_ref="Bp" level="1" /> -->
+<!--              <field field_ref="Alt" level="1" /> -->
+<!--            </field_group> -->
+        
+            <!-- VARS 2D -->
+            <field_group operation="average" freq_op="1ts">
+                <field field_ref="phis" level="1" />
+                <field field_ref="aire" level="1" operation="once" />
+                <field field_ref="contfracATM" level="1" operation="once" />
+                <field field_ref="contfracOR" level="1" />
+                <field field_ref="aireTER" level="10" />
+                <field field_ref="flat" level="1" />
+                <field field_ref="slp" level="1" />
+                <field field_ref="tsol" level="1" />
+                <field field_ref="t2m" level="1" />
+                <field field_ref="t2m_min" level="1" operation="minimum" />
+                <field field_ref="t2m_max" level="1" operation="maximum" />
+                <field field_ref="t2m_ter" level="6" />
+                <field field_ref="t2m_lic" level="6" />
+                <field field_ref="t2m_oce" level="6" />
+                <field field_ref="t2m_sic" level="6" />
+                <field field_ref="gusts" level="1" />
+                <field field_ref="wind10m" level="1" />
+                <field field_ref="wind10max" level="1" operation="maximum" />
+                <field field_ref="sicf" level="1" />
+                <field field_ref="q2m" level="1" />
+                <field field_ref="ustar" level="1" />
+                <field field_ref="u10m" level="1" />
+                <field field_ref="v10m" level="1" />
+                <field field_ref="psol" level="1" />
+                <field field_ref="qsurf" level="10" />
+                <field field_ref="ustar_ter" level="6" />
+                <field field_ref="ustar_lic" level="6" />
+                <field field_ref="ustar_oce" level="6" />
+                <field field_ref="ustar_sic" level="6" />
+                <field field_ref="wstar_ter" level="6" />
+                <field field_ref="wstar_lic" level="6" />
+                <field field_ref="wstar_oce" level="6" />
+                <field field_ref="wstar_sic" level="6" />
+                <field field_ref="wstar" level="5" />
+                <field field_ref="u10m_ter" level="6" />
+                <field field_ref="u10m_lic" level="6" />
+                <field field_ref="u10m_oce" level="6" />
+                <field field_ref="u10m_sic" level="6" />
+                <field field_ref="v10m_ter" level="6" />
+                <field field_ref="v10m_lic" level="6" />
+                <field field_ref="v10m_oce" level="6" />
+                <field field_ref="v10m_sic" level="6" />
+                <field field_ref="qsol" level="10" />
+                <field field_ref="ndayrain" level="10" operation="instant" />
+                <field field_ref="precip" level="1" />
+                <field field_ref="plul" level="1" />
+                <field field_ref="pluc" level="1" />
+                <field field_ref="snow" level="1" />
+                <field field_ref="evap" level="1" />
+                <field field_ref="evap_ter" level="6" />
+                <field field_ref="evap_lic" level="6" />
+                <field field_ref="evap_oce" level="6" />
+                <field field_ref="evap_sic" level="6" />
+                <field field_ref="msnow" level="10" />
+                <field field_ref="fsnow" level="10" />
+                <field field_ref="tops" level="1" />
+                <field field_ref="tops0" level="5" />
+                <field field_ref="topl" level="1" />
+                <field field_ref="topl0" level="5" />
+                <field field_ref="SWupTOA" level="4" />
+                <field field_ref="SWupTOAclr" level="4" />
+                <field field_ref="SWdnTOA" level="4" />
+                <field field_ref="SWdnTOAclr" level="4" />
+                <field field_ref="nettop" level="4" />
+                <field field_ref="SWup200" level="10" />
+                <field field_ref="SWup200clr" level="1" />
+                <field field_ref="SWdn200" level="10" />
+                <field field_ref="SWdn200clr" level="1" />
+                <field field_ref="LWup200" level="10" />
+                <field field_ref="LWup200clr" level="10" />
+                <field field_ref="LWdn200" level="10" />
+                <field field_ref="LWdn200clr" level="10" />
+                <field field_ref="sols" level="1" />
+                <field field_ref="sols0" level="5" />
+                <field field_ref="soll" level="1" />
+                <field field_ref="soll0" level="5" />
+                <field field_ref="radsol" level="7" />
+                <field field_ref="SWupSFC" level="4" />
+                <field field_ref="SWupSFCclr" level="4" />
+                <field field_ref="SWdnSFC" level="1" />
+                <field field_ref="SWdnSFCclr" level="4" />
+                <field field_ref="LWupSFC" level="4" />
+                <field field_ref="LWupSFCclr" level="4" />
+                <field field_ref="LWdnSFC" level="4" />
+                <field field_ref="LWdnSFCclr" level="4" />
+                <field field_ref="bils" level="2" />
+                <field field_ref="bils_tke" level="2" />
+                <field field_ref="bils_diss" level="2" />
+                <field field_ref="bils_ec" level="2" />
+                <field field_ref="bils_kinetic" level="2" />
+                <field field_ref="bils_enthalp" level="2" />
+                <field field_ref="bils_latent" level="2" />
+                <field field_ref="sens" level="1" />
+                <field field_ref="fder" level="2" />
+                <field field_ref="ffonte" level="10" />
+                <field field_ref="fqcalving" level="10" />
+                <field field_ref="fqfonte" level="10" />
+                <field field_ref="taux" level="10" />
+                <field field_ref="tauy" level="10" />
+                <field field_ref="taux_ter" level="6" />
+                <field field_ref="taux_lic" level="6" />
+                <field field_ref="taux_oce" level="6" />
+                <field field_ref="taux_sic" level="6" />
+                <field field_ref="tauy_ter" level="6" />
+                <field field_ref="tauy_lic" level="6" />
+                <field field_ref="tauy_oce" level="6" />
+                <field field_ref="tauy_sic" level="6" />
+                <field field_ref="pourc_ter" level="7" />
+                <field field_ref="pourc_lic" level="7" />
+                <field field_ref="pourc_oce" level="7" />
+                <field field_ref="pourc_sic" level="7" />
+                <field field_ref="fract_ter" level="6" />
+                <field field_ref="fract_lic" level="6" />
+                <field field_ref="fract_oce" level="6" />
+                <field field_ref="fract_sic" level="6" />
+                <field field_ref="tsol_ter" level="6" />
+                <field field_ref="tsol_lic" level="6" />
+                <field field_ref="tsol_oce" level="6" />
+                <field field_ref="tsol_sic" level="6" />
+                <field field_ref="evappot_ter" level="6" />
+                <field field_ref="evappot_lic" level="6" />
+                <field field_ref="evappot_oce" level="6" />
+                <field field_ref="evappot_sic" level="6" />
+                <field field_ref="sens_ter" level="6" />
+                <field field_ref="sens_lic" level="6" />
+                <field field_ref="sens_oce" level="6" />
+                <field field_ref="sens_sic" level="6" />
+                <field field_ref="lat_ter" level="6" />
+                <field field_ref="lat_lic" level="6" />
+                <field field_ref="lat_oce" level="6" />
+                <field field_ref="lat_sic" level="6" />
+                <field field_ref="flw_ter" level="10" />
+                <field field_ref="flw_lic" level="10" />
+                <field field_ref="flw_oce" level="10" />
+                <field field_ref="flw_sic" level="10" />
+                <field field_ref="fsw_ter" level="10" />
+                <field field_ref="fsw_lic" level="10" />
+                <field field_ref="fsw_oce" level="10" />
+                <field field_ref="fsw_sic" level="10" />
+                <field field_ref="wbils_ter" level="10" />
+                <field field_ref="wbils_lic" level="10" />
+                <field field_ref="wbils_oce" level="10" />
+                <field field_ref="wbils_sic" level="10" />
+                <field field_ref="wbilo_ter" level="10" />
+                <field field_ref="wbilo_lic" level="10" />
+                <field field_ref="wbilo_oce" level="10" />
+                <field field_ref="wbilo_sic" level="10" />
+                <field field_ref="cdrm" level="10" />
+                <field field_ref="cdrh" level="10" />
+                <field field_ref="cldl" level="1" />
+                <field field_ref="cldm" level="1" />
+                <field field_ref="cldh" level="1" />
+                <field field_ref="cldt" level="1" />
+                <field field_ref="cldq" level="1" />
+                <field field_ref="lwp" level="5" />
+                <field field_ref="iwp" level="5" />
+                <field field_ref="ue" level="10" />
+                <field field_ref="ve" level="10" />
+                <field field_ref="uq" level="10" />
+                <field field_ref="vq" level="10" />
+                <field field_ref="cape" level="10" />
+                <field field_ref="pbase" level="5" />
+                <field field_ref="ptop" level="5" />
+                <field field_ref="fbase" level="10" />
+                <field field_ref="plcl" level="10" />
+                <field field_ref="plfc" level="10" />
+                <field field_ref="wbeff" level="10" />
+                <field field_ref="prw" level="1" />
+                <field field_ref="s_pblh" level="10" />
+                <field field_ref="s_pblt" level="10" />
+                <field field_ref="s_lcl" level="10" />
+                <field field_ref="s_therm" level="10" />
+                <field field_ref="slab_bils_oce" level="1" />
+                <field field_ref="ale_bl" level="1" />
+                <field field_ref="alp_bl" level="1" />
+                <field field_ref="ale_wk" level="1" />
+                <field field_ref="alp_wk" level="1" />
+                <field field_ref="ale" level="1" />
+                <field field_ref="alp" level="1" />
+                <field field_ref="cin" level="1" />
+                <field field_ref="wape" level="1" />
+                <field field_ref="n2" level="1" />
+                <field field_ref="s2" level="1" />
+                <field field_ref="proba_notrig" level="1" />
+                <field field_ref="random_notrig" level="1" />
+                <field field_ref="ale_bl_stat" level="1" />
+                <field field_ref="ale_bl_trig" level="1" />
+                <field field_ref="alp_bl_det" level="1" />
+                <field field_ref="alp_bl_fluct_m" level="1" />
+                <field field_ref="alp_bl_fluct_tke" level="1" />
+                <field field_ref="alp_bl_conv" level="1" />
+                <field field_ref="alp_bl_stat" level="1" />
+
+                <field_group operation="average" freq_op="1ts" detect_missing_value=".true.">
+                    <field field_ref="u850" level="7" />
+                    <field field_ref="u700" level="7" />
+                    <field field_ref="u500" level="7" />
+                    <field field_ref="u200" level="7" />
+                    <field field_ref="u100" level="7" />
+                    <field field_ref="u50" level="7" />
+                    <field field_ref="u10" level="7" />
+                    <field field_ref="v850" level="7" />
+                    <field field_ref="v700" level="7" />
+                    <field field_ref="v500" level="7" />
+                    <field field_ref="v200" level="7" />
+                    <field field_ref="v100" level="7" />
+                    <field field_ref="v50" level="7" />
+                    <field field_ref="v10" level="7" />
+                    <field field_ref="w850" level="7" />
+                    <field field_ref="w700" level="7" />
+                    <field field_ref="w500" level="7" />
+                    <field field_ref="w200" level="7" />
+                    <field field_ref="w100" level="7" />
+                    <field field_ref="w50" level="7" />
+                    <field field_ref="w10" level="7" />
+                    <field field_ref="t850" level="7" />
+                    <field field_ref="t700" level="7" />
+                    <field field_ref="t500" level="7" />
+                    <field field_ref="t200" level="7" />
+                    <field field_ref="t100" level="7" />
+                    <field field_ref="t50" level="7" />
+                    <field field_ref="t10" level="7" />
+                    <field field_ref="q850" level="7" />
+                    <field field_ref="q700" level="7" />
+                    <field field_ref="q500" level="7" />
+                    <field field_ref="q200" level="7" />
+                    <field field_ref="q100" level="7" />
+                    <field field_ref="q50" level="7" />
+                    <field field_ref="q10" level="7" />
+                    <field field_ref="z850" level="7" />
+                    <field field_ref="z700" level="7" />
+                    <field field_ref="z500" level="7" />
+                    <field field_ref="z200" level="7" />
+                    <field field_ref="z100" level="7" />
+                    <field field_ref="z50" level="7" />
+                    <field field_ref="z10" level="7" />
+                </field_group>
+
+                <field field_ref="t_oce_sic" level="10" />
+                <field field_ref="weakinv" level="1" />
+                <field field_ref="dthmin" level="1" />
+                <field field_ref="u10_ter" level="4" />
+                <field field_ref="u10_lic" level="4" />
+                <field field_ref="u10_oce" level="4" />
+                <field field_ref="u10_sic" level="4" />
+                <field field_ref="v10_ter" level="4" />
+                <field field_ref="v10_lic" level="4" />
+                <field field_ref="v10_oce" level="4" />
+                <field field_ref="v10_sic" level="4" />
+                <field field_ref="rh2m" level="5" />
+                <field field_ref="rh2m_min" level="5" operation="minimum" />
+                <field field_ref="rh2m_max" level="5" operation="maximum" />
+                <field field_ref="qsat2m" level="5" />
+                <field field_ref="tpot" level="5" />
+                <field field_ref="tpote" level="5" />
+                <field field_ref="tke" level="10" />
+                <field field_ref="tke_ter" level="4" />
+                <field field_ref="tke_lic" level="4" />
+                <field field_ref="tke_oce" level="4" />
+                <field field_ref="tke_sic" level="4" />
+                <field field_ref="tke_max_ter" level="4" operation="maximum" />
+                <field field_ref="tke_max_lic" level="4" operation="maximum" />
+                <field field_ref="tke_max_oce" level="4" operation="maximum" />
+                <field field_ref="tke_max_sic" level="4" operation="maximum" />
+                <field field_ref="SWnetOR" level="10" />
+                <field field_ref="SWdownOR" level="10" />
+                <field field_ref="LWdownOR" level="10" />
+                <field field_ref="snowl" level="1" />
+                <field field_ref="cape_max" level="1" operation="maximum" />
+                <field field_ref="solldown" level="1" />
+                <field field_ref="dtsvdfo" level="10" />
+                <field field_ref="dtsvdft" level="10" />
+                <field field_ref="dtsvdfg" level="10" />
+                <field field_ref="dtsvdfi" level="10" />
+                <field field_ref="rugs" level="10" />
+                <field field_ref="z0m" level="10" />
+                <field field_ref="z0h" level="10" />
+                <field field_ref="topswad" level="10" />
+                <field field_ref="topswad0" level="10" />
+                <field field_ref="topswai" level="10" />
+                <field field_ref="solswad" level="10" />
+                <field field_ref="solswad0" level="10" />
+                <field field_ref="solswai" level="10" />
+                <field field_ref="OD550_ASBCM" level="6" />
+                <field field_ref="OD550_ASPOMM" level="6" />
+                <field field_ref="OD550_ASSO4M" level="6" />
+                <field field_ref="OD550_CSSO4M" level="6" />
+                <field field_ref="OD550_SSSSM" level="6" />
+                <field field_ref="OD550_ASSSM" level="6" />
+                <field field_ref="OD550_CSSSM" level="6" />
+                <field field_ref="OD550_CIDUSTM" level="6" />
+                <field field_ref="OD550_AIBCM" level="6" />
+                <field field_ref="OD550_AIPOMM" level="6" />
+                <field field_ref="OD550_STRAT" level="2" />
+                <field field_ref="od550aer" level="6" />
+                <field field_ref="od865aer" level="6" />
+                <field field_ref="absvisaer" level="6" />
+                <field field_ref="od550lt1aer" level="6" />
+                <field field_ref="sconcso4" level="6" />
+                <field field_ref="sconcoa" level="6" />
+                <field field_ref="sconcbc" level="6" />
+                <field field_ref="sconcss" level="6" />
+                <field field_ref="sconcdust" level="6" />
+                <field field_ref="loadso4" level="6" />
+                <field field_ref="loadoa" level="6" />
+                <field field_ref="loadbc" level="6" />
+                <field field_ref="loadss" level="6" />
+                <field field_ref="loaddust" level="6" />
+                <field field_ref="swtoaas_nat" level="6" />
+                <field field_ref="swsrfas_nat" level="6" />
+                <field field_ref="swtoacs_nat" level="6" />
+                <field field_ref="swsrfcs_nat" level="6" />
+                <field field_ref="swtoaas_ant" level="6" />
+                <field field_ref="swsrfas_ant" level="6" />
+                <field field_ref="swtoacs_ant" level="6" />
+                <field field_ref="swsrfcs_ant" level="6" />
+                <field field_ref="swtoacf_nat" level="6" />
+                <field field_ref="swsrfcf_nat" level="6" />
+                <field field_ref="swtoacf_ant" level="6" />
+                <field field_ref="swsrfcf_ant" level="6" />
+                <field field_ref="swtoacf_zero" level="6" />
+                <field field_ref="swsrfcf_zero" level="6" />
+                <field field_ref="cldncl" level="6" />
+                <field field_ref="reffclwtop" level="6" />
+                <field field_ref="cldnvi" level="6" />
+                <field field_ref="lcc" level="6" />
+                <field field_ref="wvapp" level="10" />
+                <field field_ref="ozone_daylight" level="10" />
+                <field field_ref="albe_ter" level="7" />
+                <field field_ref="albe_lic" level="7" />
+                <field field_ref="albe_oce" level="7" />
+                <field field_ref="albe_sic" level="7" />
+                <field field_ref="ages_ter" level="10" />
+                <field field_ref="ages_lic" level="10" />
+                <field field_ref="ages_oce" level="10" />
+                <field field_ref="ages_sic" level="10" />
+                <field field_ref="snow_ter" level="10" />
+                <field field_ref="snow_lic" level="10" />
+                <field field_ref="snow_oce" level="10" />
+                <field field_ref="snow_sic" level="10" />
+                <field field_ref="rugs_ter" level="6" />
+                <field field_ref="rugs_lic" level="6" />
+                <field field_ref="rugs_oce" level="6" />
+                <field field_ref="rugs_sic" level="6" />
+                <field field_ref="z0m_ter" level="6" />
+                <field field_ref="z0m_lic" level="6" />
+                <field field_ref="z0m_oce" level="6" />
+                <field field_ref="z0m_sic" level="6" />
+                <field field_ref="z0h_ter" level="6" />
+                <field field_ref="z0h_lic" level="6" />
+                <field field_ref="z0h_oce" level="6" />
+                <field field_ref="z0h_sic" level="6" />
+                <field field_ref="alb1" level="10" />
+                <field field_ref="alb2" level="10" />
+                <field field_ref="ftime_con" level="10" operation="instant" />
+                <field field_ref="wake_h" level="5" />
+                <field field_ref="wake_s" level="5" />
+                <field field_ref="plulth" level="10" />
+                <field field_ref="plulst" level="10" />
+                <field field_ref="lmaxth" level="10" />
+                <field field_ref="ftime_th" level="10" />
+                <field field_ref="f0_th" level="10" />
+                <field field_ref="zmax_th" level="4" />
+                <field field_ref="rsut4co2" level="10" />
+                <field field_ref="rlut4co2" level="10" />
+                <field field_ref="rsutcs4co2" level="10" />
+                <field field_ref="rlutcs4co2" level="10" />
+            </field_group>
+
+            <!-- VARS 3D -->
+            <field_group operation="average" freq_op="1ts" axis_ref="presnivs">
+                <field field_ref="cldtau" level="5" />
+                <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" />
+                <field field_ref="concbc" level="6" />
+                <field field_ref="concss" level="6" />
+                <field field_ref="concdust" level="6" />
+                <field field_ref="ec550aer" level="6" />
+                <field field_ref="lwcon" level="5" />
+                <field field_ref="iwcon" level="5" />
+                <field field_ref="temp" level="3" />
+                <field field_ref="theta" level="3" />
+                <field field_ref="ovap" level="3" />
+                <field field_ref="ovapinit" level="10" />
+                <field field_ref="oliq" level="3" />
+                <field field_ref="geop" level="3" />
+                <field field_ref="vitu" level="3" />
+                <field field_ref="vitv" level="3" />
+                <field field_ref="vitw" level="3" />
+                <field field_ref="pres" level="3" />
+                <field field_ref="paprs" level="3" />
+                <field field_ref="mass" level="3" />
+                <field field_ref="zfull" level="3" />
+                <field field_ref="zhalf" level="3" />
+                <field field_ref="rneb" level="5" />
+                <field field_ref="rnebcon" level="5" />
+                <field field_ref="rnebls" level="5" />
+                <field field_ref="rhum" level="5" />
+                <field field_ref="ozone" level="10" />
+                <field field_ref="upwd" level="10" />
+                <field field_ref="dtphy" level="10" />
+                <field field_ref="dqphy" level="10" />
+                <field field_ref="pr_con_l" level="10" />
+                <field field_ref="pr_con_i" level="10" />
+                <field field_ref="pr_lsc_l" level="10" />
+                <field field_ref="pr_lsc_i" level="10" />
+                <field field_ref="re" level="10" />
+                <field field_ref="fl" level="10" />
+                <field field_ref="scdnc" level="6" />
+                <field field_ref="reffclws" level="6" />
+                <field field_ref="reffclwc" level="6" />
+                <field field_ref="lcc3d" level="6" />
+                <field field_ref="lcc3dcon" level="6" />
+                <field field_ref="lcc3dstra" level="6" />
+                <field field_ref="clwcon" level="10" />
+                <field field_ref="Ma" level="10" />
+                <field field_ref="dnwd" level="10" />
+                <field field_ref="dnwd0" level="10" />
+                <field field_ref="mc" level="5" />
+                <field field_ref="dtdyn" level="10" />
+                <field field_ref="dqdyn" level="10" />
+                <field field_ref="dudyn" level="10" />
+                <field field_ref="dvdyn" level="10" />
+                <field field_ref="dtcon" level="10" />
+                <field field_ref="ducon" level="10" />
+                <field field_ref="dvcon" level="10" />
+                <field field_ref="dqcon" level="10" />
+                <field field_ref="dtwak" level="5" />
+                <field field_ref="dqwak" level="5" />
+                <field field_ref="wake_deltat" level="5" />
+                <field field_ref="wake_deltaq" level="5" />
+                <field field_ref="wake_omg" level="5" />
+                <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" />
+                <field field_ref="dtlsc" level="10" />
+                <field field_ref="dtlschr" level="10" />
+                <field field_ref="dqlsc" level="10" />
+                <field field_ref="beta_prec" level="10" />
+                <field field_ref="dtvdf" level="10" />
+                <field field_ref="dtdis" level="10" />
+                <field field_ref="dqvdf" level="10" />
+                <field field_ref="dteva" level="10" />
+                <field field_ref="dqeva" level="10" />
+                <field field_ref="dqlscth" level="10" />
+                <field field_ref="dqlscst" level="10" />
+                <field field_ref="dtlscth" level="10" />
+                <field field_ref="dtlscst" level="10" />
+                <field field_ref="ptconvth" level="10" />
+                <field field_ref="ptconv" level="10" />
+                <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="d_th" level="10" />
+                <field field_ref="dqthe" level="10" />
+                <field field_ref="dtajs" level="10" />
+                <field field_ref="dqajs" level="10" />
+                <field field_ref="dtswr" level="10" />
+                <field field_ref="dtsw0" level="10" />
+                <field field_ref="dtlwr" level="10" />
+                <field field_ref="dtlw0" level="10" />
+                <field field_ref="dtec" level="10" />
+                <field field_ref="duvdf" level="10" />
+                <field field_ref="dvvdf" level="10" />
+                <field field_ref="duoro" level="10" />
+                <field field_ref="dvoro" level="10" />
+                <field field_ref="dulif" level="10" />
+                <field field_ref="dvlif" level="10" />
+                <field field_ref="dtoro" level="10" />
+                <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" />
+                <field field_ref="tntr" level="10" />
+                <field field_ref="tntscpbl" level="10" />
+                <field field_ref="tnhus" level="10" />
+                <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" />
+                <field field_ref="dmc" level="10" />
+                <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_group>
+        </file>
+    </file_group>
+</file_definition>
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histhfCOSP_lmdz.xml
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histhfCOSP_lmdz.xml	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histhfCOSP_lmdz.xml	(revision 2694)
@@ -0,0 +1,80 @@
+<!-- This file corresponds to the LMDZ5 testing rev 2314. It might not be compatible  -->
+<!-- with older or newer revisions of LMDZ source code.                               -->
+
+<file_definition>
+     <file_group id="defile">
+        <file id="histhfCOSP" name="histhfCOSP" output_freq="6h" output_level="5"  enabled="_AUTO_">
+
+            <!-- VARS 2D -->
+            <field_group operation="instant" freq_op="3h">
+                <field field_ref="cllcalipso"         level="1" />
+                <field field_ref="clmcalipso"         level="1" />
+                <field field_ref="clhcalipso"         level="1" />
+                <field field_ref="cltcalipso"         level="1" />
+                <field field_ref="clcalipso"  level="1" axis_ref="presnivs" />
+                <field field_ref="parasol_refl"  level="1" axis_ref="sza" />
+                <field field_ref="parasol_crefl"  level="1" axis_ref="sza" />
+                <field field_ref="Ncrefl"  level="1" axis_ref="sza" />
+		<field field_ref="c01_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c02_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c03_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c04_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c05_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c06_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c07_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c08_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c09_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c10_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c11_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c12_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c13_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c14_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c15_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c16_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c17_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c18_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c19_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c20_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+                <field field_ref="c01_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c02_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c03_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c04_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c05_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c06_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c07_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c08_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c09_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c10_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c11_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c12_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c13_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c14_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c15_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c16_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c17_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c18_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c19_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c20_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="beta_mol532" level="10" axis_ref="height_mlev" />
+                <field field_ref="sunlit" level="1" />
+                <field field_ref="c01_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c02_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c03_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c04_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c05_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c06_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="c07_clisccp2" level="1" axis_ref="pressure2" />
+                <field field_ref="boxtauisccp" level="10" axis_ref="column" />
+                <field field_ref="boxptopisccp" level="10" axis_ref="column" />
+                <field field_ref="tclisccp" level="1" />
+                <field field_ref="ctpisccp" level="10" />
+                <field field_ref="tauisccp" level="10" /> 
+                <field field_ref="albisccp" level="10" />
+                <field field_ref="meantbisccp" level="10" />
+                <field field_ref="meantbclrisccp" level="10" />
+            </field_group>
+
+        </file>
+     </file_group>
+</file_definition>
+   
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histhfNMC_lmdz.xml
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histhfNMC_lmdz.xml	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histhfNMC_lmdz.xml	(revision 2694)
@@ -0,0 +1,33 @@
+<!-- This file corresponds to the LMDZ5 testing rev 2314. It might not be compatible  -->
+<!-- with older or newer revisions of LMDZ source code.                               -->
+
+<file_definition>
+    <file_group id="defile">
+        <file id="histhfNMC" name="histhfNMC" output_freq="6h" output_level="5" enabled="_AUTO_">
+
+            <!-- VARS 3D -->
+            <field_group operation="instant" freq_op="1ts" detect_missing_value=".true." >
+<!--            <field field_ref="tnondef" level="5" />  -->
+                <field field_ref="ta" level="1" />
+                <field field_ref="zg" level="5" />
+                <field field_ref="hus" level="5" />
+                <field field_ref="hur" level="5" />
+                <field field_ref="ua" level="5" />
+                <field field_ref="va" level="5" />
+                <field field_ref="wap" level="5" />
+<!--            <field field_ref="psbg" level="5" /> -->
+                <field field_ref="tro3" level="5" />
+                <field field_ref="tro3_daylight" level="5" />
+                <field field_ref="uv" level="6" />
+                <!-- <field field_ref="vq" level="6" /> -->
+                <field field_ref="vT" level="6" />
+                <field field_ref="wq" level="6" />
+                <field field_ref="vphi" level="6" />
+                <field field_ref="wT" level="6" />
+                <field field_ref="u2" level="6" />
+                <field field_ref="v2" level="6" />
+                <field field_ref="T2" level="6" />
+            </field_group>
+        </file>
+    </file_group>
+</file_definition>
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histhf_lmdz.xml
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histhf_lmdz.xml	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histhf_lmdz.xml	(revision 2694)
@@ -0,0 +1,531 @@
+<!-- This file corresponds to the LMDZ5 testing rev 2314. It might not be compatible  -->
+<!-- with older or newer revisions of LMDZ source code.                               -->
+
+<file_definition>
+    <file_group id="defile">
+        <file id="histhf" name="histhf" output_freq="6h" output_level="_AUTO_" enabled="_AUTO_">
+            
+            <!-- VARS 1D -->
+<!--            <field_group operation="once"> -->
+<!--              <field field_ref="Ap" level="1" /> -->
+<!--              <field field_ref="Bp" level="1" /> -->
+<!--              <field field_ref="Alt" level="1" /> -->
+<!--            </field_group> -->
+        
+            <!-- VARS 2D -->
+            <field_group operation="average" freq_op="1ts">
+                <field field_ref="phis" level="5" />
+                <field field_ref="aire" level="10" operation="once" />
+                <field field_ref="contfracATM" level="10" operation="once" />
+                <field field_ref="contfracOR" level="10" />
+                <field field_ref="aireTER" level="10" />
+                <field field_ref="flat" level="10" />
+                <field field_ref="slp" level="10" />
+                <field field_ref="tsol" level="5" />
+                <field field_ref="t2m" level="5" />
+                <field field_ref="t2m_min" level="10" operation="minimum" />
+                <field field_ref="t2m_max" level="10" operation="maximum" />
+                <field field_ref="t2m_ter" level="10" />
+                <field field_ref="t2m_lic" level="10" />
+                <field field_ref="t2m_oce" level="10" />
+                <field field_ref="t2m_sic" level="10" />
+                <field field_ref="gusts" level="10" />
+                <field field_ref="wind10m" level="10" />
+                <field field_ref="wind10max" level="10" operation="maximum" />
+                <field field_ref="sicf" level="10" />
+                <field field_ref="q2m" level="5" />
+                <field field_ref="ustar" level="5" />
+                <field field_ref="u10m" level="5" />
+                <field field_ref="v10m" level="5" />
+                <field field_ref="psol" level="5" />
+                <field field_ref="qsurf" level="10" />
+                <field field_ref="ustar_ter" level="10" />
+                <field field_ref="ustar_lic" level="10" />
+                <field field_ref="ustar_oce" level="10" />
+                <field field_ref="ustar_sic" level="10" />
+                <field field_ref="wstar_ter" level="10" />
+                <field field_ref="wstar_lic" level="10" />
+                <field field_ref="wstar_oce" level="10" />
+                <field field_ref="wstar_sic" level="10" />
+                <field field_ref="wstar" level="10" />
+                <field field_ref="u10m_ter" level="10" />
+                <field field_ref="u10m_lic" level="10" />
+                <field field_ref="u10m_oce" level="10" />
+                <field field_ref="u10m_sic" level="10" />
+                <field field_ref="v10m_ter" level="10" />
+                <field field_ref="v10m_lic" level="10" />
+                <field field_ref="v10m_oce" level="10" />
+                <field field_ref="v10m_sic" level="10" />
+                <field field_ref="qsol" level="10" />
+                <field field_ref="ndayrain" level="10" operation="instant" />
+                <field field_ref="precip" level="10" />
+                <field field_ref="plul" level="10" />
+                <field field_ref="pluc" level="10" />
+                <field field_ref="snow" level="10" />
+                <field field_ref="evap" level="10" />
+                <field field_ref="evap_ter" level="10" />
+                <field field_ref="evap_lic" level="10" />
+                <field field_ref="evap_oce" level="10" />
+                <field field_ref="evap_sic" level="10" />
+                <field field_ref="msnow" level="10" />
+                <field field_ref="fsnow" level="10" />
+                <field field_ref="tops" level="10" />
+                <field field_ref="tops0" level="10" />
+                <field field_ref="topl" level="5" />
+                <field field_ref="topl0" level="10" />
+                <field field_ref="SWupTOA" level="10" />
+                <field field_ref="SWupTOAclr" level="10" />
+                <field field_ref="SWdnTOA" level="10" />
+                <field field_ref="SWdnTOAclr" level="10" />
+                <field field_ref="nettop" level="10" />
+                <field field_ref="SWup200" level="10" />
+                <field field_ref="SWup200clr" level="10" />
+                <field field_ref="SWdn200" level="10" />
+                <field field_ref="SWdn200clr" level="10" />
+                <field field_ref="LWup200" level="10" />
+                <field field_ref="LWup200clr" level="10" />
+                <field field_ref="LWdn200" level="10" />
+                <field field_ref="LWdn200clr" level="10" />
+                <field field_ref="sols" level="10" />
+                <field field_ref="sols0" level="10" />
+                <field field_ref="soll" level="10" />
+                <field field_ref="soll0" level="10" />
+                <field field_ref="radsol" level="10" />
+                <field field_ref="SWupSFC" level="10" />
+                <field field_ref="SWupSFCclr" level="10" />
+                <field field_ref="SWdnSFC" level="10" />
+                <field field_ref="SWdnSFCclr" level="10" />
+                <field field_ref="LWupSFC" level="10" />
+                <field field_ref="LWupSFCclr" level="10" />
+                <field field_ref="LWdnSFC" level="10" />
+                <field field_ref="LWdnSFCclr" level="10" />
+                <field field_ref="bils" level="5" />
+                <field field_ref="bils_tke" level="5" />
+                <field field_ref="bils_diss" level="5" />
+                <field field_ref="bils_ec" level="5" />
+                <field field_ref="bils_kinetic" level="5" />
+                <field field_ref="bils_enthalp" level="5" />
+                <field field_ref="bils_latent" level="5" />
+                <field field_ref="sens" level="10" />
+                <field field_ref="fder" level="10" />
+                <field field_ref="ffonte" level="10" />
+                <field field_ref="fqcalving" level="10" />
+                <field field_ref="fqfonte" level="10" />
+                <field field_ref="taux" level="10" />
+                <field field_ref="tauy" level="10" />
+                <field field_ref="taux_ter" level="10" />
+                <field field_ref="taux_lic" level="10" />
+                <field field_ref="taux_oce" level="10" />
+                <field field_ref="taux_sic" level="10" />
+                <field field_ref="tauy_ter" level="10" />
+                <field field_ref="tauy_lic" level="10" />
+                <field field_ref="tauy_oce" level="10" />
+                <field field_ref="tauy_sic" level="10" />
+                <field field_ref="pourc_ter" level="10" />
+                <field field_ref="pourc_lic" level="10" />
+                <field field_ref="pourc_oce" level="10" />
+                <field field_ref="pourc_sic" level="10" />
+                <field field_ref="fract_ter" level="10" />
+                <field field_ref="fract_lic" level="10" />
+                <field field_ref="fract_oce" level="10" />
+                <field field_ref="fract_sic" level="10" />
+                <field field_ref="tsol_ter" level="10" />
+                <field field_ref="tsol_lic" level="10" />
+                <field field_ref="tsol_oce" level="10" />
+                <field field_ref="tsol_sic" level="10" />
+                <field field_ref="evappot_ter" level="10" />
+                <field field_ref="evappot_lic" level="10" />
+                <field field_ref="evappot_oce" level="10" />
+                <field field_ref="evappot_sic" level="10" />
+                <field field_ref="sens_ter" level="7" />
+                <field field_ref="sens_lic" level="7" />
+                <field field_ref="sens_oce" level="7" />
+                <field field_ref="sens_sic" level="7" />
+                <field field_ref="lat_ter" level="7" />
+                <field field_ref="lat_lic" level="7" />
+                <field field_ref="lat_oce" level="7" />
+                <field field_ref="lat_sic" level="7" />
+                <field field_ref="flw_ter" level="10" />
+                <field field_ref="flw_lic" level="10" />
+                <field field_ref="flw_oce" level="10" />
+                <field field_ref="flw_sic" level="10" />
+                <field field_ref="fsw_ter" level="10" />
+                <field field_ref="fsw_lic" level="10" />
+                <field field_ref="fsw_oce" level="10" />
+                <field field_ref="fsw_sic" level="10" />
+                <field field_ref="wbils_ter" level="10" />
+                <field field_ref="wbils_lic" level="10" />
+                <field field_ref="wbils_oce" level="10" />
+                <field field_ref="wbils_sic" level="10" />
+                <field field_ref="wbilo_ter" level="10" />
+                <field field_ref="wbilo_lic" level="10" />
+                <field field_ref="wbilo_oce" level="10" />
+                <field field_ref="wbilo_sic" level="10" />
+                <field field_ref="cdrm" level="10" />
+                <field field_ref="cdrh" level="7" />
+                <field field_ref="cldl" level="10" />
+                <field field_ref="cldm" level="10" />
+                <field field_ref="cldh" level="10" />
+                <field field_ref="cldt" level="10" />
+                <field field_ref="cldq" level="10" />
+                <field field_ref="lwp" level="10" />
+                <field field_ref="iwp" level="10" />
+                <field field_ref="ue" level="10" />
+                <field field_ref="ve" level="10" />
+                <field field_ref="uq" level="10" />
+                <field field_ref="vq" level="10" />
+                <field field_ref="cape" level="10" />
+                <field field_ref="pbase" level="10" />
+                <field field_ref="ptop" level="10" />
+                <field field_ref="fbase" level="10" />
+                <field field_ref="plcl" level="10" />
+                <field field_ref="plfc" level="10" />
+                <field field_ref="wbeff" level="10" />
+                <field field_ref="prw" level="10" />
+                <field field_ref="s_pblh" level="10" />
+                <field field_ref="s_pblt" level="10" />
+                <field field_ref="s_lcl" level="10" />
+                <field field_ref="s_therm" level="10" />
+                <field field_ref="slab_bils_oce" level="10" />
+                <field field_ref="ale_bl" level="10" />
+                <field field_ref="alp_bl" level="10" />
+                <field field_ref="ale_wk" level="10" />
+                <field field_ref="alp_wk" level="10" />
+                <field field_ref="ale" level="10" />
+                <field field_ref="alp" level="10" />
+                <field field_ref="cin" level="10" />
+                <field field_ref="wape" level="10" />
+                <field field_ref="n2" level="6" />
+                <field field_ref="s2" level="6" />
+                <field field_ref="proba_notrig" level="6" />
+                <field field_ref="random_notrig" level="6" />
+                <field field_ref="ale_bl_stat" level="6" />
+                <field field_ref="ale_bl_trig" level="6" />
+                <field field_ref="alp_bl_det" level="10" />
+                <field field_ref="alp_bl_fluct_m" level="10" />
+                <field field_ref="alp_bl_fluct_tke" level="10" />
+                <field field_ref="alp_bl_conv" level="10" />
+                <field field_ref="alp_bl_stat" level="10" />
+
+                <field_group operation="average" freq_op="1ts" detect_missing_value=".true.">
+                    <field field_ref="u850" level="10" />
+                    <field field_ref="u700" level="10" />
+                    <field field_ref="u500" level="10" />
+                    <field field_ref="u200" level="10" />
+                    <field field_ref="u100" level="10" />
+                    <field field_ref="u50" level="10" />
+                    <field field_ref="u10" level="10" />
+                    <field field_ref="v850" level="10" />
+                    <field field_ref="v700" level="10" />
+                    <field field_ref="v500" level="10" />
+                    <field field_ref="v200" level="10" />
+                    <field field_ref="v100" level="10" />
+                    <field field_ref="v50" level="10" />
+                    <field field_ref="v10" level="10" />
+                    <field field_ref="w850" level="10" />
+                    <field field_ref="w700" level="10" />
+                    <field field_ref="w500" level="10" />
+                    <field field_ref="w200" level="10" />
+                    <field field_ref="w100" level="10" />
+                    <field field_ref="w50" level="10" />
+                    <field field_ref="w10" level="10" />
+                    <field field_ref="t850" level="10" />
+                    <field field_ref="t700" level="10" />
+                    <field field_ref="t500" level="10" />
+                    <field field_ref="t200" level="10" />
+                    <field field_ref="t100" level="10" />
+                    <field field_ref="t50" level="10" />
+                    <field field_ref="t10" level="10" />
+                    <field field_ref="q850" level="10" />
+                    <field field_ref="q700" level="10" />
+                    <field field_ref="q500" level="10" />
+                    <field field_ref="q200" level="10" />
+                    <field field_ref="q100" level="10" />
+                    <field field_ref="q50" level="10" />
+                    <field field_ref="q10" level="10" />
+                    <field field_ref="z850" level="10" />
+                    <field field_ref="z700" level="10" />
+                    <field field_ref="z500" level="10" />
+                    <field field_ref="z200" level="10" />
+                    <field field_ref="z100" level="10" />
+                    <field field_ref="z50" level="10" />
+                    <field field_ref="z10" level="10" />
+                </field_group>
+
+                <field field_ref="t_oce_sic" level="10" />
+                <field field_ref="weakinv" level="10" />
+                <field field_ref="dthmin" level="10" />
+                <field field_ref="u10_ter" level="10" />
+                <field field_ref="u10_lic" level="10" />
+                <field field_ref="u10_oce" level="10" />
+                <field field_ref="u10_sic" level="10" />
+                <field field_ref="v10_ter" level="10" />
+                <field field_ref="v10_lic" level="10" />
+                <field field_ref="v10_oce" level="10" />
+                <field field_ref="v10_sic" level="10" />
+                <field field_ref="rh2m" level="10" />
+                <field field_ref="rh2m_min" level="10" operation="minimum" />
+                <field field_ref="rh2m_max" level="10" operation="maximum" />
+                <field field_ref="qsat2m" level="10" />
+                <field field_ref="tpot" level="10" />
+                <field field_ref="tpote" level="10" />
+                <field field_ref="tke" level="10" />
+                <field field_ref="tke_ter" level="10" />
+                <field field_ref="tke_lic" level="10" />
+                <field field_ref="tke_oce" level="10" />
+                <field field_ref="tke_sic" level="10" />
+                <field field_ref="tke_max_ter" level="10" operation="maximum" />
+                <field field_ref="tke_max_lic" level="10" operation="maximum" />
+                <field field_ref="tke_max_oce" level="10" operation="maximum" />
+                <field field_ref="tke_max_sic" level="10" operation="maximum" />
+                <field field_ref="SWnetOR" level="10" />
+                <field field_ref="SWdownOR" level="10" />
+                <field field_ref="LWdownOR" level="10" />
+                <field field_ref="snowl" level="10" />
+                <field field_ref="cape_max" level="10" operation="maximum" />
+                <field field_ref="solldown" level="10" />
+                <field field_ref="dtsvdfo" level="10" />
+                <field field_ref="dtsvdft" level="10" />
+                <field field_ref="dtsvdfg" level="10" />
+                <field field_ref="dtsvdfi" level="10" />
+                <field field_ref="rugs" level="10" />
+                <field field_ref="z0m" level="10" />
+                <field field_ref="z0h" level="10" />
+                <field field_ref="topswad" level="10" />
+                <field field_ref="topswad0" level="10" />
+                <field field_ref="topswai" level="10" />
+                <field field_ref="solswad" level="10" />
+                <field field_ref="solswad0" level="10" />
+                <field field_ref="solswai" level="10" />
+                <field field_ref="OD550_ASBCM" level="10" />
+                <field field_ref="OD550_ASPOMM" level="10" />
+                <field field_ref="OD550_ASSO4M" level="10" />
+                <field field_ref="OD550_CSSO4M" level="10" />
+                <field field_ref="OD550_SSSSM" level="10" />
+                <field field_ref="OD550_ASSSM" level="10" />
+                <field field_ref="OD550_CSSSM" level="10" />
+                <field field_ref="OD550_CIDUSTM" level="10" />
+                <field field_ref="OD550_AIBCM" level="10" />
+                <field field_ref="OD550_AIPOMM" level="10" />
+                <field field_ref="OD550_STRAT" level="10" />
+                <field field_ref="od550aer" level="10" />
+                <field field_ref="od865aer" level="10" />
+                <field field_ref="absvisaer" level="10" />
+                <field field_ref="od550lt1aer" level="10" />
+                <field field_ref="sconcso4" level="10" />
+                <field field_ref="sconcoa" level="10" />
+                <field field_ref="sconcbc" level="10" />
+                <field field_ref="sconcss" level="10" />
+                <field field_ref="sconcdust" level="10" />
+                <field field_ref="loadso4" level="10" />
+                <field field_ref="loadoa" level="10" />
+                <field field_ref="loadbc" level="10" />
+                <field field_ref="loadss" level="10" />
+                <field field_ref="loaddust" level="10" />
+                <field field_ref="swtoaas_nat" level="10" />
+                <field field_ref="swsrfas_nat" level="10" />
+                <field field_ref="swtoacs_nat" level="10" />
+                <field field_ref="swsrfcs_nat" level="10" />
+                <field field_ref="swtoaas_ant" level="10" />
+                <field field_ref="swsrfas_ant" level="10" />
+                <field field_ref="swtoacs_ant" level="10" />
+                <field field_ref="swsrfcs_ant" level="10" />
+                <field field_ref="swtoacf_nat" level="10" />
+                <field field_ref="swsrfcf_nat" level="10" />
+                <field field_ref="swtoacf_ant" level="10" />
+                <field field_ref="swsrfcf_ant" level="10" />
+                <field field_ref="swtoacf_zero" level="10" />
+                <field field_ref="swsrfcf_zero" level="10" />
+                <field field_ref="cldncl" level="10" />
+                <field field_ref="reffclwtop" level="10" />
+                <field field_ref="cldnvi" level="10" />
+                <field field_ref="lcc" level="10" />
+                <field field_ref="wvapp" level="10" />
+                <field field_ref="ozone_daylight" level="10" />
+                <field field_ref="albe_ter" level="7" />
+                <field field_ref="albe_lic" level="7" />
+                <field field_ref="albe_oce" level="7" />
+                <field field_ref="albe_sic" level="7" />
+                <field field_ref="ages_ter" level="10" />
+                <field field_ref="ages_lic" level="10" />
+                <field field_ref="ages_oce" level="10" />
+                <field field_ref="ages_sic" level="10" />
+                <field field_ref="snow_ter" level="10" />
+                <field field_ref="snow_lic" level="10" />
+                <field field_ref="snow_oce" level="10" />
+                <field field_ref="snow_sic" level="10" />
+                <field field_ref="rugs_ter" level="10" />
+                <field field_ref="rugs_lic" level="10" />
+                <field field_ref="rugs_oce" level="10" />
+                <field field_ref="rugs_sic" level="10" />
+                <field field_ref="z0m_ter" level="10" />
+                <field field_ref="z0m_lic" level="10" />
+                <field field_ref="z0m_oce" level="10" />
+                <field field_ref="z0m_sic" level="10" />
+                <field field_ref="z0h_ter" level="10" />
+                <field field_ref="z0h_lic" level="10" />
+                <field field_ref="z0h_oce" level="10" />
+                <field field_ref="z0h_sic" level="10" />
+                <field field_ref="alb1" level="10" />
+                <field field_ref="alb2" level="10" />
+                <field field_ref="ftime_con" level="10" operation="instant" />
+                <field field_ref="wake_h" level="10" />
+                <field field_ref="wake_s" level="10" />
+                <field field_ref="plulth" level="10" />
+                <field field_ref="plulst" level="10" />
+                <field field_ref="lmaxth" level="10" />
+                <field field_ref="ftime_th" level="10" />
+                <field field_ref="f0_th" level="10" />
+                <field field_ref="zmax_th" level="5" />
+                <field field_ref="rsut4co2" level="10" />
+                <field field_ref="rlut4co2" level="10" />
+                <field field_ref="rsutcs4co2" level="10" />
+                <field field_ref="rlutcs4co2" level="10" />
+            </field_group>
+
+            <!-- VARS 3D -->
+            <field_group operation="average" freq_op="1ts" axis_ref="presnivs">
+                <field field_ref="cldtau" level="10" />
+                <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" />
+                <field field_ref="concbc" level="10" />
+                <field field_ref="concss" level="10" />
+                <field field_ref="concdust" level="10" />
+                <field field_ref="ec550aer" level="10" />
+                <field field_ref="lwcon" level="10" />
+                <field field_ref="iwcon" level="10" />
+                <field field_ref="temp" level="10" />
+                <field field_ref="theta" level="10" />
+                <field field_ref="ovap" level="10" />
+                <field field_ref="ovapinit" level="10" />
+                <field field_ref="oliq" level="10" />
+                <field field_ref="geop" level="10" />
+                <field field_ref="vitu" level="6" />
+                <field field_ref="vitv" level="6" />
+                <field field_ref="vitw" level="6" />
+                <field field_ref="pres" level="10" />
+                <field field_ref="paprs" level="10" />
+                <field field_ref="mass" level="10" />
+                <field field_ref="zfull" level="10" />
+                <field field_ref="zhalf" level="10" />
+                <field field_ref="rneb" level="10" />
+                <field field_ref="rnebcon" level="10" />
+                <field field_ref="rnebls" level="10" />
+                <field field_ref="rhum" level="10" />
+                <field field_ref="ozone" level="10" />
+                <field field_ref="upwd" level="10" />
+                <field field_ref="dtphy" level="10" />
+                <field field_ref="dqphy" level="10" />
+                <field field_ref="pr_con_l" level="10" />
+                <field field_ref="pr_con_i" level="10" />
+                <field field_ref="pr_lsc_l" level="10" />
+                <field field_ref="pr_lsc_i" level="10" />
+                <field field_ref="re" level="10" />
+                <field field_ref="fl" level="10" />
+                <field field_ref="scdnc" level="10" />
+                <field field_ref="reffclws" level="10" />
+                <field field_ref="reffclwc" level="10" />
+                <field field_ref="lcc3d" level="10" />
+                <field field_ref="lcc3dcon" level="10" />
+                <field field_ref="lcc3dstra" level="10" />
+                <field field_ref="clwcon" level="10" />
+                <field field_ref="Ma" level="10" />
+                <field field_ref="dnwd" level="10" />
+                <field field_ref="dnwd0" level="10" />
+                <field field_ref="mc" level="10" />
+                <field field_ref="dtdyn" level="10" />
+                <field field_ref="dqdyn" level="10" />
+                <field field_ref="dudyn" level="10" />
+                <field field_ref="dvdyn" level="10" />
+                <field field_ref="dtcon" level="10" />
+                <field field_ref="ducon" level="10" />
+                <field field_ref="dvcon" level="10" />
+                <field field_ref="dqcon" level="10" />
+                <field field_ref="dtwak" level="10" />
+                <field field_ref="dqwak" level="10" />
+                <field field_ref="wake_deltat" level="10" />
+                <field field_ref="wake_deltaq" level="10" />
+                <field field_ref="wake_omg" level="10" />
+                <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" />
+                <field field_ref="dtlsc" level="10" />
+                <field field_ref="dtlschr" level="10" />
+                <field field_ref="dqlsc" level="10" />
+                <field field_ref="beta_prec" level="10" />
+                <field field_ref="dtvdf" level="10" />
+                <field field_ref="dtdis" level="10" />
+                <field field_ref="dqvdf" level="10" />
+                <field field_ref="dteva" level="10" />
+                <field field_ref="dqeva" level="10" />
+                <field field_ref="dqlscth" level="10" />
+                <field field_ref="dqlscst" level="10" />
+                <field field_ref="dtlscth" level="10" />
+                <field field_ref="dtlscst" level="10" />
+                <field field_ref="ptconvth" level="10" />
+                <field field_ref="ptconv" level="10" />
+                <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="d_th" level="10" />
+                <field field_ref="dqthe" level="10" />
+                <field field_ref="dtajs" level="10" />
+                <field field_ref="dqajs" level="10" />
+                <field field_ref="dtswr" level="10" />
+                <field field_ref="dtsw0" level="10" />
+                <field field_ref="dtlwr" level="10" />
+                <field field_ref="dtlw0" level="10" />
+                <field field_ref="dtec" level="10" />
+                <field field_ref="duvdf" level="10" />
+                <field field_ref="dvvdf" level="10" />
+                <field field_ref="duoro" level="10" />
+                <field field_ref="dvoro" level="10" />
+                <field field_ref="dulif" level="10" />
+                <field field_ref="dvlif" level="10" />
+                <field field_ref="dtoro" level="10" />
+                <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" />
+                <field field_ref="tntr" level="10" />
+                <field field_ref="tntscpbl" level="10" />
+                <field field_ref="tnhus" level="10" />
+                <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" />
+                <field field_ref="dmc" level="10" />
+                <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_group>
+        </file>
+    </file_group>
+</file_definition>
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histins_lmdz.xml
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histins_lmdz.xml	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histins_lmdz.xml	(revision 2694)
@@ -0,0 +1,531 @@
+<!-- This file corresponds to the LMDZ5 testing rev 2314. It might not be compatible  -->
+<!-- with older or newer revisions of LMDZ source code.                               -->
+
+<file_definition>
+    <file_group id="defile">
+        <file id="histins" name="Xhistins" output_freq="1ts" output_level="4" enabled=".FALSE.">
+            
+            <!-- VARS 1D -->
+<!--            <field_group operation="once">    -->
+<!--              <field field_ref="Ap" level="1" />    -->
+<!--              <field field_ref="Bp" level="1" />    -->
+<!--              <field field_ref="Alt" level="1" />    -->
+<!--            </field_group>    -->
+        
+            <!-- VARS 2D -->
+            <field_group operation="instant" freq_op="1ts">
+                <field field_ref="phis" level="10" />
+                <field field_ref="aire" level="10" operation="once" />
+                <field field_ref="contfracATM" level="1" operation="once" />
+                <field field_ref="contfracOR" level="1" />
+                <field field_ref="aireTER" level="1" />
+                <field field_ref="flat" level="10" />
+                <field field_ref="slp" level="1" />
+                <field field_ref="tsol" level="1" />
+                <field field_ref="t2m" level="1" />
+                <field field_ref="t2m_min" level="10" operation="minimum" />
+                <field field_ref="t2m_max" level="10" operation="maximum" />
+                <field field_ref="t2m_ter" level="10" />
+                <field field_ref="t2m_lic" level="10" />
+                <field field_ref="t2m_oce" level="10" />
+                <field field_ref="t2m_sic" level="10" />
+                <field field_ref="gusts" level="1" />
+                <field field_ref="wind10m" level="1" />
+                <field field_ref="wind10max" level="10" operation="maximum" />
+                <field field_ref="sicf" level="10" />
+                <field field_ref="q2m" level="1" />
+                <field field_ref="ustar" level="1" />
+                <field field_ref="u10m" level="1" />
+                <field field_ref="v10m" level="1" />
+                <field field_ref="psol" level="1" />
+                <field field_ref="qsurf" level="10" />
+                <field field_ref="ustar_ter" level="10" />
+                <field field_ref="ustar_lic" level="10" />
+                <field field_ref="ustar_oce" level="10" />
+                <field field_ref="ustar_sic" level="10" />
+                <field field_ref="wstar_ter" level="10" />
+                <field field_ref="wstar_lic" level="10" />
+                <field field_ref="wstar_oce" level="10" />
+                <field field_ref="wstar_sic" level="10" />
+                <field field_ref="wstar" level="10" />
+                <field field_ref="u10m_ter" level="10" />
+                <field field_ref="u10m_lic" level="10" />
+                <field field_ref="u10m_oce" level="10" />
+                <field field_ref="u10m_sic" level="10" />
+                <field field_ref="v10m_ter" level="10" />
+                <field field_ref="v10m_lic" level="10" />
+                <field field_ref="v10m_oce" level="10" />
+                <field field_ref="v10m_sic" level="10" />
+                <field field_ref="qsol" level="10" />
+                <field field_ref="ndayrain" level="10" operation="instant"  />
+                <field field_ref="precip" level="1" />
+                <field field_ref="plul" level="1" />
+                <field field_ref="pluc" level="1" />
+                <field field_ref="snow" level="10" />
+                <field field_ref="evap" level="10" />
+                <field field_ref="evap_ter" level="10" />
+                <field field_ref="evap_lic" level="10" />
+                <field field_ref="evap_oce" level="10" />
+                <field field_ref="evap_sic" level="10" />
+                <field field_ref="msnow" level="10" />
+                <field field_ref="fsnow" level="10" />
+                <field field_ref="tops" level="10" />
+                <field field_ref="tops0" level="10" />
+                <field field_ref="topl" level="10" />
+                <field field_ref="topl0" level="10" />
+                <field field_ref="SWupTOA" level="10" />
+                <field field_ref="SWupTOAclr" level="10" />
+                <field field_ref="SWdnTOA" level="10" />
+                <field field_ref="SWdnTOAclr" level="10" />
+                <field field_ref="nettop" level="10" />
+                <field field_ref="SWup200" level="10" />
+                <field field_ref="SWup200clr" level="10" />
+                <field field_ref="SWdn200" level="10" />
+                <field field_ref="SWdn200clr" level="10" />
+                <field field_ref="LWup200" level="10" />
+                <field field_ref="LWup200clr" level="10" />
+                <field field_ref="LWdn200" level="10" />
+                <field field_ref="LWdn200clr" level="10" />
+                <field field_ref="sols" level="10" />
+                <field field_ref="sols0" level="10" />
+                <field field_ref="soll" level="10" />
+                <field field_ref="soll0" level="10" />
+                <field field_ref="radsol" level="10" />
+                <field field_ref="SWupSFC" level="10" />
+                <field field_ref="SWupSFCclr" level="10" />
+                <field field_ref="SWdnSFC" level="10" />
+                <field field_ref="SWdnSFCclr" level="10" />
+                <field field_ref="LWupSFC" level="10" />
+                <field field_ref="LWupSFCclr" level="10" />
+                <field field_ref="LWdnSFC" level="10" />
+                <field field_ref="LWdnSFCclr" level="10" />
+                <field field_ref="bils" level="10" />
+                <field field_ref="bils_tke" level="10" />
+                <field field_ref="bils_diss" level="10" />
+                <field field_ref="bils_ec" level="10" />
+                <field field_ref="bils_kinetic" level="10" />
+                <field field_ref="bils_enthalp" level="10" />
+                <field field_ref="bils_latent" level="10" />
+                <field field_ref="sens" level="10" />
+                <field field_ref="fder" level="10" />
+                <field field_ref="ffonte" level="10" />
+                <field field_ref="fqcalving" level="10" />
+                <field field_ref="fqfonte" level="10" />
+                <field field_ref="taux" level="10" />
+                <field field_ref="tauy" level="10" />
+                <field field_ref="taux_ter" level="10" />
+                <field field_ref="taux_lic" level="10" />
+                <field field_ref="taux_oce" level="10" />
+                <field field_ref="taux_sic" level="10" />
+                <field field_ref="tauy_ter" level="10" />
+                <field field_ref="tauy_lic" level="10" />
+                <field field_ref="tauy_oce" level="10" />
+                <field field_ref="tauy_sic" level="10" />
+                <field field_ref="pourc_ter" level="10" />
+                <field field_ref="pourc_lic" level="10" />
+                <field field_ref="pourc_oce" level="10" />
+                <field field_ref="pourc_sic" level="10" />
+                <field field_ref="fract_ter" level="10" />
+                <field field_ref="fract_lic" level="10" />
+                <field field_ref="fract_oce" level="10" />
+                <field field_ref="fract_sic" level="10" />
+                <field field_ref="tsol_ter" level="10" />
+                <field field_ref="tsol_lic" level="10" />
+                <field field_ref="tsol_oce" level="10" />
+                <field field_ref="tsol_sic" level="10" />
+                <field field_ref="evappot_ter" level="10" />
+                <field field_ref="evappot_lic" level="10" />
+                <field field_ref="evappot_oce" level="10" />
+                <field field_ref="evappot_sic" level="10" />
+                <field field_ref="sens_ter" level="10" />
+                <field field_ref="sens_lic" level="10" />
+                <field field_ref="sens_oce" level="10" />
+                <field field_ref="sens_sic" level="10" />
+                <field field_ref="lat_ter" level="10" />
+                <field field_ref="lat_lic" level="10" />
+                <field field_ref="lat_oce" level="10" />
+                <field field_ref="lat_sic" level="10" />
+                <field field_ref="flw_ter" level="10" />
+                <field field_ref="flw_lic" level="10" />
+                <field field_ref="flw_oce" level="10" />
+                <field field_ref="flw_sic" level="10" />
+                <field field_ref="fsw_ter" level="10" />
+                <field field_ref="fsw_lic" level="10" />
+                <field field_ref="fsw_oce" level="10" />
+                <field field_ref="fsw_sic" level="10" />
+                <field field_ref="wbils_ter" level="10" />
+                <field field_ref="wbils_lic" level="10" />
+                <field field_ref="wbils_oce" level="10" />
+                <field field_ref="wbils_sic" level="10" />
+                <field field_ref="wbilo_ter" level="10" />
+                <field field_ref="wbilo_lic" level="10" />
+                <field field_ref="wbilo_oce" level="10" />
+                <field field_ref="wbilo_sic" level="10" />
+                <field field_ref="cdrm" level="10" />
+                <field field_ref="cdrh" level="10" />
+                <field field_ref="cldl" level="10" />
+                <field field_ref="cldm" level="10" />
+                <field field_ref="cldh" level="10" />
+                <field field_ref="cldt" level="2" />
+                <field field_ref="cldq" level="10" />
+                <field field_ref="lwp" level="10" />
+                <field field_ref="iwp" level="10" />
+                <field field_ref="ue" level="10" />
+                <field field_ref="ve" level="10" />
+                <field field_ref="uq" level="10" />
+                <field field_ref="vq" level="10" />
+                <field field_ref="cape" level="10" />
+                <field field_ref="pbase" level="10" />
+                <field field_ref="ptop" level="10" />
+                <field field_ref="fbase" level="10" />
+                <field field_ref="plcl" level="10" />
+                <field field_ref="plfc" level="10" />
+                <field field_ref="wbeff" level="10" />
+                <field field_ref="prw" level="10" />
+                <field field_ref="s_pblh" level="10" />
+                <field field_ref="s_pblt" level="10" />
+                <field field_ref="s_lcl" level="10" />
+                <field field_ref="s_therm" level="10" />
+                <field field_ref="slab_bils_oce" level="10" />
+                <field field_ref="ale_bl" level="1" />
+                <field field_ref="alp_bl" level="1" />
+                <field field_ref="ale_wk" level="1" />
+                <field field_ref="alp_wk" level="1" />
+                <field field_ref="ale" level="1" />
+                <field field_ref="alp" level="1" />
+                <field field_ref="cin" level="1" />
+                <field field_ref="wape" level="1" />
+                <field field_ref="n2" level="1" />
+                <field field_ref="s2" level="1" />
+                <field field_ref="proba_notrig" level="1" />
+                <field field_ref="random_notrig" level="1" />
+                <field field_ref="ale_bl_stat" level="1" />
+                <field field_ref="ale_bl_trig" level="1" />
+                <field field_ref="alp_bl_det" level="1" />
+                <field field_ref="alp_bl_fluct_m" level="1" />
+                <field field_ref="alp_bl_fluct_tke" level="1" />
+                <field field_ref="alp_bl_conv" level="1" />
+                <field field_ref="alp_bl_stat" level="1" />
+
+                <field_group operation="instant" freq_op="1ts" detect_missing_value=".true.">
+                    <field field_ref="u850" level="7" />
+                    <field field_ref="u700" level="7" />
+                    <field field_ref="u500" level="7" />
+                    <field field_ref="u200" level="7" />
+                    <field field_ref="u100" level="7" />
+                    <field field_ref="u50" level="7" />
+                    <field field_ref="u10" level="7" />
+                    <field field_ref="v850" level="7" />
+                    <field field_ref="v700" level="7" />
+                    <field field_ref="v500" level="7" />
+                    <field field_ref="v200" level="7" />
+                    <field field_ref="v100" level="7" />
+                    <field field_ref="v50" level="7" />
+                    <field field_ref="v10" level="7" />
+                    <field field_ref="w850" level="7" />
+                    <field field_ref="w700" level="7" />
+                    <field field_ref="w500" level="7" />
+                    <field field_ref="w200" level="7" />
+                    <field field_ref="w100" level="7" />
+                    <field field_ref="w50" level="7" />
+                    <field field_ref="w10" level="7" />
+                    <field field_ref="t850" level="7" />
+                    <field field_ref="t700" level="7" />
+                    <field field_ref="t500" level="7" />
+                    <field field_ref="t200" level="7" />
+                    <field field_ref="t100" level="7" />
+                    <field field_ref="t50" level="7" />
+                    <field field_ref="t10" level="7" />
+                    <field field_ref="q850" level="7" />
+                    <field field_ref="q700" level="7" />
+                    <field field_ref="q500" level="7" />
+                    <field field_ref="q200" level="7" />
+                    <field field_ref="q100" level="7" />
+                    <field field_ref="q50" level="7" />
+                    <field field_ref="q10" level="7" />
+                    <field field_ref="z850" level="7" />
+                    <field field_ref="z700" level="7" />
+                    <field field_ref="z500" level="7" />
+                    <field field_ref="z200" level="7" />
+                    <field field_ref="z100" level="7" />
+                    <field field_ref="z50" level="7" />
+                    <field field_ref="z10" level="7" />
+                </field_group>
+
+                <field field_ref="t_oce_sic" level="10" />
+                <field field_ref="weakinv" level="10" />
+                <field field_ref="dthmin" level="10" />
+                <field field_ref="u10_ter" level="10" />
+                <field field_ref="u10_lic" level="10" />
+                <field field_ref="u10_oce" level="10" />
+                <field field_ref="u10_sic" level="10" />
+                <field field_ref="v10_ter" level="10" />
+                <field field_ref="v10_lic" level="10" />
+                <field field_ref="v10_oce" level="10" />
+                <field field_ref="v10_sic" level="10" />
+                <field field_ref="rh2m" level="10" />
+                <field field_ref="rh2m_min" level="10" operation="minimum"  />
+                <field field_ref="rh2m_max" level="10" operation="maximum"  />
+                <field field_ref="qsat2m" level="10" />
+                <field field_ref="tpot" level="10" />
+                <field field_ref="tpote" level="10" />
+                <field field_ref="tke" level="10" />
+                <field field_ref="tke_ter" level="10" />
+                <field field_ref="tke_lic" level="10" />
+                <field field_ref="tke_oce" level="10" />
+                <field field_ref="tke_sic" level="10" />
+                <field field_ref="tke_max_ter" level="10" operation="maximum" />
+                <field field_ref="tke_max_lic" level="10" operation="maximum" />
+                <field field_ref="tke_max_oce" level="10" operation="maximum" />
+                <field field_ref="tke_max_sic" level="10" operation="maximum" />
+                <field field_ref="SWnetOR" level="2" />
+                <field field_ref="SWdownOR" level="2" />
+                <field field_ref="LWdownOR" level="2" />
+                <field field_ref="snowl" level="10" />
+                <field field_ref="cape_max" level="10" operation="maximum" />
+                <field field_ref="solldown" level="10" />
+                <field field_ref="dtsvdfo" level="10" />
+                <field field_ref="dtsvdft" level="10" />
+                <field field_ref="dtsvdfg" level="10" />
+                <field field_ref="dtsvdfi" level="10" />
+                <field field_ref="rugs" level="10" />
+                <field field_ref="z0m" level="10" />
+                <field field_ref="z0h" level="10" />
+                <field field_ref="topswad" level="10" />
+                <field field_ref="topswad0" level="10" />
+                <field field_ref="topswai" level="10" />
+                <field field_ref="solswad" level="10" />
+                <field field_ref="solswad0" level="10" />
+                <field field_ref="solswai" level="10" />
+                <field field_ref="OD550_ASBCM" level="10" />
+                <field field_ref="OD550_ASPOMM" level="10" />
+                <field field_ref="OD550_ASSO4M" level="10" />
+                <field field_ref="OD550_CSSO4M" level="10" />
+                <field field_ref="OD550_SSSSM" level="10" />
+                <field field_ref="OD550_ASSSM" level="10" />
+                <field field_ref="OD550_CSSSM" level="10" />
+                <field field_ref="OD550_CIDUSTM" level="10" />
+                <field field_ref="OD550_AIBCM" level="10" />
+                <field field_ref="OD550_AIPOMM" level="10" />
+                <field field_ref="OD550_STRAT" level="10" />
+                <field field_ref="od550aer" level="10" />
+                <field field_ref="od865aer" level="10" />
+                <field field_ref="absvisaer" level="10" />
+                <field field_ref="od550lt1aer" level="10" />
+                <field field_ref="sconcso4" level="10" />
+                <field field_ref="sconcoa" level="10" />
+                <field field_ref="sconcbc" level="10" />
+                <field field_ref="sconcss" level="10" />
+                <field field_ref="sconcdust" level="10" />
+                <field field_ref="loadso4" level="10" />
+                <field field_ref="loadoa" level="10" />
+                <field field_ref="loadbc" level="10" />
+                <field field_ref="loadss" level="10" />
+                <field field_ref="loaddust" level="10" />
+                <field field_ref="swtoaas_nat" level="10" />
+                <field field_ref="swsrfas_nat" level="10" />
+                <field field_ref="swtoacs_nat" level="10" />
+                <field field_ref="swsrfcs_nat" level="10" />
+                <field field_ref="swtoaas_ant" level="10" />
+                <field field_ref="swsrfas_ant" level="10" />
+                <field field_ref="swtoacs_ant" level="10" />
+                <field field_ref="swsrfcs_ant" level="10" />
+                <field field_ref="swtoacf_nat" level="10" />
+                <field field_ref="swsrfcf_nat" level="10" />
+                <field field_ref="swtoacf_ant" level="10" />
+                <field field_ref="swsrfcf_ant" level="10" />
+                <field field_ref="swtoacf_zero" level="10" />
+                <field field_ref="swsrfcf_zero" level="10" />
+                <field field_ref="cldncl" level="10" />
+                <field field_ref="reffclwtop" level="10" />
+                <field field_ref="cldnvi" level="10" />
+                <field field_ref="lcc" level="10" />
+                <field field_ref="wvapp" level="10" />
+                <field field_ref="ozone_daylight" level="10" />
+                <field field_ref="albe_ter" level="10" />
+                <field field_ref="albe_lic" level="10" />
+                <field field_ref="albe_oce" level="10" />
+                <field field_ref="albe_sic" level="10" />
+                <field field_ref="ages_ter" level="10" />
+                <field field_ref="ages_lic" level="10" />
+                <field field_ref="ages_oce" level="10" />
+                <field field_ref="ages_sic" level="10" />
+                <field field_ref="snow_ter" level="10" />
+                <field field_ref="snow_lic" level="10" />
+                <field field_ref="snow_oce" level="10" />
+                <field field_ref="snow_sic" level="10" />
+                <field field_ref="rugs_ter" level="10" />
+                <field field_ref="rugs_lic" level="10" />
+                <field field_ref="rugs_oce" level="10" />
+                <field field_ref="rugs_sic" level="10" />
+                <field field_ref="z0m_ter" level="10" />
+                <field field_ref="z0m_lic" level="10" />
+                <field field_ref="z0m_oce" level="10" />
+                <field field_ref="z0m_sic" level="10" />
+                <field field_ref="z0h_ter" level="10" />
+                <field field_ref="z0h_lic" level="10" />
+                <field field_ref="z0h_oce" level="10" />
+                <field field_ref="z0h_sic" level="10" />
+                <field field_ref="alb1" level="10" />
+                <field field_ref="alb2" level="10" />
+                <field field_ref="ftime_con" level="10" operation="instant" />
+                <field field_ref="wake_h" level="10" />
+                <field field_ref="wake_s" level="10" />
+                <field field_ref="plulth" level="10" />
+                <field field_ref="plulst" level="10" />
+                <field field_ref="lmaxth" level="10" />
+                <field field_ref="ftime_th" level="10" />
+                <field field_ref="f0_th" level="10" />
+                <field field_ref="zmax_th" level="4" />
+                <field field_ref="rsut4co2" level="10" />
+                <field field_ref="rlut4co2" level="10" />
+                <field field_ref="rsutcs4co2" level="10" />
+                <field field_ref="rlutcs4co2" level="10" />
+            </field_group>
+
+            <!-- VARS 3D -->
+            <field_group operation="instant" freq_op="1ts" axis_ref="presnivs">
+                <field field_ref="cldtau" level="10" />
+                <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" />
+                <field field_ref="concbc" level="10" />
+                <field field_ref="concss" level="10" />
+                <field field_ref="concdust" level="10" />
+                <field field_ref="ec550aer" level="10" />
+                <field field_ref="lwcon" level="10" />
+                <field field_ref="iwcon" level="10" />
+                <field field_ref="temp" level="4" />
+                <field field_ref="theta" level="4" />
+                <field field_ref="ovap" level="4" />
+                <field field_ref="ovapinit" level="10" />
+                <field field_ref="oliq" level="4" />
+                <field field_ref="geop" level="10" />
+                <field field_ref="vitu" level="4" />
+                <field field_ref="vitv" level="4" />
+                <field field_ref="vitw" level="10" />
+                <field field_ref="pres" level="10" />
+                <field field_ref="paprs" level="10" />
+                <field field_ref="mass" level="10" />
+                <field field_ref="zfull" level="10" />
+                <field field_ref="zhalf" level="10" />
+                <field field_ref="rneb" level="10" />
+                <field field_ref="rnebcon" level="10" />
+                <field field_ref="rnebls" level="10" />
+                <field field_ref="rhum" level="10" />
+                <field field_ref="ozone" level="10" />
+                <field field_ref="upwd" level="10" />
+                <field field_ref="dtphy" level="10" />
+                <field field_ref="dqphy" level="10" />
+                <field field_ref="pr_con_l" level="10" />
+                <field field_ref="pr_con_i" level="10" />
+                <field field_ref="pr_lsc_l" level="10" />
+                <field field_ref="pr_lsc_i" level="10" />
+                <field field_ref="re" level="10" />
+                <field field_ref="fl" level="10" />
+                <field field_ref="scdnc" level="10" />
+                <field field_ref="reffclws" level="10" />
+                <field field_ref="reffclwc" level="10" />
+                <field field_ref="lcc3d" level="10" />
+                <field field_ref="lcc3dcon" level="10" />
+                <field field_ref="lcc3dstra" level="10" />
+                <field field_ref="clwcon" level="10" />
+                <field field_ref="Ma" level="10" />
+                <field field_ref="dnwd" level="10" />
+                <field field_ref="dnwd0" level="10" />
+                <field field_ref="mc" level="10" />
+                <field field_ref="dtdyn" level="10" />
+                <field field_ref="dqdyn" level="10" />
+                <field field_ref="dudyn" level="10" />
+                <field field_ref="dvdyn" level="10" />
+                <field field_ref="dtcon" level="10" />
+                <field field_ref="ducon" level="10" />
+                <field field_ref="dvcon" level="10" />
+                <field field_ref="dqcon" level="10" />
+                <field field_ref="dtwak" level="10" />
+                <field field_ref="dqwak" level="10" />
+                <field field_ref="wake_deltat" level="10" />
+                <field field_ref="wake_deltaq" level="10" />
+                <field field_ref="wake_omg" level="10" />
+                <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" />
+                <field field_ref="dtlsc" level="10" />
+                <field field_ref="dtlschr" level="10" />
+                <field field_ref="dqlsc" level="10" />
+                <field field_ref="beta_prec" level="10" />
+                <field field_ref="dtvdf" level="10" />
+                <field field_ref="dtdis" level="10" />
+                <field field_ref="dqvdf" level="10" />
+                <field field_ref="dteva" level="10" />
+                <field field_ref="dqeva" level="10" />
+                <field field_ref="dqlscth" level="10" />
+                <field field_ref="dqlscst" level="10" />
+                <field field_ref="dtlscth" level="10" />
+                <field field_ref="dtlscst" level="10" />
+                <field field_ref="ptconvth" level="10" />
+                <field field_ref="ptconv" level="10" />
+                <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="d_th" level="10" />
+                <field field_ref="dqthe" level="10" />
+                <field field_ref="dtajs" level="10" />
+                <field field_ref="dqajs" level="10" />
+                <field field_ref="dtswr" level="10" />
+                <field field_ref="dtsw0" level="10" />
+                <field field_ref="dtlwr" level="10" />
+                <field field_ref="dtlw0" level="10" />
+                <field field_ref="dtec" level="10" />
+                <field field_ref="duvdf" level="10" />
+                <field field_ref="dvvdf" level="10" />
+                <field field_ref="duoro" level="10" />
+                <field field_ref="dvoro" level="10" />
+                <field field_ref="dulif" level="10" />
+                <field field_ref="dvlif" level="10" />
+                <field field_ref="dtoro" level="10" />
+                <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" />
+                <field field_ref="tntr" level="10" />
+                <field field_ref="tntscpbl" level="10" />
+                <field field_ref="tnhus" level="10" />
+                <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" />
+                <field field_ref="dmc" level="10" />
+                <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_group>
+        </file>
+    </file_group>
+</file_definition>
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histmthCOSP_lmdz.xml
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histmthCOSP_lmdz.xml	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histmthCOSP_lmdz.xml	(revision 2694)
@@ -0,0 +1,80 @@
+<!-- This file corresponds to the LMDZ5 testing rev 2314. It might not be compatible  -->
+<!-- with older or newer revisions of LMDZ source code.                               -->
+
+<file_definition>
+     <file_group id="defile">
+        <file id="histmthCOSP" name="histmthCOSP" output_freq="1mo" output_level="5"  enabled="_AUTO_">
+
+            <!-- VARS 2D -->
+            <field_group operation="average" freq_op="3h">
+                <field field_ref="cllcalipso"         level="1" />
+                <field field_ref="clmcalipso"         level="1" />
+                <field field_ref="clhcalipso"         level="1" />
+                <field field_ref="cltcalipso"         level="1" />
+                <field field_ref="clcalipso"  level="1" axis_ref="presnivs" />
+                <field field_ref="parasol_refl"  level="1" axis_ref="sza" />
+                <field field_ref="parasol_crefl"  level="1" axis_ref="sza" />
+                <field field_ref="Ncrefl"  level="1" axis_ref="sza" />
+		<field field_ref="c01_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c02_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c03_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c04_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c05_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c06_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c07_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c08_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c09_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c10_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c11_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c12_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c13_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c14_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c15_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c16_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c17_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c18_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c19_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+		<field field_ref="c20_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
+                <field field_ref="c01_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c02_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c03_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c04_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c05_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c06_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c07_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c08_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c09_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c10_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c11_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c12_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c13_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c14_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c15_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c16_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c17_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c18_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c19_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="c20_atb532" level="10" axis_ref="height_mlev" />
+                <field field_ref="beta_mol532" level="10" axis_ref="height_mlev" />
+                <field field_ref="sunlit" level="10" />
+                <field field_ref="c01_clisccp2" level="10" axis_ref="pressure2" />
+                <field field_ref="c02_clisccp2" level="10" axis_ref="pressure2" />
+                <field field_ref="c03_clisccp2" level="10" axis_ref="pressure2" />
+                <field field_ref="c04_clisccp2" level="10" axis_ref="pressure2" />
+                <field field_ref="c05_clisccp2" level="10" axis_ref="pressure2" />
+                <field field_ref="c06_clisccp2" level="10" axis_ref="pressure2" />
+                <field field_ref="c07_clisccp2" level="10" axis_ref="pressure2" />
+                <field field_ref="boxtauisccp" level="10" axis_ref="column" />
+                <field field_ref="boxptopisccp" level="10" axis_ref="column" />
+                <field field_ref="tclisccp" level="10" />
+                <field field_ref="ctpisccp" level="10" />
+                <field field_ref="tauisccp" level="10" /> 
+                <field field_ref="albisccp" level="10" />
+                <field field_ref="meantbisccp" level="10" />
+                <field field_ref="meantbclrisccp" level="10" />
+            </field_group>
+
+        </file>
+     </file_group>
+</file_definition>
+   
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histmthNMC_lmdz.xml
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histmthNMC_lmdz.xml	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histmthNMC_lmdz.xml	(revision 2694)
@@ -0,0 +1,33 @@
+<!-- This file corresponds to the LMDZ5 testing rev 2314. It might not be compatible  -->
+<!-- with older or newer revisions of LMDZ source code.                               -->
+
+<file_definition>
+    <file_group id="defile">
+        <file id="histmthNMC" name="histmthNMC" output_freq="1mo" output_level="5" enabled="_AUTO_">
+
+            <!-- VARS 3D -->
+            <field_group operation="average" freq_op="1ts" detect_missing_value=".true.">
+<!--            <field field_ref="tnondef" level="5" />  -->
+                <field field_ref="ta" level="1" />
+                <field field_ref="zg" level="5" />
+                <field field_ref="hus" level="5" />
+                <field field_ref="hur" level="5" />
+                <field field_ref="ua" level="5" />
+                <field field_ref="va" level="5" />
+                <field field_ref="wap" level="5" />
+<!--            <field field_ref="psbg" level="5" />  -->
+                <field field_ref="tro3" level="5" />
+                <field field_ref="tro3_daylight" level="5" />
+                <field field_ref="uv" level="6" />
+                <!-- <field field_ref="vq" level="6" /> -->
+                <field field_ref="vT" level="6" />
+                <field field_ref="wq" level="6" />
+                <field field_ref="vphi" level="6" />
+                <field field_ref="wT" level="6" />
+                <field field_ref="u2" level="6" />
+                <field field_ref="v2" level="6" />
+                <field field_ref="T2" level="6" />
+            </field_group>
+        </file>
+    </file_group>
+</file_definition>
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histmth_lmdz.xml
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histmth_lmdz.xml	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histmth_lmdz.xml	(revision 2694)
@@ -0,0 +1,533 @@
+<!-- This file corresponds to the LMDZ5 testing rev 2314. It might not be compatible  -->
+<!-- with older or newer revisions of LMDZ source code.                               -->
+
+<file_definition>
+        <file_group id="defile">
+        <file id="histmth" name="histmth" output_freq="1mo" output_level="5"  enabled="_AUTO_">
+
+            <!-- VARS 1D -->
+<!--            <field_group operation="once">  -->
+<!--              <field field_ref="Ap" level="1" />  -->
+<!--              <field field_ref="Bp" level="1" />  -->
+<!--              <field field_ref="Alt" level="1" />  -->
+<!--            </field_group>  -->
+        
+            <!-- VARS 2D -->
+            <field_group operation="average" freq_op="1ts">
+                <field field_ref="phis"         level="1" />
+                <field field_ref="aire"         level="1"   operation="once"/>
+                <field field_ref="contfracATM"  level="10"  operation="once"/>
+                <field field_ref="contfracOR"   level="10" />
+                <field field_ref="aireTER"      level="10" />
+                <field field_ref="flat"         level="5" />
+                <field field_ref="slp"          level="1" />
+                <field field_ref="tsol"         level="1" />
+                <field field_ref="t2m"          level="1" />
+                <field field_ref="t2m_min" level="1" operation="minimum" />
+                <field field_ref="t2m_max" level="1" operation="maximum" />
+                <field field_ref="t2m_ter" level="10" />
+                <field field_ref="t2m_lic" level="10" />
+                <field field_ref="t2m_oce" level="10" />
+                <field field_ref="t2m_sic" level="10" />
+                <field field_ref="gusts" level="1" />
+                <field field_ref="wind10m" level="1" />
+                <field field_ref="wind10max" level="10" operation="maximum" />
+                <field field_ref="sicf"      level="1" />
+                <field field_ref="q2m"       level="1" />
+                <field field_ref="ustar"     level="1" />
+                <field field_ref="u10m"      level="1" />
+                <field field_ref="v10m"      level="1" />
+                <field field_ref="psol"      level="1" />
+                <field field_ref="qsurf"     level="1" />
+                <field field_ref="ustar_ter" level="10" />
+                <field field_ref="ustar_lic" level="10" />
+                <field field_ref="ustar_oce" level="10" />
+                <field field_ref="ustar_sic" level="10" />
+                <field field_ref="wstar_ter" level="10" />
+                <field field_ref="wstar_lic" level="10" />
+                <field field_ref="wstar_oce" level="10" />
+                <field field_ref="wstar_sic" level="10" />
+                <field field_ref="wstar"    level="5" />
+                <field field_ref="u10m_ter" level="10" />
+                <field field_ref="u10m_lic" level="10" />
+                <field field_ref="u10m_oce" level="10" />
+                <field field_ref="u10m_sic" level="10" />
+                <field field_ref="v10m_ter" level="10" />
+                <field field_ref="v10m_lic" level="10" />
+                <field field_ref="v10m_oce" level="10" />
+                <field field_ref="v10m_sic" level="10" />
+                <field field_ref="qsol"     level="1" />
+                <field field_ref="ndayrain" level="1" operation="instant" />
+                <field field_ref="precip"   level="1" />
+                <field field_ref="plul"     level="1" />
+                <field field_ref="pluc"     level="1" />
+                <field field_ref="snow"     level="1" />
+                <field field_ref="evap"     level="1" />
+                <field field_ref="evap_ter" level="1" />
+                <field field_ref="evap_lic" level="1" />
+                <field field_ref="evap_oce" level="1" />
+                <field field_ref="evap_sic" level="1" />
+                <field field_ref="msnow"    level="1" />
+                <field field_ref="fsnow"    level="1" />
+                <field field_ref="tops"     level="1" />
+                <field field_ref="tops0"    level="1" />
+                <field field_ref="topl"     level="1" />
+                <field field_ref="topl0"    level="1" />
+                <field field_ref="SWupTOA"  level="1" />
+                <field field_ref="SWupTOAclr"   level="1" />
+                <field field_ref="SWdnTOA"      level="1" />
+                <field field_ref="SWdnTOAclr"   level="1" />
+                <field field_ref="nettop"       level="1" />
+                <field field_ref="SWup200"      level="1" />
+                <field field_ref="SWup200clr"   level="10" />
+                <field field_ref="SWdn200"      level="1" />
+                <field field_ref="SWdn200clr"   level="10" />
+                <field field_ref="LWup200"      level="1" />
+                <field field_ref="LWup200clr"   level="1" />
+                <field field_ref="LWdn200"      level="1" />
+                <field field_ref="LWdn200clr"   level="1" />
+                <field field_ref="sols"  level="1" />
+                <field field_ref="sols0" level="1" />
+                <field field_ref="soll" level="1" />
+                <field field_ref="soll0" level="1" />
+                <field field_ref="radsol" level="1" />
+                <field field_ref="SWupSFC" level="1" />
+                <field field_ref="SWupSFCclr" level="1" />
+                <field field_ref="SWdnSFC" level="1" />
+                <field field_ref="SWdnSFCclr" level="1" />
+                <field field_ref="LWupSFC" level="1" />
+                <field field_ref="LWupSFCclr" level="1" />
+                <field field_ref="LWdnSFC" level="1" />
+                <field field_ref="LWdnSFCclr" level="1" />
+                <field field_ref="bils" level="1" />
+                <field field_ref="bils_tke" level="1" />
+                <field field_ref="bils_diss" level="1" />
+                <field field_ref="bils_ec" level="1" />
+                <field field_ref="bils_kinetic" level="1" />
+                <field field_ref="bils_enthalp" level="1" />
+                <field field_ref="bils_latent" level="1" />
+                <field field_ref="sens" level="1" />
+                <field field_ref="fder" level="1" />
+                <field field_ref="ffonte" level="1" />
+                <field field_ref="fqcalving" level="1" />
+                <field field_ref="fqfonte" level="1" />
+                <field field_ref="taux" level="1" />
+                <field field_ref="tauy" level="1" />
+                <field field_ref="taux_ter" level="1" />
+                <field field_ref="taux_lic" level="1" />
+                <field field_ref="taux_oce" level="1" />
+                <field field_ref="taux_sic" level="1" />
+                <field field_ref="tauy_ter" level="1" />
+                <field field_ref="tauy_lic" level="1" />
+                <field field_ref="tauy_oce" level="1" />
+                <field field_ref="tauy_sic" level="1" />
+                <field field_ref="pourc_ter" level="1" />
+                <field field_ref="pourc_lic" level="1" />
+                <field field_ref="pourc_oce" level="1" />
+                <field field_ref="pourc_sic" level="1" />
+                <field field_ref="fract_ter" level="1" />
+                <field field_ref="fract_lic" level="1" />
+                <field field_ref="fract_oce" level="1" />
+                <field field_ref="fract_sic" level="1" />
+                <field field_ref="tsol_ter" level="1" />
+                <field field_ref="tsol_lic" level="1" />
+                <field field_ref="tsol_oce" level="1" />
+                <field field_ref="tsol_sic" level="1" />
+                <field field_ref="evappot_ter" level="1" />
+                <field field_ref="evappot_lic" level="4" />
+                <field field_ref="evappot_oce" level="4" />
+                <field field_ref="evappot_sic" level="4" />
+                <field field_ref="sens_ter" level="1" />
+                <field field_ref="sens_lic" level="1" />
+                <field field_ref="sens_oce" level="1" />
+                <field field_ref="sens_sic" level="1" />
+                <field field_ref="lat_ter" level="1" />
+                <field field_ref="lat_lic" level="1" />
+                <field field_ref="lat_oce" level="1" />
+                <field field_ref="lat_sic" level="1" />
+                <field field_ref="flw_ter" level="1" />
+                <field field_ref="flw_lic" level="1" />
+                <field field_ref="flw_oce" level="1" />
+                <field field_ref="flw_sic" level="1" />
+                <field field_ref="fsw_ter" level="1" />
+                <field field_ref="fsw_lic" level="1" />
+                <field field_ref="fsw_oce" level="1" />
+                <field field_ref="fsw_sic" level="1" />
+                <field field_ref="wbils_ter" level="1" />
+                <field field_ref="wbils_lic" level="1" />
+                <field field_ref="wbils_oce" level="1" />
+                <field field_ref="wbils_sic" level="1" />
+                <field field_ref="wbilo_ter" level="1" />
+                <field field_ref="wbilo_lic" level="1" />
+                <field field_ref="wbilo_oce" level="1" />
+                <field field_ref="wbilo_sic" level="1" />
+                <field field_ref="cdrm" level="1" />
+                <field field_ref="cdrh" level="1" />
+                <field field_ref="cldl" level="1" />
+                <field field_ref="cldm" level="1" />
+                <field field_ref="cldh" level="1" />
+                <field field_ref="cldt" level="1" />
+                <field field_ref="cldq" level="1" />
+                <field field_ref="lwp" level="1" />
+                <field field_ref="iwp" level="1" />
+                <field field_ref="ue" level="1" />
+                <field field_ref="ve" level="1" />
+                <field field_ref="uq" level="1" />
+                <field field_ref="vq" level="1" />
+                <field field_ref="cape" level="1" />
+                <field field_ref="pbase" level="1" />
+                <field field_ref="ptop" level="1" />
+                <field field_ref="fbase" level="1" />
+                <field field_ref="plcl" level="1" />
+                <field field_ref="plfc" level="1" />
+                <field field_ref="wbeff" level="1" />
+                <field field_ref="prw" level="1" />
+                <field field_ref="s_pblh" level="1" />
+                <field field_ref="s_pblt" level="1" />
+                <field field_ref="s_lcl" level="1" />
+                <field field_ref="s_therm" level="1" />
+                <field field_ref="slab_bils_oce" level="1" />
+                <field field_ref="ale_bl" level="1" />
+                <field field_ref="alp_bl" level="1" />
+                <field field_ref="ale_wk" level="1" />
+                <field field_ref="alp_wk" level="1" />
+                <field field_ref="ale" level="1" />
+                <field field_ref="alp" level="1" />
+                <field field_ref="cin" level="1" />
+                <field field_ref="wape" level="1" />
+                <field field_ref="n2" level="1" />
+                <field field_ref="s2" level="1" />
+                <field field_ref="proba_notrig" level="1" />
+                <field field_ref="random_notrig" level="1" />
+                <field field_ref="ale_bl_stat" level="1" />
+                <field field_ref="ale_bl_trig" level="1" />
+                <field field_ref="alp_bl_det" level="1" />
+                <field field_ref="alp_bl_fluct_m" level="1" />
+                <field field_ref="alp_bl_fluct_tke" level="1" />
+                <field field_ref="alp_bl_conv" level="1" />
+                <field field_ref="alp_bl_stat" level="1" />
+
+                <field_group operation="average" freq_op="1ts" detect_missing_value=".true.">
+                    <field field_ref="u850" level="1" />
+                    <field field_ref="u700" level="1" />
+                    <field field_ref="u500" level="1" />
+                    <field field_ref="u200" level="1" />
+                    <field field_ref="u100" level="1" />
+                    <field field_ref="u50" level="1" />
+                    <field field_ref="u10" level="1" />
+                    <field field_ref="v850" level="1" />
+                    <field field_ref="v700" level="1" />
+                    <field field_ref="v500" level="1" />
+                    <field field_ref="v200" level="1" />
+                    <field field_ref="v100" level="1" />
+                    <field field_ref="v50" level="1" />
+                    <field field_ref="v10" level="1" />
+                    <field field_ref="w850" level="1" />
+                    <field field_ref="w700" level="1" />
+                    <field field_ref="w500" level="1" />
+                    <field field_ref="w200" level="1" />
+                    <field field_ref="w100" level="1" />
+                    <field field_ref="w50" level="1" />
+                    <field field_ref="w10" level="1" />
+                    <field field_ref="t850" level="1" />
+                    <field field_ref="t700" level="1" />
+                    <field field_ref="t500" level="1" />
+                    <field field_ref="t200" level="1" />
+                    <field field_ref="t100" level="1" />
+                    <field field_ref="t50" level="1" />
+                    <field field_ref="t10" level="1" />
+                    <field field_ref="q850" level="1" />
+                    <field field_ref="q700" level="1" />
+                    <field field_ref="q500" level="1" />
+                    <field field_ref="q200" level="1" />
+                    <field field_ref="q100" level="1" />
+                    <field field_ref="q50" level="1" />
+                    <field field_ref="q10" level="1" />
+                    <field field_ref="z850" level="1" />
+                    <field field_ref="z700" level="1" />
+                    <field field_ref="z500" level="1" />
+                    <field field_ref="z200" level="1" />
+                    <field field_ref="z100" level="1" />
+                    <field field_ref="z50" level="1" />
+                    <field field_ref="z10" level="1" />
+                </field_group>
+
+                <field field_ref="t_oce_sic" level="1" />
+                <field field_ref="weakinv" level="10" />
+                <field field_ref="dthmin" level="10" />
+                <field field_ref="u10_ter" level="10" />
+                <field field_ref="u10_lic" level="10" />
+                <field field_ref="u10_oce" level="10" />
+                <field field_ref="u10_sic" level="10" />
+                <field field_ref="v10_ter" level="10" />
+                <field field_ref="v10_lic" level="10" />
+                <field field_ref="v10_oce" level="10" />
+                <field field_ref="v10_sic" level="10" />
+                <field field_ref="rh2m" level="5" />
+                <field field_ref="rh2m_min" level="10" operation="minimum" />
+                <field field_ref="rh2m_max" level="10" operation="maximum" />
+                <field field_ref="qsat2m" level="10" />
+                <field field_ref="tpot" level="10" />
+                <field field_ref="tpote" level="10" />
+                <field field_ref="tke" level="4" />
+                <field field_ref="tke_ter" level="10" />
+                <field field_ref="tke_lic" level="10" />
+                <field field_ref="tke_oce" level="10" />
+                <field field_ref="tke_sic" level="10" />
+                <field field_ref="tke_max_ter" level="10" operation="maximum" />
+                <field field_ref="tke_max_lic" level="10" operation="maximum" />
+                <field field_ref="tke_max_oce" level="10" operation="maximum" />
+                <field field_ref="tke_max_sic" level="10" operation="maximum" />
+                <field field_ref="SWnetOR" level="10" />
+                <field field_ref="SWdownOR" level="10" />
+                <field field_ref="LWdownOR" level="10" />
+                <field field_ref="snowl" level="10" />
+                <field field_ref="cape_max" level="10" operation="maximum" />
+                <field field_ref="solldown" level="10" />
+                <field field_ref="dtsvdfo" level="10" />
+                <field field_ref="dtsvdft" level="10" />
+                <field field_ref="dtsvdfg" level="10" />
+                <field field_ref="dtsvdfi" level="10" />
+                <field field_ref="rugs" level="10" />
+                <field field_ref="z0m" level="10" />
+                <field field_ref="z0h" level="10" />
+                <field field_ref="topswad" level="2" />
+                <field field_ref="topswad0" level="2" />
+                <field field_ref="topswai" level="2" />
+                <field field_ref="solswad" level="2" />
+                <field field_ref="solswad0" level="2" />
+                <field field_ref="solswai" level="2" />
+                <field field_ref="OD550_ASBCM" level="2" />
+                <field field_ref="OD550_ASPOMM" level="2" />
+                <field field_ref="OD550_ASSO4M" level="2" />
+                <field field_ref="OD550_CSSO4M" level="2" />
+                <field field_ref="OD550_SSSSM" level="2" />
+                <field field_ref="OD550_ASSSM" level="2" />
+                <field field_ref="OD550_CSSSM" level="2" />
+                <field field_ref="OD550_CIDUSTM" level="2" />
+                <field field_ref="OD550_AIBCM" level="2" />
+                <field field_ref="OD550_AIPOMM" level="2" />
+                <field field_ref="OD550_STRAT" level="2" />
+                <field field_ref="od550aer" level="2" />
+                <field field_ref="od865aer" level="2" />
+                <field field_ref="absvisaer" level="2" />
+                <field field_ref="od550lt1aer" level="2" />
+                <field field_ref="sconcso4" level="2" />
+                <field field_ref="sconcoa" level="2" />
+                <field field_ref="sconcbc" level="2" />
+                <field field_ref="sconcss" level="2" />
+                <field field_ref="sconcdust" level="2" />
+                <field field_ref="loadso4" level="2" />
+                <field field_ref="loadoa" level="2" />
+                <field field_ref="loadbc" level="2" />
+                <field field_ref="loadss" level="2" />
+                <field field_ref="loaddust" level="2" />
+                <field field_ref="swtoaas_nat" level="4" />
+                <field field_ref="swsrfas_nat" level="4" />
+                <field field_ref="swtoacs_nat" level="4" />
+                <field field_ref="swsrfcs_nat" level="4" />
+                <field field_ref="swtoaas_ant" level="4" />
+                <field field_ref="swsrfas_ant" level="4" />
+                <field field_ref="swtoacs_ant" level="4" />
+                <field field_ref="swsrfcs_ant" level="4" />
+                <field field_ref="swtoacf_nat" level="4" />
+                <field field_ref="swsrfcf_nat" level="4" />
+                <field field_ref="swtoacf_ant" level="4" />
+                <field field_ref="swsrfcf_ant" level="4" />
+                <field field_ref="swtoacf_zero" level="4" />
+                <field field_ref="swsrfcf_zero" level="4" />
+                <field field_ref="cldncl" level="2" />
+                <field field_ref="reffclwtop" level="2" />
+                <field field_ref="cldnvi" level="2" />
+                <field field_ref="lcc" level="2" />
+                <field field_ref="wvapp" level="2" />
+                <field field_ref="ozone_daylight" level="2" />
+                <field field_ref="albe_ter" level="3" />
+                <field field_ref="albe_lic" level="3" />
+                <field field_ref="albe_oce" level="3" />
+                <field field_ref="albe_sic" level="3" />
+                <field field_ref="ages_ter" level="10" />
+                <field field_ref="ages_lic" level="3" />
+                <field field_ref="ages_oce" level="10" />
+                <field field_ref="ages_sic" level="3" />
+                <field field_ref="snow_ter" level="10" />
+                <field field_ref="snow_lic" level="3" />
+                <field field_ref="snow_oce" level="10" />
+                <field field_ref="snow_sic" level="3" />
+                <field field_ref="rugs_ter" level="3" />
+                <field field_ref="rugs_lic" level="3" />
+                <field field_ref="rugs_oce" level="3" />
+                <field field_ref="rugs_sic" level="3" />
+                <field field_ref="z0m_ter" level="3" />
+                <field field_ref="z0m_lic" level="3" />
+                <field field_ref="z0m_oce" level="3" />
+                <field field_ref="z0m_sic" level="3" />
+                <field field_ref="z0h_ter" level="3" />
+                <field field_ref="z0h_lic" level="3" />
+                <field field_ref="z0h_oce" level="3" />
+                <field field_ref="z0h_sic" level="3" />
+                <field field_ref="alb1" level="3" />
+                <field field_ref="alb2" level="3" />
+                <field field_ref="ftime_con" level="4" operation="instant" />
+                <field field_ref="wake_h" level="4" />
+                <field field_ref="wake_s" level="4" />
+                <field field_ref="plulth" level="10" />
+                <field field_ref="plulst" level="10" />
+                <field field_ref="lmaxth" level="10" />
+                <field field_ref="ftime_th" level="4" />
+                <field field_ref="f0_th" level="4" />
+                <field field_ref="zmax_th" level="4" />
+                <field field_ref="rsut4co2" level="5" />
+                <field field_ref="rlut4co2" level="5" />
+                <field field_ref="rsutcs4co2" level="5" />
+                <field field_ref="rlutcs4co2" level="5" />
+            </field_group>
+
+            <!-- VARS 3D -->
+            <field_group operation="average" freq_op="1ts" axis_ref="presnivs">
+                <field field_ref="cldtau" level="10" />
+                <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" />
+                <field field_ref="concbc" level="2" />
+                <field field_ref="concss" level="2" />
+                <field field_ref="concdust" level="2" />
+                <field field_ref="ec550aer" level="2" />
+                <field field_ref="lwcon" level="2" />
+                <field field_ref="iwcon" level="2" />
+                <field field_ref="temp" level="2" />
+                <field field_ref="theta" level="2" />
+                <field field_ref="ovap" level="2" />
+                <field field_ref="ovapinit" level="2" />
+                <field field_ref="oliq" level="2" />
+                <field field_ref="geop" level="2" />
+                <field field_ref="vitu" level="2" />
+                <field field_ref="vitv" level="2" />
+                <field field_ref="vitw" level="2" />
+                <field field_ref="pres" level="2" />
+                <field field_ref="paprs" level="2" />
+                <field field_ref="mass" level="2" />
+                <field field_ref="zfull" level="2" />
+                <field field_ref="zhalf" level="2" />
+                <field field_ref="rneb" level="2" />
+                <field field_ref="rnebcon" level="2" />
+                <field field_ref="rnebls" level="2" />
+                <field field_ref="rhum" level="2" />
+                <field field_ref="ozone" level="2" />
+                <field field_ref="upwd" level="2" />
+                <field field_ref="dtphy" level="2" />
+                <field field_ref="dqphy" level="2" />
+                <field field_ref="pr_con_l" level="2" />
+                <field field_ref="pr_con_i" level="2" />
+                <field field_ref="pr_lsc_l" level="2" />
+                <field field_ref="pr_lsc_i" level="2" />
+                <field field_ref="re" level="5" />
+                <field field_ref="fl" level="5" />
+                <field field_ref="scdnc" level="2" />
+                <field field_ref="reffclws" level="2" />
+                <field field_ref="reffclwc" level="2" />
+                <field field_ref="lcc3d" level="2" />
+                <field field_ref="lcc3dcon" level="2" />
+                <field field_ref="lcc3dstra" level="2" />
+                <field field_ref="clwcon" level="4" />
+                <field field_ref="Ma" level="4" />
+                <field field_ref="dnwd" level="4" />
+                <field field_ref="dnwd0" level="4" />
+                <field field_ref="mc" level="4" />
+                <field field_ref="dtdyn" level="4" />
+                <field field_ref="dqdyn" level="4" />
+                <field field_ref="dudyn" level="4" />
+                <field field_ref="dvdyn" level="4" />
+                <field field_ref="dtcon" level="4" />
+                <field field_ref="ducon" level="4" />
+                <field field_ref="dvcon" level="4" />
+                <field field_ref="dqcon" level="4" />
+                <field field_ref="dtwak" level="4" />
+                <field field_ref="dqwak" level="4" />
+                <field field_ref="wake_deltat" level="4" />
+                <field field_ref="wake_deltaq" level="4" />
+                <field field_ref="wake_omg" level="4" />
+                <field field_ref="wdtrainA" level="4" />
+                <field field_ref="wdtrainM" level="4" />
+                <field field_ref="Vprecip" level="10" />
+                <field field_ref="ftd" level="4" />
+                <field field_ref="fqd" level="4" />
+                <field field_ref="dtlsc" level="4" />
+                <field field_ref="dtlschr" level="4" />
+                <field field_ref="dqlsc" level="4" />
+                <field field_ref="beta_prec" level="4" />
+                <field field_ref="dtvdf" level="4" />
+                <field field_ref="dtdis" level="4" />
+                <field field_ref="dqvdf" level="4" />
+                <field field_ref="dteva" level="4" />
+                <field field_ref="dqeva" level="4" />
+                <field field_ref="dqlscth" level="10" />
+                <field field_ref="dqlscst" level="10" />
+                <field field_ref="dtlscth" level="10" />
+                <field field_ref="dtlscst" level="10" />
+                <field field_ref="ptconvth" level="10" />
+                <field field_ref="ptconv" level="4" />
+                <field field_ref="ratqs" level="4" />
+                <field field_ref="dtthe" level="4" />
+                <field field_ref="f_th" level="4" />
+                <field field_ref="e_th" level="4" />
+                <field field_ref="w_th" level="4" />
+                <field field_ref="lambda_th" level="10" />
+                <field field_ref="q_th" level="4" />
+                <field field_ref="a_th" level="4" />
+                <field field_ref="d_th" level="4" />
+                <field field_ref="dqthe" level="4" />
+                <field field_ref="dtajs" level="4" />
+                <field field_ref="dqajs" level="4" />
+                <field field_ref="dtswr" level="4" />
+                <field field_ref="dtsw0" level="4" />
+                <field field_ref="dtlwr" level="4" />
+                <field field_ref="dtlw0" level="4" />
+                <field field_ref="dtec"  level="4" />
+                <field field_ref="duvdf" level="4" />
+                <field field_ref="dvvdf" level="4" />
+                <field field_ref="duoro" level="4" />
+                <field field_ref="dvoro" level="4" />
+                <field field_ref="dulif" level="4" />
+                <field field_ref="dvlif" level="4" />
+                <field field_ref="dtoro" level="4" />
+                <field field_ref="dtlif" level="4" />
+                <field field_ref="dthin" level="4" />
+                <field field_ref="rsu" level="4" />
+                <field field_ref="rsd" level="4" />
+                <field field_ref="rlu" level="4" />
+                <field field_ref="rld" level="4" />
+                <field field_ref="rsucs" level="4" />
+                <field field_ref="rsdcs" level="4" />
+                <field field_ref="rlucs" level="4" />
+                <field field_ref="rldcs" level="4" />
+                <field field_ref="tnt"  level="4" />
+                <field field_ref="tntc" level="4" />
+                <field field_ref="tntr" level="4" />
+                <field field_ref="tntscpbl" level="4" />
+                <field field_ref="tnhus"    level="4" />
+                <field field_ref="tnhusc"   level="4" />
+                <field field_ref="tnhusscpbl" level="4" />
+                <field field_ref="evu" level="4" />
+                <field field_ref="h2o" level="4" />
+                <field field_ref="mcd" level="4" />
+                <field field_ref="dmc" level="4" />
+                <field field_ref="ref_liq" level="4" />
+                <field field_ref="ref_ice" level="4" />
+                <field field_ref="rsu4co2" level="5" />
+                <field field_ref="rlu4co2" level="5" />
+                <field field_ref="rsucs4co2" level="5" />
+                <field field_ref="rlucs4co2" level="5" />
+                <field field_ref="rsd4co2" level="5" />
+                <field field_ref="rld4co2" level="5" />
+                <field field_ref="rsdcs4co2" level="5" />
+                <field field_ref="rldcs4co2" level="5" />
+            </field_group>
+        </file>
+
+        </file_group>
+    </file_definition>
+   
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histstn_lmdz.xml
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histstn_lmdz.xml	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_histstn_lmdz.xml	(revision 2694)
@@ -0,0 +1,531 @@
+<!-- This file corresponds to the LMDZ5 testing rev 2314. It might not be compatible  -->
+<!-- with older or newer revisions of LMDZ source code.                               -->
+
+<file_definition>
+    <file_group id="defile">
+        <file id="histstn" name="histstn" output_freq="1800s" output_level="5" enabled="_AUTO_">
+
+            <!-- VARS 1D -->
+<!--            <field_group operation="once">  -->
+<!--              <field field_ref="Ap" level="1" />  -->
+<!--              <field field_ref="Bp" level="1" />  -->
+<!--              <field field_ref="Alt" level="1" />  -->
+<!--            </field_group>  -->
+        
+            <!-- VARS 2D -->
+            <field_group operation="average" freq_op="1ts">
+                <field field_ref="phis" level="1" />
+                <field field_ref="aire" level="1" operation="once" />
+                <field field_ref="contfracATM" level="10" operation="once" />
+                <field field_ref="contfracOR" level="10" />
+                <field field_ref="aireTER" level="10" />
+                <field field_ref="flat" level="10" />
+                <field field_ref="slp" level="10" />
+                <field field_ref="tsol" level="10" />
+                <field field_ref="t2m" level="10" />
+                <field field_ref="t2m_min" level="10" operation="minimum" />
+                <field field_ref="t2m_max" level="10" operation="maximum" />
+                <field field_ref="t2m_ter" level="10" />
+                <field field_ref="t2m_lic" level="10" />
+                <field field_ref="t2m_oce" level="10" />
+                <field field_ref="t2m_sic" level="10" />
+                <field field_ref="gusts" level="10" />
+                <field field_ref="wind10m" level="10" />
+                <field field_ref="wind10max" level="10" />
+                <field field_ref="sicf" level="10" />
+                <field field_ref="q2m" level="10" />
+                <field field_ref="ustar" level="10" />
+                <field field_ref="u10m" level="10" />
+                <field field_ref="v10m" level="10" />
+                <field field_ref="psol" level="10" />
+                <field field_ref="qsurf" level="10" />
+                <field field_ref="ustar_ter" level="10" />
+                <field field_ref="ustar_lic" level="10" />
+                <field field_ref="ustar_oce" level="10" />
+                <field field_ref="ustar_sic" level="10" />
+                <field field_ref="wstar_ter" level="10" />
+                <field field_ref="wstar_lic" level="10" />
+                <field field_ref="wstar_oce" level="10" />
+                <field field_ref="wstar_sic" level="10" />
+                <field field_ref="wstar" level="10" />
+                <field field_ref="u10m_ter" level="10" />
+                <field field_ref="u10m_lic" level="10" />
+                <field field_ref="u10m_oce" level="10" />
+                <field field_ref="u10m_sic" level="10" />
+                <field field_ref="v10m_ter" level="10" />
+                <field field_ref="v10m_lic" level="10" />
+                <field field_ref="v10m_oce" level="10" />
+                <field field_ref="v10m_sic" level="10" />
+                <field field_ref="qsol" level="10" />
+                <field field_ref="ndayrain" level="10" operation="instant" />
+                <field field_ref="precip" level="10" />
+                <field field_ref="plul" level="10" />
+                <field field_ref="pluc" level="10" />
+                <field field_ref="snow" level="10" />
+                <field field_ref="evap" level="10" />
+                <field field_ref="evap_ter" level="10" />
+                <field field_ref="evap_lic" level="10" />
+                <field field_ref="evap_oce" level="10" />
+                <field field_ref="evap_sic" level="10" />
+                <field field_ref="msnow" level="10" />
+                <field field_ref="fsnow" level="10" />
+                <field field_ref="tops" level="10" />
+                <field field_ref="tops0" level="10" />
+                <field field_ref="topl" level="10" />
+                <field field_ref="topl0" level="10" />
+                <field field_ref="SWupTOA" level="10" />
+                <field field_ref="SWupTOAclr" level="10" />
+                <field field_ref="SWdnTOA" level="10" />
+                <field field_ref="SWdnTOAclr" level="10" />
+                <field field_ref="nettop" level="10" />
+                <field field_ref="SWup200" level="10" />
+                <field field_ref="SWup200clr" level="10" />
+                <field field_ref="SWdn200" level="10" />
+                <field field_ref="SWdn200clr" level="10" />
+                <field field_ref="LWup200" level="10" />
+                <field field_ref="LWup200clr" level="10" />
+                <field field_ref="LWdn200" level="10" />
+                <field field_ref="LWdn200clr" level="10" />
+                <field field_ref="sols" level="10" />
+                <field field_ref="sols0" level="10" />
+                <field field_ref="soll" level="10" />
+                <field field_ref="soll0" level="10" />
+                <field field_ref="radsol" level="10" />
+                <field field_ref="SWupSFC" level="10" />
+                <field field_ref="SWupSFCclr" level="10" />
+                <field field_ref="SWdnSFC" level="10" />
+                <field field_ref="SWdnSFCclr" level="10" />
+                <field field_ref="LWupSFC" level="10" />
+                <field field_ref="LWupSFCclr" level="10" />
+                <field field_ref="LWdnSFC" level="10" />
+                <field field_ref="LWdnSFCclr" level="10" />
+                <field field_ref="bils" level="10" />
+                <field field_ref="bils_tke" level="10" />
+                <field field_ref="bils_diss" level="10" />
+                <field field_ref="bils_ec" level="10" />
+                <field field_ref="bils_kinetic" level="10" />
+                <field field_ref="bils_enthalp" level="10" />
+                <field field_ref="bils_latent" level="10" />
+                <field field_ref="sens" level="10" />
+                <field field_ref="fder" level="10" />
+                <field field_ref="ffonte" level="10" />
+                <field field_ref="fqcalving" level="10" />
+                <field field_ref="fqfonte" level="10" />
+                <field field_ref="taux" level="10" />
+                <field field_ref="tauy" level="10" />
+                <field field_ref="taux_ter" level="10" />
+                <field field_ref="taux_lic" level="10" />
+                <field field_ref="taux_oce" level="10" />
+                <field field_ref="taux_sic" level="10" />
+                <field field_ref="tauy_ter" level="10" />
+                <field field_ref="tauy_lic" level="10" />
+                <field field_ref="tauy_oce" level="10" />
+                <field field_ref="tauy_sic" level="10" />
+                <field field_ref="pourc_ter" level="10" />
+                <field field_ref="pourc_lic" level="10" />
+                <field field_ref="pourc_oce" level="10" />
+                <field field_ref="pourc_sic" level="10" />
+                <field field_ref="fract_ter" level="10" />
+                <field field_ref="fract_lic" level="10" />
+                <field field_ref="fract_oce" level="10" />
+                <field field_ref="fract_sic" level="10" />
+                <field field_ref="tsol_ter" level="10" />
+                <field field_ref="tsol_lic" level="10" />
+                <field field_ref="tsol_oce" level="10" />
+                <field field_ref="tsol_sic" level="10" />
+                <field field_ref="evappot_ter" level="10" />
+                <field field_ref="evappot_lic" level="10" />
+                <field field_ref="evappot_oce" level="10" />
+                <field field_ref="evappot_sic" level="10" />
+                <field field_ref="sens_ter" level="10" />
+                <field field_ref="sens_lic" level="10" />
+                <field field_ref="sens_oce" level="10" />
+                <field field_ref="sens_sic" level="10" />
+                <field field_ref="lat_ter" level="10" />
+                <field field_ref="lat_lic" level="10" />
+                <field field_ref="lat_oce" level="10" />
+                <field field_ref="lat_sic" level="10" />
+                <field field_ref="flw_ter" level="10" />
+                <field field_ref="flw_lic" level="10" />
+                <field field_ref="flw_oce" level="10" />
+                <field field_ref="flw_sic" level="10" />
+                <field field_ref="fsw_ter" level="10" />
+                <field field_ref="fsw_lic" level="10" />
+                <field field_ref="fsw_oce" level="10" />
+                <field field_ref="fsw_sic" level="10" />
+                <field field_ref="wbils_ter" level="10" />
+                <field field_ref="wbils_lic" level="10" />
+                <field field_ref="wbils_oce" level="10" />
+                <field field_ref="wbils_sic" level="10" />
+                <field field_ref="wbilo_ter" level="10" />
+                <field field_ref="wbilo_lic" level="10" />
+                <field field_ref="wbilo_oce" level="10" />
+                <field field_ref="wbilo_sic" level="10" />
+                <field field_ref="cdrm" level="10" />
+                <field field_ref="cdrh" level="10" />
+                <field field_ref="cldl" level="10" />
+                <field field_ref="cldm" level="10" />
+                <field field_ref="cldh" level="10" />
+                <field field_ref="cldt" level="10" />
+                <field field_ref="cldq" level="10" />
+                <field field_ref="lwp" level="10" />
+                <field field_ref="iwp" level="10" />
+                <field field_ref="ue" level="10" />
+                <field field_ref="ve" level="10" />
+                <field field_ref="uq" level="10" />
+                <field field_ref="vq" level="10" />
+                <field field_ref="cape" level="10" />
+                <field field_ref="pbase" level="10" />
+                <field field_ref="ptop" level="10" />
+                <field field_ref="fbase" level="10" />
+                <field field_ref="plcl" level="10" />
+                <field field_ref="plfc" level="10" />
+                <field field_ref="wbeff" level="10" />
+                <field field_ref="prw" level="10" />
+                <field field_ref="s_pblh" level="10" />
+                <field field_ref="s_pblt" level="10" />
+                <field field_ref="s_lcl" level="10" />
+                <field field_ref="s_therm" level="10" />
+                <field field_ref="slab_bils_oce" level="10" />
+                <field field_ref="ale_bl" level="10" />
+                <field field_ref="alp_bl" level="10" />
+                <field field_ref="ale_wk" level="10" />
+                <field field_ref="alp_wk" level="10" />
+                <field field_ref="ale" level="10" />
+                <field field_ref="alp" level="10" />
+                <field field_ref="cin" level="10" />
+                <field field_ref="wape" level="10" />
+                <field field_ref="n2" level="10" />
+                <field field_ref="s2" level="10" />
+                <field field_ref="proba_notrig" level="10" />
+                <field field_ref="random_notrig" level="10" />
+                <field field_ref="ale_bl_stat" level="10" />
+                <field field_ref="ale_bl_trig" level="10" />
+                <field field_ref="alp_bl_det" level="10" />
+                <field field_ref="alp_bl_fluct_m" level="10" />
+                <field field_ref="alp_bl_fluct_tke" level="10" />
+                <field field_ref="alp_bl_conv" level="10" />
+                <field field_ref="alp_bl_stat" level="10" />
+
+                <field_group operation="average" freq_op="1ts" detect_missing_value=".true.">
+                    <field field_ref="u850" level="10" />
+                    <field field_ref="u700" level="10" />
+                    <field field_ref="u500" level="10" />
+                    <field field_ref="u200" level="10" />
+                    <field field_ref="u100" level="10" />
+                    <field field_ref="u50" level="10" />
+                    <field field_ref="u10" level="10" />
+                    <field field_ref="v850" level="10" />
+                    <field field_ref="v700" level="10" />
+                    <field field_ref="v500" level="10" />
+                    <field field_ref="v200" level="10" />
+                    <field field_ref="v100" level="10" />
+                    <field field_ref="v50" level="10" />
+                    <field field_ref="v10" level="10" />
+                    <field field_ref="w850" level="10" />
+                    <field field_ref="w700" level="10" />
+                    <field field_ref="w500" level="10" />
+                    <field field_ref="w200" level="10" />
+                    <field field_ref="w100" level="10" />
+                    <field field_ref="w50" level="10" />
+                    <field field_ref="w10" level="10" />
+                    <field field_ref="t850" level="10" />
+                    <field field_ref="t700" level="10" />
+                    <field field_ref="t500" level="10" />
+                    <field field_ref="t200" level="10" />
+                    <field field_ref="t100" level="10" />
+                    <field field_ref="t50" level="10" />
+                    <field field_ref="t10" level="10" />
+                    <field field_ref="q850" level="10" />
+                    <field field_ref="q700" level="10" />
+                    <field field_ref="q500" level="10" />
+                    <field field_ref="q200" level="10" />
+                    <field field_ref="q100" level="10" />
+                    <field field_ref="q50" level="10" />
+                    <field field_ref="q10" level="10" />
+                    <field field_ref="z850" level="10" />
+                    <field field_ref="z700" level="10" />
+                    <field field_ref="z500" level="10" />
+                    <field field_ref="z200" level="10" />
+                    <field field_ref="z100" level="10" />
+                    <field field_ref="z50" level="10" />
+                    <field field_ref="z10" level="10" />
+                </field_group>
+
+                <field field_ref="t_oce_sic" level="10" />
+                <field field_ref="weakinv" level="10" />
+                <field field_ref="dthmin" level="10" />
+                <field field_ref="u10_ter" level="10" />
+                <field field_ref="u10_lic" level="10" />
+                <field field_ref="u10_oce" level="10" />
+                <field field_ref="u10_sic" level="10" />
+                <field field_ref="v10_ter" level="10" />
+                <field field_ref="v10_lic" level="10" />
+                <field field_ref="v10_oce" level="10" />
+                <field field_ref="v10_sic" level="10" />
+                <field field_ref="rh2m" level="10" />
+                <field field_ref="rh2m_min" level="10" operation="minimum" />
+                <field field_ref="rh2m_max" level="10" operation="maximum" />
+                <field field_ref="qsat2m" level="10" />
+                <field field_ref="tpot" level="10" />
+                <field field_ref="tpote" level="10" />
+                <field field_ref="tke" level="10" />
+                <field field_ref="tke_ter" level="10" />
+                <field field_ref="tke_lic" level="10" />
+                <field field_ref="tke_oce" level="10" />
+                <field field_ref="tke_sic" level="10" />
+                <field field_ref="tke_max_ter" level="10" operation="maximum" />
+                <field field_ref="tke_max_lic" level="10" operation="maximum" />
+                <field field_ref="tke_max_oce" level="10" operation="maximum" />
+                <field field_ref="tke_max_sic" level="10" operation="maximum" />
+                <field field_ref="SWnetOR" level="10" />
+                <field field_ref="SWdownOR" level="10" />
+                <field field_ref="LWdownOR" level="10" />
+                <field field_ref="snowl" level="10" />
+                <field field_ref="cape_max" level="10" operation="maximum" />
+                <field field_ref="solldown" level="10" />
+                <field field_ref="dtsvdfo" level="10" />
+                <field field_ref="dtsvdft" level="10" />
+                <field field_ref="dtsvdfg" level="10" />
+                <field field_ref="dtsvdfi" level="10" />
+                <field field_ref="rugs" level="10" />
+                <field field_ref="z0m" level="10" />
+                <field field_ref="z0h" level="10" />
+                <field field_ref="topswad" level="10" />
+                <field field_ref="topswad0" level="10" />
+                <field field_ref="topswai" level="10" />
+                <field field_ref="solswad" level="10" />
+                <field field_ref="solswad0" level="10" />
+                <field field_ref="solswai" level="10" />
+                <field field_ref="OD550_ASBCM" level="10" />
+                <field field_ref="OD550_ASPOMM" level="10" />
+                <field field_ref="OD550_ASSO4M" level="10" />
+                <field field_ref="OD550_CSSO4M" level="10" />
+                <field field_ref="OD550_SSSSM" level="10" />
+                <field field_ref="OD550_ASSSM" level="10" />
+                <field field_ref="OD550_CSSSM" level="10" />
+                <field field_ref="OD550_CIDUSTM" level="10" />
+                <field field_ref="OD550_AIBCM" level="10" />
+                <field field_ref="OD550_AIPOMM" level="10" />
+                <field field_ref="OD550_STRAT" level="10" />
+                <field field_ref="od550aer" level="10" />
+                <field field_ref="od865aer" level="10" />
+                <field field_ref="absvisaer" level="10" />
+                <field field_ref="od550lt1aer" level="10" />
+                <field field_ref="sconcso4" level="10" />
+                <field field_ref="sconcoa" level="10" />
+                <field field_ref="sconcbc" level="10" />
+                <field field_ref="sconcss" level="10" />
+                <field field_ref="sconcdust" level="10" />
+                <field field_ref="loadso4" level="10" />
+                <field field_ref="loadoa" level="10" />
+                <field field_ref="loadbc" level="10" />
+                <field field_ref="loadss" level="10" />
+                <field field_ref="loaddust" level="10" />
+                <field field_ref="swtoaas_nat" level="10" />
+                <field field_ref="swsrfas_nat" level="10" />
+                <field field_ref="swtoacs_nat" level="10" />
+                <field field_ref="swsrfcs_nat" level="10" />
+                <field field_ref="swtoaas_ant" level="10" />
+                <field field_ref="swsrfas_ant" level="10" />
+                <field field_ref="swtoacs_ant" level="10" />
+                <field field_ref="swsrfcs_ant" level="10" />
+                <field field_ref="swtoacf_nat" level="10" />
+                <field field_ref="swsrfcf_nat" level="10" />
+                <field field_ref="swtoacf_ant" level="10" />
+                <field field_ref="swsrfcf_ant" level="10" />
+                <field field_ref="swtoacf_zero" level="10" />
+                <field field_ref="swsrfcf_zero" level="10" />
+                <field field_ref="cldncl" level="10" />
+                <field field_ref="reffclwtop" level="10" />
+                <field field_ref="cldnvi" level="10" />
+                <field field_ref="lcc" level="10" />
+                <field field_ref="wvapp" level="10" />
+                <field field_ref="ozone_daylight" level="10" />
+                <field field_ref="albe_ter" level="10" />
+                <field field_ref="albe_lic" level="10" />
+                <field field_ref="albe_oce" level="10" />
+                <field field_ref="albe_sic" level="10" />
+                <field field_ref="ages_ter" level="10" />
+                <field field_ref="ages_lic" level="10" />
+                <field field_ref="ages_oce" level="10" />
+                <field field_ref="ages_sic" level="10" />
+                <field field_ref="snow_ter" level="10" />
+                <field field_ref="snow_lic" level="10" />
+                <field field_ref="snow_oce" level="10" />
+                <field field_ref="snow_sic" level="10" />
+                <field field_ref="rugs_ter" level="10" />
+                <field field_ref="rugs_lic" level="10" />
+                <field field_ref="rugs_oce" level="10" />
+                <field field_ref="rugs_sic" level="10" />
+                <field field_ref="z0m_ter" level="10" />
+                <field field_ref="z0m_lic" level="10" />
+                <field field_ref="z0m_oce" level="10" />
+                <field field_ref="z0m_sic" level="10" />
+                <field field_ref="z0h_ter" level="10" />
+                <field field_ref="z0h_lic" level="10" />
+                <field field_ref="z0h_oce" level="10" />
+                <field field_ref="z0h_sic" level="10" />
+                <field field_ref="alb1" level="10" />
+                <field field_ref="alb2" level="10" />
+                <field field_ref="ftime_con" level="10" operation="instant" />
+                <field field_ref="wake_h" level="10" />
+                <field field_ref="wake_s" level="10" />
+                <field field_ref="plulth" level="10" />
+                <field field_ref="plulst" level="10" />
+                <field field_ref="lmaxth" level="10" />
+                <field field_ref="ftime_th" level="10" />
+                <field field_ref="f0_th" level="10" />
+                <field field_ref="zmax_th" level="10" />
+                <field field_ref="rsut4co2" level="10" />
+                <field field_ref="rlut4co2" level="10" />
+                <field field_ref="rsutcs4co2" level="10" />
+                <field field_ref="rlutcs4co2" level="10" />
+            </field_group>
+
+            <!-- VARS 3D -->
+            <field_group operation="average" freq_op="1ts" axis_ref="presnivs">
+                <field field_ref="cldtau" level="10" />
+                <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" />
+                <field field_ref="concbc" level="10" />
+                <field field_ref="concss" level="10" />
+                <field field_ref="concdust" level="10" />
+                <field field_ref="ec550aer" level="10" />
+                <field field_ref="lwcon" level="10" />
+                <field field_ref="iwcon" level="10" />
+                <field field_ref="temp" level="10" />
+                <field field_ref="theta" level="10" />
+                <field field_ref="ovap" level="10" />
+                <field field_ref="ovapinit" level="10" />
+                <field field_ref="oliq" level="10" />
+                <field field_ref="geop" level="10" />
+                <field field_ref="vitu" level="10" />
+                <field field_ref="vitv" level="10" />
+                <field field_ref="vitw" level="10" />
+                <field field_ref="pres" level="10" />
+                <field field_ref="paprs" level="10" />
+                <field field_ref="mass" level="10" />
+                <field field_ref="zfull" level="10" />
+                <field field_ref="zhalf" level="10" />
+                <field field_ref="rneb" level="10" />
+                <field field_ref="rnebcon" level="10" />
+                <field field_ref="rnebls" level="10" />
+                <field field_ref="rhum" level="10" />
+                <field field_ref="ozone" level="10" />
+                <field field_ref="upwd" level="10" />
+                <field field_ref="dtphy" level="10" />
+                <field field_ref="dqphy" level="10" />
+                <field field_ref="pr_con_l" level="10" />
+                <field field_ref="pr_con_i" level="10" />
+                <field field_ref="pr_lsc_l" level="10" />
+                <field field_ref="pr_lsc_i" level="10" />
+                <field field_ref="re" level="10" />
+                <field field_ref="fl" level="10" />
+                <field field_ref="scdnc" level="10" />
+                <field field_ref="reffclws" level="10" />
+                <field field_ref="reffclwc" level="10" />
+                <field field_ref="lcc3d" level="10" />
+                <field field_ref="lcc3dcon" level="10" />
+                <field field_ref="lcc3dstra" level="10" />
+                <field field_ref="clwcon" level="10" />
+                <field field_ref="Ma" level="10" />
+                <field field_ref="dnwd" level="10" />
+                <field field_ref="dnwd0" level="10" />
+                <field field_ref="mc" level="10" />
+                <field field_ref="dtdyn" level="10" />
+                <field field_ref="dqdyn" level="10" />
+                <field field_ref="dudyn" level="10" />
+                <field field_ref="dvdyn" level="10" />
+                <field field_ref="dtcon" level="10" />
+                <field field_ref="ducon" level="10" />
+                <field field_ref="dvcon" level="10" />
+                <field field_ref="dqcon" level="10" />
+                <field field_ref="dtwak" level="10" />
+                <field field_ref="dqwak" level="10" />
+                <field field_ref="wake_deltat" level="10" />
+                <field field_ref="wake_deltaq" level="10" />
+                <field field_ref="wake_omg" level="10" />
+                <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" />
+                <field field_ref="dtlsc" level="10" />
+                <field field_ref="dtlschr" level="10" />
+                <field field_ref="dqlsc" level="10" />
+                <field field_ref="beta_prec" level="10" />
+                <field field_ref="dtvdf" level="10" />
+                <field field_ref="dtdis" level="10" />
+                <field field_ref="dqvdf" level="10" />
+                <field field_ref="dteva" level="10" />
+                <field field_ref="dqeva" level="10" />
+                <field field_ref="dqlscth" level="10" />
+                <field field_ref="dqlscst" level="10" />
+                <field field_ref="dtlscth" level="10" />
+                <field field_ref="dtlscst" level="10" />
+                <field field_ref="ptconvth" level="10" />
+                <field field_ref="ptconv" level="10" />
+                <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="d_th" level="10" />
+                <field field_ref="dqthe" level="10" />
+                <field field_ref="dtajs" level="10" />
+                <field field_ref="dqajs" level="10" />
+                <field field_ref="dtswr" level="10" />
+                <field field_ref="dtsw0" level="10" />
+                <field field_ref="dtlwr" level="10" />
+                <field field_ref="dtlw0" level="10" />
+                <field field_ref="dtec" level="10" />
+                <field field_ref="duvdf" level="10" />
+                <field field_ref="dvvdf" level="10" />
+                <field field_ref="duoro" level="10" />
+                <field field_ref="dvoro" level="10" />
+                <field field_ref="dulif" level="10" />
+                <field field_ref="dvlif" level="10" />
+                <field field_ref="dtoro" level="10" />
+                <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" />
+                <field field_ref="tntr" level="10" />
+                <field field_ref="tntscpbl" level="10" />
+                <field field_ref="tnhus" level="10" />
+                <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" />
+                <field field_ref="dmc" level="10" />
+                <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_group>
+        </file>
+    </file_group>
+</file_definition>
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_orchidee.xml
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_orchidee.xml	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/file_def_orchidee.xml	(revision 2694)
@@ -0,0 +1,634 @@
+<!-- =========================================================================================================== -->
+<!-- file_def_orchidee.xml : Definition of output files                                                          -->
+
+<!-- Definition of variables or groups included in the different files                                           -->
+<!-- Change this file by adding the files and/or variables you want to produce                                   -->
+<!-- Only variables and groups existing in field_def_orchidee.xml can be used                                    -->
+<!-- This file corresponds to revision 2724 in the trunk ORCHIDEE/src_xml directory. It might not be compatible  -->
+<!-- with older or newer revisions of ORCHIDEE source code.                                                      -->
+<!-- =========================================================================================================== -->
+
+<file_definition type="one_file" par_access="collective" enabled=".TRUE." min_digits="4">
+
+  <!-- Definition of files with sechiba diagnostics -->
+
+  <!-- Sechiba file 1 -->
+  <file id="sechiba1" name="sechiba_history" output_level="11" output_freq="_AUTO_" enabled="_AUTO_">
+    <!-- level 1 -->
+    <field field_ref="Areas" level="1"/>
+    <field field_ref="LandPoints" level="1"/>
+    <field field_ref="Contfrac" level="1"/>
+    <field field_ref="evap" level="1"/>
+    <field field_ref="coastalflow" level="1"/>
+    <field field_ref="riverflow" level="1"/>
+    <field field_ref="temp_sol_C" level="1"/>
+    <field field_ref="rain" level="1"/>
+    <field field_ref="snowf" level="1"/>
+    <field field_ref="netrad" level="1"/>
+    <field field_ref="lai" level="1"/>
+    <field field_ref="reinf_slope" level="1"/>
+    <field field_ref="soilindex" level="1"/>
+    <field field_ref="basinmap" level="1"/>
+    <field field_ref="nbrivers" level="1"/>
+    <field field_ref="npp" level="1"/>
+    <!-- level 2 -->
+    <field field_ref="subli" level="2"/>
+    <field field_ref="runoff" level="2"/>
+    <field field_ref="drainage" level="2"/>
+    <field field_ref="riversret" level="2"/>
+    <field field_ref="hydrographs" level="2"/>
+    <field field_ref="evapnu" level="2"/>
+    <field field_ref="evapnu_soil" level="2"/>
+    <field field_ref="drainage_soil" level="2"/>
+    <field field_ref="transpir_soil" level="2"/>
+    <field field_ref="runoff_soil" level="2"/>
+    <field field_ref="tair" level="2"/>
+    <field field_ref="qair" level="2"/>
+    <field field_ref="q2m" level="2"/>
+    <field field_ref="t2m" level="2"/>
+    <field field_ref="alb_vis" level="2"/>
+    <field field_ref="alb_nir" level="2"/>
+    <field field_ref="soilalb_vis" level="2"/>
+    <field field_ref="soilalb_nir" level="2"/>
+    <field field_ref="vegalb_vis" level="2"/>
+    <field field_ref="vegalb_nir" level="2"/>
+    <field field_ref="z0" level="2"/>
+    <field field_ref="roughheight" level="2"/>
+    <field field_ref="transpir" level="2"/>
+    <field field_ref="inter" level="2"/>
+    <!-- level 3 -->
+    <field field_ref="tsol_max" level="3"/>
+    <field field_ref="tsol_min" level="3"/>
+    <field field_ref="fluxsens" level="3"/>
+    <field field_ref="fluxlat" level="3"/>
+    <field field_ref="snow" level="3"/>
+    <field field_ref="snowage" level="3"/>
+    <field field_ref="snownobio" level="3"/>
+    <field field_ref="snownobioage" level="3"/>
+    <field field_ref="vegetfrac" level="3"/>
+    <field field_ref="maxvegetfrac" level="3"/>
+    <field field_ref="tot_bare_soil" level="3"/>
+    <field field_ref="nobiofrac" level="3"/>
+    <field field_ref="flood_frac" level="3"/>
+    <field field_ref="reinfiltration" level="3"/>
+    <field field_ref="frac_bare" level="3"/>
+    <field field_ref="soiltile" level="3"/>
+    <field field_ref="moistc_1" level="3"/>
+    <field field_ref="moistc_2" level="3"/>
+    <field field_ref="moistc_3" level="3"/>
+    <field field_ref="kfactroot_1" level="3"/>
+    <field field_ref="kfactroot_2" level="3"/>
+    <field field_ref="kfactroot_3" level="3"/>
+    <field field_ref="vegetsoil_1" level="3"/>
+    <field field_ref="vegetsoil_2" level="3"/>
+    <field field_ref="vegetsoil_3" level="3"/>
+    <field field_ref="humtot_pro" level="3"/>
+    <!-- level 4 -->
+    <field field_ref="dss" level="4"/>
+    <field field_ref="gqsb" level="4"/>
+    <field field_ref="bqsb" level="4"/>
+    <field field_ref="humtot" level="4"/>
+    <field field_ref="humtot_soil" level="4"/>
+    <field field_ref="SWI" level="4"/>
+    <field field_ref="njsc" level="4"/>
+    <field field_ref="qsintveg" level="4"/>
+    <field field_ref="rstruct" level="4"/>
+    <field field_ref="gpp" level="4"/>
+    <field field_ref="nee" level="4"/>
+    <field field_ref="maint_resp" level="4"/>
+    <field field_ref="hetero_resp" level="4"/>
+    <field field_ref="growth_resp" level="4"/>
+    <field field_ref="precisol" level="4"/>
+    <field field_ref="drysoil_frac" level="4"/>
+    <field field_ref="evapot" level="4"/>
+    <field field_ref="evapot_corr" level="4"/>
+    <!-- level 5 -->
+    <field field_ref="swnet" level="5"/>
+    <field field_ref="swdown" level="5"/>
+    <field field_ref="lwdown" level="5"/>
+    <field field_ref="lwnet" level="5"/>
+    <!-- level 6 -->
+    <field field_ref="twbr" level="6"/>
+    <field field_ref="ptn" level="6"/>
+    <!-- level 7 -->
+    <field field_ref="fastr" level="7"/>
+    <field field_ref="slowr" level="7"/>
+    <field field_ref="streamr" level="7"/>
+    <field field_ref="lakevol" level="7"/>
+    <!-- level 8 -->
+    <field field_ref="pondr" level="8"/>
+    <field field_ref="swampmap" level="8"/>
+    <field field_ref="irrigation" level="8"/>
+    <field field_ref="netirrig" level="8"/>
+    <field field_ref="irrigmap" level="8"/>
+    <field field_ref="floodmap" level="8"/>
+    <field field_ref="floodh" level="8"/>
+    <field field_ref="floodr" level="8"/>
+    <field field_ref="floodout" level="8"/>
+    <field field_ref="evapflo" level="8"/>
+    <field field_ref="k_litt" level="8"/>
+    <field field_ref="beta" level="8"/>
+    <field field_ref="raero" level="8"/>
+    <field field_ref="cdrag" level="8"/>
+    <field field_ref="Wind" level="8"/>
+    <field field_ref="qsatt" level="8"/>
+    <field field_ref="vbeta1" level="8"/>
+    <field field_ref="vbeta4" level="8"/>
+    <field field_ref="vbeta5" level="8"/>
+    <field field_ref="gsmean" level="8"/>
+    <field field_ref="humrel" level="8"/>
+    <!-- level 10 -->
+    <field field_ref="cimean" level="10"/>
+    <field field_ref="vbeta3" level="10"/>
+    <field field_ref="rveget" level="10"/>
+    <field field_ref="rsol" level="10"/>
+    <field field_ref="vbeta2" level="10"/>
+    <field field_ref="qsintmax" level="10"/>
+    <!-- level 11 -->
+    <field field_ref="mrsos" level="11"/>
+    <field field_ref="mrso" level="11"/>
+    <field field_ref="mrros" level="11"/>
+    <field field_ref="mrro" level="11"/>
+    <field field_ref="prveg" level="11"/>
+    <field field_ref="evspsblveg" level="11"/>
+    <field field_ref="evspsblsoi" level="11"/>
+    <field field_ref="tran" level="11"/>
+    <field field_ref="treeFrac" level="11"/>
+    <field field_ref="grassFrac" level="11"/>
+    <field field_ref="cropFrac" level="11"/>
+    <field field_ref="baresoilFrac" level="11"/>
+    <field field_ref="residualFrac" level="11"/>
+    <field field_ref="PAR" level="11"/>
+    <field field_ref="PARsun" level="11"/>
+    <field field_ref="PARsh" level="11"/>
+    <field field_ref="laisun" level="11"/>
+    <field field_ref="laish" level="11"/>
+    <field field_ref="Fdf" level="11"/>
+    <field field_ref="PARsuntab" level="11"/>
+    <field field_ref="PARshtab" level="11"/>
+    <field field_ref="PARdf" level="11"/>
+    <field field_ref="PARdr" level="11"/>
+    <field field_ref="Trans" level="11"/>
+    <field field_ref="Day" level="11"/>
+    <field field_ref="Year_length" level="11"/>
+    <field field_ref="flx_fertil_no" level="11"/>
+    <field field_ref="CRF" level="11"/>
+    <field field_ref="flx_co2_bbg_year" level="11"/>
+    <field field_ref="N_qt_WRICE_year" level="11"/>
+    <field field_ref="N_qt_OTHER_year" level="11"/>
+    <field field_ref="ptnlev1" level="11"/>
+    <field field_ref="flx_iso" level="11"/>
+    <field field_ref="flx_mono" level="11"/>
+    <field field_ref="flx_ORVOC" level="11"/>
+    <field field_ref="flx_MBO" level="11"/>
+    <field field_ref="flx_methanol" level="11"/>
+    <field field_ref="flx_acetone" level="11"/>
+    <field field_ref="flx_acetal" level="11"/>
+    <field field_ref="flx_formal" level="11"/>
+    <field field_ref="flx_acetic" level="11"/>
+    <field field_ref="flx_formic" level="11"/>
+    <field field_ref="flx_no_soil" level="11"/>
+    <field field_ref="flx_no" level="11"/>
+  </file>
+
+
+  <!-- Sechiba file 2 -->
+  <file id="sechiba2" name="sechiba_out_2" output_level="2" output_freq="10800s" enabled="_AUTO_">
+    <!-- level 1 -->
+    <field field_ref="Areas" level="1"/>
+    <field field_ref="LandPoints" level="1"/>
+    <field field_ref="Contfrac" level="1"/>
+    <field field_ref="mrsos" level="1"/>
+    <field field_ref="mrro" level="1"/>
+    <field field_ref="ptn" level="1"/>
+    <!-- level 2 -->
+    <field field_ref="cdrag" level="2"/>
+    <field field_ref="soilalb_vis" level="2"/>
+    <field field_ref="soilalb_nir" level="2"/>
+    <field field_ref="vegalb_vis" level="2"/>
+    <field field_ref="vegalb_nir" level="2"/>
+    <field field_ref="z0" level="2"/>
+    <field field_ref="coastalflow" level="2"/>
+    <field field_ref="riverflow" level="2"/>
+    <field field_ref="tsol_rad" level="2"/>
+    <field field_ref="vevapnu" level="2"/>
+    <field field_ref="temp_sol_C" level="2"/>
+    <field field_ref="qsurf" level="2"/>
+    <field field_ref="albedo" level="2"/>
+    <field field_ref="fluxsens" level="2"/>
+    <field field_ref="fluxlat" level="2"/>
+    <field field_ref="emis" level="2"/>
+    <field field_ref="riversret" level="2"/>
+    <field field_ref="hydrographs" level="2"/>
+    <!-- level 3 -->
+    <field field_ref="evap" level="3"/>
+    <field field_ref="rain" level="3"/>
+    <field field_ref="snowf" level="3"/>
+    <field field_ref="netrad" level="3"/>
+    <field field_ref="lai" level="3"/>
+    <field field_ref="basinmap" level="3"/>
+    <field field_ref="nbrivers" level="3"/>
+    <field field_ref="moistc_1" level="3"/>
+    <field field_ref="moistc_2" level="3"/>
+    <field field_ref="moistc_3" level="3"/>
+    <field field_ref="humtot_pro" level="3"/>
+    <!-- level 4 -->
+    <field field_ref="subli" level="4"/>
+    <field field_ref="runoff" level="4"/>
+    <field field_ref="drainage" level="4"/>
+    <field field_ref="tair" level="4"/>
+    <field field_ref="qair" level="4"/>
+    <field field_ref="q2m" level="4"/>
+    <field field_ref="t2m" level="4"/>
+    <field field_ref="alb_vis" level="4"/>
+    <field field_ref="alb_nir" level="4"/>
+    <field field_ref="roughheight" level="4"/>
+    <field field_ref="transpir" level="4"/>
+    <field field_ref="inter" level="4"/>
+    <field field_ref="evapnu_soil" level="4"/>
+    <field field_ref="drainage_soil" level="4"/>
+    <field field_ref="transpir_soil" level="4"/>
+    <field field_ref="runoff_soil" level="4"/>
+    <!-- level 5 -->
+    <field field_ref="tsol_max" level="5"/>
+    <field field_ref="tsol_min" level="5"/>
+    <field field_ref="snow" level="5"/>
+    <field field_ref="snowage" level="5"/>
+    <field field_ref="snownobio" level="5"/>
+    <field field_ref="snownobioage" level="5"/>
+    <field field_ref="vegetfrac" level="5"/>
+    <field field_ref="maxvegetfrac" level="5"/>
+    <field field_ref="nobiofrac" level="5"/>
+    <field field_ref="kfactroot_1" level="5"/>
+    <field field_ref="kfactroot_2" level="5"/>
+    <field field_ref="kfactroot_3" level="5"/>
+    <field field_ref="vegetsoil_1" level="5"/>
+    <field field_ref="vegetsoil_2" level="5"/>
+    <field field_ref="vegetsoil_3" level="5"/>
+    <!-- level 6 -->
+    <field field_ref="dss" level="6"/>
+    <field field_ref="gqsb" level="6"/>
+    <field field_ref="bqsb" level="6"/>
+    <field field_ref="humtot" level="6"/>
+    <field field_ref="humtot_soil" level="6"/>
+    <field field_ref="SWI" level="6"/>
+    <field field_ref="qsintveg" level="6"/>
+    <field field_ref="rstruct" level="6"/>
+    <field field_ref="gpp" level="6"/>
+    <field field_ref="nee" level="6"/>
+    <field field_ref="maint_resp" level="6"/>
+    <field field_ref="hetero_resp" level="6"/>
+    <field field_ref="growth_resp" level="6"/>
+    <field field_ref="npp" level="6"/>
+    <field field_ref="precisol" level="6"/>
+    <field field_ref="drysoil_frac" level="6"/>
+    <field field_ref="evapot" level="6"/>
+    <field field_ref="evapot_corr" level="6"/>
+    <field field_ref="twbr" level="6"/>
+    <!-- level 7 -->
+    <field field_ref="swnet" level="7"/>
+    <field field_ref="swdown" level="7"/>
+    <field field_ref="lwdown" level="7"/>
+    <field field_ref="lwnet" level="7"/>
+    <!-- level 8 -->
+    <field field_ref="fastr" level="8"/>
+    <field field_ref="slowr" level="8"/>
+    <field field_ref="streamr" level="8"/>
+    <field field_ref="floodr" level="8"/>
+    <field field_ref="floodh" level="8"/>
+    <field field_ref="pondr" level="8"/>
+    <field field_ref="lakevol" level="8"/>
+    <field field_ref="irrigation" level="8"/>
+    <field field_ref="netirrig" level="8"/>
+    <field field_ref="irrigmap" level="8"/>
+    <field field_ref="floodmap" level="8"/>
+    <field field_ref="swampmap" level="8"/>
+    <!-- level 9 -->
+    <field field_ref="beta" level="9"/>
+    <field field_ref="raero" level="9"/>
+    <field field_ref="Wind" level="9"/>
+    <field field_ref="qsatt" level="9"/>
+    <field field_ref="vbeta1" level="9"/>
+    <field field_ref="vbeta4" level="9"/>
+    <field field_ref="gsmean" level="9"/>
+    <field field_ref="vbeta5" level="9"/>
+    <field field_ref="reinf_slope" level="9"/>
+    <field field_ref="soilindex" level="9"/>
+    <field field_ref="humrel" level="9"/>
+    <!-- level 10 -->
+    <field field_ref="cimean" level="10"/>
+    <field field_ref="vbeta3" level="10"/>
+    <field field_ref="rveget" level="10"/>
+    <field field_ref="rsol" level="10"/>
+    <field field_ref="vbeta2" level="10"/>
+    <field field_ref="qsintmax" level="10"/>
+    <field field_ref="PAR" level="10"/>
+    <field field_ref="PARsun" level="10"/>
+    <field field_ref="PARsh" level="10"/>
+    <field field_ref="laisun" level="10"/>
+    <field field_ref="laish" level="10"/>
+    <field field_ref="Fdf" level="10"/>
+    <field field_ref="PARsuntab" level="10"/>
+    <field field_ref="PARshtab" level="10"/>
+    <field field_ref="PARdf" level="10"/>
+    <field field_ref="PARdr" level="10"/>
+    <field field_ref="Trans" level="10"/>
+    <field field_ref="Day" level="10"/>
+    <field field_ref="Year_length" level="10"/>
+    <field field_ref="flx_fertil_no" level="10"/>
+    <field field_ref="CRF" level="10"/>
+    <field field_ref="flx_co2_bbg_year" level="10"/>
+    <field field_ref="N_qt_WRICE_year" level="10"/>
+    <field field_ref="N_qt_OTHER_year" level="10"/>
+    <field field_ref="ptnlev1" level="10"/>
+    <field field_ref="flx_iso" level="10"/>
+    <field field_ref="flx_mono" level="10"/>
+    <field field_ref="flx_ORVOC" level="10"/>
+    <field field_ref="flx_MBO" level="10"/>
+    <field field_ref="flx_methanol" level="10"/>
+    <field field_ref="flx_acetone" level="10"/>
+    <field field_ref="flx_acetal" level="10"/>
+    <field field_ref="flx_formal" level="10"/>
+    <field field_ref="flx_acetic" level="10"/>
+    <field field_ref="flx_formic" level="10"/>
+    <field field_ref="flx_no_soil" level="10"/>
+    <field field_ref="flx_no" level="10"/>
+  </file>
+
+  <!-- Sechiba alma file 1 -->
+  <file id="sechiba1_alma" name="sechiba_history_alma" output_level="10" output_freq="1800s" enabled=".FALSE.">
+    <field field_ref="Areas" level="1"/>
+    <field field_ref="LandPoints" level="1"/>
+    <field field_ref="Contfrac" level="1"/>
+    <field field_ref="Qg" level="1"/>
+    <field field_ref="Qv" level="1"/>
+    <field field_ref="Qs" level="1"/>
+    <field field_ref="Qsb" level="1"/>
+    <field field_ref="DelSurfHeat" level="1"/>
+    <field field_ref="DelColdCont" level="1"/>
+    <field field_ref="fluxsens" name="Qh" level="1"/>
+    <field field_ref="fluxlat" name="Qle" level="1"/>
+    <field field_ref="lwnet" name="LWnet" level="1"/>
+    <field field_ref="swnet" name="SWnet" level="1"/>
+    <field field_ref="snowf_alma" level="1"/>
+    <field field_ref="rain_alma" level="1"/>
+    <field field_ref="evap_alma" name="Evap" level="1"/>
+    <field field_ref="Qsm" level="1"/>
+    <field field_ref="irrigation_alma" level="1"/>
+    <field field_ref="netirrig_alma" level="1"/>
+    <field field_ref="temp_sol_K" level="1"/>
+    <field field_ref="PotSurfT" level="1"/>
+    <field field_ref="albedo_alma" level="1"/>
+    <field field_ref="SurfStor" level="1"/>
+    <field field_ref="snow" name="SWE" long_name="Snow Water Equivalent" level="1"/>
+    <field field_ref="SoilWet" level="1"/>
+    <field field_ref="evapot_corr_alma" level="1"/>
+    <field field_ref="evapot_alma" level="1"/>
+    <field field_ref="ECanop" level="1"/>
+    <field field_ref="TVeg" level="1"/>
+    <field field_ref="SubSnow" level="1"/>
+    <field field_ref="irrigmap" name="IrrigationMap" level="1"/>
+    <field field_ref="floodmap" name="FloodplainsMap" level="1"/>
+    <field field_ref="swampmap" name="SwampMap" level="1"/>
+    <field field_ref="hydrographs" name="Dis" level="1"/>
+    <field field_ref="gpp" name="GPP" level="1"/>
+    <field field_ref="nee" name="NEE" level="1"/>
+    <field field_ref="maint_resp" level="1"/>
+    <field field_ref="hetero_resp" level="1"/>
+    <field field_ref="growth_resp" level="1"/>
+    <field field_ref="npp" level="1"/>
+    <field field_ref="z0" name="Z0" long_name="Roughness height" level="1"/>
+    <field field_ref="roughheight" name="EffectHeight" long_name="Effective displacement height (h-d)" level="1"/>
+    <field field_ref="DelSoilMoist" level="1"/>
+    <field field_ref="DelSurfStor" level="1"/>
+    <field field_ref="DelIntercept" level="1"/>
+    <field field_ref="DelSWE" level="1"/>
+    <field field_ref="vevapnu_alma" level="1"/>
+    <field field_ref="evapflo_alma" level="1"/>
+    <field field_ref="ACond" level="1"/>
+    <field field_ref="tair" name="Tair" level="2"/>
+    <field field_ref="qair" name="Qair" level="2"/>
+    <field field_ref="Qf" level="2"/>
+    <field field_ref="vegetfrac" level="3"/>
+    <field field_ref="maxvegetfrac" level="3"/>
+    <field field_ref="nobiofrac" level="3"/>
+    <field field_ref="SoilMoist" level="7"/>
+    <field field_ref="RootMoist" level="1"/>
+    <field field_ref="ptn" name="SoilTemp" level="7"/>
+    <field field_ref="vbeta1" name="SnowFrac" level="7"/>
+    <field field_ref="SAlbedo" level="7"/>
+    <field field_ref="SnowDepth" level="7"/>
+    <field field_ref="temp_sol_K" name="RadT" level="1"/>
+    <field field_ref="twbr" level="1"/>
+  </file>
+
+  <!-- Sechiba alma file 2 -->
+  <file id="sechiba2_alma" name="sechiba_out_2_alma" output_level="10" output_freq="1800s" enabled=".FALSE.">
+    <field field_ref="Areas" level="1"/>
+    <field field_ref="LandPoints" level="1"/>
+    <field field_ref="Contfrac" level="1"/>
+    <field field_ref="Qg" level="1"/>
+    <field field_ref="Qv" level="1"/>
+    <field field_ref="Qs" level="1"/>
+    <field field_ref="Qsb" level="1"/>
+    <field field_ref="DelSurfHeat" level="1"/>
+    <field field_ref="DelColdCont" level="1"/>
+    <field field_ref="fluxsens" name="Qh" level="1"/>
+    <field field_ref="fluxlat" name="Qle" level="1"/>
+    <field field_ref="lwnet" name="LWnet" level="1"/>
+    <field field_ref="swnet" name="SWnet" level="1"/>
+    <field field_ref="snowf_alma" level="1"/>
+    <field field_ref="rain_alma" level="1"/>
+    <field field_ref="evap_alma" name="Evap" level="1"/>
+    <field field_ref="Qsm" level="1"/>
+    <field field_ref="irrigation_alma" level="1"/>
+    <field field_ref="netirrig_alma" level="1"/>
+    <field field_ref="temp_sol_K" level="1"/>
+    <field field_ref="albedo_alma" level="1"/>
+    <field field_ref="SurfStor" level="1"/>
+    <field field_ref="snow" name="SWE" long_name="Snow Water Equivalent" level="1"/>
+    <field field_ref="SoilWet" level="1"/>
+    <field field_ref="evapot_corr_alma" level="1"/>
+    <field field_ref="ECanop" level="1"/>
+    <field field_ref="TVeg" level="1"/>
+    <field field_ref="SubSnow" level="1"/>
+    <field field_ref="irrigmap" name="IrrigationMap" level="1"/>
+    <field field_ref="floodmap" name="FloodplainsMap" level="1"/>
+    <field field_ref="swampmap" name="SwampMap" level="1"/>
+    <field field_ref="hydrographs" name="Dis" level="1"/>
+    <field field_ref="gpp" name="GPP" level="1"/>
+    <field field_ref="nee" name="NEE" level="1"/>
+    <field field_ref="maint_resp" level="1"/>
+    <field field_ref="hetero_resp" level="1"/>
+    <field field_ref="growth_resp" level="1"/>
+    <field field_ref="npp" level="1"/>
+    <field field_ref="DelSoilMoist" level="1"/>
+    <field field_ref="DelSurfStor" level="1"/>
+    <field field_ref="DelIntercept" level="1"/>
+    <field field_ref="DelSWE" level="1"/>
+    <field field_ref="vevapnu_alma" level="1"/>
+    <field field_ref="evapflo_alma" level="1"/>
+    <field field_ref="ACond" level="1"/>
+    <field field_ref="SoilMoist" level="7"/>
+    <field field_ref="RootMoist" level="1"/>
+    <field field_ref="ptn" name="SoilTemp" level="7"/>
+    <field field_ref="vbeta1" name="SnowFrac" level="7"/>
+    <field field_ref="SAlbedo" level="7"/>
+    <field field_ref="SnowDepth" level="7"/>
+    <field field_ref="Qf" level="2"/>
+    <field field_ref="vegetfrac" level="3"/>
+    <field field_ref="maxvegetfrac" level="3"/>
+    <field field_ref="nobiofrac" level="3"/>
+    <field field_ref="temp_sol_K" name="RadT" level="5"/>
+  </file>
+
+  <!-- Definition of files with stomate diagnostics -->
+  <!-- Stomate file 1 -->
+  <file id="stomate1" name="stomate_history" output_level="10" output_freq="_AUTO_" enabled="_AUTO_">
+    <!-- level 1 -->
+    <field field_ref="RESOLUTION_X" level="1"/>
+    <field field_ref="RESOLUTION_Y" level="1"/>
+    <field field_ref="CONTFRAC_STOMATE" level="1"/>
+    <field field_ref="Areas" level="1"/>
+    <field field_ref="T2M_MONTH" level="1"/>
+    <field field_ref="T2M_WEEK" level="1"/>
+    <field field_ref="FIREFRAC" level="1"/>
+    <field field_ref="CO2FLUX" level="1"/>
+    <field field_ref="CO2_FIRE" level="1"/>
+    <field field_ref="CO2_TAKEN" level="1"/>
+    <field field_ref="LAI" level="1"/>
+    <field field_ref="VEGET_MAX" level="1"/>
+    <field field_ref="NPP_STOMATE" level="1"/>
+    <field field_ref="GPP" level="1"/>
+    <!-- level 2 -->
+    <field field_ref="LEAF_M" level="2"/>
+    <field field_ref="SAP_M_AB" level="2"/>
+    <field field_ref="SAP_M_BE" level="2"/>
+    <field field_ref="HEART_M_AB" level="2"/>
+    <field field_ref="HEART_M_BE" level="2"/>
+    <field field_ref="ROOT_M" level="2"/>
+    <field field_ref="FRUIT_M" level="2"/>
+    <field field_ref="RESERVE_M" level="2"/>
+    <field field_ref="MAINT_RESP" level="2"/>
+    <field field_ref="GROWTH_RESP" level="2"/>
+    <!-- level 3 -->
+    <field field_ref="IND" level="3"/>
+    <field field_ref="ADAPTATION" level="3"/>
+    <field field_ref="REGENERATION" level="3"/>
+    <field field_ref="CN_IND" level="3"/>
+    <field field_ref="WOODMASS_IND" level="3"/>
+    <field field_ref="MOISTRESS" level="3"/>
+    <field field_ref="HET_RESP" level="3"/>
+    <!-- level 4 -->
+    <field field_ref="SAP_AB_TURN" level="4"/>
+    <field field_ref="ROOT_TURN" level="4"/>
+    <field field_ref="FRUIT_TURN" level="4"/>
+    <field field_ref="TOTAL_BM_LITTER" level="4"/>
+    <field field_ref="LEAF_BM_LITTER" level="4"/>
+    <field field_ref="SAP_AB_BM_LITTER" level="4"/>
+    <field field_ref="SAP_BE_BM_LITTER" level="4"/>
+    <field field_ref="HEART_AB_BM_LITTER" level="4"/>
+    <field field_ref="HEART_BE_BM_LITTER" level="4"/>
+    <field field_ref="ROOT_BM_LITTER" level="4"/>
+    <field field_ref="FRUIT_BM_LITTER" level="4"/>
+    <field field_ref="RESERVE_BM_LITTER" level="4"/>
+    <field field_ref="TOTAL_M" level="4"/>
+    <field field_ref="TOTAL_TURN" level="4"/>
+    <field field_ref="LEAF_TURN" level="4"/>
+    <!-- level 5 -->
+    <field field_ref="LITTER_STR_AB" level="5"/>
+    <field field_ref="LITTER_MET_AB" level="5"/>
+    <field field_ref="LITTER_STR_BE" level="5"/>
+    <field field_ref="LITTER_MET_BE" level="5"/>
+    <field field_ref="DEADLEAF_COVER" level="5"/>
+    <field field_ref="TOTAL_SOIL_CARB" level="5"/>
+    <field field_ref="CARBON_ACTIVE" level="5"/>
+    <field field_ref="CARBON_SLOW" level="5"/>
+    <field field_ref="CARBON_PASSIVE" level="5"/>
+    <field field_ref="LITTERHUM" level="5"/>
+    <field field_ref="BM_ALLOC_LEAF" level="5"/>
+    <field field_ref="BM_ALLOC_SAP_AB" level="5"/>
+    <field field_ref="BM_ALLOC_SAP_BE" level="5"/>
+    <field field_ref="BM_ALLOC_ROOT" level="5"/>
+    <field field_ref="BM_ALLOC_FRUIT" level="5"/>
+    <field field_ref="BM_ALLOC_RES" level="5"/>
+    <field field_ref="HERBIVORES" level="5"/>
+    <field field_ref="TURNOVER_TIME" level="5"/>
+    <field field_ref="PROD10" level="5"/>
+    <field field_ref="FLUX10" level="5"/>
+    <field field_ref="PROD100" level="5"/>
+    <field field_ref="FLUX100" level="5"/>
+    <field field_ref="CONVFLUX" level="5"/>
+    <field field_ref="CFLUX_PROD10" level="5"/>
+    <field field_ref="CFLUX_PROD100" level="5"/>
+    <field field_ref="HARVEST_ABOVE" level="5"/>
+    <!-- level 6 -->
+    <field field_ref="VCMAX" level="6"/>
+    <field field_ref="LEAF_AGE" level="6"/>
+    <field field_ref="MORTALITY" level="6"/>
+    <field field_ref="FIREDEATH" level="6"/>
+    <field field_ref="IND_ESTAB" level="6"/>
+    <field field_ref="ESTABTREE" level="6"/>
+    <field field_ref="ESTABGRASS" level="6"/>
+    <field field_ref="LIGHT_DEATH" level="6"/>
+    <!-- level 7 -->
+    <field field_ref="AGE" level="7"/>
+    <field field_ref="HEIGHT" level="7"/>
+    <!-- level 9 -->
+    <field field_ref="WHEN_GROWTHINIT" level="9"/>
+    <field field_ref="PFTPRESENT" level="9"/>
+    <field field_ref="GDD_MIDWINTER" level="9"/>
+    <field field_ref="GDD_M5_DORMANCE" level="9"/>
+    <field field_ref="NCD_DORMANCE" level="9"/>
+    <field field_ref="ALLOW_INITPHENO" level="9"/>
+    <field field_ref="BEGIN_LEAVES" level="9"/>
+    <field field_ref="T2M_LONGTERM" level="9"/>
+    <!-- level 10 -->
+    <field field_ref="FIREINDEX" level="10"/>
+  </file>
+
+  <!-- Stomate file 2 -->
+  <file id="stomate2" name="stomate_ipcc_history" output_level="1" output_freq="_AUTO_" enabled="_AUTO_">
+    <!-- level 1 -->
+    <field field_ref="RESOLUTION_X" level="1"/>
+    <field field_ref="RESOLUTION_Y" level="1"/>
+    <field field_ref="CONTFRAC_STOMATE" level="1"/>
+    <field field_ref="Areas" level="1"/>
+    <field field_ref="cVeg" level="1"/>
+    <field field_ref="cLitter" level="1"/>
+    <field field_ref="cSoil" level="1"/>
+    <field field_ref="cProduct" level="1"/>
+    <field field_ref="cMassVariation" level="1"/>
+    <field field_ref="lai_ipcc" level="1"/>
+    <field field_ref="gpp_ipcc" level="1"/>
+    <field field_ref="ra" level="1"/>
+    <field field_ref="npp_ipcc" level="1"/>
+    <field field_ref="rh" level="1"/>
+    <field field_ref="fFire" level="1"/>
+    <field field_ref="fHarvest" level="1"/>
+    <field field_ref="fLuc" level="1"/>
+    <field field_ref="nbp" level="1"/>
+    <field field_ref="fVegLitter" level="1"/>
+    <field field_ref="fLitterSoil" level="1"/>
+    <field field_ref="cLeaf" level="1"/>
+    <field field_ref="cWood" level="1"/>
+    <field field_ref="cRoot" level="1"/>
+    <field field_ref="cMisc" level="1"/>
+    <field field_ref="cLitterAbove" level="1"/>
+    <field field_ref="cLitterBelow" level="1"/>
+    <field field_ref="cSoilFast" level="1"/>
+    <field field_ref="cSoilMedium" level="1"/>
+    <field field_ref="cSoilSlow" level="1"/>
+    <field field_ref="landCoverFrac" level="1"/>
+    <field field_ref="treeFracPrimDec" level="1"/>
+    <field field_ref="treeFracPrimEver" level="1"/>
+    <field field_ref="c3PftFrac" level="1"/>
+    <field field_ref="c4PftFrac" level="1"/>
+    <field field_ref="rGrowth" level="1"/>
+    <field field_ref="rMaint" level="1"/>
+    <field field_ref="nppLeaf" level="1"/>
+    <field field_ref="nppWood" level="1"/>
+    <field field_ref="nppRoot" level="1"/>
+    <field field_ref="nep" level="1"/>
+  </file>
+</file_definition>
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/gcm.def_128x118x39
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/gcm.def_128x118x39	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/gcm.def_128x118x39	(revision 2694)
@@ -0,0 +1,56 @@
+## $Id$
+## This parameter set up contains a zoom over Europe
+##
+## nombre de pas par jour (multiple de iperiod) ( ici pour  dt = 1 min )      
+day_step=2880
+## periode pour le pas Matsuno (en pas)
+iperiod=5
+## choix de l'operateur de dissipation (star ou  non star )
+lstardis=y
+## nombre d'iterations de l'operateur de dissipation   gradiv
+nitergdiv=1
+## nombre d'iterations de l'operateur de dissipation  nxgradrot
+nitergrot=2
+## nombre d'iterations de l'operateur de dissipation  divgrad            
+niterh=2
+## temps de dissipation des plus petites long.d ondes pour u,v (gradiv)  
+tetagdiv=1200.
+## temps de dissipation des plus petites long.d ondes pour u,v(nxgradrot)
+tetagrot=1200.
+## temps de dissipation des plus petites long.d ondes pour  h ( divgrad) 
+tetatemp=1200.
+## coefficient pour gamdissip                                            
+coefdis=0.
+## choix du shema d'integration temporelle (Matsuno ou Matsuno-leapfrog) 
+purmats=n
+## avec ou sans physique                                                 
+physic=y
+## periode de la physique (en pas)                                       
+## iphysiq est modifie pour la nouvelle physique par le lmdz.driver pour les autres cas le valeur par defaut est utilise
+iphysiq=_AUTO_ : DEFAULT = 60
+##  Avec ou sans strato
+ok_strato=y 
+#  Couche eponge dans les couches de pression plus faible que 100 fois la pression de la derniere couche
+iflag_top_bound=2
+#  Coefficient pour la couche eponge (valeur derniere couche)
+tau_top_bound=5.e-5
+## longitude en degres du centre du zoom                                 
+clon=8.5
+## latitude en degres du centre du zoom                                  
+clat=50.
+## facteur de grossissement du zoom,selon longitude                      
+grossismx=4.48751
+## facteur de grossissement du zoom ,selon latitude                      
+grossismy=3.40784
+##  Fonction  f(y)  hyperbolique  si = .true.  , sinon  sinusoidale         
+fxyhypb=y
+## extension en longitude  de la zone du zoom  ( fraction de la zone totale)
+dzoomx=0.208914
+## extension en latitude de la zone  du zoom  ( fraction de la zone totale)
+dzoomy=0.243706
+##raideur du zoom en  X
+taux=10.
+##raideur du zoom en  Y
+tauy=10.
+##  Fonction  f(y) avec y = Sin(latit.) si = .true. , sinon y = latit.         
+ysinus=y
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/gcm.def_144x142x79
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/gcm.def_144x142x79	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/gcm.def_144x142x79	(revision 2694)
@@ -0,0 +1,93 @@
+## $Id: gcm.def 1403 2010-07-01 09:02:53Z fairhead $
+## nombre de pas par jour (multiple de iperiod) ( ici pour  dt = 1 min )      
+day_step=720
+## periode pour le pas Matsuno (en pas)
+iperiod=5
+## choix de l'operateur de dissipation (star ou  non star )
+lstardis=y
+## nombre d'iterations de l'operateur de dissipation   gradiv
+nitergdiv=1
+## nombre d'iterations de l'operateur de dissipation  nxgradrot
+nitergrot=2
+## nombre d'iterations de l'operateur de dissipation  divgrad            
+niterh=2
+## temps de dissipation des plus petites long.d ondes pour u,v (gradiv)  
+tetagdiv=1800.
+## temps de dissipation des plus petites long.d ondes pour u,v(nxgradrot)
+#tetagrot=5400.
+tetagrot=7200.
+## temps de dissipation des plus petites long.d ondes pour  h ( divgrad) 
+tetatemp=5400.
+## coefficient pour gamdissip                                            
+coefdis=0.
+## choix du shema d'integration temporelle (Matsuno:y ou Matsuno-leapfrog:n) 
+purmats=n
+## avec ou sans physique
+## 0: pas de physique (e.g. en mode Shallow Water)
+## 1: avec physique (e.g. physique phylmd)
+## 2: avec rappel newtonien dans la dynamique                                         
+iflag_phys=1
+## avec ou sans fichiers de demarrage (start.nc, startphy.nc) ?
+## (sans fichiers de demarrage, initialisation des champs par iniacademic
+##  dans la dynamique)
+read_start=y
+## periode de la physique (en pas dynamiques, n'a de sens que si iflag_phys=1)                                       
+iphysiq=_AUTO_ : DEFAULT = 5
+#
+#### Verticale discretisation
+## Modified verticale discretisation for stratospheric versions.
+## The new version can be controled by following parameters
+## Al the parameters are given in km assuming a given scalehigh
+vert_sampling=strato_custom
+## scale hight
+vert_scale=7.
+## width of first layer
+vert_dzmin=0.017
+## dz in the low atmosphere
+vert_dzlow=1.
+## height at which resolution recches dzlow
+vert_z0low=8.7
+## dz in the mid atmsophere
+vert_dzmid=2.
+## height at which resolution recches dzmid
+vert_z0mid=70.
+## width of the transition
+vert_h_mid=20.
+## dz in the high atmsophere
+vert_dzhig=11.
+## height at which resolution recches dz
+vert_z0hig=75.
+## width of the transition
+vert_h_hig=20.
+## vert_prof_dissip used to choose the vertical profile
+## of horizontal dissipation (values are 0 and 1)
+vert_prof_dissip = 1
+dissip_zref = 50
+##  Avec ou sans strato
+ok_strato=y 
+#  Couche eponge dans les couches de pression plus faible que 100 fois la pression de la derniere couche
+iflag_top_bound=2
+#  Coefficient pour la couche eponge (valeur derniere couche)
+tau_top_bound=5.e-4
+#
+### Parametres du zoom
+## longitude en degres du centre du zoom                                 
+clon=0.
+## latitude en degres du centre du zoom                                  
+clat=0.
+## facteur de grossissement du zoom,selon longitude                      
+grossismx=1.0
+## facteur de grossissement du zoom ,selon latitude                      
+grossismy=1.0
+##  Fonction  f(y)  hyperbolique  si = .true.  , sinon  sinusoidale         
+fxyhypb=y
+## extension en longitude  de la zone du zoom  ( fraction de la zone totale)
+dzoomx=0.0
+## extension en latitude de la zone  du zoom  ( fraction de la zone totale)
+dzoomy=0.0
+##raideur du zoom en  X
+taux=3.
+##raideur du zoom en  Y
+tauy=3.
+##  Fonction  f(y) avec y = Sin(latit.) si = .true. , sinon y = latit.         
+ysinus=y
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/iodef.xml
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/iodef.xml	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/iodef.xml	(revision 2694)
@@ -21,5 +21,5 @@
 	  <variable id="using_server"              type="boolean">false</variable>
 	  <variable id="using_oasis"               type="boolean">false</variable>
-	  <variable id="oasis_codes_id"            type="string" >oceanx</variable>
+	  <variable id="oasis_codes_id"            type="string" >LMDZ,oceanx</variable>
 	
       </variable_definition>
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/orchidee.def_CWRR
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/orchidee.def_CWRR	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/orchidee.def_CWRR	(revision 2694)
@@ -20,38 +20,9 @@
 # Use XIOS for writing diagnostics file
 # defulat = n
-XIOS_ORCHIDEE_OK = _AUTO_
-
-# Flag to activate sechiba_out_2.nc history file for SECHIBA
-# default  = FALSE
-SECHIBA_HISTFILE2 = _AUTO_
-
-# SECHIBA history output level (0..10)
-# default = 5
-SECHIBA_HISTLEVEL = _AUTO_
-
-# SECHIBA history 2 output level (0..10)
-# default = 1
-SECHIBA_HISTLEVEL2 = _AUTO_
-
-# STOMATE history output level (0..10)
-# default = 10
-STOMATE_HISTLEVEL = _AUTO_
+XIOS_ORCHIDEE_OK = y
 
 # Writefrequency in seconds in sechiba_history.nc
 # default = 86400.0
-WRITE_STEP = _AUTO_
-
-# Writefrequency in seconds sechiba_out_2.nc 
-# default = 1800.0
-WRITE_STEP2 = _AUTO_
-
-# Writefrequency in days in stomate_history.nc
-# default = 10.
-STOMATE_HIST_DT = _AUTO_
-
-# Writefrequency in days or -1 for monthly output in stomate_ipcc_history.nc
-# default = 0.
-STOMATE_IPCC_HIST_DT = -1
-
+WRITE_STEP = 0
 
 # Hydrology parameters
@@ -72,5 +43,4 @@
 # default = n
 RIVER_ROUTING = y
-
 
 #**************************************************************************
@@ -121,2 +91,9 @@
 LAND_COVER_CHANGE = _AUTO_
 
+# Do not use default fire module
+FIRE_DISABLE = y
+
+# Create river description file
+RIVER_DESC = _AUTO_
+RIVER_DESC_FILE =  river_desc.nc
+
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/orchidee.def_Choi
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/orchidee.def_Choi	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/orchidee.def_Choi	(revision 2694)
@@ -20,38 +20,9 @@
 # Use XIOS for writing diagnostics file
 # defulat = n
-XIOS_ORCHIDEE_OK = _AUTO_
-
-# Flag to activate sechiba_out_2.nc history file for SECHIBA
-# default  = FALSE
-SECHIBA_HISTFILE2 = _AUTO_
-
-# SECHIBA history output level (0..10)
-# default = 5
-SECHIBA_HISTLEVEL = _AUTO_
-
-# SECHIBA history 2 output level (0..10)
-# default = 1
-SECHIBA_HISTLEVEL2 = _AUTO_
-
-# STOMATE history output level (0..10)
-# default = 10
-STOMATE_HISTLEVEL = _AUTO_
+XIOS_ORCHIDEE_OK = y
 
 # Writefrequency in seconds in sechiba_history.nc
 # default = 86400.0
-WRITE_STEP = _AUTO_
-
-# Writefrequency in seconds sechiba_out_2.nc 
-# default = 1800.0
-WRITE_STEP2 = _AUTO_
-
-# Writefrequency in days in stomate_history.nc
-# default = 10.
-STOMATE_HIST_DT = _AUTO_
-
-# Writefrequency in days or -1 for monthly output in stomate_ipcc_history.nc
-# default = 0.
-STOMATE_IPCC_HIST_DT = -1
-
+WRITE_STEP = 0
 
 # Hydrology parameters
@@ -72,5 +43,4 @@
 # default = n
 RIVER_ROUTING = y
-
 
 #**************************************************************************
@@ -121,2 +91,9 @@
 LAND_COVER_CHANGE = _AUTO_
 
+# Do not use default fire module
+FIRE_DISABLE = y
+
+# Create river description file
+RIVER_DESC = _AUTO_
+RIVER_DESC_FILE =  river_desc.nc
+
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/physiq.def_L79_NPv5.17g
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/physiq.def_L79_NPv5.17g	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/physiq.def_L79_NPv5.17g	(revision 2694)
@@ -0,0 +1,183 @@
+##############################################################################
+# PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
+##############################################################################
+# D: Valeur par default
+#
+#Parametres Orographiques et cdrags
+#**********************************
+##   Si=.T. ,  lecture du fichier limit avec la bonne annee 
+ok_limitvrai=n
+#Cdrags 
+f_cdrag_stable=1.
+f_cdrag_ter=1.
+f_cdrag_oce=0.7
+f_ri_cd_min=0.6
+#cdmmax
+cdmmax=2.5E-3
+#cdhmax
+cdhmax=2.0E-3
+##  Orodr  ou  non   pour l orographie
+ok_orodr=y
+##  Orolf  ou  non   pour l orographie              
+ok_orolf=y
+#Rugoro
+f_rugoro=0.
+#
+### Random gravity waves
+#Activitate the stochastic parameterization of convective GWs (should be equal to ok_strato)
+ok_gwd_rando=y
+# Scale the momentum fluxes due to convective GWs
+gwd_rando_ruwmax=2.5
+#Scale the saturated momentum flux of  convective GWs 
+gwd_rando_sat=0.2
+
+#
+# Rayonnement
+#*********************
+# activation du nouveau code de rayonnement RRTM
+# 0 : Ancien code et 1 : RRTM (D=0)
+iflag_rrtm=0
+#NSW=2
+#
+##  Activation ou non de la parametrisation de Hines pour la strato
+#******************************************************************
+ok_hines=y
+#
+# Parametres nuages
+#******************
+#seuils de la precipitation des nuages strateformes (D: 2.6e-4 2.6e-4)
+cld_lc_lsc=0.0003
+cld_lc_con=0.0003
+#constante de temps pour eleminer eau lsc et convective (D: 3600. 3600.)
+cld_tau_lsc=1800.
+cld_tau_con=1800.
+#facteurs correctifs sur la vitesse de chute des cristaux de glace (D: 1 1)
+ffallv_lsc=0.66528
+ffallv_con=0.66528
+#coefficient sur la reevaporation de la pluie (D: 2.e-5 n)
+coef_eva=2e-5
+reevap_ice=y
+#calcul des proprietes des nuages convectifs (D:1 0.375 1.e-4) 
+iflag_cldcon=6
+fact_cldcon=1.
+facttemps=0.
+#calcul eau condensee et fraction nuageuse a partir des PDF (D:0, 0:version avec ratqs sinon nouvelles PDFs)  
+iflag_pdf=1
+#calcul epaisseur optique et emmissivite des nuages (D: y 1 0.01 0.3)
+ok_newmicro=y
+iflag_ratqs=4
+ratqsbas=0.002
+ratqshaut=0.312
+#rayon effectif pour les nuages de glace (D:35)
+rad_froid=35
+#rayons effectifs pour les nuages eau liq (tailles des gouttes d eau nuageuse, D: 13 9)
+rad_chau1=12
+rad_chau2=11
+##  Choix ou non  de  New oliq               
+new_oliq=y
+#Rayons min et max effectifs des particules des nuages
+rei_min=16.
+rei_max=61.29
+#
+# Flags Convection 
+#*****************
+#Convection scheme switch (D:2, 1:LMD, 2:Tiedtke, 3:KE New Physics, 30:KE AR4)
+iflag_con=3
+#output level of energy conservation diagnostics
+if_ebil=0
+#maximum efficiency of cld water->precipitation conversion (D: 0.993)
+epmax=0.998
+#dry convective adjustment at beginning of Emanuel convective scheme (D: n 0)
+ok_adj_ema=n
+iflag_clw=0
+#Convective closure (D:1, 0:AR4, 2:ALE and ALP)
+iflag_clos=2
+#Convective entrainment mixing law (D:1, 0:AR4=flat PDF, 1=PDF)
+iflag_mix=0
+#weights of the bell shaped and flat PDF (used only if iflag_mix=1) (D: 1 0)
+qqa1=1.
+qqa2=0.
+#Parameters of the bell shaped PDF; Fmax=center (D= 0.65), Gammas=width (D=0.05)
+cvl_corr=1.0
+#Multiplicative factor of Emanuel convective scheme precipitation (D: 1.)
+Fmax=0.65
+#
+# Flags Couche limite
+#********************
+#shema de CL des thermiques (D:0, 0:ajustement sec,=>1:versions thermiques) 
+iflag_thermals=18
+#pas de temps du spliting pour les thermiques
+nsplit_thermals=1
+tau_thermals=0.
+iflag_thermals_ed=8
+fact_thermals_ed_dz=0.1
+iflag_thermals_optflux=0
+#shema de la couche de surface (D:1, 1:LMD, 8:Mellor-Yamada) 
+iflag_pbl=11
+#diffusion turbulente
+ksta_ter=1.e-7
+ksta=1.e-10
+#ok_kzmin : calcul Kzmin dans la CL de surface
+ok_kzmin=y
+#couplage ou non avec la convection
+iflag_coupl=5 (0:AR4 et 1:nouvelle physique)
+seuil_inversion=-0.08
+#rendement sur la puissance fournie par les thermiques a la convection
+alp_bl_k=0.5
+#
+## temperature dependency of qsat for iterative procedure
+## temporary flag to switch between the old (CMIP5, D=0) and new versions (=1) versions 
+iflag_fisrtilp_qsat=4 
+## Reactivation du calcul d'un zmax continu pour les thermiques
+## reactivation d'une fermeture humide des thermiques  iflag_thermals_closure=2 (D=1)
+iflag_thermals_closure=1
+#
+# Flags wakes
+#************
+#Wake scheme switch (D:0, 0:AR4, 1:New Physics)
+iflag_wake=1
+#Constant value to be added to Alp (D: 0.)
+alp_offset=0.
+
+### nrlmd le 10/04/2012: Declenchement ###
+#Déclelenchement par couche-limite (0: deterministe, 1: stochastique)
+iflag_trig_bl=1
+#Surface critique au LCL
+s_trig=1.2e7
+#Temps de decorrelation entre scenes de cumulus
+tau_trig_shallow=1200
+#Temps de decorrelation entre scenes de cumulonimbus
+tau_trig_deep=1200
+# Pour la stabilisation
+random_notrig_max=0.99
+ok_adjwk=y
+tmax_fonte_cv=288.15
+
+
+### nrlmd le 10/04/2012: Fermeture ###
+#Fermeture par couche-limite (0: deterministe, 1: statistique, 2: statistique+convergence grande échelle)
+iflag_clos_bl=1
+### fin nrlmd le 10/04/2012
+
+## Modification de la plage de temperature pour la phase mixte liquide/glace des nuages
+## Controle par les t_glace_min/max, exposant_glace, iflag_t_glace (D=0)
+t_glace_min=240.
+t_glace_max=273.13
+exposant_glace=1.7
+iflag_t_glace=1
+iflag_ice_thermo=1
+
+#
+## The source terms of the TKE prognostic equation are diagnosed from tendencies (du, dv, dT) 
+## associated with subrgrid scaleamotions and treated as an additional heat source.
+## Controled by a key, iflag_ener_conserv (D=-1):
+## 0 : no conservation, -1 : old adhoc correction for kinetic E only (used for CMIP5) 
+## 1 : conservation, 101 : conversion from kinetic to heat only, 110 conversion from potential to heat only
+iflag_ener_conserv=1
+
+#Activation of corrections for water conservation (D: n). 
+##The default is n for compatibility with earlier versions.
+##generally it should be y.
+ok_conserv_q=y 
+
+
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/run.def
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/run.def	(revision 2693)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/PARAM/run.def	(revision 2694)
@@ -4,5 +4,4 @@
 INCLUDEDEF=gcm.def
 INCLUDEDEF=orchidee.def
-INCLUDEDEF=output.def
 INCLUDEDEF=config.def
 INCLUDEDEF=reprobus.def
@@ -26,6 +25,4 @@
 ## flag de sortie dynzon
 ok_dynzon=n
-## periode de stockage fichier dynzon (en jour)
-periodav= _AUTOBLOCKER_
 ## activation du calcul d equilibrage de charge
 adjust= _AUTO_
@@ -52,6 +49,4 @@
 ### config_inca=aero/chem needed only if type_trac=inca
 config_inca=_AUTOBLOCKER_ 
-### Only concerning the program ce0l : for creating file grilles_gcm.nc
-grilles_gcm_netcdf=_AUTO_
 ### To activate XIOS ouputs only
 ok_all_xml= _AUTO_
Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/POST/monitoring01_inca.cfg
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/POST/monitoring01_inca.cfg	(revision 2694)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/POST/monitoring01_inca.cfg	(revision 2694)
@@ -0,0 +1,80 @@
+#**************************************************************
+# Author: Patrick Brockmann
+# Contact: Patrick.Brockmann@cea.fr
+# $Date: 2009/05/14 15:09:35 $
+# $Name: ATLAS_608_1_5 $
+# $Revision: 1.1.1.2 $
+# History:
+# Modification:
+#**************************************************************
+
+##################################################################################################################
+#-----------------------------------------------------------------------------------------------------------------
+#  field | files patterns | files additionnal | operations | title | units | calcul of area
+#-----------------------------------------------------------------------------------------------------------------
+#
+#   field = name of the field to monitore 
+#   files patterns = pattern of the files used to monitore the field (must be discriminant) 
+#   files additionnal = additionnal files accessible by $FER_DATA
+#   operations = operations to calculate the field 
+#   title = variable title
+#   units = variable units
+#   calcul of area = expression to use for the weight average
+#
+# Notes:
+#   - Comment lines begin by # character.
+#   - Separator between fields is | character.
+#   - Operations must use the ferret syntax, if several files are used precise with the syntax d=x to refer to the x dataset.
+#     They must be enclosed by parenthesis if more than one variable is used.
+#   - files patterns,files additionnal,operations,title,units must be enclosed with character ". 
+#     Use "" if empty.
+#   - Fields will be presented through an html page with thumbnails global, north, south, land, ocean.
+#     Use a field name with one of these pattern to display it under the corresponding thumbnail.
+#
+##################################################################################################################
+
+color=F0D5F4
+smooth=12
+FreqTS=DA
+#-----------------------------------------------------------------------------------------------------------------
+#  field | files patterns | files additionnal | operations | title | units | calcul of area
+#-----------------------------------------------------------------------------------------------------------------
+od550bcas_global   | "od550bcas"    | "" | "od550bcas[d=1]"    	| "bc as optical depth @550nm" 	| "(-)" 	| "area[d=1]"
+od550pomas_global  | "od550pomas"   | "" | "od550pomas[d=1]"   	| "pom as optical depth @550nm" | "(-)" 	| "area[d=1]"
+od550so4as_global  | "od550so4as"   | "" | "od550so4as[d=1]"   	| "so4 as optical depth @550nm" | "(-)" 	| "area[d=1]"
+od550so4cs_global  | "od550so4cs"   | "" | "od550so4cs[d=1]"   	| "so4 cs optical depth @550nm" | "(-)" 	| "area[d=1]"
+OD550_SSSSM_global | "OD550_SSSSM"  | "" | "OD550_SSSSM[d=1]"  	| "ssssm optical depth @550nm" 	| "(-)" 	| "area[d=1]"
+od550ssas_global   | "od550ssas"    | "" | "od550ssas[d=1]"    	| "ss as optical depth @550nm" 	| "(-)" 	| "area[d=1]"
+od550ss_global	   | "od550ss" 	    | "" | "od550ss[d=1]"     	| "seasalt optical depth @550nm"| "(-)" 	| "area[d=1]"
+od550dust_global   | "od550dust"    | "" | "od550dust[d=1]"    	| "cidustm optical depth @550nm"| "(-)" 	| "area[d=1]"
+od550bc_global	   | "od550bc" 	    | "" | "od550bc[d=1]"     	| "bc optical depth @550nm" 	| "(-)" 	| "area[d=1]"
+od550oa_global	   | "od550oa" 	    | "" | "od550oa[d=1]"     	| "oa optical depth @550nm" 	| "(-)" 	| "area[d=1]"
+loaddustCI_global  | "loaddustCI"   | "" | "loaddustCI[d=1]"   	| "loaddustCI"   	| "(-)" 	| "area[d=1]"
+loadno3CI_global   | "loadno3CI"    | "" | "loadno3CI[d=1]"    	| "loadno3CI"    	| "(-)" 	| "area[d=1]"
+loadbcAI_global	   | "loadbcAI"     | "" | "loadbcAI[d=1]"     	| "loadbcAI"     	| "(-)" 	| "area[d=1]"
+loadpomAI_global   | "loadpomAI"    | "" | "loadpomAI[d=1]"    	| "loadpomAI"    	| "(-)" 	| "area[d=1]"
+loadssCS_global	   | "loadssCS"     | "" | "loadssCS[d=1]"     	| "loadssCS"     	| "(-)" 	| "area[d=1]"
+loadso4CS_global   | "loadso4CS"    | "" | "loadso4CS[d=1]"    	| "loadso4CS"    	| "(-)" 	| "area[d=1]"
+loadno3CS_global   | "loadno3CS"    | "" | "loadno3CS[d=1]"    	| "loadno3CS"    	| "(-)" 	| "area[d=1]"
+loadSSAS_global	   | "loadSSAS"     | "" | "loadSSAS[d=1]"     	| "loadSSAS"     	| "(-)" 	| "area[d=1]"
+loadbcAS_global	   | "loadbcAS"     | "" | "loadbcAS[d=1]"     	| "loadbcAS"     	| "(-)" 	| "area[d=1]"
+loadpomAS_global   | "loadpomAS"    | "" | "loadpomAS[d=1]"    	| "loadpomAS"    	| "(-)" 	| "area[d=1]"
+loadso4AS_global   | "loadso4AS"    | "" | "loadso4AS[d=1]"    	| "loadso4AS"    	| "(-)" 	| "area[d=1]"
+LOAD_ASNH4M_global | "LOAD_ASNH4M"  | "" | "LOAD_ASNH4M[d=1]"  	| "LOAD_ASNH4M"  	| "(-)" 	| "area[d=1]"
+LOAD_ASNO3M_global | "LOAD_ASNO3M"  | "" | "LOAD_ASNO3M[d=1]"  	| "LOAD_ASNO3M"  	| "(-)" 	| "area[d=1]"
+LOAD_SSSSM_global  | "LOAD_SSSSM"   | "" | "LOAD_SSSSM[d=1]"   	| "LOAD_SSSSM"   	| "(-)" 	| "area[d=1]"
+o3_col_global      | "o3_col" 	    | "" | "o3_col[d=1]" 	| "o3_col" 	 | "?" | "area[d=1]"
+co_col_global	   | "co_col" 	    | "" | "co_col[d=1]"	| "co_col" 	 | "?" | "area[d=1]"
+no2_col_global	   | "no2_col" 	    | "" | "no2_col[d=1]" 	| "no2_col" 	 | "?" | "area[d=1]"
+ch2o_col_global    | "ch2o_col"     | "" | "ch2o_col[d=1]" 	| "ch2o_col" 	 | "?" | "area[d=1]"
+ch4_col_global	   | "ch4_col" 	    | "" | "ch4_col[d=1]" 	| "ch4_col" 	 | "?" | "area[d=1]"
+hno2_col_global    | "hno2_col"     | "" | "hno2_col[d=1]" 	| "hno2_col" 	 | "?" | "area[d=1]"
+swtoaasduss_global | "SWTOAAS_DUSS" | "" | "SWTOAAS_DUSS[d=1]" | "SW Top-of-Atm Rad. flx dust + seasalt"            |"W m-2"      | "area[d=1]"
+swtoaasant_global  | "SWTOAAS_ANT"  | "" | "SWTOAAS_ANT[d=1]"  | "SWTOAAS_ANT " | "W m-2" | "area[d=1]"
+swtoaasaer_global  | "SWTOAAS_AER"  | "" | "SWTOAAS_AER[d=1]"  | "SWTOAAS_AER " | "W m-2" | "area[d=1]"
+swtoaasnat_global  | "SWTOAAS_NAT"  | "" | "SWTOAAS_NAT[d=1]"  | "SWTOAAS_NAT " | "W m-2" | "area[d=1]"
+swtoaasbc_global   | "SWTOAAS_BC"   | "" | "SWTOAAS_BC[d=1]"   | "SWTOAAS_BC  " | "W m-2" | "area[d=1]"
+swtoaasso4_global  | "SWTOAAS_SO4"  | "" | "SWTOAAS_SO4[d=1]"  | "SWTOAAS_SO4 " | "W m-2" | "area[d=1]"
+swtoaaspom_global  | "SWTOAAS_POM"  | "" | "SWTOAAS_POM[d=1]"  | "SWTOAAS_POM " | "W m-2" | "area[d=1]"
+swtoaascno3_global | "SWTOAAS_CNO3" | "" | "SWTOAAS_CNO3[d=1]" | "SWTOAAS_CNO3" | "W m-2" | "area[d=1]"
+swtoaasfno3_global | "SWTOAAS_FNO3" | "" | "SWTOAAS_FNO3[d=1]" | "SWTOAAS_FNO3" | "W m-2" | "area[d=1]"
