Changeset 2566

Timestamp:

06/12/15 16:33:44 (9 years ago)

Author:

sdipsl

Message:

• Reference or actions related to IOIPSL output management has been removed
• XIOS is used by default
• Use a low level of output by default
• Add missing variables related to monitoring01*cfg files (sohtc300, tro3, solaire, co2_ppm, CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt)
• Remove dbio_T from pisces.card and pisces.driver
• Waiting for file_def_histhf3h_lmdz.xml and file_def_histhf3hm_lmdz.xml integration in LMDZ/DefLists
• Still need to homogenize OUTPUT_LEVEL like option in comp.card
• Will be propagate to sister v6_rc0 confiurations when fully completed
• Has been tested

Location:

CONFIG/UNIFORM/v6_rc0/IPSLCM6

Files:

• EXPERIMENTS/IPSLCM/piControl/COMP/lim2.card (modified) (3 diffs)
• EXPERIMENTS/IPSLCM/piControl/COMP/lim3.card (modified) (2 diffs)
• EXPERIMENTS/IPSLCM/piControl/COMP/lmdz.card (modified) (7 diffs)
• EXPERIMENTS/IPSLCM/piControl/COMP/oasis.card (modified) (8 diffs)
• EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card (modified) (17 diffs)
• EXPERIMENTS/IPSLCM/piControl/COMP/orchidee.card (modified) (3 diffs)
• EXPERIMENTS/IPSLCM/piControl/COMP/pisces.card (modified) (5 diffs)
• EXPERIMENTS/IPSLCM/piControl/COMP/stomate.card (modified) (3 diffs)
• EXPERIMENTS/IPSLCM/piControl/COMP/xios.card (modified) (2 diffs)
• GENERAL/DRIVER/lmdz.driver (modified) (3 diffs)
• GENERAL/DRIVER/opa9.driver (modified) (17 diffs)
• GENERAL/DRIVER/orchidee.driver (modified) (3 diffs)
• GENERAL/DRIVER/pisces.driver (modified) (5 diffs)
• GENERAL/DRIVER/stomate.driver (modified) (3 diffs)
• GENERAL/DRIVER/xios.driver (modified) (2 diffs)
• GENERAL/PARAM/context_nemo.xml (modified) (5 diffs)
• GENERAL/PARAM/orchidee.def_CWRR (modified) (2 diffs)
• GENERAL/PARAM/orchidee.def_Choi (modified) (2 diffs)
• GENERAL/PARAM/run.def (modified) (1 diff)

CONFIG/UNIFORM/v6_rc0/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/lim2.card

@@ -5 +5 @@
 
 [InitialStateFiles]
-List=   ()
+List=   ()
 
 [BoundaryFiles]
-List=   ()
+List=   ()
 ListNonDel= ()
 
 [SmoothFiles]
-List=   ()
+List=   ()
 
 [ParametersFiles]
-List=   (${SUBMIT_DIR}/PARAM/namelist_lim2_${RESOL_OCE}_ref, namelist_ice_ref), \
+List=   (${SUBMIT_DIR}/PARAM/namelist_lim2_${RESOL_OCE}_ref, namelist_ice_ref), \
         (${SUBMIT_DIR}/PARAM/namelist_lim2_${RESOL_OCE}_cfg, namelist_ice_cfg)
 
 [RestartFiles]
-List=   (${config_UserChoices_JobName}_${NEMO_END}_restart_ice.nc, restart_icemod.nc, restart_ice_in.nc)
+List=   (${config_UserChoices_JobName}_${NEMO_END}_restart_ice.nc, restart_icemod.nc, restart_ice_in.nc)
 
 [OutputText]
@@ -35 +35 @@
 TimeSeriesVars3D = ()
 ChunckJob3D = NONE
-Seasonal=ON
+Seasonal = ON
 
 [Post_1D_icemod]
@@ -44 +44 @@
 TimeSeriesVars3D = ()
 ChunckJob3D = NONE
-Seasonal=OFF
-
-
-
+Seasonal = OFF

CONFIG/UNIFORM/v6_rc0/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/lim3.card

@@ -5 +5 @@
 
 [InitialStateFiles]
-List=   ()
+List=   ()
 
 [BoundaryFiles]
-List=   ()
+List=   ()
 ListNonDel= ()
 
 [SmoothFiles]
-List=   ()
+List=   ()
 
 [ParametersFiles]
-List=   (${SUBMIT_DIR}/PARAM/namelist_lim3_${RESOL_OCE}_ref, namelist_ice_ref), \
+List=   (${SUBMIT_DIR}/PARAM/namelist_lim3_${RESOL_OCE}_ref, namelist_ice_ref), \
         (${SUBMIT_DIR}/PARAM/namelist_lim3_${RESOL_OCE}_cfg, namelist_ice_cfg)
 
 [RestartFiles]
-List=   (${config_UserChoices_JobName}_${NEMO_END}_restart_ice.nc, restart_icemod.nc, restart_ice_in.nc)
+List=   (${config_UserChoices_JobName}_${NEMO_END}_restart_ice.nc, restart_icemod.nc, restart_ice_in.nc)
 
 [OutputText]
@@ -26 +26 @@
 [OutputFiles]
 List=   (${config_UserChoices_JobName}_1m_icemod.nc, ${R_OUT_ICE_O_M}/${PREFIX}_1M_icemod.nc, Post_1M_icemod ), \
-        (${config_UserChoices_JobName}_1d_icemod.nc, ${R_OUT_ICE_O_D}/${PREFIX}_1D_icemod.nc, Post_1D_icemod )
+        (${config_UserChoices_JobName}_1d_icemod.nc, ${R_OUT_ICE_O_D}/${PREFIX}_1D_icemod.nc, NONE )
 
 [Post_1M_icemod]
 Patches = ()
-GatherWithInternal = (nav_lon, nav_lat, time_counter)
+GatherWithInternal = (nav_lon, nav_lat, time_counter, time_counter_bounds)
 TimeSeriesVars2D = (bmelt, evap, grLateral, ialb, ice_pres, iicetemp, iicethic, iicevelu, iicevelv, ileadfra, isnowthi, prsn, rsdssi, sblsi, sim, snoToIce, snomelt, soicecov, strairx, strairy, tmelt, transifs, transix, transiy, tsice)
 ChunckJob2D = NONE
 TimeSeriesVars3D = ()
 ChunckJob3D = NONE
-Seasonal=ON
+Seasonal = ON
 
 [Post_1D_icemod]
 Patches = ()
-GatherWithInternal = (nav_lon, nav_lat, time_counter)
+GatherWithInternal = (nav_lon, nav_lat, time_counter, time_counter_bounds)
 TimeSeriesVars2D = (iicethic, iicevelu, iicevelv, ileadfra)
 ChunckJob2D = 200Y
 TimeSeriesVars3D = ()
 ChunckJob3D = NONE
-Seasonal=OFF
+Seasonal = OFF
 

CONFIG/UNIFORM/v6_rc0/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/lmdz.card

@@ -3 +3 @@
 
 [UserChoices]
-# Physics package to use : 
-# LMDZ_Physics=AP for standard/old physics(defalut), can be used with LMDZ4_AR5 or LMDZ5/trunk sources 
+# 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.1 for new physics, to be used with LMDZ5/trunk revision 1554 or later
 LMDZ_Physics=AP
 #LMDZ_Physics=NPv4.12
 
-# 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=preind
 
-# manage radiative aerosol effect and ozone 
+# manage radiative aerosol effect and ozone
 flag_aerosol=6
 ok_ade=y
@@ -29 +29 @@
 
 # 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
 
@@ -37 +37 @@
 # Set OutLevel to choose the level of output files from LMDZ. The file PARAM/output.def_$OutLevel will be used.
 # OutLevel=low/medium/high
-OutLevel=medium
+OutLevel=low
 
 # Set COSP activation and Outputs frequency (monthly, daily, HF) = y/n
 LMDZ_COSP_OK=n
-LMDZ_COSP_monthly=y
-LMDZ_COSP_daily=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=y
-LMDZ_NMC_daily=y
+LMDZ_NMC_daily=n
 LMDZ_NMC_hf=n
-
-# Use XIOS as output library
-XIOS=y
 
 [InitialStateFiles]
@@ -62 +59 @@
 # With AR5 ozone(tropo + strato from LMDZOR-INCA-REPROBUS simulations)
 ListNonDel= (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/AR5/HISTORIQUE/aerosols_11YearsClim_1855_v5.nc, aerosols.nat.nc),\
-            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/AR5/HISTORIQUE/climoz_LMDZ_1855_v2.nc, climoz_LMDZ.nc)
+            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/AR5/HISTORIQUE/climoz_LMDZ_1855_v2.nc, climoz_LMDZ.nc)
 
 [SmoothFiles]
-List=   ()
+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, . ),                                \
+        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . ),            \
+        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . ),          \
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . ),   \
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthCOSP_lmdz.xml, .),\
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histday_lmdz.xml, . ),   \
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayCOSP_lmdz.xml, .),\
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayNMC_lmdz.xml, . ),\
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhf_lmdz.xml, . ),    \
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfCOSP_lmdz.xml, .), \
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfNMC_lmdz.xml, . ), \
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstn_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_histhf3h_lmdz.xml, . ),  \
+#        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhf3hm_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, used_run.def, iodef.xml, context_lmdz.xml,field_def_lmdz.xml,debug.01)
-#List=   (lmdz.x.prt)
+List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, used_run.def, iodef.xml, context_lmdz.xml,field_def_lmdz.xml,debug.01,lmdz.prt)
 
 [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,   NONE),   \
-        (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,        NONE),        \
+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,       Post_1D_histday),       \
-        (histdayCOSP.nc,   ${R_OUT_ATM_O_D}/${PREFIX}_1D_histdayCOSP.nc,   NONE),   \
-        (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,        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) 
+        (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]
@@ -128 +126 @@
 GatherWithInternal = (lon, lat, pressure2, height, sza, time_counter, time_counter_bounds)
 TimeSeriesVars2D = (cllcalipso, clmcalipso, clhcalipso, cltcalipso, tclisccp, albisccp, ctpisccp)
-ChunckJob2D = OFF 
+ChunckJob2D = OFF
 TimeSeriesVars3D = (clcalipso, clisccp2_c01, clisccp2_c02, clisccp2_c03, clisccp2_c04, clisccp2_c05, clisccp2_c06, clisccp2_c07, parasol_refl)
 ChunckJob3D = OFF
@@ -138 +136 @@
 TimeSeriesVars2D = ()
 ChunckJob2D = NONE
-TimeSeriesVars3D = (ta, zg, hus, hur, ua, va, wap)
-ChunckJob3D = 100Y
+TimeSeriesVars3D = (ta, tro3, zg, hus, hur, ua, va, wap)
+ChunckJob3D = NONE
 Seasonal=ON
-
-[Post_1M_dynzon]
-Patches = ()
-GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
-TimeSeriesVars2D = ()
-ChunckJob2D = NONE
-TimeSeriesVars3D = ()
-ChunckJob3D = NONE
-Seasonal=OFF
 
 [Post_1M_paramLMDZ_phy]
@@ -214 +203 @@
 Seasonal=OFF
 
