Index: /CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/pdControl/COMP/opa9.card
===================================================================
--- /CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/pdControl/COMP/opa9.card	(revision 2996)
+++ /CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/pdControl/COMP/opa9.card	(revision 2997)
@@ -54,23 +54,22 @@
 
 [OutputFiles]
-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          ),\
-        (${config_UserChoices_JobName}_1y_grid_V.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_V.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_1y_grid_W.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_W.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_1y_diaptr.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_diaptr.nc     , Post_1Y_diaptr),\
-        (${config_UserChoices_JobName}_1m_scalar.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_scalar.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_1m_grid_T.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_T.nc     , Post_1M_grid_T),\
-        (${config_UserChoices_JobName}_1m_grid_U.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_U.nc     , Post_1M_grid_U),\
-        (${config_UserChoices_JobName}_1m_grid_V.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_V.nc     , Post_1M_grid_V),\
-        (${config_UserChoices_JobName}_1m_grid_W.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_W.nc     , Post_1M_grid_W),\
-        (${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_W.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_W.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_1d_SBC.nc   , ${R_OUT_OCE_O_D}/${PREFIX}_1D_SBC.nc        , NONE          ),\
-        (${config_UserChoices_JobName}_1d_diaptr.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_diaptr.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_1d_scalar.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_scalar.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_1d_SBC_scalar, ${R_OUT_OCE_O_D}/${PREFIX}_1D_SBC_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          ),\
+        (${config_UserChoices_JobName}_1y_grid_V.nc    , ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_V.nc     , NONE          ),\
+        (${config_UserChoices_JobName}_1y_grid_W.nc    , ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_W.nc     , NONE          ),\
+        (${config_UserChoices_JobName}_1y_diaptr.nc    , ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_diaptr.nc     , Post_1Y_diaptr),\
+        (${config_UserChoices_JobName}_1m_scalar.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_scalar.nc     , NONE          ),\
+        (${config_UserChoices_JobName}_1m_grid_T.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_T.nc     , Post_1M_grid_T),\
+        (${config_UserChoices_JobName}_1m_grid_U.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_U.nc     , Post_1M_grid_U),\
+        (${config_UserChoices_JobName}_1m_grid_V.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_V.nc     , Post_1M_grid_V),\
+        (${config_UserChoices_JobName}_1m_grid_W.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_W.nc     , Post_1M_grid_W),\
+        (${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_W.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_W.nc     , NONE          ),\
+        (${config_UserChoices_JobName}_1d_SBC.nc       , ${R_OUT_OCE_O_D}/${PREFIX}_1D_SBC.nc        , NONE          ),\
+        (${config_UserChoices_JobName}_1d_diaptr.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_1D_diaptr.nc     , NONE          ),\
+        (${config_UserChoices_JobName}_1d_scalar.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_1D_scalar.nc     , NONE          ),\
         (mesh_mask.nc     , ${R_OUT_OCE_O}/${config_UserChoices_JobName}_mesh_mask.nc                       , NONE),\
         (runoffs.nc       , ${R_OUT_OCE_O}/${config_UserChoices_JobName}_runoffs.nc                         , NONE),\
Index: /CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card
===================================================================
--- /CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card	(revision 2996)
+++ /CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card	(revision 2997)
@@ -12,5 +12,5 @@
 List=	()
 ListNonDel= (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/coordinates.nc                     , .  ), \
-	    (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/${opa9_UserChoices_ORCA_version}_bathy_meter.nc    , bathy_meter.nc ), \
+            (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/${opa9_UserChoices_ORCA_version}_bathy_meter.nc    , bathy_meter.nc ), \
             (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/runoffs_${opa9_UserChoices_ORCA_version}_depths.nc    , runoffs_eORCA1.0_depths.nc   ), \
             (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/ahmcoef.nc                         , .  ), \
@@ -54,23 +54,22 @@
 
 [OutputFiles]
-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          ),\
-        (${config_UserChoices_JobName}_1y_grid_V.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_V.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_1y_grid_W.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_W.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_1y_diaptr.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_diaptr.nc     , Post_1Y_diaptr),\
-        (${config_UserChoices_JobName}_1m_scalar.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_scalar.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_1m_grid_T.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_T.nc     , Post_1M_grid_T),\
-        (${config_UserChoices_JobName}_1m_grid_U.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_U.nc     , Post_1M_grid_U),\
-        (${config_UserChoices_JobName}_1m_grid_V.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_V.nc     , Post_1M_grid_V),\
-        (${config_UserChoices_JobName}_1m_grid_W.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_W.nc     , Post_1M_grid_W),\
-        (${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_W.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_W.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_1d_SBC.nc   , ${R_OUT_OCE_O_D}/${PREFIX}_1D_SBC.nc        , NONE          ),\
-        (${config_UserChoices_JobName}_1d_diaptr.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_diaptr.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_1d_scalar.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_scalar.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_1d_SBC_scalar, ${R_OUT_OCE_O_D}/${PREFIX}_1D_SBC_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          ),\
+        (${config_UserChoices_JobName}_1y_grid_V.nc    , ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_V.nc     , NONE          ),\
+        (${config_UserChoices_JobName}_1y_grid_W.nc    , ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_W.nc     , NONE          ),\
+        (${config_UserChoices_JobName}_1y_diaptr.nc    , ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_diaptr.nc     , Post_1Y_diaptr),\
+        (${config_UserChoices_JobName}_1m_scalar.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_scalar.nc     , NONE          ),\
+        (${config_UserChoices_JobName}_1m_grid_T.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_T.nc     , Post_1M_grid_T),\
+        (${config_UserChoices_JobName}_1m_grid_U.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_U.nc     , Post_1M_grid_U),\
+        (${config_UserChoices_JobName}_1m_grid_V.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_V.nc     , Post_1M_grid_V),\
+        (${config_UserChoices_JobName}_1m_grid_W.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_W.nc     , Post_1M_grid_W),\
+        (${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_W.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_W.nc     , NONE          ),\
+        (${config_UserChoices_JobName}_1d_SBC.nc       , ${R_OUT_OCE_O_D}/${PREFIX}_1D_SBC.nc        , NONE          ),\
+        (${config_UserChoices_JobName}_1d_diaptr.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_1D_diaptr.nc     , NONE          ),\
+        (${config_UserChoices_JobName}_1d_scalar.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_1D_scalar.nc     , NONE          ),\
         (mesh_mask.nc     , ${R_OUT_OCE_O}/${config_UserChoices_JobName}_mesh_mask.nc                       , NONE),\
         (runoffs.nc       , ${R_OUT_OCE_O}/${config_UserChoices_JobName}_runoffs.nc                         , NONE),\
Index: /CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/file_def_nemo-lim3.xml
===================================================================
--- /CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/file_def_nemo-lim3.xml	(revision 2996)
+++ /CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/file_def_nemo-lim3.xml	(revision 2997)
@@ -9,115 +9,91 @@
 ============================================================================================================
   -->
-    
-    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4">
-    
-      <file_group id="1ts" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
-      <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
-      <file_group id="2h" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
-      <file_group id="3h" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
-      <file_group id="4h" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
-      <file_group id="6h" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->        
-      <file_group id="1d" output_freq="1d"  output_level="10" enabled=".TRUE."/>  <!-- 5d files -->   	
-      <file_group id="5d" output_freq="5d"  output_level="10" enabled=".TRUE."/>  <!-- 5d files -->   	
+   <file_definition type="one_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="1d" min_digits="4">
 
-      <file_group id="1m" output_freq="1mo" output_level="10" enabled="_AUTO_"> <!-- real monthly files -->
-
-	<file id="file16" name_suffix="_icemod" description="ice variables" enabled=".TRUE." >
-	  <field field_ref="snowthic_cea"     name="snthic"     long_name="surface_snow_thickness"   />
-	  <field field_ref="icethic_cea"      name="sithic"     long_name="sea_ice_thickness"        />
-          <field field_ref="icevolu"          name="sivolu" />
-          <field field_ref="snowvol"          name="snvolu" />
-          <field field_ref="iceconc"          name="siconc"  />
-
-          <field field_ref="vfxbog"          name="vfxbog" />
-          <field field_ref="vfxdyn"          name="vfxdyn" />
-          <field field_ref="vfxopw"          name="vfxopw" />
-          <field field_ref="vfxsni"          name="vfxsni" />
-          <field field_ref="vfxsum"          name="vfxsum" />
-          <field field_ref="vfxbom"          name="vfxbom" />
-          <field field_ref="vfxres"          name="vfxres" />
-          <field field_ref="vfxice"          name="vfxice" />
-          <field field_ref="vfxsnw"          name="vfxsnw" />
-          <field field_ref="vfxsub"          name="vfxsub" />
-          <field field_ref="vfxspr"          name="vfxspr" />
-
-          <field field_ref="icetrp"          name="sivtrp" />
-          <field field_ref="snwtrp"          name="snvtrp" />
-          <field field_ref="saltrp"          name="saltrp" />
-          <field field_ref="deitrp"          name="deitrp" />
-          <field field_ref="destrp"          name="destrp" />
-
-          <field field_ref="sfxbri"           name="sfxbri" />
-          <field field_ref="sfxdyn"           name="sfxdyn" />
-          <field field_ref="sfxres"           name="sfxres" />
-          <field field_ref="sfxbog"           name="sfxbog" />
-          <field field_ref="sfxbom"           name="sfxbom" />
-          <field field_ref="sfxsum"           name="sfxsum" />
-          <field field_ref="sfxsni"           name="sfxsni" />
-          <field field_ref="sfxopw"           name="sfxopw" />
-          <field field_ref="sfx"              name="sfx" />
-
-          <field field_ref="hfxsum"          name="hfxsum"    />
-          <field field_ref="hfxbom"          name="hfxbom"    />
-          <field field_ref="hfxbog"          name="hfxbog"    />
-          <field field_ref="hfxdif"          name="hfxdif"    />
-          <field field_ref="hfxopw"          name="hfxopw"    />
-          <field field_ref="hfxout"          name="hfxout"    />
-          <field field_ref="hfxin"           name="hfxin"    />
-          <field field_ref="hfxsnw"          name="hfxsnw"    />
-          <field field_ref="hfxerr"          name="hfxerr"    />
-          <field field_ref="hfxerr_rem"      name="hfxerr_rem"    />
-
-	  <!-- ice-ocean heat flux from mass exchange -->
-          <field field_ref="hfxdyn"          name="hfxdyn"    />
-          <field field_ref="hfxres"          name="hfxres"    />
-          <field field_ref="hfxthd"          name="hfxthd"    />
-	  <!-- ice-atm. heat flux from mass exchange -->
-          <field field_ref="hfxsub"          name="hfxsub"    />
-          <field field_ref="hfxspr"          name="hfxspr"    />
-
-	  <!-- diags -->
-          <field field_ref="hfxdhc"          name="hfxdhc"    />
-          <field field_ref="hfxtur"          name="hfxtur"    />
-
-          <field field_ref="isst"             name="sst" />
-          <field field_ref="isss"             name="sss" />
-          <field field_ref="micesalt"         name="sisali" />
-          <field field_ref="micet"            name="sitemp" />
-          <field field_ref="icest"            name="sistem" />
-          <field field_ref="icehc"            name="siheco" />
-          <field field_ref="isnowhc"          name="snheco" />
-          <field field_ref="miceage"          name="siages" />
-
-          <field field_ref="uice_ipa"         name="sivelu" />
-          <field field_ref="vice_ipa"         name="sivelv" />
-          <field field_ref="icevel"           name="sivelo" />
-          <field field_ref="idive"            name="sidive" />
-          <field field_ref="ishear"           name="sishea" />
-          <field field_ref="icestr"           name="sistre" />
-
-          <field field_ref="ibrinv"           name="sibrin" />
-          <field field_ref="icecolf"          name="sicolf" />
-
-          <field field_ref="iceage_cat"       name="siagecat"/>
-          <field field_ref="iceconc_cat"      name="siconcat"/>
-          <field field_ref="icethic_cat"      name="sithicat"/>
-          <field field_ref="snowthic_cat"     name="snthicat"/>
-          <field field_ref="salinity_cat"     name="salincat"/>
-          <field field_ref="brinevol_cat"     name="sibricat"/>
-
-	</file>
-
-      </file_group>
-
-
-      <file_group id="2m" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
-      <file_group id="3m" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
-      <file_group id="4m" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
-      <file_group id="6m" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
-      <file_group id="1y"  output_freq="1y" output_level="10" enabled=".TRUE."/> <!-- real yearly files -->
-      <file_group id="2y"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
-      <file_group id="5y"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
-      <file_group id="10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
-
+     <file_group id="1ts" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
+     <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
+     <file_group id="2h" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
+     <file_group id="3h" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
+     <file_group id="4h" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
+     <file_group id="6h" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->       
+     <file_group id="1d" output_freq="1d"  output_level="10" enabled=".TRUE."/>  <!-- 1d files -->     
+     <file_group id="5d" output_freq="5d"  output_level="10" enabled=".TRUE."/>  <!-- 5d files -->     
+     
+     <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."> <!-- real monthly files -->
+       
+       <file id="file27" name_suffix="_icemod" description="ice variables" enabled=".true." >
+	 
+	 <field field_ref="snowthic_cea"     name="snthic"     long_name="surface_snow_thickness"   />
+	 <field field_ref="icethic_cea"      name="sithic"     long_name="sea_ice_thickness"        />
+         <field field_ref="icevolu"          name="sivolu"  />
+         <field field_ref="snowvol"          name="snvolu"  />
+         <field field_ref="iceconc"          name="siconc"  />
+	 
+	 <!-- thermo -->
+         <field field_ref="micesalt"         name="sisali" />
+         <field field_ref="micet"            name="sitemp" />
+         <field field_ref="icest"            name="sistem" />
+         <field field_ref="icehc"            name="siheco" />
+         <field field_ref="isnowhc"          name="snheco" />
+         <field field_ref="miceage"          name="siages" />
+	 
+	 <!-- dyn -->
+         <field field_ref="uice_ipa"         name="sivelu" />
+         <field field_ref="vice_ipa"         name="sivelv" />
+         <field field_ref="icevel"           name="sivelo" />
+         <field field_ref="idive"            name="sidive" />
+         <field field_ref="ishear"           name="sishea" />
+         <field field_ref="icestr"           name="sistre" />
+	 
+	 <!-- transports -->
+         <field field_ref="icetrp"          name="sivtrp" />
+         <field field_ref="snwtrp"          name="snvtrp" />
+         <field field_ref="saltrp"          name="saltrp" />
+         <field field_ref="deitrp"          name="deitrp" />
+         <field field_ref="destrp"          name="destrp" />
+	 
+	 <!-- volume flux -->
+         <field field_ref="vfxice"          name="vfxice" />
+         <field field_ref="vfxsnw"          name="vfxsnw" />
+         <field field_ref="vfxsub"          name="vfxsub" />
+         <field field_ref="vfxsub_err"      name="vfxsub_err" />
+         <field field_ref="vfxspr"          name="vfxspr" />
+	 
+	 <!-- ice-ocean salt flux -->
+         <field field_ref="sfx"              name="sfx" />
+	 
+	 <!-- heat fluxes -->
+         <field field_ref="hfxout"          name="hfxout"   />
+         <field field_ref="hfxin"           name="hfxin"    />
+	 
+	 <!-- ice-atm. heat flux from mass exchange -->
+         <field field_ref="hfxsub"          name="hfxsub"   />
+         <field field_ref="hfxspr"          name="hfxspr"   />
+	 
+	 <!-- outputs by category -->
+         <field field_ref="iceage_cat"       name="siagecat"/>
+         <field field_ref="iceconc_cat"      name="siconcat"/>
+         <field field_ref="icethic_cat"      name="sithicat"/>
+         <field field_ref="snowthic_cat"     name="snthicat"/>
+         <field field_ref="salinity_cat"     name="salincat"/>
+         <field field_ref="brinevol_cat"     name="sibricat"/>
+	 
+	 <!-- ocean outputs -->
+	 <field field_ref="isst"             name="sst"    />
+         <field field_ref="isss"             name="sss"    />
+	 
+       </file>
+       
+     </file_group>
+     
+     <file_group id="2m" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
+     <file_group id="3m" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
+     <file_group id="4m" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
+     <file_group id="6m" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
+     <file_group id="1y"  output_freq="1y" output_level="10" enabled=".TRUE."/> <!-- real yearly files -->
+     <file_group id="2y"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
+     <file_group id="5y"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
+     <file_group id="10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
+     
    </file_definition>
+   
Index: /CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/file_def_nemo-opa.xml
===================================================================
--- /CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/file_def_nemo-opa.xml	(revision 2996)
+++ /CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/file_def_nemo-opa.xml	(revision 2997)
@@ -37,78 +37,57 @@
        
         <file id="file2" name_suffix="_scalar" description="scalar variables" enabled=".true." >
-           <field field_ref="voltot"      grid_ref="grid_1point"     name="scvoltot"  />
-           <field field_ref="sshtot"      grid_ref="grid_1point"     name="scsshtot"  />
-           <field field_ref="sshsteric"   grid_ref="grid_1point"   name="scsshste"  />
-           <field field_ref="sshthster"   grid_ref="grid_1point"   name="scsshtst"  />
-           <field field_ref="masstot"     grid_ref="grid_1point"   name="scmastot"  />
-           <field field_ref="temptot"     grid_ref="grid_1point"   name="sctemtot"  />
-           <field field_ref="saltot"      grid_ref="grid_1point"   name="scsaltot"  />
-
-          <field field_ref="bgtemper"     grid_ref="grid_1point" name="bgtemper"    />
-          <field field_ref="bgsaline"     grid_ref="grid_1point" name="bgsaline"    />
-          <field field_ref="bgheatco"     grid_ref="grid_1point" name="bgheatco"    />
-          <field field_ref="bgsaltco"     grid_ref="grid_1point" name="bgsaltco"    />
-          <field field_ref="bgvolssh"     grid_ref="grid_1point" name="bgvolssh"    /> 
-          <field field_ref="bgvole3t"     grid_ref="grid_1point" name="bgvole3t"    />
-          <field field_ref="bgfrcvol"     grid_ref="grid_1point" name="bgfrcvol"    />
-          <field field_ref="bgfrctem"     grid_ref="grid_1point" name="bgfrctem"    />
-          <field field_ref="bgfrcsal"     grid_ref="grid_1point" name="bgfrcsal"    />
-	</file>
-
-        <file id="file3" name_suffix="_SBC_scalar" description="scalar variables" enabled=".true." >
-      <field field_ref="ibgvoltot"  grid_ref="grid_1point"  name="ibgvoltot"   />
-      <field field_ref="sbgvoltot"  grid_ref="grid_1point"  name="sbgvoltot"   />
-      <field field_ref="ibgarea"    grid_ref="grid_1point"  name="ibgarea"     />
-      <field field_ref="ibgsaline"  grid_ref="grid_1point"  name="ibgsaline"   />
-      <field field_ref="ibgtemper"  grid_ref="grid_1point"  name="ibgtemper"   />
-      <field field_ref="ibgheatco"  grid_ref="grid_1point"  name="ibgheatco"   />
-      <field field_ref="sbgheatco"  grid_ref="grid_1point"  name="sbgheatco"   />
-      <field field_ref="ibgsaltco"  grid_ref="grid_1point"  name="ibgsaltco"   />
-      
-      <field field_ref="ibgvfx"     grid_ref="grid_1point"  name="ibgvfx"      />
-      <field field_ref="ibgvfxbog"  grid_ref="grid_1point"  name="ibgvfxbog"      />
-      <field field_ref="ibgvfxopw"  grid_ref="grid_1point"  name="ibgvfxopw"      />
-      <field field_ref="ibgvfxsni"  grid_ref="grid_1point"  name="ibgvfxsni"      />
-      <field field_ref="ibgvfxdyn"  grid_ref="grid_1point"  name="ibgvfxdyn"      />
-      <field field_ref="ibgvfxbom"  grid_ref="grid_1point"  name="ibgvfxbom"      />
-      <field field_ref="ibgvfxsum"  grid_ref="grid_1point"  name="ibgvfxsum"      />
-      <field field_ref="ibgvfxres"  grid_ref="grid_1point"  name="ibgvfxres"      />
-      <field field_ref="ibgvfxspr"  grid_ref="grid_1point"  name="ibgvfxspr"      />
-      <field field_ref="ibgvfxsnw"  grid_ref="grid_1point"  name="ibgvfxsnw"      />
-      <field field_ref="ibgvfxsub"  grid_ref="grid_1point"  name="ibgvfxsub"      />
-      
-      <field field_ref="ibgsfx"     grid_ref="grid_1point"  name="ibgsfx"     />
-      <field field_ref="ibgsfxbri"  grid_ref="grid_1point"  name="ibgsfxbri"    />
-      <field field_ref="ibgsfxdyn"  grid_ref="grid_1point"  name="ibgsfxdyn" />
-      <field field_ref="ibgsfxres"  grid_ref="grid_1point"  name="ibgsfxres" />
-      <field field_ref="ibgsfxbog"  grid_ref="grid_1point"  name="ibgsfxbog"      />
-      <field field_ref="ibgsfxopw"  grid_ref="grid_1point"  name="ibgsfxopw"      />
-      <field field_ref="ibgsfxsni"  grid_ref="grid_1point"  name="ibgsfxsni"      />
-      <field field_ref="ibgsfxbom"  grid_ref="grid_1point"  name="ibgsfxbom"      />
-      <field field_ref="ibgsfxsum"  grid_ref="grid_1point"  name="ibgsfxsum"      />
-      
-      <field field_ref="ibghfxdhc"  grid_ref="grid_1point"  name="ibghfxdhc"    />
-      <field field_ref="ibghfxspr"  grid_ref="grid_1point"  name="ibghfxspr"    />
-      
-      <field field_ref="ibghfxres"   grid_ref="grid_1point" name="ibghfxres"    />
-      <field field_ref="ibghfxsub"   grid_ref="grid_1point" name="ibghfxsub"    />
-      <field field_ref="ibghfxdyn"   grid_ref="grid_1point" name="ibghfxdyn"    />
-      <field field_ref="ibghfxthd"   grid_ref="grid_1point" name="ibghfxthd"    />
-      <field field_ref="ibghfxsum"   grid_ref="grid_1point" name="ibghfxsum"    />
-      <field field_ref="ibghfxbom"   grid_ref="grid_1point" name="ibghfxbom"    />
-      <field field_ref="ibghfxbog"   grid_ref="grid_1point" name="ibghfxbog"    />
-      <field field_ref="ibghfxdif"   grid_ref="grid_1point" name="ibghfxdif"    />
-      <field field_ref="ibghfxopw"   grid_ref="grid_1point" name="ibghfxopw"    />
-      <field field_ref="ibghfxout"   grid_ref="grid_1point" name="ibghfxout"    />
-      <field field_ref="ibghfxin"   grid_ref="grid_1point"  name="ibghfxin"     />
-      <field field_ref="ibghfxsnw"   grid_ref="grid_1point" name="ibghfxsnw"    />
-      
-      <field field_ref="ibgfrcvol"   grid_ref="grid_1point" name="ibgfrcvol"   />
-      <field field_ref="ibgfrcsfx"   grid_ref="grid_1point" name="ibgfrcsfx"  />
-      <field field_ref="ibgvolgrm"   grid_ref="grid_1point" name="ibgvolgrm"    />
-      
+
+	  <!-- Volume -->
+          <!-- global contents -->
+	  <field field_ref="voltot"       grid_ref="grid_1point"   name="scvoltot"  />
+	  <field field_ref="sshtot"       grid_ref="grid_1point"   name="scsshtot"  />
+	  <field field_ref="sshsteric"    grid_ref="grid_1point"   name="scsshste"  />
+	  <field field_ref="sshthster"    grid_ref="grid_1point"   name="scsshtst"  />
+	  <field field_ref="masstot"      grid_ref="grid_1point"   name="scmastot"  />
+	  <field field_ref="temptot"      grid_ref="grid_1point"   name="sctemtot"  />
+	  <field field_ref="saltot"       grid_ref="grid_1point"   name="scsaltot"  />
+	  
+	  <!-- global drifts (conservation checks) -->
+	  <field field_ref="bgtemper"     grid_ref="grid_1point"   name="bgtemper"    />
+	  <field field_ref="bgsaline"     grid_ref="grid_1point"   name="bgsaline"    />
+	  <field field_ref="bgheatco"     grid_ref="grid_1point"   name="bgheatco"    />
+	  <field field_ref="bgheatfx"     grid_ref="grid_1point"   name="bgheatfx"    />
+	  <field field_ref="bgsaltco"     grid_ref="grid_1point"   name="bgsaltco"    />
+	  <field field_ref="bgvolssh"     grid_ref="grid_1point"   name="bgvolssh"    />
+	  <field field_ref="bgvole3t"     grid_ref="grid_1point"   name="bgvole3t"    />
+
+	  <!-- global surface forcings  -->
+	  <field field_ref="bgfrcvol"     grid_ref="grid_1point"   name="bgfrcvol"    />
+	  <field field_ref="bgfrctem"     grid_ref="grid_1point"   name="bgfrctem"    />
+	  <field field_ref="bgfrchfx"     grid_ref="grid_1point"   name="bgfrchfx"    />
+	  <field field_ref="bgfrcsal"     grid_ref="grid_1point"   name="bgfrcsal"    />
+
+	  <!-- Surface -->
+	  <!-- global contents -->
+          <field field_ref="ibgvol_tot"     grid_ref="grid_1point"  name="ibgvol_tot"   />
+          <field field_ref="sbgvol_tot"     grid_ref="grid_1point"  name="sbgvol_tot"   />
+          <field field_ref="ibgarea_tot"    grid_ref="grid_1point"  name="ibgarea_tot"  />
+          <field field_ref="ibgsalt_tot"    grid_ref="grid_1point"  name="ibgsalt_tot"  />
+          <field field_ref="ibgheat_tot"    grid_ref="grid_1point"  name="ibgheat_tot"  />
+          <field field_ref="sbgheat_tot"    grid_ref="grid_1point"  name="sbgheat_tot"  />
+	  
+	  <!-- global drifts (conservation checks) -->
+          <field field_ref="ibgvolume"      grid_ref="grid_1point"  name="ibgvolume"    />
+          <field field_ref="ibgsaltco"      grid_ref="grid_1point"  name="ibgsaltco"    />
+          <field field_ref="ibgheatco"      grid_ref="grid_1point"  name="ibgheatco"    />
+          <field field_ref="ibgheatfx"      grid_ref="grid_1point"  name="ibgheatfx"    />
+	  
+	  <!-- global forcings  -->
+          <field field_ref="ibgfrcvoltop"   grid_ref="grid_1point"  name="ibgfrcvoltop" />
+          <field field_ref="ibgfrcvolbot"   grid_ref="grid_1point"  name="ibgfrcvolbot" />
+          <field field_ref="ibgfrctemtop"   grid_ref="grid_1point"  name="ibgfrctemtop" />
+          <field field_ref="ibgfrctembot"   grid_ref="grid_1point"  name="ibgfrctembot" />
+          <field field_ref="ibgfrcsal"      grid_ref="grid_1point"  name="ibgfrcsal"    />
+          <field field_ref="ibgfrchfxtop"   grid_ref="grid_1point"  name="ibgfrchfxtop" />
+          <field field_ref="ibgfrchfxbot"   grid_ref="grid_1point"  name="ibgfrchfxbot" />
+	  
         </file>
-
-	<file id="file4" name_suffix="_SBC" description="surface fluxes variables" > <!-- time step automaticaly defined based on nn_fsbc -->
+	
+	<file id="file3" name_suffix="_SBC" description="surface fluxes variables" > <!-- time step automaticaly defined based on nn_fsbc -->
 	  <field field_ref="qsr_oce"       name="qsr_oce"  long_name="downward shortwave flux at ocean surface"           />
 	  <field field_ref="qns_oce"       name="qns_oce"  long_name="downward non solar flux at ocean surface"           />
@@ -143,4 +122,10 @@
 	  <field field_ref="evap_ao_cea"   name="evap_ao_cea"      />
 	  <field field_ref="subl_ai_cea"   name="subl_ai_cea"      />
+	  <field field_ref="fmmflx"        name="fmmflx"  />
+          <field field_ref="fwfisf"        name="fwfisf"  />
+          <field field_ref="hflx_snow_ai_cea" name="hflx_snow_ai"  />
+          <field field_ref="hflx_snow_ao_cea" name="hflx_snow_ao"  />
+          <field field_ref="hflx_ice_cea"     name="hflx_ice"      />
+          <field field_ref="hflx_rnf_cea"     name="hflx_rnf"      />
 	  <!-- For salt conservation checking -->
           <field field_ref="saltflx"      name="sosflxdo"  />
@@ -157,5 +142,5 @@
       <file_group id="1m" output_freq="1mo" output_level="10" enabled="_AUTO_"> <!-- real monthly files -->
 
-        <file id="file5" name_suffix="_grid_T" >
+        <file id="file4" name_suffix="_grid_T" >
 	  <field field_ref="e3t" long_name="T-cell thickness" />
           <field field_ref="botpres"      name="pbo"      long_name="Pressure_at_sea_floor"                                          />
@@ -233,5 +218,5 @@
         </file>
 
-	<file id="file6" name_suffix="_grid_U" description="ocean U grid variables" >
+	<file id="file5" name_suffix="_grid_U" description="ocean U grid variables" >
 	  <field field_ref="e3u"  />
 	  <field field_ref="ssu"          name="uos"     long_name="sea_surface_x_velocity"    />
@@ -246,5 +231,5 @@
 	</file>
 	
-	<file id="file7" name_suffix="_grid_V" description="ocean V grid variables" >
+	<file id="file6" name_suffix="_grid_V" description="ocean V grid variables" >
 	  <field field_ref="e3v"  />
 	  <field field_ref="ssv"          name="vos"     long_name="sea_surface_y_velocity"    />
@@ -259,5 +244,5 @@
 	</file>
 	
-	<file id="file8" name_suffix="_grid_W" description="ocean W grid variables" >
+	<file id="file7" name_suffix="_grid_W" description="ocean W grid variables" >
 	  <field field_ref="e3w"  />
 	  <field field_ref="woce"         name="wo"     />
@@ -280,77 +265,58 @@
 	</file>
 
-	<file id="file9" name_suffix="_scalar" description="scalar variables" enabled=".true." >
-      <field field_ref="voltot"   grid_ref="grid_1point"    name="scvoltot"  />
-      <field field_ref="sshtot"   grid_ref="grid_1point"    name="scsshtot"  />
-      <field field_ref="sshsteric" grid_ref="grid_1point"   name="scsshste"  />
-      <field field_ref="sshthster" grid_ref="grid_1point"   name="scsshtst"  />
-      <field field_ref="masstot"    grid_ref="grid_1point"  name="scmastot"  />
-      <field field_ref="temptot"   grid_ref="grid_1point"   name="sctemtot"  />
-      <field field_ref="saltot"    grid_ref="grid_1point"   name="scsaltot"  />
-
-      <field field_ref="bgtemper"   grid_ref="grid_1point"  name="bgtemper"    />
-      <field field_ref="bgsaline"   grid_ref="grid_1point"  name="bgsaline"    />
-      <field field_ref="bgheatco"   grid_ref="grid_1point"  name="bgheatco"    />
-      <field field_ref="bgsaltco"   grid_ref="grid_1point"  name="bgsaltco"    />
-      <field field_ref="bgvolssh"   grid_ref="grid_1point"  name="bgvolssh"    /> 
-      <field field_ref="bgvole3t"   grid_ref="grid_1point"  name="bgvole3t"    />
-      <field field_ref="bgfrcvol"   grid_ref="grid_1point"  name="bgfrcvol"    />
-      <field field_ref="bgfrctem"   grid_ref="grid_1point"  name="bgfrctem"    />
-      <field field_ref="bgfrcsal"   grid_ref="grid_1point"  name="bgfrcsal"    />
-
-      <field field_ref="ibgvoltot"  grid_ref="grid_1point"  name="ibgvoltot"   />
-      <field field_ref="sbgvoltot"  grid_ref="grid_1point"  name="sbgvoltot"   />
-      <field field_ref="ibgarea"    grid_ref="grid_1point"  name="ibgarea"     />
-      <field field_ref="ibgsaline"  grid_ref="grid_1point"  name="ibgsaline"   />
-      <field field_ref="ibgtemper"  grid_ref="grid_1point"  name="ibgtemper"   />
-      <field field_ref="ibgheatco"  grid_ref="grid_1point"  name="ibgheatco"   />
-      <field field_ref="sbgheatco"   grid_ref="grid_1point" name="sbgheatco"   />
-      <field field_ref="ibgsaltco"   grid_ref="grid_1point" name="ibgsaltco"   />
-
-      <field field_ref="ibgvfx"     grid_ref="grid_1point"  name="ibgvfx"      />
-      <field field_ref="ibgvfxbog"  grid_ref="grid_1point"  name="ibgvfxbog"      />
-      <field field_ref="ibgvfxopw"  grid_ref="grid_1point"  name="ibgvfxopw"      />
-      <field field_ref="ibgvfxsni"  grid_ref="grid_1point"  name="ibgvfxsni"      />
-      <field field_ref="ibgvfxdyn"  grid_ref="grid_1point"  name="ibgvfxdyn"      />
-      <field field_ref="ibgvfxbom"  grid_ref="grid_1point"  name="ibgvfxbom"      />
-      <field field_ref="ibgvfxsum"  grid_ref="grid_1point"  name="ibgvfxsum"      />
-      <field field_ref="ibgvfxres"  grid_ref="grid_1point"  name="ibgvfxres"      />
-      <field field_ref="ibgvfxspr"  grid_ref="grid_1point"  name="ibgvfxspr"      />
-      <field field_ref="ibgvfxsnw"  grid_ref="grid_1point"  name="ibgvfxsnw"      />
-      <field field_ref="ibgvfxsub"  grid_ref="grid_1point"  name="ibgvfxsub"      />
-
-      <field field_ref="ibgsfx"     grid_ref="grid_1point"  name="ibgsfx"     />
-      <field field_ref="ibgsfxbri"   grid_ref="grid_1point" name="ibgsfxbri"    />
-      <field field_ref="ibgsfxdyn"   grid_ref="grid_1point" name="ibgsfxdyn" />
-      <field field_ref="ibgsfxres"  grid_ref="grid_1point"  name="ibgsfxres" />
-      <field field_ref="ibgsfxbog"  grid_ref="grid_1point"  name="ibgsfxbog"      />
-      <field field_ref="ibgsfxopw"  grid_ref="grid_1point"  name="ibgsfxopw"      />
-      <field field_ref="ibgsfxsni"  grid_ref="grid_1point"  name="ibgsfxsni"      />
-      <field field_ref="ibgsfxbom"  grid_ref="grid_1point"  name="ibgsfxbom"      />
-      <field field_ref="ibgsfxsum"  grid_ref="grid_1point"  name="ibgsfxsum"      />
-
-      <field field_ref="ibghfxdhc"  grid_ref="grid_1point"  name="ibghfxdhc"    />
-      <field field_ref="ibghfxspr"  grid_ref="grid_1point"  name="ibghfxspr"    />
-
-      <field field_ref="ibghfxres" grid_ref="grid_1point"   name="ibghfxres"    />
-      <field field_ref="ibghfxsub"  grid_ref="grid_1point"  name="ibghfxsub"    />
-      <field field_ref="ibghfxdyn"  grid_ref="grid_1point"  name="ibghfxdyn"    />
-      <field field_ref="ibghfxthd"  grid_ref="grid_1point"   name="ibghfxthd"    />
-      <field field_ref="ibghfxsum"  grid_ref="grid_1point"   name="ibghfxsum"    />
-      <field field_ref="ibghfxbom"  grid_ref="grid_1point"   name="ibghfxbom"    />
-      <field field_ref="ibghfxbog"  grid_ref="grid_1point"   name="ibghfxbog"    />
-      <field field_ref="ibghfxdif"  grid_ref="grid_1point"   name="ibghfxdif"    />
-      <field field_ref="ibghfxopw"  grid_ref="grid_1point"   name="ibghfxopw"    />
-      <field field_ref="ibghfxout"  grid_ref="grid_1point"   name="ibghfxout"    />
-      <field field_ref="ibghfxin"   grid_ref="grid_1point"  name="ibghfxin"    />
-      <field field_ref="ibghfxsnw"  grid_ref="grid_1point"   name="ibghfxsnw"    />
-
-      <field field_ref="ibgfrcvol"   grid_ref="grid_1point"  name="ibgfrcvol"   />
-      <field field_ref="ibgfrcsfx"   grid_ref="grid_1point"  name="ibgfrcsfx"  />
-      <field field_ref="ibgvolgrm"   grid_ref="grid_1point"  name="ibgvolgrm"    />
-
+	<file id="file8" name_suffix="_scalar" description="scalar variables" enabled=".true." >
+
+	  <!-- Volume -->
+          <!-- global contents -->
+	  <field field_ref="voltot"       grid_ref="grid_1point"   name="scvoltot"  />
+	  <field field_ref="sshtot"       grid_ref="grid_1point"   name="scsshtot"  />
+	  <field field_ref="sshsteric"    grid_ref="grid_1point"   name="scsshste"  />
+	  <field field_ref="sshthster"    grid_ref="grid_1point"   name="scsshtst"  />
+	  <field field_ref="masstot"      grid_ref="grid_1point"   name="scmastot"  />
+	  <field field_ref="temptot"      grid_ref="grid_1point"   name="sctemtot"  />
+	  <field field_ref="saltot"       grid_ref="grid_1point"   name="scsaltot"  />
+	  
+	  <!-- global drifts (conservation checks) -->
+	  <field field_ref="bgtemper"     grid_ref="grid_1point"   name="bgtemper"    />
+	  <field field_ref="bgsaline"     grid_ref="grid_1point"   name="bgsaline"    />
+	  <field field_ref="bgheatco"     grid_ref="grid_1point"   name="bgheatco"    />
+	  <field field_ref="bgheatfx"     grid_ref="grid_1point"   name="bgheatfx"    />
+	  <field field_ref="bgsaltco"     grid_ref="grid_1point"   name="bgsaltco"    />
+	  <field field_ref="bgvolssh"     grid_ref="grid_1point"   name="bgvolssh"    />
+	  <field field_ref="bgvole3t"     grid_ref="grid_1point"   name="bgvole3t"    />
+
+	  <!-- global surface forcings  -->
+	  <field field_ref="bgfrcvol"     grid_ref="grid_1point"   name="bgfrcvol"    />
+	  <field field_ref="bgfrctem"     grid_ref="grid_1point"   name="bgfrctem"    />
+	  <field field_ref="bgfrchfx"     grid_ref="grid_1point"   name="bgfrchfx"    />
+	  <field field_ref="bgfrcsal"     grid_ref="grid_1point"   name="bgfrcsal"    />
+
+	  <!-- Surface -->
+	  <!-- global contents -->
+          <field field_ref="ibgvol_tot"     grid_ref="grid_1point"  name="ibgvol_tot"   />
+          <field field_ref="sbgvol_tot"     grid_ref="grid_1point"  name="sbgvol_tot"   />
+          <field field_ref="ibgarea_tot"    grid_ref="grid_1point"  name="ibgarea_tot"  />
+          <field field_ref="ibgsalt_tot"    grid_ref="grid_1point"  name="ibgsalt_tot"  />
+          <field field_ref="ibgheat_tot"    grid_ref="grid_1point"  name="ibgheat_tot"  />
+          <field field_ref="sbgheat_tot"    grid_ref="grid_1point"  name="sbgheat_tot"  />
+	  
+	  <!-- global drifts (conservation checks) -->
+          <field field_ref="ibgvolume"      grid_ref="grid_1point"  name="ibgvolume"    />
+          <field field_ref="ibgsaltco"      grid_ref="grid_1point"  name="ibgsaltco"    />
+          <field field_ref="ibgheatco"      grid_ref="grid_1point"  name="ibgheatco"    />
+          <field field_ref="ibgheatfx"      grid_ref="grid_1point"  name="ibgheatfx"    />
+	  
+	  <!-- global forcings  -->
+          <field field_ref="ibgfrcvoltop"   grid_ref="grid_1point"  name="ibgfrcvoltop" />
+          <field field_ref="ibgfrcvolbot"   grid_ref="grid_1point"  name="ibgfrcvolbot" />
+          <field field_ref="ibgfrctemtop"   grid_ref="grid_1point"  name="ibgfrctemtop" />
+          <field field_ref="ibgfrctembot"   grid_ref="grid_1point"  name="ibgfrctembot" />
+          <field field_ref="ibgfrcsal"      grid_ref="grid_1point"  name="ibgfrcsal"    />
+          <field field_ref="ibgfrchfxtop"   grid_ref="grid_1point"  name="ibgfrchfxtop" />
+          <field field_ref="ibgfrchfxbot"   grid_ref="grid_1point"  name="ibgfrchfxbot" />
+	  
         </file>
 
-	<file id="file10" name_suffix="_diaptr" description="diaptr variables" enabled=".true." >
+	<file id="file9" name_suffix="_diaptr" description="diaptr variables" enabled=".true." >
 	  <field field_ref="zomsfglo"          name="zomsfglo"  grid_ref="grid_ptr_W_3D" />
           <field field_ref="zomsfatl"          name="zomsfatl"  grid_ref="grid_ptr_W_3D" />
@@ -389,33 +355,33 @@
       <file_group id="1y"  output_freq="1y" output_level="10" enabled="_AUTO_"> <!-- real yearly files -->
 
-    <file id="file11" name_suffix="_grid_T" description="ocean T grid variables" >
-      <field field_ref="e3t"  />
-      <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       />
-      <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                          />
-      <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                />
-      <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"      operation="average" freq_op="1y" > @toce_e3t / @e3t </field>        
-      <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                   operation="average" freq_op="1y" > @soce_e3t / @e3t </field>         
-      <field field_ref="sst2"         name="tossq"    long_name="square_of_sea_surface_temperature"             />
-      <field field_ref="ssh2"         name="zossq"    long_name="square_of_sea_surface_height_above_geoid"      />
-      <field field_ref="mldr10_1"     />
-      <field field_ref="mldkz5"       name="omlmax"   long_name="ocean_mixed_layer_thickness_defined_by_mixing_scheme" level="2" operation="maximum" />
-      <field field_ref="erp"          name="wfcorr"   long_name="water_flux_correction"                                   level="1" /> <!-- usually = 0 -->
-      <field field_ref="qns"          name="nshfls"      long_name="surface_net_downward_non_solar_flux"                                         level="1" />
-      <field field_ref="qsr"          name="rsntds"      long_name="surface_net_downward_shortwave_flux"                                         level="1" />
-      <field field_ref="qsr3d"        name="rsds"        long_name="downwelling_shortwave_flux_in_sea_water"                                     level="1" />
-      <field field_ref="qt"           name="tohfls"   long_name="surface_net_downward_total_heat_flux"          />
-      <field field_ref="taum"         name="taum" />
-      <field field_ref="wspd"         name="sowindsp"  />
-      <field field_ref="precip"       name="soprecip" />
-      <!-- available with ln_blk_clio or ln_blk_core -->
-      <field field_ref="qns_oce"      name="sonshdoo"  />
-      <field field_ref="qlw_oce"      name="solwhdoo"  />
-      <field field_ref="qsb_oce"      name="sosehdoo"  />
-      <field field_ref="qla_oce"      name="solahdoo"  />
-      <field field_ref="taum_oce"     name="sowndsto"  />
-      <!-- ice and snow -->
-      <field field_ref="snowpre"      name="isnowpre"/>
-      <field field_ref="utau_ice"     name="iicestru" />
-      <field field_ref="vtau_ice"     name="iicestrv" />
+	<file id="file10" name_suffix="_grid_T" description="ocean T grid variables" >
+	  <field field_ref="e3t"  />
+	  <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       />
+	  <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                          />
+	  <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                />
+	  <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"      operation="average" freq_op="1y" > @toce_e3t / @e3t </field>        
+	  <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                   operation="average" freq_op="1y" > @soce_e3t / @e3t </field>         
+	  <field field_ref="sst2"         name="tossq"    long_name="square_of_sea_surface_temperature"             />
+	  <field field_ref="ssh2"         name="zossq"    long_name="square_of_sea_surface_height_above_geoid"      />
+	  <field field_ref="mldr10_1"     />
+	  <field field_ref="mldkz5"       name="omlmax"   long_name="ocean_mixed_layer_thickness_defined_by_mixing_scheme" level="2" operation="maximum" />
+	  <field field_ref="erp"          name="wfcorr"   long_name="water_flux_correction"                                   level="1" /> <!-- usually = 0 -->
+	  <field field_ref="qns"          name="nshfls"      long_name="surface_net_downward_non_solar_flux"                                         level="1" />
+	  <field field_ref="qsr"          name="rsntds"      long_name="surface_net_downward_shortwave_flux"                                         level="1" />
+	  <field field_ref="qsr3d"        name="rsds"        long_name="downwelling_shortwave_flux_in_sea_water"                                     level="1" />
+	  <field field_ref="qt"           name="tohfls"   long_name="surface_net_downward_total_heat_flux"          />
+	  <field field_ref="taum"         name="taum" />
+	  <field field_ref="wspd"         name="sowindsp"  />
+	  <field field_ref="precip"       name="soprecip" />
+	  <!-- available with ln_blk_clio or ln_blk_core -->
+	  <field field_ref="qns_oce"      name="sonshdoo"  />
+	  <field field_ref="qlw_oce"      name="solwhdoo"  />
+	  <field field_ref="qsb_oce"      name="sosehdoo"  />
+	  <field field_ref="qla_oce"      name="solahdoo"  />
+	  <field field_ref="taum_oce"     name="sowndsto"  />
+	  <!-- ice and snow -->
+	  <field field_ref="snowpre"      name="isnowpre"/>
+	  <field field_ref="utau_ice"     name="iicestru" />
+	  <field field_ref="vtau_ice"     name="iicestrv" />
 	  <!-- For heat conservation checking -->
 	  <field field_ref="qt_oce"        name="qt_oce"   long_name="downward total flux at ocean surface"           />
@@ -444,59 +410,55 @@
 	  <!-- For salt conservation checking -->
           <field field_ref="saltflx"      name="sosflxdo"  />
-    </file>
-
-    <file id="file12" name_suffix="_grid_U" description="ocean U grid variables" >
-      <field field_ref="e3u"  />
-      <field field_ref="ssu"          name="uos"     long_name="sea_surface_x_velocity"    />
-      <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity"      operation="average" freq_op="1y" > @uoce_e3u / @e3u </field> 
-      <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
-      <field field_ref="uocetr_eff"   name="uocetr_eff"  />
-    </file>
-
-    <file id="file13" name_suffix="_grid_V" description="ocean V grid variables" >
-      <field field_ref="e3v"  />
-      <field field_ref="ssv"          name="vos"     long_name="sea_surface_y_velocity"    />
-      <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity"     operation="average" freq_op="1y" > @voce_e3v / @e3v </field>
-      <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />
-      <field field_ref="vocetr_eff"   name="vocetr_eff"  />
-    </file>
-
-    <file id="file14" name_suffix="_grid_W" description="ocean W grid variables" >
-      <field field_ref="e3w"  />
-      <field field_ref="woce"         name="wo"      long_name="ocean vertical velocity"         />
-      <field field_ref="avt"          name="difvho"  long_name="ocean_vertical_heat_diffusivity" />
-      <field field_ref="wocetr_eff"   name="wocetr_eff"  />
-      <field field_ref="avt_evd"      name="avt_evd"    />
-      <field field_ref="av_wave"      name="av_wave"    />
-      <field field_ref="bn2"          name="bn2"        />
-      <field field_ref="bflx_tmx"     name="bflx_tmx"   />
-      <field field_ref="pcmap_tmx"    name="pcmap_tmx"  />
-      <field field_ref="emix_tmx"     name="emix_tmx"   />
-      <field field_ref="av_ratio"     name="av_ratio"   />
-    </file>
-
-    <file id="file15" name_suffix="_diaptr" description="diaptr variables" enabled=".TRUE." >
-      <field field_ref="zotemglo" grid_ref="grid_ptr_T_3D"  />
-      <field field_ref="zosalglo" grid_ref="grid_ptr_T_3D"  />
-      <field field_ref="zosrfglo" grid_ref="grid_ptr_T_3D"  />
-      <field field_ref="zomsfglo" grid_ref="grid_ptr_W_3D"  />
-      <field field_ref="zotematl" grid_ref="grid_ptr_T_3D"  />
-      <field field_ref="zosalatl" grid_ref="grid_ptr_T_3D"  />
-      <field field_ref="zosrfatl" grid_ref="grid_ptr_T_3D"  />
-      <field field_ref="zomsfatl" grid_ref="grid_ptr_W_3D"  />
-      <field field_ref="zotempac" grid_ref="grid_ptr_T_3D"   />
-      <field field_ref="zosalpac" grid_ref="grid_ptr_T_3D"  />
-      <field field_ref="zosrfpac" grid_ref="grid_ptr_T_3D"  />
-
-    </file>   
-   </file_group>
-
+	</file>
+	
+	<file id="file11" name_suffix="_grid_U" description="ocean U grid variables" >
+	  <field field_ref="e3u"  />
+	  <field field_ref="ssu"          name="uos"     long_name="sea_surface_x_velocity"    />
+	  <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity"      operation="average" freq_op="1y" > @uoce_e3u / @e3u </field> 
+	  <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
+	  <field field_ref="uocetr_eff"   name="uocetr_eff"  />
+	</file>
+	
+	<file id="file12" name_suffix="_grid_V" description="ocean V grid variables" >
+	  <field field_ref="e3v"  />
+	  <field field_ref="ssv"          name="vos"     long_name="sea_surface_y_velocity"    />
+	  <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity"     operation="average" freq_op="1y" > @voce_e3v / @e3v </field>
+	  <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />
+	  <field field_ref="vocetr_eff"   name="vocetr_eff"  />
+	</file>
+	
+	<file id="file13" name_suffix="_grid_W" description="ocean W grid variables" >
+	  <field field_ref="e3w"  />
+	  <field field_ref="woce"         name="wo"      long_name="ocean vertical velocity"         />
+	  <field field_ref="avt"          name="difvho"  long_name="ocean_vertical_heat_diffusivity" />
+	  <field field_ref="wocetr_eff"   name="wocetr_eff"  />
+	  <field field_ref="avt_evd"      name="avt_evd"    />
+	  <field field_ref="av_wave"      name="av_wave"    />
+	  <field field_ref="bn2"          name="bn2"        />
+	  <field field_ref="bflx_tmx"     name="bflx_tmx"   />
+	  <field field_ref="pcmap_tmx"    name="pcmap_tmx"  />
+	  <field field_ref="emix_tmx"     name="emix_tmx"   />
+	  <field field_ref="av_ratio"     name="av_ratio"   />
+	</file>
+	
+	<file id="file14" name_suffix="_diaptr" description="diaptr variables" enabled=".TRUE." >
+	  <field field_ref="zotemglo" grid_ref="grid_ptr_T_3D"  />
+	  <field field_ref="zosalglo" grid_ref="grid_ptr_T_3D"  />
+	  <field field_ref="zosrfglo" grid_ref="grid_ptr_T_3D"  />
+	  <field field_ref="zomsfglo" grid_ref="grid_ptr_W_3D"  />
+	  <field field_ref="zotematl" grid_ref="grid_ptr_T_3D"  />
+	  <field field_ref="zosalatl" grid_ref="grid_ptr_T_3D"  />
+	  <field field_ref="zosrfatl" grid_ref="grid_ptr_T_3D"  />
+	  <field field_ref="zomsfatl" grid_ref="grid_ptr_W_3D"  />
+	  <field field_ref="zotempac" grid_ref="grid_ptr_T_3D"   />
+	  <field field_ref="zosalpac" grid_ref="grid_ptr_T_3D"  />
+	  <field field_ref="zosrfpac" grid_ref="grid_ptr_T_3D"  />
+	  
+	</file>   
+      </file_group>
+      
       <file_group id="2y"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
       <file_group id="5y"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
       <file_group id="10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
-
-   </file_definition>
-    
-
-
-
+      
+    </file_definition>
Index: /CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_lim3_ORCA1_cfg
===================================================================
--- /CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_lim3_ORCA1_cfg	(revision 2996)
+++ /CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_lim3_ORCA1_cfg	(revision 2997)
@@ -8,5 +8,5 @@
    cn_icerst_in  = "restart_ice_in" !  suffix of ice restart name (input)
    rn_amax_s     = 0.95             !  maximum tolerated ice concentration SH
-   ln_limdiahsb  = .true.           !  check the heat and salt budgets (T) or not (F)
+   ln_limdiahsb  = .false.          !  check the heat and salt budgets (T) or not (F)
    ln_limdiaout  = .true.           !  output the heat and salt budgets (T) or not (F)
 /