+[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 = OFF
+Seasonal=OFF
+
 [Post_3H_histhf3h]
 Patches= ()
 GatherWithInternal = (lon, lat, presnivs, time_counter, time_counter_bounds)
-TimeSeriesVars2D = (phis, tsol, t2m, q2m, u10m, v10m, psol, topl, bils)
+TimeSeriesVars2D = (phis, tsol, t2m, q2m, ustar, u10m, v10m, psol)
 ChunckJob2D = OFF
 TimeSeriesVars3D = ()
 ChunckJob3D = OFF
 Seasonal=OFF
-

CONFIG/UNIFORM/v6_rc0/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/oasis.card

@@ -1 @@
-[Compatibility] 
-libIGCM=1.0 
-         
+[Compatibility]
+libIGCM=1.0
+
 [UserChoices]
 OutputMode=n
@@ -8 +8 @@
 
 [InitialStateFiles]
-List=   (${R_INIT}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/flxat.nc, flxat.nc), \
-        (${R_INIT}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/sstoc.nc, sstoc.nc)
+List=   (${R_INIT}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/flxat.nc, flxat.nc), \
+        (${R_INIT}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/sstoc.nc, sstoc.nc)
 
 [BoundaryFiles]
-List=   ()
+List=   ()
 ListNonDel= (${R_BC}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/grids.nc, grids.nc),\
-            (${R_BC}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/masks.nc, masks.nc),\
-            (${R_BC}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/areas.nc, areas.nc),\
-            (${R_BC}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_torc_to_tlmd_MOSAIC.nc, rmp_torc_to_tlmd_MOSAIC.nc),\
-            (${R_BC}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC.nc, rmp_tlmd_to_torc_MOSAIC.nc),\
-            (${R_BC}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC_calvin.nc, rmp_tlmd_to_torc_MOSAIC_calvin.nc),\
-            (${R_BC}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC_rivflu.nc, rmp_tlmd_to_torc_MOSAIC_rivflu.nc)
+            (${R_BC}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/masks.nc, masks.nc),\
+            (${R_BC}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/areas.nc, areas.nc),\
+            (${R_BC}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_torc_to_tlmd_MOSAIC.nc, rmp_torc_to_tlmd_MOSAIC.nc),\
+            (${R_BC}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC.nc, rmp_tlmd_to_torc_MOSAIC.nc),\
+            (${R_BC}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC_calvin.nc, rmp_tlmd_to_torc_MOSAIC_calvin.nc),\
+            (${R_BC}/CPL/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC_rivflu.nc, rmp_tlmd_to_torc_MOSAIC_rivflu.nc)
 
 [SmoothFiles]
-List=   ()
+List=   ()
 
 [ParametersFiles]
-List=   (${SUBMIT_DIR}/PARAM/namcouple_${RESOL_CPL}, namcouple)
+List=   (${SUBMIT_DIR}/PARAM/namcouple_${RESOL_CPL}, namcouple)
 
 [RestartFiles]
-List=   (flxat.nc, flxat.nc, flxat.nc),\
-        (sstoc.nc, sstoc.nc, sstoc.nc)
+List=   (flxat.nc, flxat.nc, flxat.nc),\
+        (sstoc.nc, sstoc.nc, sstoc.nc)
 
 [OutputText]
@@ -35 +35 @@
 
 [OutputFiles]
-List=   (SISUTESW_LMDZ_01.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_SISUTESW.nc,    Post_ncks_cdo),\
-    (SIICECOV_LMDZ_02.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_SIICECOV.nc,    Post_ncks_cdo),\
-    (SIICTEMW_LMDZ_03.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_SIICTEMW.nc,    Post_ncks_cdo),\
-    (SIICEALW_LMDZ_04.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_SIICEALW.nc,    Post_ncks_cdo),\
-    (CURRENTX_LMDZ_05.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_CURRENTX.nc,    Post_ncks_cdo),\
-    (CURRENTY_LMDZ_06.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_CURRENTY.nc,    Post_ncks_cdo),\
-    (CURRENTZ_LMDZ_07.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_CURRENTZ.nc,    Post_ncks_cdo),\
-    (COTAUXXU_LMDZ_08.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTAUXXU.nc,    Post_ncks_cdo),\
-    (COTAUYYU_LMDZ_09.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTAUYYU.nc,    Post_ncks_cdo),\
-    (COTAUZZU_LMDZ_10.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTAUZZU.nc,    Post_ncks_cdo),\
-    (COTAUXXV_LMDZ_11.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTAUXXV.nc,    Post_ncks_cdo),\
-    (COTAUYYV_LMDZ_12.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTAUYYV.nc,    Post_ncks_cdo),\
-    (COTAUZZV_LMDZ_13.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTAUZZV.nc,    Post_ncks_cdo),\
-    (COWINDSP_LMDZ_14.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COWINDSP.nc,    Post_ncks_cdo),\
-    (COTOTRAI_LMDZ_15.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTOTRAI.nc,    Post_ncks_cdo),\
-    (COTOTSNO_LMDZ_16.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTOTSNO.nc,    Post_ncks_cdo),\
-    (COTOTEVA_LMDZ_17.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTOTEVA.nc,    Post_ncks_cdo),\
-    (COICEVAP_LMDZ_18.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COICEVAP.nc,    Post_ncks_cdo),\
-    (COQSRMIX_LMDZ_19.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COQSRMIX.nc,    Post_ncks_cdo),\
-    (COQNSMIX_LMDZ_20.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COQNSMIX.nc,    Post_ncks_cdo),\
-    (COSHFICE_LMDZ_21.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COSHFICE.nc,    Post_ncks_cdo),\
-    (CONSFICE_LMDZ_22.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_CONSFICE.nc,    Post_ncks_cdo),\
-    (CODFLXDT_LMDZ_23.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_CODFLXDT.nc,    Post_ncks_cdo),\
-    (COCALVIN_LMDZ_24.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COCALVIN.nc,    Post_ncks_cdo),\
-    (COLIQRUN_LMDZ_25.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COLIQRUN.nc,    Post_ncks_cdo),\
-    (O_SSTSST_oceanx_01.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_SSTSST.nc,    Post_ncks_cdo),\
-    (OIceFrc_oceanx_02.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_OIceFrac.nc,    Post_ncks_cdo),\
-    (O_TepIce_oceanx_03.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_TepIce.nc,    Post_ncks_cdo),\
-    (O_AlbIce_oceanx_04.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_AlbIce.nc,    Post_ncks_cdo),\
-    (O_OCurx1_oceanx_05.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_OCurx1.nc,    Post_ncks_cdo),\
-    (O_OCury1_oceanx_06.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_OCury1.nc,    Post_ncks_cdo),\
-    (O_OCurz1_oceanx_07.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_OCurz1.nc,    Post_ncks_cdo),\
-    (O_OTaux1_oceanx_08.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_OTaux1.nc,    Post_ncks_cdo),\
-    (O_OTauy1_oceanx_09.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_OTauy1.nc,    Post_ncks_cdo),\
-    (O_OTauz1_oceanx_10.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_OTauz1.nc,    Post_ncks_cdo),\
-    (O_OTaux2_oceanx_11.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_OTaux2.nc,    Post_ncks_cdo),\
-    (O_OTauy2_oceanx_12.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_OTauy2.nc,    Post_ncks_cdo),\
-    (O_OTauz2_oceanx_13.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_OTauz2.nc,    Post_ncks_cdo),\
-    (O_Wind10_oceanx_14.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_Wind10.nc,    Post_ncks_cdo),\
-    (OTotRain_oceanx_15.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_OTotRain.nc,    Post_ncks_cdo),\
-    (OTotSnow_oceanx_16.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_OTotSnow.nc,    Post_ncks_cdo),\
-    (OTotEvap_oceanx_17.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_OTotEvap.nc,    Post_ncks_cdo),\
-    (OIceEvap_oceanx_18.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_OIceEvap.nc,    Post_ncks_cdo),\
-    (O_QsrMix_oceanx_19.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_QsrMix.nc,    Post_ncks_cdo),\
-    (O_QnsMix_oceanx_20.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_QsrIce.nc,    Post_ncks_cdo),\
-    (O_QsrIce_oceanx_21.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_QnsMix.nc,    Post_ncks_cdo),\
-    (O_QnsIce_oceanx_22.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_QnsIce.nc,    Post_ncks_cdo),\
-    (O_dQnsdT_oceanx_23.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_dQnsdT.nc,    Post_ncks_cdo),\
-    (OCalving_oceanx_24.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_OCalving.nc,    Post_ncks_cdo),\
-    (O_Runoff_oceanx_25.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_O_Runoff.nc,    Post_ncks_cdo),\
-    (TEMPO_1D_cpl_atm.nc,    ${R_OUT_CPL_O_D}/${PREFIX}_1D_cpl_atm.nc , Post_1D_cpl_atm), \
-    (TEMPO_1D_cpl_oce.nc,    ${R_OUT_CPL_O_D}/${PREFIX}_1D_cpl_oce.nc , Post_1D_cpl_oce), \
-    (TEMPO_1M_cpl_atm.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_1M_cpl_atm.nc , Post_1M_cpl_atm), \
-    (TEMPO_1M_cpl_oce.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_1M_cpl_oce.nc , Post_1M_cpl_oce)
+List=   ()
+
+#List=   (SISUTESW_LMDZ_01.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_SISUTESW.nc,    Post_ncks_cdo),\
+#        (SIICECOV_LMDZ_02.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_SIICECOV.nc,    Post_ncks_cdo),\
+#        (SIICTEMW_LMDZ_03.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_SIICTEMW.nc,    Post_ncks_cdo),\
+#        (SIICEALW_LMDZ_04.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_SIICEALW.nc,    Post_ncks_cdo),\
+#        (CURRENTX_LMDZ_05.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_CURRENTX.nc,    Post_ncks_cdo),\
+#        (CURRENTY_LMDZ_06.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_CURRENTY.nc,    Post_ncks_cdo),\
+#        (CURRENTZ_LMDZ_07.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_CURRENTZ.nc,    Post_ncks_cdo),\
+#        (COTAUXXU_LMDZ_08.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTAUXXU.nc,    Post_ncks_cdo),\
+#        (COTAUYYU_LMDZ_09.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTAUYYU.nc,    Post_ncks_cdo),\
+#        (COTAUZZU_LMDZ_10.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTAUZZU.nc,    Post_ncks_cdo),\
+#        (COTAUXXV_LMDZ_11.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTAUXXV.nc,    Post_ncks_cdo),\
+#        (COTAUYYV_LMDZ_12.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTAUYYV.nc,    Post_ncks_cdo),\
+#        (COTAUZZV_LMDZ_13.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTAUZZV.nc,    Post_ncks_cdo),\
+#        (COWINDSP_LMDZ_14.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COWINDSP.nc,    Post_ncks_cdo),\
+#        (COTOTRAI_LMDZ_15.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTOTRAI.nc,    Post_ncks_cdo),\
+#        (COTOTSNO_LMDZ_16.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTOTSNO.nc,    Post_ncks_cdo),\
+#        (COTOTEVA_LMDZ_17.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COTOTEVA.nc,    Post_ncks_cdo),\
+#        (COICEVAP_LMDZ_18.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COICEVAP.nc,    Post_ncks_cdo),\
+#        (COQSRMIX_LMDZ_19.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COQSRMIX.nc,    Post_ncks_cdo),\
+#        (COQNSMIX_LMDZ_20.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COQNSMIX.nc,    Post_ncks_cdo),\
+#        (COSHFICE_LMDZ_21.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COSHFICE.nc,    Post_ncks_cdo),\
+#        (CONSFICE_LMDZ_22.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_CONSFICE.nc,    Post_ncks_cdo),\
+#        (CODFLXDT_LMDZ_23.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_CODFLXDT.nc,    Post_ncks_cdo),\
+#        (COCALVIN_LMDZ_24.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COCALVIN.nc,    Post_ncks_cdo),\
+#        (COLIQRUN_LMDZ_25.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_COLIQRUN.nc,    Post_ncks_cdo),\
+#        (O_SSTSST_oceanx_01.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_SSTSST.nc,    Post_ncks_cdo),\
+#        (OIceFrc_oceanx_02.nc,   ${R_OUT_CPL_O_M}/${PREFIX}_OIceFrac.nc,    Post_ncks_cdo),\
+#        (O_TepIce_oceanx_03.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_TepIce.nc,    Post_ncks_cdo),\
+#        (O_AlbIce_oceanx_04.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_AlbIce.nc,    Post_ncks_cdo),\
+#        (O_OCurx1_oceanx_05.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_OCurx1.nc,    Post_ncks_cdo),\
+#        (O_OCury1_oceanx_06.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_OCury1.nc,    Post_ncks_cdo),\
+#        (O_OCurz1_oceanx_07.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_OCurz1.nc,    Post_ncks_cdo),\
+#        (O_OTaux1_oceanx_08.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_OTaux1.nc,    Post_ncks_cdo),\
+#        (O_OTauy1_oceanx_09.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_OTauy1.nc,    Post_ncks_cdo),\
+#        (O_OTauz1_oceanx_10.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_OTauz1.nc,    Post_ncks_cdo),\
+#        (O_OTaux2_oceanx_11.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_OTaux2.nc,    Post_ncks_cdo),\
+#        (O_OTauy2_oceanx_12.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_OTauy2.nc,    Post_ncks_cdo),\
+#        (O_OTauz2_oceanx_13.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_OTauz2.nc,    Post_ncks_cdo),\
+#        (O_Wind10_oceanx_14.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_Wind10.nc,    Post_ncks_cdo),\
+#        (OTotRain_oceanx_15.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_OTotRain.nc,    Post_ncks_cdo),\
+#        (OTotSnow_oceanx_16.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_OTotSnow.nc,    Post_ncks_cdo),\
+#        (OTotEvap_oceanx_17.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_OTotEvap.nc,    Post_ncks_cdo),\
+#        (OIceEvap_oceanx_18.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_OIceEvap.nc,    Post_ncks_cdo),\
+#        (O_QsrMix_oceanx_19.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_QsrMix.nc,    Post_ncks_cdo),\
+#        (O_QnsMix_oceanx_20.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_QsrIce.nc,    Post_ncks_cdo),\
+#        (O_QsrIce_oceanx_21.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_QnsMix.nc,    Post_ncks_cdo),\
+#        (O_QnsIce_oceanx_22.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_QnsIce.nc,    Post_ncks_cdo),\
+#        (O_dQnsdT_oceanx_23.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_dQnsdT.nc,    Post_ncks_cdo),\
+#        (OCalving_oceanx_24.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_OCalving.nc,    Post_ncks_cdo),\
+#        (O_Runoff_oceanx_25.nc,  ${R_OUT_CPL_O_M}/${PREFIX}_O_Runoff.nc,    Post_ncks_cdo),\
+#        (TEMPO_1D_cpl_atm.nc,    ${R_OUT_CPL_O_D}/${PREFIX}_1D_cpl_atm.nc , NONE),         \
+#        (TEMPO_1D_cpl_oce.nc,    ${R_OUT_CPL_O_D}/${PREFIX}_1D_cpl_oce.nc , NONE),         \
+#        (TEMPO_1M_cpl_atm.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_1M_cpl_atm.nc , NONE),         \
+#        (TEMPO_1M_cpl_oce.nc,    ${R_OUT_CPL_O_M}/${PREFIX}_1M_cpl_oce.nc , NONE)
 
 [Post_ncks_cdo]
@@ -97 +99 @@
 TimeSeriesVars3D = ()
 ChunckJob3D = NONE
-Seasonal=OFF
+Seasonal = OFF
 
 [Post_1D_cpl_atm]
@@ -106 +108 @@
 TimeSeriesVars3D = ()
 ChunckJob3D = NONE
-Seasonal=OFF
+Seasonal = OFF
 
 [Post_1D_cpl_oce]
@@ -115 +117 @@
 TimeSeriesVars3D = ()
 ChunckJob3D = NONE
-Seasonal=OFF
+Seasonal = OFF
 
 [Post_1M_cpl_atm]
@@ -124 +126 @@
 TimeSeriesVars3D = ()
 ChunckJob3D = NONE
-Seasonal=ON
+Seasonal = ON
 
 [Post_1M_cpl_oce]
@@ -133 +135 @@
 TimeSeriesVars3D = ()
 ChunckJob3D = NONE
-Seasonal=ON
-
+Seasonal = ON

CONFIG/UNIFORM/v6_rc0/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card

@@ -34 +34 @@
 List=   (${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}_ref, namelist_ref),      \
         (${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}_cfg, namelist_cfg),      \
-        (${SUBMIT_DIR}/PARAM/context_nemo.xml,   context_nemo.xml),         \
-        (${SUBMIT_DIR}/PARAM/field_def_nemo.xml,   field_def_nemo.xml),     \
-        (${SUBMIT_DIR}/PARAM/domain_def_nemo.xml,  domain_def_nemo.xml)
+        (${SUBMIT_DIR}/PARAM/context_nemo.xml,          context_nemo.xml),  \
+        (${SUBMIT_DIR}/PARAM/field_def_nemo.xml,        field_def_nemo.xml),\
+        (${SUBMIT_DIR}/PARAM/domain_def_nemo.xml,       domain_def_nemo.xml)
 
 [RestartFiles]
@@ -45 +45 @@
 
 [OutputFiles]
-List=   (mesh_mask.nc      , ${R_OUT_OCE_O}/${config_UserChoices_JobName}_mesh_mask.nc, NONE),\
-        (${config_UserChoices_JobName}_1y_scalar.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_scalar.nc, NONE),\
+List=   (${config_UserChoices_JobName}_1y_scalar.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_scalar.nc, NONE),\
         (${config_UserChoices_JobName}_1y_grid_T.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_T.nc, NONE),\
         (${config_UserChoices_JobName}_1y_grid_U.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_U.nc, NONE),\
@@ -57 +56 @@
         (${config_UserChoices_JobName}_1m_grid_W.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_W.nc, NONE),\
         (${config_UserChoices_JobName}_1m_diaptr.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_diaptr.nc, Post_1M_diaptr),\
-        (${config_UserChoices_JobName}_1d_grid_T.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_T.nc, Post_1D_grid_T),\
-        (${config_UserChoices_JobName}_1d_grid_U.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_U.nc, Post_1D_grid_U),\
-        (${config_UserChoices_JobName}_1d_grid_V.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_V.nc, Post_1D_grid_V),\
-        (damping.coeff.nc , ${R_OUT_OCE_O_D}/${PREFIX}_damping.coeff.nc, NONE),\
-        (output.abort.nc  , ${R_OUT_OCE_D}/${PREFIX}_output.abort.nc, NONE),\
-        (output.init.nc   , ${R_OUT_OCE_O_I}/${config_UserChoices_JobName}_${PeriodDateBegin}_output.init.nc, NONE)
+        (${config_UserChoices_JobName}_1d_grid_T.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_T.nc, NONE),\
+        (${config_UserChoices_JobName}_1d_grid_U.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_U.nc, NONE),\
+        (${config_UserChoices_JobName}_1d_grid_V.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_V.nc, NONE),\
+        (mesh_mask.nc,      ${R_OUT_OCE_O}/${config_UserChoices_JobName}_mesh_mask.nc,        NONE),\
+        (damping.coeff.nc,  ${R_OUT_OCE_O_D}/${PREFIX}_damping.coeff.nc,                      NONE),\
+        (output.abort.nc ,  ${R_OUT_OCE_D}/${PREFIX}_output.abort.nc,                         NONE),\
+        (output.init.nc,    ${R_OUT_OCE_O_I}/${config_UserChoices_JobName}_${PeriodDateBegin}_output.init.nc, NONE)
 
 # Monthly analysis
@@ -73 +73 @@
 TimeSeriesVars3D = ()
 ChunckJob3D = NONE
-Seasonal=OFF
+Seasonal = OFF
 
 [Post_1M_grid_T]
@@ -82 +82 @@
 TimeSeriesVars3D = (vosaline,votemper)
 ChunckJob3D = 50Y
-Seasonal=ON
+Seasonal = ON
 
 [Post_1M_grid_U]
@@ -91 +91 @@
 TimeSeriesVars3D = (vozocrtx,vozoeivu)
 ChunckJob3D = 50Y
-Seasonal=ON
+Seasonal = ON
 
 [Post_1M_grid_V]
@@ -100 +100 @@
 TimeSeriesVars3D = (vomecrty, vomeeivv)
 ChunckJob3D = 50Y
-Seasonal=ON
+Seasonal = ON
 
 [Post_1M_grid_W]
@@ -109 +109 @@
 TimeSeriesVars3D = (difvmo, difvmto, difvtrto, voddmavs, voveeivw, votkeavt, vovecrtz, wmo, wmosq)
 ChunckJob3D = 50Y
-Seasonal=OFF
+Seasonal = OFF
 
 [Post_1M_diaptr]
@@ -118 +118 @@
 TimeSeriesVars3D = ()
 ChunckJob3D = NONE
-Seasonal=ON
+Seasonal = ON
 
 # Daily analysis
@@ -129 +129 @@
 TimeSeriesVars3D = (vosaline,votemper)
 ChunckJob3D = OFF
-Seasonal=OFF
+Seasonal = OFF
 
 [Post_1D_grid_U]
@@ -138 +138 @@
 TimeSeriesVars3D = (vozocrtx)
 ChunckJob3D = OFF
-Seasonal=OFF
+Seasonal = OFF
 
 [Post_1D_grid_V]
@@ -147 +147 @@
 TimeSeriesVars3D = (vomecrty)
 ChunckJob3D = OFF
-Seasonal=OFF
+Seasonal = OFF
 
 ## Yearly analysis
@@ -167 +167 @@
 TimeSeriesVars3D = (rhopoto, rsds, thkcello, vosaline,votemper)
 ChunckJob3D = 50Y
-Seasonal=OFF
+Seasonal = OFF
 
 [Post_1Y_grid_U]
@@ -176 +176 @@
 TimeSeriesVars3D = (umo, vozocrtx,vozoeivu)
 ChunckJob3D = 50Y
-Seasonal=OFF
+Seasonal = OFF
 
 [Post_1Y_grid_V]
@@ -185 +185 @@
 TimeSeriesVars3D = (vmo, vomecrty, vomeeivv)
 ChunckJob3D = 50Y
-Seasonal=OFF
+Seasonal = OFF
 
 [Post_1Y_grid_W]
@@ -194 +194 @@
 TimeSeriesVars3D = (difvmo, difvmto, difvtrto, voddmavs, voveeivw, votkeavt, vovecrtz, wmo, wmosq)
 ChunckJob3D = 50Y
-Seasonal=OFF
+Seasonal = OFF
 
 [Post_1Y_diaptr]
@@ -203 +203 @@
 TimeSeriesVars3D = ()
 ChunckJob3D = NONE
-Seasonal=OFF
+Seasonal = OFF

CONFIG/UNIFORM/v6_rc0/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/orchidee.card

@@ -11 +11 @@
 sechiba_LEVEL=11
 
-# Use XIOS as output library
-XIOS=y
-
 [InitialStateFiles]
-List=   (${R_INIT}/SRF/${config_UserChoices_TagName}/routing.nc,          . ), \
-        (${R_INIT}/SRF/${config_UserChoices_TagName}/cartepente2d_15min.nc, .), \
-        (${R_INIT}/SRF/${config_UserChoices_TagName}/PFTmap_IPCC_1850.nc, PFTmap.nc)
+List=   (${R_INIT}/SRF/${config_UserChoices_TagName}/routing.nc,            .), \
+        (${R_INIT}/SRF/${config_UserChoices_TagName}/cartepente2d_15min.nc, .), \
+        (${R_INIT}/SRF/${config_UserChoices_TagName}/PFTmap_IPCC_1850.nc,   PFTmap.nc)
 
 [BoundaryFiles]
-List=   (${R_INIT}/SRF/${config_UserChoices_TagName}/soils_param.nc,      . )
+List=   (${R_INIT}/SRF/${config_UserChoices_TagName}/soils_param.nc, . )
 ListNonDel= ()
 
 [SmoothFiles]
-List=()
+List=   ()
 
 [ParametersFiles]
-List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\
-        (${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, .)
+List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def),  \
+        (${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, .)
 
 [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)
+List=   (sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc)
 
 [OutputText]
@@ -40 +37 @@
 
 [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, NONE), \
-        (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]
@@ -51 +48 @@
 TimeSeriesVars3D = (lai, maxvegetfrac, vegetfrac, ptn, nee)
 ChunckJob3D = NONE
-Seasonal=ON
+Seasonal = ON
 
 [Post_HF_sechiba_out_2]
-Patches= ()
-GatherWithInternal= (lon, lat, time_counter, Areas, Contfrac, time_counter_bounds)
-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

CONFIG/UNIFORM/v6_rc0/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/pisces.card

@@ -3 +3 @@
 
 [UserChoices]
-DBIO_ENABLE=y
 
 [InitialStateFiles]
@@ -26 +25 @@
 
 [SmoothFiles]
-List=  ()
+List=   ()
 
 [ParametersFiles]
-List=   (${SUBMIT_DIR}/PARAM/namelist_top_${RESOL_OCE}_ref, namelist_top_ref), \
-        (${SUBMIT_DIR}/PARAM/namelist_top_${RESOL_OCE}_cfg, namelist_top_cfg), \
+List=   (${SUBMIT_DIR}/PARAM/namelist_top_${RESOL_OCE}_ref, namelist_top_ref),       \
+        (${SUBMIT_DIR}/PARAM/namelist_top_${RESOL_OCE}_cfg, namelist_top_cfg),       \
         (${SUBMIT_DIR}/PARAM/namelist_pisces_${RESOL_OCE}_ref, namelist_pisces_ref) ,\
         (${SUBMIT_DIR}/PARAM/namelist_pisces_${RESOL_OCE}_cfg, namelist_pisces_cfg)
 
 [RestartFiles]
-List=   (${config_UserChoices_JobName}_${NEMO_END}_restart_trc.nc,  restart_trc.nc, restart_trc.nc)
+List=   (${config_UserChoices_JobName}_${NEMO_END}_restart_trc.nc,  restart_trc.nc, restart_trc.nc)
 
 [OutputText]
@@ -42 +41 @@
 [OutputFiles]
 List=   (${config_UserChoices_JobName}_1m_ptrc_T.nc, ${R_OUT_MBG_O_M}/${PREFIX}_1M_ptrc_T.nc, Post_1M_ptrc_T), \
-        (${config_UserChoices_JobName}_1m_diad_T.nc, ${R_OUT_MBG_O_M}/${PREFIX}_1M_diad_T.nc, Post_1M_diad_T), \
-        (${config_UserChoices_JobName}_1m_dbio_T.nc, ${R_OUT_MBG_O_M}/${PREFIX}_1M_dbio_T.nc, NONE)
+        (${config_UserChoices_JobName}_1m_diad_T.nc, ${R_OUT_MBG_O_M}/${PREFIX}_1M_diad_T.nc, Post_1M_diad_T)
 
 [Post_1M_ptrc_T]
@@ -52 +50 @@
 TimeSeriesVars3D = (Alkalini, BFe, CaCO3, DCHL, DFe, DIC, DOC, DSi, Fer, GOC, GSi, NCHL, NFe, NH4, NO3, O2, PHY, PHY2, PO4, POC, SFe, Si, ZOO, ZOO2)
 ChunckJob3D = 50Y
-Seasonal=ON
+Seasonal = ON
 
 [Post_1M_diad_T]
@@ -61 +59 @@
 TimeSeriesVars3D = (PPPHY, PPPHY2, PPNEWN, PPNEWD, PAR, PH)
 ChunckJob3D = 50Y
-Seasonal=ON
-
-[Post_1M_dbio_T]
-Patches = ()
-GatherWithInternal = (nav_lon, nav_lat, deptht, time_counter, time_counter_bounds)
-TimeSeriesVars2D = (INTDIC, INTNFIX, INTPBFE, INTPBSI, INTPCAL, INTPNEW, INTPP, INTPPPHY, INTPPPHY2, O2MIN, ZO2MIN )
-ChunckJob2D = NONE
-TimeSeriesVars3D = (CHLT, EXPC, EXPCAL, EXPFE, EXPSI, PFET, PHYT, POCT, TPBFE, TPNEW, TPP, ZOOT)
-ChunckJob3D = 50Y
-Seasonal=ON
+Seasonal = ON

CONFIG/UNIFORM/v6_rc0/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/stomate.card

@@ -9 +9 @@
 
 [BoundaryFiles]
-List=   ()
+List=   ()
 ListNonDel= (${R_BC}/SRF/${config_UserChoices_TagName}/reftemp.nc, .)
 
 [SmoothFiles]
-List=   ()
+List=   ()
 
 [ParametersFiles]
@@ -20 +20 @@
 [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)
+List=   (stomate_rest_out.nc, stomate_rest.nc, stomate_rest_in.nc)
 
 [OutputText]
@@ -26 +26 @@
 
 [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]
-Patches= ()
-GatherWithInternal= (lon, lat, PFT, time_counter, Areas, time_counter_bounds)
-TimeSeriesVars2D= (T2M_MONTH,CONTFRAC,RESOLUTION_X,RESOLUTION_Y,CONVFLUX,CFLUX_PROD10,CFLUX_PROD100,HARVEST_ABOVE)
+Patches = ()
+GatherWithInternal = (lon, lat, PFT, time_counter, Areas, time_counter_bounds)
+TimeSeriesVars2D = (T2M_MONTH,CONTFRAC,RESOLUTION_X,RESOLUTION_Y,CONVFLUX,CFLUX_PROD10,CFLUX_PROD100,HARVEST_ABOVE)
 ChunckJob2D = NONE
 TimeSeriesVars3D = (LAI,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE,TOTAL_TURN)
 ChunckJob3D = NONE
-Seasonal=ON
+Seasonal = ON
 
 [Post_1M_stomate_ipcc_history]
-Patches= ()
-GatherWithInternal= (lon, lat, PFT, time_counter, Areas, CONTFRAC, time_counter_bounds)
-TimeSeriesVars2D=(cVeg, cLitter, cSoil, cProduct, lai, gpp, ra, npp, rh, fFire, fHarvest, fLuc, nbp, fVegLitter, fLitterSoil, cLeaf, cWood, cRoot, cMisc, cLitterAbove, cLitterBelow, cSoilFast, cSoilMedium, cSoilSlow, landCoverFrac, treeFracPrimDec, treeFracPrimEver, c3PftFrac, c4PftFrac, rGrowth, rMaint, nppLeaf, nppWood, nppRoot, nep)
+Patches = ()
+GatherWithInternal = (lon, lat, PFT, time_counter, Areas, CONTFRAC, time_counter_bounds)
+TimeSeriesVars2D = (cVeg, cLitter, cSoil, cProduct, lai, gpp, ra, npp, rh, fFire, fHarvest, fLuc, nbp, fVegLitter, fLitterSoil, cLeaf, cWood, cRoot, cMisc, cLitterAbove, cLitterBelow, cSoilFast, cSoilMedium, cSoilSlow, landCoverFrac, treeFracPrimDec, treeFracPrimEver, c3PftFrac, c4PftFrac, rGrowth, rMaint, nppLeaf, nppWood, nppRoot, nep)
 ChunckJob2D = NONE
-TimeSeriesVars3D=()
+TimeSeriesVars3D = ()
 ChunckJob3D = NONE
-Seasonal=ON
+Seasonal = ON

CONFIG/UNIFORM/v6_rc0/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/xios.card

@@ -5 +5 @@
 
 [InitialStateFiles]
-List=   ()
+List=   ()
 
 [BoundaryFiles]
-List=   ()
+List=   ()
 ListNonDel= ()
 
 [SmoothFiles]
-List=   ()
+List=   ()
 
 [ParametersFiles]
-List=   ()
+List=   ()
 
 [RestartFiles]
-List=   (NONE)
+List=   (NONE)
 
 [OutputText]
@@ -25 +25 @@
 [OutputFiles]
 List=   ()
-
-
-

CONFIG/UNIFORM/v6_rc0/IPSLCM6/GENERAL/DRIVER/lmdz.driver

@@ -325 +325 @@
     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.
+    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
-
+    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 XIOS XMLs
+    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 5
+        elif [ X${OutLevel} = Xmedium ] ; then
+            IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf output_level 6
+        elif [ X${OutLevel} = Xhigh ] ; then
+            IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf output_level 7
+        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
 
@@ -481 +469 @@
 
     ## 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}
+    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}
 
     # Set anneeref different for gcm and ce0l
@@ -622 +610 @@
     fi
 
-    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
-
-        # 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
-    fi
+    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
     
     IGCM_debug_PopStack "ATM_Update"

CONFIG/UNIFORM/v6_rc0/IPSLCM6/GENERAL/DRIVER/opa9.driver

@@ -9 +9 @@
     RESOL_OCE_ICE=$( echo ${RESOL} | awk "-Fx" '{print $1}' )
     case ${RESOL_OCE_ICE} in
-        ( *LIM2* )
-        SEAICE_MODEL=LIM2 
-        LIM_VERSION=2
-        ;;
-
-        ( *LIM3* )
-        SEAICE_MODEL=LIM3
-        LIM_VERSION=3
-        ;;
-        ( *CICE*) SEAICE_MODEL=CICE ;;
-        ( *     ) SEAICE_MODEL=UNKNOWN ;;
+        ( *LIM2* )
+        SEAICE_MODEL=LIM2
+        LIM_VERSION=2
+        ;;
+
+        ( *LIM3* )
+        SEAICE_MODEL=LIM3
+        LIM_VERSION=3
+        ;;
+        ( *CICE*) SEAICE_MODEL=CICE ;;
+        ( *     ) SEAICE_MODEL=UNKNOWN ;;
     esac
     RESOL_OCE=$( echo ${RESOL_OCE_ICE} | sed "s/${SEAICE_MODEL}//" )
@@ -31 +31 @@
     # Local function to find namelists parameters
     supergrep () {
-        grep "^ *$1 *=" $2 | sed -e "s% *\!.*%%"
+        grep "^ *$1 *=" $2 | sed -e "s% *\!.*%%"
     }
 
@@ -56 +56 @@
     IGCM_debug_Print 1 "namelist_ref : ${NAMELIST_OPA_REF}"
     if [ ! -r ${NAMELIST_OPA_REF} ] ; then
-        echo "${NAMELIST_OPA_REF} non trouve"
+        echo "${NAMELIST_OPA_REF} non trouve"
     fi
     IGCM_debug_Print 1 "namelist_cfg : ${NAMELIST_OPA_CFG}"
     if [ ! -r ${NAMELIST_OPA_CFG} ] ; then
-        echo "${NAMELIST_OPA_CFG} non trouve"
+        echo "${NAMELIST_OPA_CFG} non trouve"
     fi
 
@@ -69 +69 @@
     PAT_NLEAPY=$(   supergrep nn_leapy    ${NAMELIST_OPA_CFG} )
     PAT_NSTOCK=$(   supergrep nn_stock    ${NAMELIST_OPA_CFG} )
-    PAT_NWRITE=$(   supergrep nn_write    ${NAMELIST_OPA_CFG} )
     PAT_RESTAR=$(   supergrep ln_rstart   ${NAMELIST_OPA_CFG} )
     PAT_NRSTAR=$(   supergrep nn_rstctl   ${NAMELIST_OPA_CFG} )
     PAT_NMSH=$(     supergrep nn_msh      ${NAMELIST_OPA_CFG} )
-    PAT_NN_WRITE=$( supergrep nn_write    ${NAMELIST_OPA_CFG} )
-    PAT_NN_FWRI=$(  supergrep nn_fwri     ${NAMELIST_OPA_CFG} )
     PAT_ICE_EMBD=$( supergrep nn_ice_embd ${NAMELIST_OPA_CFG} )
     PAT_ICEFLX=$(   supergrep cn_iceflx   ${NAMELIST_OPA_CFG} )
@@ -80 +77 @@
     PAT_JPNJ=$(     supergrep jpnj        ${NAMELIST_OPA_CFG} )
     PAT_JPNIJ=$(    supergrep jpnij       ${NAMELIST_OPA_CFG} )
-    PAT_NN_FSBC=$(  supergrep nn_fsbc     ${NAMELIST_OPA_CFG} ) 
+    PAT_NN_FSBC=$(  supergrep nn_fsbc     ${NAMELIST_OPA_CFG} )
 
     ORCA_RDT=$(       supergrep rn_rdt        ${NAMELIST_OPA_CFG} | sed 's/ *rn_rdt *=//'  | sed 's/\. *//' )
@@ -87 +84 @@
     #(( ORCA_NPDT_SBC   = ORCA_NPDT_JOUR / ORCA_NN_FSBC ))
     (( ORCA_RDT_SBC =  ORCA_RDT * ORCA_NN_FSBC ))
- 
+
 
     # Period Length In Days between DateBegin and first day of calendar 0001 01 01
@@ -99 +96 @@
     IGCM_debug_Print 1 "PAT_NLEAPY   $PAT_NLEAPY"
     IGCM_debug_Print 1 "PAT_NSTOCK   $PAT_NSTOCK"
-    IGCM_debug_Print 1 "PAT_NWRITE   $PAT_NWRITE"
     IGCM_debug_Print 1 "PAT_RESTAR   $PAT_RESTAR"
     IGCM_debug_Print 1 "PAT_NRSTAR   $PAT_NRSTAR"
     IGCM_debug_Print 1 "PAT_NMSH     $PAT_NMSH"
-    IGCM_debug_Print 1 "PAT_NN_WRITE $PAT_NN_WRITE"
-    IGCM_debug_Print 1 "PAT_NN_FWRI  $PAT_NN_FWRI"
     IGCM_debug_Print 1 "PAT_ICE_EMBD $PAT_ICE_EMBD"
     IGCM_debug_Print 1 "PAT_ICEFLX   $PAT_ICEFLX"
@@ -117 +111 @@
     IGCM_debug_Print 1 "ORCA_NPDT_JOUR  $ORCA_NPDT_JOUR"
     IGCM_debug_Print 1 "DaysSinceJC     $DaysSinceJC"
-    
+
     IGCM_debug_PopStack "OCE_Initialize"
-   
+
 }
 
@@ -133 +127 @@
     ## This informations are used for diaptr, trends and diagap files
     ## only the first frequency is used for this files
-   
+
     IGCM_debug_Print 1 "FreqCoupling    $FreqCoupling"
     IGCM_debug_Print 1 "ORCA_NN_FSBC    $ORCA_NN_FSBC"
@@ -140 +134 @@
 
     if [[ ${ORCA_RDT_SBC} -gt ${FreqCoupling} ]] ; then
-        IGCM_debug_Exit "ORCA_RDT_SBC=${ORCA_RDT_SBC} is greater than FreqCoupling=${FreqCoupling}"
-        IGCM_debug_Verif_Exit
-    fi
-    
-    ##--Write Frequency Purpose ....
-    frequency=$( echo ${config_OCE_WriteFrequency} | awk "-F " '{print $1}' )
-    factor=$( echo ${frequency} | sed -e "s/[yYmMdD]//" )
-    case ${frequency} in
-        1Y|1y)
-            (( ORCA_NWRITE = ORCA_NPDT_JOUR * factor * $( IGCM_date_DaysInYear  ${year} ) ))          ;
-            PREFIX_NWRITE=${config_UserChoices_JobName}_${factor}y ;
-            R_OUT_OCE_NWRITE=${R_OUT_OCE_O_Y} ;
-            WF1=${factor}Y ;;
-        1M|1m)
-            (( ORCA_NWRITE = ORCA_NPDT_JOUR * factor * $( IGCM_date_DaysInMonth ${year} ${month} ) )) ;
-            PREFIX_NWRITE=${config_UserChoices_JobName}_${factor}m ;
-            R_OUT_OCE_NWRITE=${R_OUT_OCE_O_M} ;
-            WF1=${factor}M ;;
-        *D|*d)
-            (( ORCA_NWRITE = ORCA_NPDT_JOUR * factor  ))  ;
-            PREFIX_NWRITE=${config_UserChoices_JobName}_${factor}d ;
-            R_OUT_OCE_NWRITE=${R_OUT_OCE_O_D} ;
-            WF1=${factor}D ;;
-        *)
-            (( ORCA_NWRITE = 0 ))                                                            ;;
-    esac
+        IGCM_debug_Exit "ORCA_RDT_SBC=${ORCA_RDT_SBC} is greater than FreqCoupling=${FreqCoupling}"
+        IGCM_debug_Verif_Exit
+    fi
 
     ##--Write Frequency for iomput
@@ -188 +159 @@
 
     ##-- Output level : 3 for more 1D variables
-    eval opa9_OUTPUT_LEVEL=\${opa9_UserChoices_OUTPUT_LEVEL} > /dev/null 2>&1
-    OUTPUT_LEVEL=${opa9_OUTPUT_LEVEL}
-
+    OUTPUT_LEVEL=${opa9_UserChoices_OUTPUT_LEVEL}
 
     # Period Length In Days between DateBegin and first day of calendar 0001 01 01
-    # Needed by OPA namelist to compute correct file names 
+    # Needed by OPA namelist to compute correct file names
     (( PeriodDaysSinceJC =  $( IGCM_date_DaysSinceJC ${PeriodDateBegin} ) + 1  ))
 
@@ -206 +175 @@
     ##-- Restart configuration
     if ( [ "${CumulPeriod}" -eq 1 ] && [ "${config_OCE_Restart}" = "n" ] ) ; then
-        ORCA_LRSTAR=.FALSE.
-        ORCA_NRSTDT=0
+        ORCA_LRSTAR=.FALSE.
+        ORCA_NRSTDT=0
         # Put ORCA_NMSH=0 when OPA running in parallel mode
-        ORCA_NMSH=1
-        #echo "NO OPA RESTART"
+        ORCA_NMSH=1
+        #echo "NO OPA RESTART"
     elif ( [ "${CumulPeriod}" -eq 1 ] && [ "${config_OCE_Restart}" = "y" ] ) ; then
-        ORCA_LRSTAR=.TRUE.
-        ORCA_NRSTDT=0
-        ORCA_NMSH=1
-        #echo "OPA RESTART"
+        ORCA_LRSTAR=.TRUE.
+        ORCA_NRSTDT=0
+        ORCA_NMSH=1
+        #echo "OPA RESTART"
     else
-        ORCA_LRSTAR=.TRUE.
-        ORCA_NRSTDT=2
-        ORCA_NMSH=0
-        #echo "OPA RESTART"
+        ORCA_LRSTAR=.TRUE.
+        ORCA_NRSTDT=2
+        ORCA_NMSH=0
+        #echo "OPA RESTART"
     fi
 
@@ -244 +213 @@
 
     typeset -r PRECIS=8
-    NEMO_END=$( echo $( awk "BEGIN { printf \"%0${PRECIS}d\",${ORCA_NITEND} }" ) ) 
+    NEMO_END=$( echo $( awk "BEGIN { printf \"%0${PRECIS}d\",${ORCA_NITEND} }" ) )
 
 
     case ${SEAICE_MODEL} in
-        ( LIM2 ) 
-        NN_ICE_EMBD=0
-        ICEFLX=none
-        ;;
-        ( LIM3 ) 
-        NN_ICE_EMBD=2
-        ICEFLX=${opa9_UserChoices_iceflx:-linear}
-        ;;
+        ( LIM2 )
+        NN_ICE_EMBD=0
+        ICEFLX=none
+        ;;
+        ( LIM3 )
+        NN_ICE_EMBD=2
+        ICEFLX=${opa9_UserChoices_iceflx:-linear}
+        ;;
     esac
 
@@ -261 +230 @@
 
     sed -e "s/${PAT_CEXPER}/       cn_exp=\"${config_UserChoices_JobName}\"/"   \
-        -e "s/${PAT_NIT000}/       nn_it000=${ORCA_NIT000}/"                    \
-        -e "s/${PAT_NITEND}/       nn_itend=${ORCA_NITEND}/"                    \
-        -e "s/${PAT_NDATE0}/       nn_date0=${PeriodDateBegin}/"                \
+        -e "s/${PAT_NIT000}/       nn_it000=${ORCA_NIT000}/"                    \
+        -e "s/${PAT_NITEND}/       nn_itend=${ORCA_NITEND}/"                    \
+        -e "s/${PAT_NDATE0}/       nn_date0=${PeriodDateBegin}/"                \
         -e "s%${PAT_NLEAPY}%       nn_leapy=${ORCA_NLEAPY}%"                    \
-        -e "s/${PAT_NSTOCK}/       nn_stock=${ORCA_NSTOCK}/"                    \
-        -e "s/${PAT_NWRITE}/       nn_write=${ORCA_NWRITE}/"                    \
-        -e "s/${PAT_RESTAR}/       ln_rstart=${ORCA_LRSTAR}/"                   \
-        -e "s/${PAT_NRSTAR}/       nn_rstctl=${ORCA_NRSTDT}/"                   \
-        -e "s/${PAT_NMSH}/         nn_msh=${ORCA_NMSH}/"                        \
-        -e "s/${PAT_NN_WRITE}/     nn_prg=${ORCA_NWRITE}/"                      \
-        -e "s/${PAT_NN_FWRI}/      nn_fwri=${ORCA_NWRITE}/"                     \
-        -e "s/${PAT_NN_FSBC}/      nn_fsbc=${ORCA_NN_FSBC}/"                    \
-        -e "s/${PAT_ICE_EMBD}/     nn_ice_embd=${NN_ICE_EMBD}/"                 \
-        -e "s/${PAT_ICEFLX}/       cn_iceflx=\'${ICEFLX}'/"                     \
-        -e "s/${PAT_JPNI}/         jpni=1/"                                     \
-        -e "s/${PAT_JPNJ}/         jpnj=${NUM_PROC_OCE}/"                       \
-        -e "s/${PAT_JPNIJ}/        jpnij=${NUM_PROC_OCE}/"                      \
-        namelist_cfg > namelist_cfg.tmp
+        -e "s/${PAT_NSTOCK}/       nn_stock=${ORCA_NSTOCK}/"                    \
+        -e "s/${PAT_RESTAR}/       ln_rstart=${ORCA_LRSTAR}/"                   \
+        -e "s/${PAT_NRSTAR}/       nn_rstctl=${ORCA_NRSTDT}/"                   \
+        -e "s/${PAT_NMSH}/         nn_msh=${ORCA_NMSH}/"                        \
+        -e "s/${PAT_NN_FSBC}/      nn_fsbc=${ORCA_NN_FSBC}/"                    \
+        -e "s/${PAT_ICE_EMBD}/     nn_ice_embd=${NN_ICE_EMBD}/"                 \
+        -e "s/${PAT_ICEFLX}/       cn_iceflx=\'${ICEFLX}'/"                     \
+        -e "s/${PAT_JPNI}/         jpni=1/"                                     \
+        -e "s/${PAT_JPNJ}/         jpnj=${NUM_PROC_OCE}/"                       \
+        -e "s/${PAT_JPNIJ}/        jpnij=${NUM_PROC_OCE}/"                      \
+        namelist_cfg > namelist_cfg.tmp
 
     IGCM_sys_Mv namelist_cfg.tmp namelist_cfg
@@ -293 +259 @@
         -e "s/_1M_ENABLE_/${V1M_ENABLE}/" \
         -e "s/_1Y_ENABLE_/${V1Y_ENABLE}/" \
-        -e "s/_OUTPUT_LEVEL_/${OUTPUT_LEVEL}/" \
         context_nemo.xml > context_nemo.xml.tmp
 
@@ -310 +275 @@
     echo '<context id="nemo" src="./context_nemo.xml"/>' > add.tmp
     cp iodef.xml iodef.xml.tmp
-    sed -e "/COMPONENT CONTEXT/r add.tmp" \
-        iodef.xml.tmp > iodef.xml
+    sed -e "/COMPONENT CONTEXT/r add.tmp" iodef.xml.tmp > iodef.xml
     rm iodef.xml.tmp add.tmp
-
 
     IGCM_debug_PopStack "OCE_Update"
@@ -325 +288 @@
     if [ -f date.file ] ; then
         # Prefix use in opa9.card AND in lim2.card :
-        DATE_OPA=$( cat date.file | \
-            sed "s/\ ${config_UserChoices_JobName}_[0-9]*[a-z]_\([0-9]*_[0-9]*\)_\ */\1/g" )
-        MainPrefix=${config_UserChoices_JobName}_1d_${DATE_OPA}
-        SecondPrefix=${config_UserChoices_JobName}_1m_${DATE_OPA}
+        DATE_OPA=$( cat date.file | \
+            sed "s/\ ${config_UserChoices_JobName}_[0-9]*[a-z]_\([0-9]*_[0-9]*\)_\ */\1/g" )
+        MainPrefix=${config_UserChoices_JobName}_1d_${DATE_OPA}
+        SecondPrefix=${config_UserChoices_JobName}_1m_${DATE_OPA}
     fi
 

CONFIG/UNIFORM/v6_rc0/IPSLCM6/GENERAL/DRIVER/orchidee.driver

@@ -15 +15 @@
 
     ##- 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
 
@@ -33 +33 @@
     # 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
+        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_OK_STOMATE y
     else
-        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_OK_STOMATE n
+        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_OK_STOMATE n
     fi
 
-    typeset SECHIBA_WRITE_STEP
+    # Default init : files are desactivated
+    IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .FALSE.
+    IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba2 enabled .FALSE.
 
-    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
-    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/' ) 
+    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 ;;
+        *Y|*y)
+            WriteInYears=$( echo ${SRF_WriteFrequency} | awk -F '[yY]' '{print $1}' )
+            PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | awk -F '[yY]' '{print $1}' )
+            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
+            ;;
+        *M|*m)
+            WriteInMonths=$( echo ${SRF_WriteFrequency} | awk -F '[mM]' '{print $1}' )
+            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
+            ;;
+        5D|5d)
+            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
+            ;;
+        1D|1d)
+            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
+            ;;
+        *s)
+            WriteInSeconds=$( echo ${SRF_WriteFrequency} | awk -F '[s]' '{print $1}' )
+            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_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 ))
+    # Outputs HF in HISTFILE2 if required. Output frequency is 3 hours by default.
+    if [ X${SRF_ok_hf} = 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
-    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
+        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
 
@@ -176 +106 @@
     #IGCM_sys_Put_Out ${RUN_DIR}/run.def ${R_SAVE}/${PREFIX}_run.def
 
-#Temporary way to fix bug on cimean variable
-    IGCM_comp_modifyXmlFile force field_def_orchidee.xml cimean enabled .FALSE. 
+    #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
     # 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"

CONFIG/UNIFORM/v6_rc0/IPSLCM6/GENERAL/DRIVER/pisces.driver

@@ -3 +3 @@
 #-----------------------------------
 function MBG_Initialize
-{ 
+{
     IGCM_debug_PushStack "MBG_Initialize"
 
@@ -21 +21 @@
     # ln_rsttr  boolean term for tracer model restart (true or false)
     # nrsttr    control of the time step (0, 1 or 2)
-    
+
     ##--Variables used by PISCES --
- 
+
     NAMELIST_TOP_CFG=${SUBMIT_DIR}/PARAM/namelist_top_${RESOL_OCE}_cfg
     NAMELIST_PISCES_CFG=${SUBMIT_DIR}/PARAM/namelist_pisces_${RESOL_OCE}_cfg
@@ -58 +58 @@
 
         # If we start from IPSLCM5* restart files.
-        for file in restart_trc*.nc ; do
+        for file in restart_trc*.nc ; do
             ncrename -v TRBDSi,TRBGSi -v TRNDSi,TRNGSi -v TRNBSi,TRNDSi -v TRBBSi,TRBDSi ${file} > /dev/null 2>&1
-        done
+        done
 
     else
@@ -72 +72 @@
     fi
 
-    ##-- Enable dbio output file
-    DBIO_ENABLE=".FALSE." 
-    eval pisces_DBIO_ENABLE=\${pisces_UserChoices_DBIO_ENABLE} > /dev/null 2>&1
-    if [ "${pisces_DBIO_ENABLE}" = "y" ]; then
-        DBIO_ENABLE=".TRUE."
-    fi
-
-    # update iodef.xml
-
-    echo 'Informations into iodef.xml : DBIO_ENABLE'
-    echo ${DBIO_ENABLE}
-
-    sed -e "s/<DBIO_ENABLE>/${DBIO_ENABLE}/" \
-        iodef.xml > iodef.xml.tmp
-
-    IGCM_sys_Mv iodef.xml.tmp iodef.xml
-
     ##-- CO2 forcing : update atcco2 value in namelist_pisces_cfg
     if [ "${pisces_UserChoices_CARBON_CYCLE}" = "y" ]; then
-        # Special case for carbon cycle
-        # Activate this case by putting CARBON_CYCLE=y in pisces.card section UserChoices
-        echo 'Update atcco2 in namelist_pisces_cfg with value from file co2.log'
-        PathCO2log=${SUBMIT_DIR}
-        PreviousLinelog=$( tail -1 ${PathCO2log}/co2.log )
-        IPCC_PIS_CO2=$( echo "${PreviousLinelog[*]}" | gawk -F '|' '{gsub(" ",""); print $4}' )
-        sed -e "s%${PAT_PIS_ATCCO2}%          atcco2=${IPCC_PIS_CO2}%"             \
-            namelist_pisces_cfg > namelist_pisces_cfg.tmp
-        IGCM_sys_Mv namelist_pisces_cfg.tmp namelist_pisces_cfg
+        # Special case for carbon cycle
+        # Activate this case by putting CARBON_CYCLE=y in pisces.card section UserChoices
+        echo 'Update atcco2 in namelist_pisces_cfg with value from file co2.log'
+        PathCO2log=${SUBMIT_DIR}
+        PreviousLinelog=$( tail -1 ${PathCO2log}/co2.log )
+        IPCC_PIS_CO2=$( echo "${PreviousLinelog[*]}" | gawk -F '|' '{gsub(" ",""); print $4}' )
+        sed -e "s%${PAT_PIS_ATCCO2}%          atcco2=${IPCC_PIS_CO2}%"             \
+            namelist_pisces_cfg > namelist_pisces_cfg.tmp
+        IGCM_sys_Mv namelist_pisces_cfg.tmp namelist_pisces_cfg
     else
-        # Take same CO2 as for LMDZ, in parameter file config.def.
-        # ATM_Update is done before MBG_Update and therefor config.def file contains the correct value for CO2.
-        echo 'Update atcco2 in namelist_pisces_cfg with same value as for LMDZ'
-        LMDZ_CO2=$( lmdzgrep co2_ppm config.def )
-        sed -e "s%${PAT_PIS_ATCCO2}%          atcco2=${LMDZ_CO2}%"             \
-            namelist_pisces_cfg > namelist_pisces_cfg.tmp
-        IGCM_sys_Mv namelist_pisces_cfg.tmp namelist_pisces_cfg
+        # Take same CO2 as for LMDZ, in parameter file config.def.
+        # ATM_Update is done before MBG_Update and therefor config.def file contains the correct value for CO2.
+        echo 'Update atcco2 in namelist_pisces_cfg with same value as for LMDZ'
+        LMDZ_CO2=$( lmdzgrep co2_ppm config.def )
+        sed -e "s%${PAT_PIS_ATCCO2}%          atcco2=${LMDZ_CO2}%"             \
+            namelist_pisces_cfg > namelist_pisces_cfg.tmp
+        IGCM_sys_Mv namelist_pisces_cfg.tmp namelist_pisces_cfg
     fi
 
@@ -136 +119 @@
     IGCM_debug_PopStack "MBG_Finalize"
 }
-

CONFIG/UNIFORM/v6_rc0/IPSLCM6/GENERAL/DRIVER/stomate.driver

@@ -9 +9 @@
 
     RESOL_SBG=ALL
-    
+
     IGCM_debug_PopStack "SBG_Initialize"
 }
@@ -18 +18 @@
     IGCM_debug_PushStack "SBG_Update"
 
-    typeset STOMATE_WRITE_STEP
+    # Default init : files are desactivated
+    IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .FALSE.
+    IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .FALSE.
 
-    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 
-
-            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 ;;
+        *Y|*y)
+            WriteInYears=$( echo ${config_SBG_WriteFrequency} | awk -F '[yY]' '{print $1}' )
+            PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | awk -F '[yY]' '{print $1}' )
+            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
+            ;;
+        *M|*m)
+            WriteInMonths=$( echo ${config_SBG_WriteFrequency} | awk -F '[mM]' '{print $1}' )
+            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
+            ;;
+        5D|5d)
+            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
+            ;;
+        1D|1d)
+            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
+            ;;
+        *s)
+            WriteInSeconds=$( echo ${config_SBG_WriteFrequency} | awk -F '[s]' '{print $1}' )
+            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
+            ;;
+        *)
+            IGCM_debug_Exit "SBG_Update " ${config_SBG_WriteFrequency} " invalid WriteFrequency : choose in 1Y, 1M, 5D, 1D."
+            IGCM_debug_Verif_Exit ;;
     esac
 
-
-#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}
-
     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
 
@@ -156 +89 @@
 
     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
+        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
 

CONFIG/UNIFORM/v6_rc0/IPSLCM6/GENERAL/DRIVER/xios.driver

@@ -2 +2 @@
 #-----------------------------------
 function IOS_Initialize
-{ 
+{
     IGCM_debug_PushStack "IOS_Initialize"
 
@@ -16 +16 @@
 
     echo UPDATE IOS !!!
-# Activate server mode
+    # 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 
+    # Add LMDZ as component id
+    IGCM_comp_modifyXmlFile force iodef.xml oasis_codes_id NONE LMDZ,oceanx
     if [ -f namcouple ] ; then
-        sed -e "s/2  LMDZ oceanx/3 LMDZ oceanx ${config_Executable_IOS[1]}/" namcouple > namcouple.tmp 
-        IGCM_sys_Mv namcouple.tmp namcouple
+        sed -e "s/2  LMDZ oceanx/3 LMDZ oceanx ${config_Executable_IOS[1]}/" namcouple > namcouple.tmp
+        IGCM_sys_Mv namcouple.tmp namcouple
     fi
 

CONFIG/UNIFORM/v6_rc0/IPSLCM6/GENERAL/PARAM/context_nemo.xml

@@ -3 +3 @@
   <!-- =========================================================================================================== -->
  <context id="nemo" time_origin="1900-01-01 00:00:00" >
-    
+
     <!-- $id$ -->
-    
-    <!-- 
+
+    <!--
 ============================================================================================================
 =                                  definition of all existing variables                                    =
@@ -13 +13 @@
     -->
     <field_definition src="./field_def_nemo.xml"/>
-    <!-- 
+    <!--
 ============================================================================================================
 =                                           output files definition                                        =
@@ -20 +20 @@
 ============================================================================================================
     -->
-    
+
     <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4">
-    
+
       <file_group id="1h" output_freq="1h"  output_level="10" enabled=".FALSE."/> <!-- 1h files -->
-     
+
       <file_group id="1d" output_freq="1d"  output_level="10" enabled="_1D_ENABLE_"> <!-- 1d files -->
 
-        <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" >
-          <field field_ref="sst"          name="sosstsst"  />
-          <field field_ref="sss"          name="sosaline"  />
-          <field field_ref="ssh"          name="sossheig"  />
-          <field field_ref="empmr"        name="sowaflup"  />
-          <field field_ref="qsr"          name="soshfldo"  />
+        <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" >
+          <field field_ref="sst"          name="sosstsst"  />
+          <field field_ref="sss"          name="sosaline"  />
+          <field field_ref="ssh"          name="sossheig"  />
+          <field field_ref="empmr"        name="sowaflup"  />
+          <field field_ref="qsr"          name="soshfldo"  />
           <field field_ref="saltflx"      name="sosfldow"  />
-          <field field_ref="qt"           name="sohefldo"  />
-          <field field_ref="mldr10_1"     name="somxl010"  />
-          <field field_ref="mldkz5"       name="somixhgt"  />
-          <field field_ref="ice_cover"    name="soicecov"  />
-          <field field_ref="wspd"         name="sowindsp"  />
-          <field field_ref="erp"          name="sowafldp"  />
-          <field field_ref="ist_ipa"      name="soicetem"  />
-          <field field_ref="icealb_cea"   name="soicealb"  />   
-        </file>
-
-        <file id="file2" name_suffix="_grid_U" description="ocean U grid variables" >
-          <field field_ref="uoce"         name="vozocrtx"  />
-          <field field_ref="uoce_eiv"     name="vozoeivu"  />
-          <field field_ref="utau"         name="sozotaux"  />
-        </file>
-        
-        <file id="file3" name_suffix="_grid_V" description="ocean V grid variables" >
-          <field field_ref="voce"         name="vomecrty"  />
-          <field field_ref="voce_eiv"     name="vomeeivv"  />
-          <field field_ref="vtau"         name="sometauy"  />
-        </file>
-        
+          <field field_ref="qt"           name="sohefldo"  />
+          <field field_ref="hc300"        name="sohtc300"  />
+          <field field_ref="mldr10_1"     name="somxl010"  />
+          <field field_ref="mldkz5"       name="somixhgt"  />
+          <field field_ref="ice_cover"    name="soicecov"  />
+          <field field_ref="wspd"         name="sowindsp"  />
+          <field field_ref="erp"          name="sowafldp"  />
+          <field field_ref="ist_ipa"      name="soicetem"  />
+          <field field_ref="icealb_cea"   name="soicealb"  />
+        </file>
+
+        <file id="file2" name_suffix="_grid_U" description="ocean U grid variables" >
+          <field field_ref="uoce"         name="vozocrtx"  />
+          <field field_ref="uoce_eiv"     name="vozoeivu"  />
+          <field field_ref="utau"         name="sozotaux"  />
+        </file>
+
+        <file id="file3" name_suffix="_grid_V" description="ocean V grid variables" >
+          <field field_ref="voce"         name="vomecrty"  />
+          <field field_ref="voce_eiv"     name="vomeeivv"  />
+          <field field_ref="vtau"         name="sometauy"  />
+        </file>
+
       </file_group>
 
       <file_group id="1m" output_freq="1mo" output_level="10" enabled="_1M_ENABLE_"> <!-- real monthly files -->
 
-        <file id="file4" name_suffix="_grid_T" description="ocean T grid variables" >
-          <field field_ref="sst"          name="sosstsst"  />
-          <field field_ref="sss"          name="sosaline"  />
-          <field field_ref="ssh"          name="sossheig"  />
-          <field field_ref="toce"         name="votemper"  />
-          <field field_ref="soce"         name="vosaline"  />
-          <field field_ref="empmr"        name="sowaflup"  />
-          <field field_ref="qsr"          name="soshfldo"  />
+        <file id="file4" name_suffix="_grid_T" description="ocean T grid variables" >
+          <field field_ref="sst"          name="sosstsst"  />
+          <field field_ref="sss"          name="sosaline"  />
+          <field field_ref="ssh"          name="sossheig"  />
+          <field field_ref="toce"         name="votemper"  />
+          <field field_ref="soce"         name="vosaline"  />
+          <field field_ref="empmr"        name="sowaflup"  />
+          <field field_ref="qsr"          name="soshfldo"  />
           <field field_ref="saltflx"      name="sosfldow"  />
-          <field field_ref="qt"           name="sohefldo"  />
-          <field field_ref="mldr10_1"     name="somxl010"  />
-          <field field_ref="mldkz5"       name="somixhgt"  />
-          <field field_ref="ice_cover"    name="soicecov"  />
-          <field field_ref="wspd"         name="sowindsp"  />
-          <field field_ref="erp"          name="sowafldp"  />
-          <field field_ref="ist_ipa"      name="soicetem"  />
-          <field field_ref="icealb_cea"   name="soicealb"  />   
-        </file>
-
-        <file id="file5" name_suffix="_grid_U" description="ocean U grid variables" >
-          <field field_ref="uoce"         name="vozocrtx"  />
-          <field field_ref="uoce_eiv"     name="vozoeivu"  />
-          <field field_ref="utau"         name="sozotaux"  />
-        </file>
-        
-        <file id="file6" name_suffix="_grid_V" description="ocean V grid variables" >
-          <field field_ref="voce"         name="vomecrty"  />
-          <field field_ref="voce_eiv"     name="vomeeivv"  />
-          <field field_ref="vtau"         name="sometauy"  />
-        </file>
-
-        <file id="file7" name_suffix="_icemod" description="ice variables" >
-          <field field_ref="ice_pres"                     />
-          <field field_ref="snowthic_cea" name="isnowthi" />
-          <field field_ref="icethic_cea"  name="iicethic" />
-          <field field_ref="iceprod_cea"  name="iiceprod" />
-          <field field_ref="ist_ipa"      name="iicetemp" />
-          <field field_ref="uice_ipa"     name="iicevelu" />
-          <field field_ref="vice_ipa"     name="iicevelv" />
-          <field field_ref="utau_ice"     name="iicestru" />
-          <field field_ref="vtau_ice"     name="iicestrv" />
-          <field field_ref="qsr_io_cea"   name="iicesflx" />
-          <field field_ref="qns_io_cea"   name="iicenflx" />
-          <field field_ref="snowpre"      name="isnowpre" />
-        </file>
-
-    <file id="file8" name_suffix="_diaptr" description="diaptr variables" >
-       <field field_ref="zotemglo"   />
-       <field field_ref="zosalglo"     />
-       <field field_ref="zosrfglo"    />
-       <field field_ref="zomsfglo"    />
-       <field field_ref="zomsfeiv"    />
-       <field field_ref="zotematl"   />
-       <field field_ref="zosalatl"     />
-       <field field_ref="zosrfatl"    />
-       <field field_ref="zomsfatl"    />
-       <field field_ref="zotempac"   />
-       <field field_ref="zosalpac"     />
-       <field field_ref="zosrfpac"    />
-       <field field_ref="zomsfpac"    />
-       <field field_ref="zotemind"   />
-       <field field_ref="zosalind"     />
-       <field field_ref="zosrfind"    />
-       <field field_ref="zomsfind"    />
-       <field field_ref="zotemipc"   />
-       <field field_ref="zosalipc"     />
-       <field field_ref="zosrfipc"    />
-       <field field_ref="zomsfipc"     />
-       <field field_ref="sophtadv"      />
-       <field field_ref="sophteiv"      />
-       <field field_ref="sophtldf"      />
-       <field field_ref="sophtove"      />
-       <field field_ref="sohtatl"       />
-       <field field_ref="sohtpac"       />
-       <field field_ref="sohtind"       />
-       <field field_ref="sohtipc"       />
-       <field field_ref="sopstadv"      />
-       <field field_ref="sopsteiv"      />
-       <field field_ref="sopstldf"      />
-       <field field_ref="sopstove"      />
-       <field field_ref="sostatl"       />
-       <field field_ref="sostpac"       />
-       <field field_ref="sostind"       />
-       <field field_ref="sostipc"       />
-    </file>
-
-        <file id="file9" name_suffix="_ptrc_T" description="pisces sms variables" >
-       <field field_ref="DIC"      />
-       <field field_ref="Alkalini" />
-       <field field_ref="O2"       />
-       <field field_ref="CaCO3"    />
-       <field field_ref="PO4"      />
-       <field field_ref="POC"      />
-       <field field_ref="Si"       />
-       <field field_ref="PHY"      />
-       <field field_ref="ZOO"      />
-       <field field_ref="DOC"      />
-       <field field_ref="PHY2"     />
-       <field field_ref="ZOO2"     />
-       <field field_ref="DSi"      />
-       <field field_ref="Fer"      />
-       <field field_ref="BFe"      />
-       <field field_ref="GOC"      />
-       <field field_ref="SFe"      />
-       <field field_ref="DFe"      />
-       <field field_ref="GSi"      />
-       <field field_ref="NFe"      />
-       <field field_ref="NCHL"     />
-       <field field_ref="DCHL"     />
-       <field field_ref="NO3"      />
-       <field field_ref="NH4"      />
-        </file>
-        
-        <file id="file10" name_suffix="_diad_T" description="additional pisces diagnostics" >
-       <field field_ref="PH"       />
-       <field field_ref="CO3"      />
-       <field field_ref="CO3sat"   />
-       <field field_ref="PAR"      />
-       <field field_ref="PPPHY"    />
-       <field field_ref="PPPHY2"   />
-       <field field_ref="PPNEWN"   />
-       <field field_ref="PPNEWD"   />
-       <field field_ref="PBSi"     />
-       <field field_ref="PFeN"     />
-       <field field_ref="PFeD"     />
-       <field field_ref="xfracal"  />
-       <field field_ref="PCAL"     />
-       <field field_ref="DCAL"     />
-       <field field_ref="GRAZ1"    />
-       <field field_ref="GRAZ2"    />
-       <field field_ref="EPC100"   />
-       <field field_ref="EPFE100"  />
-       <field field_ref="EPSI100"  />
-       <field field_ref="EPCAL100" />
-       <field field_ref="Cflx"     />
-       <field field_ref="Oflx"     />
-       <field field_ref="Kg"       />
-       <field field_ref="Dpco2"    />
-       <field field_ref="Dpo2"     />
-       <field field_ref="Heup"     />
-       <field field_ref="Irondep"  />
-       <field field_ref="Ironsed"  />
-       <field field_ref="Ironice"  />
-       <field field_ref="Nfix"     />
-       <field field_ref="MuN"      />
-       <field field_ref="MuD"      />
-       <field field_ref="LNnut"    />
-       <field field_ref="LDnut"    />
-       <field field_ref="LNFe"     />
-       <field field_ref="LDFe"     />
-       <field field_ref="LNlight"  />
-       <field field_ref="LDlight"  />
-       <field field_ref="pdust"    />
-       <field field_ref="Fe3"     />
-       <field field_ref="FeL1"     />
-       <field field_ref="TL1"      />
-       <field field_ref="Sdenit"   />
-       <field field_ref="Totlig"   />
-        </file>
-
-    </file_group>
+          <field field_ref="qt"           name="sohefldo"  />
+          <field field_ref="hc300"        name="sohtc300"  />
+          <field field_ref="mldr10_1"     name="somxl010"  />
+          <field field_ref="mldkz5"       name="somixhgt"  />
+          <field field_ref="ice_cover"    name="soicecov"  />
+          <field field_ref="wspd"         name="sowindsp"  />
+          <field field_ref="erp"          name="sowafldp"  />
+          <field field_ref="ist_ipa"      name="soicetem"  />
+          <field field_ref="icealb_cea"   name="soicealb"  />
+        </file>
+
+        <file id="file5" name_suffix="_grid_U" description="ocean U grid variables" >
+          <field field_ref="uoce"         name="vozocrtx"  />
+          <field field_ref="uoce_eiv"     name="vozoeivu"  />
+          <field field_ref="utau"         name="sozotaux"  />
+        </file>
+
+        <file id="file6" name_suffix="_grid_V" description="ocean V grid variables" >
+          <field field_ref="voce"         name="vomecrty"  />
+          <field field_ref="voce_eiv"     name="vomeeivv"  />
+          <field field_ref="vtau"         name="sometauy"  />
+        </file>
+
+        <file id="file7" name_suffix="_icemod" description="ice variables" >
+          <field field_ref="ice_pres"                     />
+          <field field_ref="snowthic_cea" name="isnowthi" />
+          <field field_ref="icethic_cea"  name="iicethic" />
+          <field field_ref="iceprod_cea"  name="iiceprod" />
+          <field field_ref="ist_ipa"      name="iicetemp" />
+          <field field_ref="uice_ipa"     name="iicevelu" />
+          <field field_ref="vice_ipa"     name="iicevelv" />
+          <field field_ref="utau_ice"     name="iicestru" />
+          <field field_ref="vtau_ice"     name="iicestrv" />
+          <field field_ref="qsr_io_cea"   name="iicesflx" />
+          <field field_ref="qns_io_cea"   name="iicenflx" />
+          <field field_ref="snowpre"      name="isnowpre" />
+        </file>
+
+        <file id="file8" name_suffix="_diaptr" description="diaptr variables" >
+          <field field_ref="zotemglo"   />
+          <field field_ref="zosalglo"     />
+          <field field_ref="zosrfglo"    />
+          <field field_ref="zomsfglo"    />
+          <field field_ref="zomsfeiv"    />
+          <field field_ref="zotematl"   />
+          <field field_ref="zosalatl"     />
+          <field field_ref="zosrfatl"    />
+          <field field_ref="zomsfatl"    />
+          <field field_ref="zotempac"   />
+          <field field_ref="zosalpac"     />
+          <field field_ref="zosrfpac"    />
+          <field field_ref="zomsfpac"    />
+          <field field_ref="zotemind"   />
+          <field field_ref="zosalind"     />
+          <field field_ref="zosrfind"    />
+          <field field_ref="zomsfind"    />
+          <field field_ref="zotemipc"   />
+          <field field_ref="zosalipc"     />
+          <field field_ref="zosrfipc"    />
+          <field field_ref="zomsfipc"     />
+          <field field_ref="sophtadv"      />
+          <field field_ref="sophteiv"      />
+          <field field_ref="sophtldf"      />
+          <field field_ref="sophtove"      />
+          <field field_ref="sohtatl"       />
+          <field field_ref="sohtpac"       />
+          <field field_ref="sohtind"       />
+          <field field_ref="sohtipc"       />
+          <field field_ref="sopstadv"      />
+          <field field_ref="sopsteiv"      />
+          <field field_ref="sopstldf"      />
+          <field field_ref="sopstove"      />
+          <field field_ref="sostatl"       />
+          <field field_ref="sostpac"       />
+          <field field_ref="sostind"       />
+          <field field_ref="sostipc"       />
+        </file>
+
+        <file id="file9" name_suffix="_ptrc_T" description="pisces sms variables" >
+          <field field_ref="DIC"      />
+          <field field_ref="Alkalini" />
+          <field field_ref="O2"       />
+          <field field_ref="CaCO3"    />
+          <field field_ref="PO4"      />
+          <field field_ref="POC"      />
+          <field field_ref="Si"       />
+          <field field_ref="PHY"      />
+          <field field_ref="ZOO"      />
+          <field field_ref="DOC"      />
+          <field field_ref="PHY2"     />
+          <field field_ref="ZOO2"     />
+          <field field_ref="DSi"      />
+          <field field_ref="Fer"      />
+          <field field_ref="BFe"      />
+          <field field_ref="GOC"      />
+          <field field_ref="SFe"      />
+          <field field_ref="DFe"      />
+          <field field_ref="GSi"      />
+          <field field_ref="NFe"      />
+          <field field_ref="NCHL"     />
+          <field field_ref="DCHL"     />
+          <field field_ref="NO3"      />
+          <field field_ref="NH4"      />
+        </file>
+
+        <file id="file10" name_suffix="_diad_T" description="additional pisces diagnostics" >
+          <field field_ref="PH"       />
+          <field field_ref="CO3"      />
+          <field field_ref="CO3sat"   />
+          <field field_ref="PAR"      />
+          <field field_ref="PPPHY"    />
+          <field field_ref="PPPHY2"   />
+          <field field_ref="PPNEWN"   />
+          <field field_ref="PPNEWD"   />
+          <field field_ref="PBSi"     />
+          <field field_ref="PFeN"     />
+          <field field_ref="PFeD"     />
+          <field field_ref="xfracal"  />
+          <field field_ref="PCAL"     />
+          <field field_ref="DCAL"     />
+          <field field_ref="GRAZ1"    />
+          <field field_ref="GRAZ2"    />
+          <field field_ref="EPC100"   />
+          <field field_ref="EPFE100"  />
+          <field field_ref="EPSI100"  />
+          <field field_ref="EPCAL100" />
+          <field field_ref="Cflx"     />
+          <field field_ref="Oflx"     />
+          <field field_ref="Kg"       />
+          <field field_ref="Dpco2"    />
+          <field field_ref="Dpo2"     />
+          <field field_ref="Heup"     />
+          <field field_ref="Irondep"  />
+          <field field_ref="Ironsed"  />
+          <field field_ref="Ironice"  />
+          <field field_ref="Nfix"     />
+          <field field_ref="MuN"      />
+          <field field_ref="MuD"      />
+          <field field_ref="LNnut"    />
+          <field field_ref="LDnut"    />
+          <field field_ref="LNFe"     />
+          <field field_ref="LDFe"     />
+          <field field_ref="LNlight"  />
+          <field field_ref="LDlight"  />
+          <field field_ref="pdust"    />
+          <field field_ref="Fe3"     />
+          <field field_ref="FeL1"     />
+          <field field_ref="TL1"      />
+          <field field_ref="Sdenit"   />
+          <field field_ref="Totlig"   />
+        </file>
+
+      </file_group>
 
       <file_group id="1y"  output_freq="1y" output_level="10" enabled="_1Y_ENABLE_"> <!-- real yearly files -->
 
-        <file id="file11" name_suffix="_ptrc_T" description="pisces sms variables" >
-       <field field_ref="DIC"      />
-       <field field_ref="Alkalini" />
-       <field field_ref="O2"       />
-       <field field_ref="CaCO3"    />
-       <field field_ref="PO4"      />
-       <field field_ref="POC"      />
-       <field field_ref="Si"       />
-       <field field_ref="PHY"      />
-       <field field_ref="ZOO"      />
-       <field field_ref="DOC"      />
-       <field field_ref="PHY2"     />
-       <field field_ref="ZOO2"     />
-       <field field_ref="DSi"      />
-       <field field_ref="Fer"      />
-       <field field_ref="BFe"      />
-       <field field_ref="GOC"      />
-       <field field_ref="SFe"      />
-       <field field_ref="DFe"      />
-       <field field_ref="GSi"      />
-       <field field_ref="NFe"      />
-       <field field_ref="NCHL"     />
-       <field field_ref="DCHL"     />
-       <field field_ref="NO3"      />
-       <field field_ref="NH4"      />
-        </file>
-
-        <file id="file12" name_suffix="_diad_T" description="additional pisces diagnostics" >
-       <field field_ref="PH"       />
-       <field field_ref="CO3"      />
-       <field field_ref="CO3sat"   />
-       <field field_ref="PAR"      />
-       <field field_ref="PPPHY"    />
-       <field field_ref="PPPHY2"   />
-       <field field_ref="PPNEWN"   />
-       <field field_ref="PPNEWD"   />
-       <field field_ref="PBSi"     />
-       <field field_ref="PFeN"     />
-       <field field_ref="PFeD"     />
-       <field field_ref="xfracal"  />
-       <field field_ref="PCAL"     />
-       <field field_ref="DCAL"     />
-       <field field_ref="GRAZ1"    />
-       <field field_ref="GRAZ2"    />
-       <field field_ref="EPC100"   />
-       <field field_ref="EPFE100"  />
-       <field field_ref="EPSI100"  />
-       <field field_ref="EPCAL100" />
-       <field field_ref="Cflx"     />
-       <field field_ref="Oflx"     />
-       <field field_ref="Kg"       />
-       <field field_ref="Dpco2"    />
-       <field field_ref="Dpo2"     />
-       <field field_ref="Heup"     />
-       <field field_ref="Irondep"  />
-       <field field_ref="Ironsed"  />
-       <field field_ref="Ironice"  />
-       <field field_ref="Nfix"     />
-       <field field_ref="MuN"      />
-       <field field_ref="MuD"      />
-       <field field_ref="LNnut"    />
-       <field field_ref="LDnut"    />
-       <field field_ref="LNFe"     />
-       <field field_ref="LDFe"     />
-       <field field_ref="LNlight"  />
-       <field field_ref="LDlight"  />
-       <field field_ref="pdust"    />
-       <field field_ref="Fe3"     />
-       <field field_ref="FeL1"     />
-       <field field_ref="TL1"      />
-       <field field_ref="Sdenit"   />
-       <field field_ref="Totlig"   />
-        </file>
+        <file id="file11" name_suffix="_ptrc_T" description="pisces sms variables" >
+          <field field_ref="DIC"      />
+          <field field_ref="Alkalini" />
+          <field field_ref="O2"       />
+          <field field_ref="CaCO3"    />
+          <field field_ref="PO4"      />
+          <field field_ref="POC"      />
+          <field field_ref="Si"       />
+          <field field_ref="PHY"      />
+          <field field_ref="ZOO"      />
+          <field field_ref="DOC"      />
+          <field field_ref="PHY2"     />
+          <field field_ref="ZOO2"     />
+          <field field_ref="DSi"      />
+          <field field_ref="Fer"      />
+          <field field_ref="BFe"      />
+          <field field_ref="GOC"      />
+          <field field_ref="SFe"      />
+          <field field_ref="DFe"      />
+          <field field_ref="GSi"      />
+          <field field_ref="NFe"      />
+          <field field_ref="NCHL"     />
+          <field field_ref="DCHL"     />
+          <field field_ref="NO3"      />
+          <field field_ref="NH4"      />
+        </file>
+
+        <file id="file12" name_suffix="_diad_T" description="additional pisces diagnostics" >
+          <field field_ref="PH"       />
+          <field field_ref="CO3"      />
+          <field field_ref="CO3sat"   />
+          <field field_ref="PAR"      />
+          <field field_ref="PPPHY"    />
+          <field field_ref="PPPHY2"   />
+          <field field_ref="PPNEWN"   />
+          <field field_ref="PPNEWD"   />
+          <field field_ref="PBSi"     />
+          <field field_ref="PFeN"     />
+          <field field_ref="PFeD"     />
+          <field field_ref="xfracal"  />
+          <field field_ref="PCAL"     />
+          <field field_ref="DCAL"     />
+          <field field_ref="GRAZ1"    />
+          <field field_ref="GRAZ2"    />
+          <field field_ref="EPC100"   />
+          <field field_ref="EPFE100"  />
+          <field field_ref="EPSI100"  />
+          <field field_ref="EPCAL100" />
+          <field field_ref="Cflx"     />
+          <field field_ref="Oflx"     />
+          <field field_ref="Kg"       />
+          <field field_ref="Dpco2"    />
+          <field field_ref="Dpo2"     />
+          <field field_ref="Heup"     />
+          <field field_ref="Irondep"  />
+          <field field_ref="Ironsed"  />
+          <field field_ref="Ironice"  />
+          <field field_ref="Nfix"     />
+          <field field_ref="MuN"      />
+          <field field_ref="MuD"      />
+          <field field_ref="LNnut"    />
+          <field field_ref="LDnut"    />
+          <field field_ref="LNFe"     />
+          <field field_ref="LDFe"     />
+          <field field_ref="LNlight"  />
+          <field field_ref="LDlight"  />
+          <field field_ref="pdust"    />
+          <field field_ref="Fe3"     />
+          <field field_ref="FeL1"     />
+          <field field_ref="TL1"      />
+          <field field_ref="Sdenit"   />
+          <field field_ref="Totlig"   />
+        </file>
 
       </file_group>
@@ -302 +304 @@
       <file_group id="10y" output_freq="10y" output_level="10" enabled=".FALSE."/> <!-- real 10y files -->
 
-   </file_definition>
-    
-    <!-- 
+    </file_definition>
+
+    <!--
 ============================================================================================================
 = grid definition = = DO NOT CHANGE =
 ============================================================================================================
     -->
-    
-   <axis_definition>  
+
+    <axis_definition>
       <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" />
       <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
@@ -316 +318 @@
       <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
       <axis id="nfloat" long_name="Float number"      unit="-"  />
-   </axis_definition> 
-    
-   <domain_definition src="./domain_def_nemo.xml"/>
-   
-   <grid_definition>    
-     <grid id="grid_T_2D" domain_ref="grid_T"/>
-     <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/>
-     <grid id="grid_U_2D" domain_ref="grid_U"/>
-     <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/>
-     <grid id="grid_V_2D" domain_ref="grid_V"/>
-     <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/>
-     <grid id="grid_W_2D" domain_ref="grid_W"/>
-     <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/>
-     <grid id="gznl_T_2D" domain_ref="gznl"/>
-     <grid id="gznl_T_3D" domain_ref="gznl" axis_ref="deptht"/>
-     <grid id="gznl_W_3D" domain_ref="gznl" axis_ref="depthw"/>
-    </grid_definition>  
-  
-  </context>
+    </axis_definition>
+
+    <domain_definition src="./domain_def_nemo.xml"/>
+
+    <grid_definition>
+      <grid id="grid_T_2D" domain_ref="grid_T"/>
+      <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/>
+      <grid id="grid_U_2D" domain_ref="grid_U"/>
+      <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/>
+      <grid id="grid_V_2D" domain_ref="grid_V"/>
+      <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/>
+      <grid id="grid_W_2D" domain_ref="grid_W"/>
+      <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/>
+      <grid id="gznl_T_2D" domain_ref="gznl"/>
+      <grid id="gznl_T_3D" domain_ref="gznl" axis_ref="deptht"/>
+      <grid id="gznl_W_3D" domain_ref="gznl" axis_ref="depthw"/>
+    </grid_definition>
+
+ </context>

CONFIG/UNIFORM/v6_rc0/IPSLCM6/GENERAL/PARAM/orchidee.def_CWRR

@@ -20 +20 @@
 # 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 +43 @@
 # default = n
 RIVER_ROUTING = y
-
 
 #**************************************************************************

CONFIG/UNIFORM/v6_rc0/IPSLCM6/GENERAL/PARAM/orchidee.def_Choi

@@ -20 +20 @@
 # 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 +43 @@
 # default = n
 RIVER_ROUTING = y
-
 
 #**************************************************************************

CONFIG/UNIFORM/v6_rc0/IPSLCM6/GENERAL/PARAM/run.def

@@ -55 +55 @@
 grilles_gcm_netcdf=_AUTO_
 ### To activate XIOS ouputs only
-ok_all_xml= _AUTO_
+ok_all_xml= y