Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/axis_def_nemo.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/axis_def_nemo.xml	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/axis_def_nemo.xml	(revision 6658)
@@ -0,0 +1,59 @@
+<!--
+    ============================================================================================================
+    = Axis definition = = DO NOT CHANGE =
+    ============================================================================================================
+-->
+
+<axis_definition>
+  <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" />
+  <axis id="deptht100" axis_ref="deptht" >
+     <zoom_axis begin="0" n="24" />
+  </axis>
+  <axis id="deptht200" axis_ref="deptht" >
+     <zoom_axis begin="0" n="31" />
+  </axis>
+  <axis id="deptht300" axis_ref="deptht" >
+     <zoom_axis begin="0" n="35" />
+  </axis>
+  <axis id="deptht500" axis_ref="deptht" >
+     <zoom_axis begin="0" n="40" />
+  </axis>
+  <axis id="deptht700" axis_ref="deptht" >
+     <zoom_axis begin="0" n="43" />
+  </axis>
+  <axis id="deptht1000" axis_ref="deptht" >
+    <zoom_axis begin="0" n="47" />
+  </axis>
+  <axis id="deptht2000" axis_ref="deptht" >
+    <zoom_axis begin="0" n="54" />
+  </axis>
+  <axis id="deptht3000" axis_ref="deptht" >
+     <zoom_axis begin="0" n="60" />
+  </axis>
+  <axis id="deptht4000" axis_ref="deptht" >
+     <zoom_axis begin="0" n="66" />
+  </axis>
+  <axis id="depthu"  long_name="Vertical U levels" unit="m" positive="down" />
+  <axis id="depthv"  long_name="Vertical V levels" unit="m" positive="down" />
+  <axis id="depthw"  long_name="Vertical W levels" unit="m" positive="down" />
+  <axis id="depthf"  long_name="Vertical F levels" unit="m" positive="down" />
+  <axis id="nfloat"  long_name="Float number"      unit="-"                 />
+  <axis id="icbcla"  long_name="Iceberg class"      unit="1"               />
+  <axis id="ncatice" long_name="Ice category"       unit="1"               />
+  <axis id="iax_20C" long_name="20 degC isotherm"   unit="degC"            />
+  <axis id="iax_26C" long_name="26 degC isotherm"   unit="degC"            />
+  <axis id="iax_28C" long_name="28 degC isotherm"   unit="degC"            />
+  <axis id="basin"   long_name="Sub-basin mask (1=Global 2=Atlantic 3=Indo-Pacific 4=Indian, 5=Pacific)"  unit="1" />
+  <axis id="3basin" axis_ref="basin" long_name="Sub-basin mask (1=Global 2=Atlantic 3=Indo-Pacific)" >
+     <zoom_axis begin="0" n="3" />
+  </axis>
+  <axis id="nstrait" long_name="Number of straits" unit="1" />
+  <!-- ABL vertical axis definition -->
+  <axis id="ght_abl" long_name="ABL Vertical T levels" unit="m" positive="up"   />
+  <axis id="ghw_abl" long_name="ABL Vertical W levels" unit="m" positive="up"   />
+  <axis id="section"     n_glo="16" />
+  <axis id="section_ice" n_glo="4" />
+  <axis id="gau" />
+  <!-- PISCES Sediment vertical axis definition -->
+  <axis id="profsed" long_name="Vertical S levels" unit="cm" positive="down"/>
+</axis_definition>
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/context_nemo.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/context_nemo.xml	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/context_nemo.xml	(revision 6658)
@@ -0,0 +1,43 @@
+<!--
+ ============================================================================================== 
+    NEMO context
+============================================================================================== 
+-->
+<context id="nemo">
+    <!-- $id$ -->
+    <variable_definition>
+       <!-- Year/Month/Day of time origin for NetCDF files; defaults to 1800-01-01 -->
+       <variable id="ref_year"  type="int"> 1900 </variable>
+       <variable id="ref_month" type="int"> 01 </variable>
+       <variable id="ref_day"   type="int"> 01 </variable>
+       <variable id="rho0"      type="float" > 1026.0 </variable>
+       <variable id="cpocean"   type="float" > 3991.86795711963 </variable>
+       <variable id="convSpsu"  type="float" > 0.99530670233846  </variable>
+       <variable id="rhoic"     type="float" > 917.0 </variable>
+       <variable id="rhosn"     type="float" > 330.0 </variable>
+       <variable id="missval"   type="float" > 1.e20 </variable>
+    </variable_definition>
+
+<!-- Fields definition -->
+    <field_definition src="./field_def_nemo-oce.xml"/>    <!--  NEMO ocean dynamics     -->
+    <field_definition src="./field_def_nemo-ice.xml"/>    <!--  NEMO sea-ice model      -->
+    <field_definition src="./field_def_nemo-pisces.xml"/> <!--  NEMO ocean biology      -->
+    <field_definition src="./field_def_nemo-innerttrc.xml"/> <!--  NEMO ocean biology      -->
+
+<!-- Files definition -->
+    <file_definition src="./file_def_nemo-oce.xml"/>     <!--  NEMO ocean dynamics      -->
+    <file_definition src="./file_def_nemo-ice.xml"/>     <!--  NEMO sea-ice model       -->
+    <file_definition src="./file_def_nemo-pisces.xml"/>     <!--  NEMO sea-ice model       -->
+
+
+<!-- Axis definition -->
+    <axis_definition src="./axis_def_nemo.xml"/>
+ 
+<!-- Domain definition -->
+    <domain_definition src="./domain_def_nemo.xml"/>
+
+<!-- Grids definition -->
+    <grid_definition   src="./grid_def_nemo.xml"/>
+  
+
+</context>
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/domain_def_nemo.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/domain_def_nemo.xml	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/domain_def_nemo.xml	(revision 6658)
@@ -0,0 +1,204 @@
+
+<domain_definition>
+
+  <!--   T grid   -->
+  <domain id="grid_T" long_name="grid T"/>
+  <domain id="grid_T_inner" long_name="grid T inner"/>
+
+  <!--   My zoom: example of hand defined zoom   -->
+  <domain id="myzoomT" domain_ref="grid_T" >
+    <zoom_domain ibegin="1" jbegin="1" ni="2" nj="3"/>
+  </domain>
+
+  <domain id="1point" domain_ref="grid_T" >
+    <zoom_domain ibegin="139" jbegin="119" ni="1" nj="1"/>
+  </domain>
+
+
+  <!--   Eq section -->
+  <domain id="EqT" domain_ref="grid_T" > <zoom_domain id="EqT"/> </domain>
+  <!--   TAO : see example above   -->
+  <!--   137e   -->
+  <domain id="2n137eT" domain_ref="grid_T" > <zoom_domain id="2n137eT"/> </domain>
+  <domain id="5n137eT" domain_ref="grid_T" > <zoom_domain id="5n137eT"/> </domain>
+  <domain id="8n137eT" domain_ref="grid_T" > <zoom_domain id="8n137eT"/> </domain>
+  <!-- <\!--   147e   -\-> -->
+  <domain id="0n147eT" domain_ref="grid_T" > <zoom_domain id="0n147eT"/> </domain>
+  <domain id="2n147eT" domain_ref="grid_T" > <zoom_domain id="2n147eT"/> </domain>
+  <domain id="5n147eT" domain_ref="grid_T" > <zoom_domain id="5n147eT"/> </domain>
+  <!-- <\!--   156e   -\-> -->
+  <domain id="5s156eT" domain_ref="grid_T" > <zoom_domain id="5s156eT"/> </domain>
+  <domain id="2s156eT" domain_ref="grid_T" > <zoom_domain id="2s156eT"/> </domain>
+  <domain id="0n156eT" domain_ref="grid_T" > <zoom_domain id="0n156eT"/> </domain>
+  <domain id="2n156eT" domain_ref="grid_T" > <zoom_domain id="2n156eT"/> </domain>
+  <domain id="5n156eT" domain_ref="grid_T" > <zoom_domain id="5n156eT"/> </domain>
+  <domain id="8n156eT" domain_ref="grid_T" > <zoom_domain id="8n156eT"/> </domain>
+  <!-- <\!--   165e   -\-> -->
+  <domain id="8s165eT" domain_ref="grid_T" > <zoom_domain id="8s165eT"/> </domain>
+  <domain id="5s165eT" domain_ref="grid_T" > <zoom_domain id="5s165eT"/> </domain>
+  <domain id="2s165eT" domain_ref="grid_T" > <zoom_domain id="2s165eT"/> </domain>
+  <domain id="0n165eT" domain_ref="grid_T" > <zoom_domain id="0n165eT"/> </domain>
+  <domain id="2n165eT" domain_ref="grid_T" > <zoom_domain id="2n165eT"/> </domain>
+  <domain id="5n165eT" domain_ref="grid_T" > <zoom_domain id="5n165eT"/> </domain>
+  <domain id="8n165eT" domain_ref="grid_T" > <zoom_domain id="8n165eT"/> </domain>
+  <!-- <\!--   180w   -\-> -->
+  <domain id="8s180wT" domain_ref="grid_T" > <zoom_domain id="8s180wT"/> </domain>
+  <domain id="5s180wT" domain_ref="grid_T" > <zoom_domain id="5s180wT"/> </domain>
+  <domain id="2s180wT" domain_ref="grid_T" > <zoom_domain id="2s180wT"/> </domain>
+  <domain id="0n180wT" domain_ref="grid_T" > <zoom_domain id="0n180wT"/> </domain>
+  <domain id="2n180wT" domain_ref="grid_T" > <zoom_domain id="2n180wT"/> </domain>
+  <domain id="5n180wT" domain_ref="grid_T" > <zoom_domain id="5n180wT"/> </domain>
+  <domain id="8n180wT" domain_ref="grid_T" > <zoom_domain id="8n180wT"/> </domain>
+  <!-- <\!--   170w   -\-> -->
+  <domain id="8s170wT" domain_ref="grid_T" > <zoom_domain id="8s170wT"/> </domain>
+  <domain id="5s170wT" domain_ref="grid_T" > <zoom_domain id="5s170wT"/> </domain>
+  <domain id="2s170wT" domain_ref="grid_T" > <zoom_domain id="2s170wT"/> </domain>
+  <domain id="0n170wT" domain_ref="grid_T" > <zoom_domain id="0n170wT"/> </domain>
+  <domain id="2n170wT" domain_ref="grid_T" > <zoom_domain id="2n170wT"/> </domain>
+  <domain id="5n170wT" domain_ref="grid_T" > <zoom_domain id="5n170wT"/> </domain>
+  <domain id="8n170wT" domain_ref="grid_T" > <zoom_domain id="8n170wT"/> </domain>
+  <!-- <\!--   155w   -\-> -->
+  <domain id="8s155wT" domain_ref="grid_T" > <zoom_domain id="8s155wT"/> </domain>
+  <domain id="5s155wT" domain_ref="grid_T" > <zoom_domain id="5s155wT"/> </domain>
+  <domain id="2s155wT" domain_ref="grid_T" > <zoom_domain id="2s155wT"/> </domain>
+  <domain id="0n155wT" domain_ref="grid_T" > <zoom_domain id="0n155wT"/> </domain>
+  <domain id="2n155wT" domain_ref="grid_T" > <zoom_domain id="2n155wT"/> </domain>
+  <domain id="5n155wT" domain_ref="grid_T" > <zoom_domain id="5n155wT"/> </domain>
+  <domain id="8n155wT" domain_ref="grid_T" > <zoom_domain id="8n155wT"/> </domain>
+  <!-- <\!--   140w   -\-> -->
+  <domain id="8s140wT" domain_ref="grid_T" > <zoom_domain id="8s140wT"/> </domain>
+  <domain id="5s140wT" domain_ref="grid_T" > <zoom_domain id="5s140wT"/> </domain>
+  <domain id="2s140wT" domain_ref="grid_T" > <zoom_domain id="2s140wT"/> </domain>
+  <domain id="0n140wT" domain_ref="grid_T" > <zoom_domain id="0n140wT"/> </domain>
+  <domain id="2n140wT" domain_ref="grid_T" > <zoom_domain id="2n140wT"/> </domain>
+  <domain id="5n140wT" domain_ref="grid_T" > <zoom_domain id="5n140wT"/> </domain>
+  <domain id="8n140wT" domain_ref="grid_T" > <zoom_domain id="8n140wT"/> </domain>
+  <!-- <\!--   125w   -\-> -->
+  <domain id="8s125wT" domain_ref="grid_T" > <zoom_domain id="8s125wT"/> </domain>
+  <domain id="5s125wT" domain_ref="grid_T" > <zoom_domain id="5s125wT"/> </domain>
+  <domain id="2s125wT" domain_ref="grid_T" > <zoom_domain id="2s125wT"/> </domain>
+  <domain id="0n125wT" domain_ref="grid_T" > <zoom_domain id="0n125wT"/> </domain>
+  <domain id="2n125wT" domain_ref="grid_T" > <zoom_domain id="2n125wT"/> </domain>
+  <domain id="5n125wT" domain_ref="grid_T" > <zoom_domain id="5n125wT"/> </domain>
+  <domain id="8n125wT" domain_ref="grid_T" > <zoom_domain id="8n125wT"/> </domain>
+  <!-- <\!--   110w   -\-> -->
+  <domain id="8s110wT" domain_ref="grid_T" > <zoom_domain id="8s110wT"/> </domain>
+  <domain id="5s110wT" domain_ref="grid_T" > <zoom_domain id="5s110wT"/> </domain>
+  <domain id="2s110wT" domain_ref="grid_T" > <zoom_domain id="2s110wT"/> </domain>
+  <domain id="0n110wT" domain_ref="grid_T" > <zoom_domain id="0n110wT"/> </domain>
+  <domain id="2n110wT" domain_ref="grid_T" > <zoom_domain id="2n110wT"/> </domain>
+  <domain id="5n110wT" domain_ref="grid_T" > <zoom_domain id="5n110wT"/> </domain>
+  <domain id="8n110wT" domain_ref="grid_T" > <zoom_domain id="8n110wT"/> </domain>
+  <!-- <\!--   95w   -\-> -->
+  <domain id="8s95wT" domain_ref="grid_T" > <zoom_domain id="8s95wT"/> </domain>
+  <domain id="5s95wT" domain_ref="grid_T" > <zoom_domain id="5s95wT"/> </domain>
+  <domain id="2s95wT" domain_ref="grid_T" > <zoom_domain id="2s95wT"/> </domain>
+  <domain id="0n95wT" domain_ref="grid_T" > <zoom_domain id="0n95wT"/> </domain>
+  <domain id="2n95wT" domain_ref="grid_T" > <zoom_domain id="2n95wT"/> </domain>
+  <domain id="5n95wT" domain_ref="grid_T" > <zoom_domain id="5n95wT"/> </domain>
+  <domain id="8n95wT" domain_ref="grid_T" > <zoom_domain id="8n95wT"/> </domain>
+  <!-- <\!--   RAMA   -\-> -->
+  <!-- <\!--   55e   -\-> -->
+  <domain id="16s55eT"    domain_ref="grid_T" > <zoom_domain id="16s55eT"   /> </domain>
+  <domain id="12s55eT"    domain_ref="grid_T" > <zoom_domain id="12s55eT"   /> </domain>
+  <domain id="8s55eT"     domain_ref="grid_T" > <zoom_domain id="8s55eT"    /> </domain>
+  <domain id="4s55eT"     domain_ref="grid_T" > <zoom_domain id="4s55eT"    /> </domain>
+  <domain id="1.5s55eT"   domain_ref="grid_T" > <zoom_domain id="1.5s55eT"  /> </domain>
+  <domain id="0n55eT"     domain_ref="grid_T" > <zoom_domain id="0n55eT"    /> </domain>
+  <domain id="1.5n55eT"   domain_ref="grid_T" > <zoom_domain id="1.5n55eT"  /> </domain>
+  <domain id="4n55eT"     domain_ref="grid_T" > <zoom_domain id="4n55eT"    /> </domain>
+  <!--    <\!--   65e   -\-> -->
+  <domain id="15n65eT"    domain_ref="grid_T" > <zoom_domain id="15n65eT"   /> </domain>
+  <!--    <\!--   67e   -\-> -->
+  <domain id="16s67eT"    domain_ref="grid_T" > <zoom_domain id="16s67eT"   /> </domain>
+  <domain id="12s67eT"    domain_ref="grid_T" > <zoom_domain id="12s67eT"   /> </domain>
+  <domain id="8s67eT"     domain_ref="grid_T" > <zoom_domain id="8s67eT"    /> </domain>
+  <domain id="4s67eT"     domain_ref="grid_T" > <zoom_domain id="4s67eT"    /> </domain>
+  <domain id="1.5s67eT"   domain_ref="grid_T" > <zoom_domain id="1.5s67eT"  /> </domain>
+  <domain id="0n67eT"     domain_ref="grid_T" > <zoom_domain id="0n67eT"    /> </domain>
+  <domain id="1.5n67eT"   domain_ref="grid_T" > <zoom_domain id="1.5n67eT"  /> </domain>
+  <domain id="4n67eT"     domain_ref="grid_T" > <zoom_domain id="4n67eT"    /> </domain>
+  <domain id="8n67eT"     domain_ref="grid_T" > <zoom_domain id="8n67eT"    /> </domain>
+  <!-- <\!--   80.5e   -\-> -->
+  <domain id="16s80.5eT"  domain_ref="grid_T" > <zoom_domain id="16s80.5eT" /> </domain>
+  <domain id="12s80.5eT"  domain_ref="grid_T" > <zoom_domain id="12s80.5eT" /> </domain>
+  <domain id="8s80.5eT"   domain_ref="grid_T" > <zoom_domain id="8s80.5eT"  /> </domain>
+  <domain id="4s80.5eT"   domain_ref="grid_T" > <zoom_domain id="4s80.5eT"  /> </domain>
+  <domain id="1.5s80.5eT" domain_ref="grid_T" > <zoom_domain id="1.5s80.5eT"/> </domain>
+  <domain id="0n80.5eT"   domain_ref="grid_T" > <zoom_domain id="0n80.5eT"  /> </domain>
+  <domain id="1.5n80.5eT" domain_ref="grid_T" > <zoom_domain id="1.5n80.5eT"/> </domain>
+  <domain id="4n80.5eT"   domain_ref="grid_T" > <zoom_domain id="4n80.5eT"  /> </domain>
+  <!-- <\!--   90e   -\-> -->
+  <domain id="1.5s90eT"   domain_ref="grid_T" > <zoom_domain id="1.5s90eT"  /> </domain>
+  <domain id="0n90eT"     domain_ref="grid_T" > <zoom_domain id="0n90eT"    /> </domain>
+  <domain id="1.5n90eT"   domain_ref="grid_T" > <zoom_domain id="1.5n90eT"  /> </domain>
+  <domain id="4n90eT"     domain_ref="grid_T" > <zoom_domain id="4n90eT"    /> </domain>
+  <domain id="8n90eT"     domain_ref="grid_T" > <zoom_domain id="8n90eT"    /> </domain>
+  <domain id="12n90eT"    domain_ref="grid_T" > <zoom_domain id="12n90eT"   /> </domain>
+  <domain id="15n90eT"    domain_ref="grid_T" > <zoom_domain id="15n90eT"   /> </domain>
+  <!-- <\!--   95e   -\-> -->
+  <domain id="16s95eT"    domain_ref="grid_T" > <zoom_domain id="16s95eT"   /> </domain>
+  <domain id="12s95eT"    domain_ref="grid_T" > <zoom_domain id="12s95eT"   /> </domain>
+  <domain id="8s95eT"     domain_ref="grid_T" > <zoom_domain id="8s95eT"    /> </domain>
+  <domain id="5s95eT"     domain_ref="grid_T" > <zoom_domain id="5s95eT"    /> </domain>
+  <!-- <\!--   PIRATA   -\-> -->
+  <!-- <\!--   38w-30w   -\-> -->
+  <domain id="19s34wT" domain_ref="grid_T" > <zoom_domain id="19s34wT"/> </domain>
+  <domain id="14s32wT" domain_ref="grid_T" > <zoom_domain id="14s32wT"/> </domain>
+  <domain id="8s30wT"  domain_ref="grid_T" > <zoom_domain id="8s30wT" /> </domain>
+  <domain id="0n35wT"  domain_ref="grid_T" > <zoom_domain id="0n35wT" /> </domain>
+  <domain id="4n38wT"  domain_ref="grid_T" > <zoom_domain id="4n38wT" /> </domain>
+  <domain id="8n38wT"  domain_ref="grid_T" > <zoom_domain id="8n38wT" /> </domain>
+  <domain id="12n38wT" domain_ref="grid_T" > <zoom_domain id="12n38wT"/> </domain>
+  <domain id="15n38wT" domain_ref="grid_T" > <zoom_domain id="15n38wT"/> </domain>
+  <domain id="20n38wT" domain_ref="grid_T" > <zoom_domain id="20n38wT"/> </domain>
+  <!-- <\!--   23w   -\-> -->
+  <domain id="0n23wT"  domain_ref="grid_T" > <zoom_domain id="0n23wT" /> </domain>
+  <domain id="4n23wT"  domain_ref="grid_T" > <zoom_domain id="4n23wT" /> </domain>
+  <domain id="12n23wT" domain_ref="grid_T" > <zoom_domain id="12n23wT"/> </domain>
+  <domain id="21n23wT" domain_ref="grid_T" > <zoom_domain id="21n23wT"/> </domain>
+  <!-- <\!--   10w   -\-> -->
+  <domain id="10s10wT" domain_ref="grid_T" > <zoom_domain id="10s10wT"/> </domain>
+  <domain id="6s10wT"  domain_ref="grid_T" > <zoom_domain id="6s10wT" /> </domain>
+  <domain id="0n10wT"  domain_ref="grid_T" > <zoom_domain id="0n10wT" /> </domain>
+  <!-- <\!--   0e   -\-> -->
+  <domain id="0n0eT"   domain_ref="grid_T" > <zoom_domain id="0n0eT"  /> </domain>
+
+
+  <!--   U grid   -->
+  <domain id="grid_U" long_name="grid U"/>
+  <domain id="grid_U_inner" long_name="grid U inner"/>
+  <!--   Eq section   -->
+  <domain id="EqU" domain_ref="grid_U" > <zoom_domain id="EqU"/> </domain>
+
+
+  <!--   V grid   -->
+  <domain id="grid_V" long_name="grid V"/>
+  <domain id="grid_V_inner" long_name="grid V inner"/>
+  <!--   Eq section : no V point on the Equator...   -->
+
+
+  <!--   W grid   -->
+  <domain id="grid_W" long_name="grid W"/>
+  <domain id="grid_W_inner" long_name="grid W inner"/>
+  <!--   Eq section   -->
+  <domain id="EqW" domain_ref="grid_W" > <zoom_domain id="EqW"/> </domain>
+
+  <!--   F grid   -->
+  <domain id="grid_F" long_name="grid F"/>
+  <domain id="grid_F_inner" long_name="grid F inner"/>
+
+  <!--   zonal mean grid   -->
+  <domain_group id="gznl">
+    <domain id="gznl" long_name="gznl"/>
+    <domain id="ptr" domain_ref="gznl" >
+      <zoom_domain id="ptr" ibegin="0000" jbegin="0" ni="1" nj="0000" />
+    </domain>
+  </domain_group>
+
+
+  <!--   other grids   -->
+  <domain id="scalarpoint" long_name="scalar"/>
+
+
+</domain_definition>
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/field_def_nemo-ice.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/field_def_nemo-ice.xml	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/field_def_nemo-ice.xml	(revision 6658)
@@ -0,0 +1,685 @@
+<?xml version="1.0"?>
+<!-- $id$ -->
+
+<!--
+============================================================================================================
+=                              definition of all existing sea ice variables                                =
+=                                            DO NOT CHANGE                                                 =
+============================================================================================================
+-->
+<field_definition level="1" prec="4" operation="average" enabled=".TRUE." default_value="1.e20" > <!-- time step automaticaly defined -->
+
+  <!--
+      ============================================================================================================
+      Physical sea ice model variables
+      ============================================================================================================
+  -->
+
+  <field_group id="SBC" > <!-- time step automaticaly defined based on nn_fsbc -->
+
+    <!-- 2D variables -->
+    <field_group id="SBC_2D" grid_ref="grid_T_2D" >
+
+      <!-- =================== -->
+      <!-- standard ice fields -->
+      <!-- =================== -->
+      <!-- ice presence masks -->
+      <field id="icemask"      long_name="Fraction of time steps with sea ice"                     standard_name="sea_ice_mask"                              unit="" />
+      <field id="icemask05"    long_name="Ice mask (0 if ice conc. lower than  5%, 1 otherwise)"   standard_name="sea_ice_mask05"                            unit="" />
+      <field id="icemask15"    long_name="Ice mask (0 if ice conc. lower than 15%, 1 otherwise)"   standard_name="sea_ice_mask15"                            unit="" />
+      <field id="icepres"      long_name="Fraction of time steps with sea ice"                     standard_name="sea_ice_time_fraction"                     unit="" />
+      <field id="fasticepres"  long_name="Fraction of time steps with landfast ice"                standard_name="fast_ice_time_fraction"                    unit="" />
+
+      <!-- general fields -->
+      <field id="icemass"      long_name="Sea-ice mass per gridcell area"                          standard_name="sea_ice_amount"                            unit="kg/m2"/>
+      <field id="snwmass"      long_name="Snow mass per area"                                      standard_name="liquid_water_content_of_surface_snow"      unit="kg/m2"/>
+      <field id="iceconc"      long_name="Sea-ice area fraction"                                   standard_name="sea_ice_area_fraction"                     unit=""     />
+      <field id="icevolu"      long_name="Sea-ice volume per area"                                 standard_name="sea_ice_thickness"                         unit="m"    />
+      <field id="icethic"      long_name="Sea-ice thickness"                                       standard_name="sea_ice_thickness"                         unit="m"    />
+      <field id="snwthic"      long_name="Snow thickness"                                          standard_name="snow_thickness"                            unit="m"    />
+      <field id="icebrv"       long_name="brine volume"                                                                                                      unit="%"    />
+      <field id="iceage"       long_name="ice age"                                                                                                           unit="days" detect_missing_value="true"/>
+      <field id="icehnew"      long_name="frazil ice collection thickness"                                                                                   unit="m"    />
+      <field id="snwvolu"      long_name="snow volume"                                                                                                       unit="m"    />
+      <field id="icefrb"       long_name="Sea-ice freeboard"                                       standard_name="sea_ice_freeboard"                         unit="m"    />
+      <field id="icealb"       long_name="Sea-ice or snow albedo"                                  standard_name="sea_ice_albedo"                            unit=""    detect_missing_value="true" />
+
+      <!-- melt ponds -->
+      <field id="iceapnd"      long_name="melt pond concentration"                                 standard_name="sea_ice_meltpond_concentration"            unit=""  />
+      <field id="icehpnd"      long_name="melt pond depth"                                         standard_name="sea_ice_meltpond_depth"                    unit="m" />
+      <field id="icevpnd"      long_name="melt pond volume"                                        standard_name="sea_ice_meltpond_volume"                   unit="m" />
+      <field id="icehlid"      long_name="melt pond lid depth"                                     standard_name="sea_ice_meltpondlid_depth"                 unit="m" />
+      <field id="icevlid"      long_name="melt pond lid volume"                                    standard_name="sea_ice_meltpondlid_volume"                unit="m" />
+      <field id="dvpn_mlt"     long_name="pond volume tendency due to surface melt"                standard_name="sea_ice_pondvolume_tendency_melt"          unit="kg/m2/s" />
+      <field id="dvpn_lid"     long_name="pond volume tendency due to exchanges with lid"          standard_name="sea_ice_pondvolume_tendency_lids"          unit="kg/m2/s" />
+      <field id="dvpn_rnf"     long_name="pond volume tendency due to runoff"                      standard_name="sea_ice_pondvolume_tendency_runoff"        unit="kg/m2/s" />
+      <field id="dvpn_drn"     long_name="pond volume tendency due to drainage"                    standard_name="sea_ice_pondvolume_tendency_drainage"      unit="kg/m2/s" />
+
+      <!-- heat -->
+      <field id="icetemp"      long_name="Mean ice temperature"                                                                                              unit="degC" detect_missing_value="true" />
+      <field id="snwtemp"      long_name="Mean snow temperature"                                                                                             unit="degC" detect_missing_value="true" />
+      <field id="icettop"      long_name="temperature at the ice surface"                                                                                    unit="degC" detect_missing_value="true" />
+      <field id="icetbot"      long_name="temperature at the ice bottom"                                                                                     unit="degC" detect_missing_value="true" />
+      <field id="icetsni"      long_name="temperature at the snow-ice interface"                                                                             unit="degC" detect_missing_value="true" />
+      <field id="icehc"        long_name="ice heat content"                                                                                                  unit="J/m2" />
+      <field id="snwhc"        long_name="snow heat content"                                                                                                 unit="J/m2" />
+
+      <!-- salt -->
+      <field id="icesalt"      long_name="Sea ice salinity"                                                                                                  unit="g/kg"  detect_missing_value="true" />
+      <field id="icesalm"      long_name="Mass of salt in sea ice per area"                        standard_name="sea_ice_salt_mass"                         unit="kg/m2" />
+
+      <!-- momentum (rheology) -->
+      <field id="uice"         long_name="X-component of sea ice velocity"                         standard_name="sea_ice_x_velocity"                        unit="m/s"  />
+      <field id="vice"         long_name="Y-component of sea ice velocity"                         standard_name="sea_ice_y_velocity"                        unit="m/s"  />
+      <field id="icevel"       long_name="Sea-ice speed"                                           standard_name="sea_ice_speed"                             unit="m/s"  />
+      <field id="utau_ai"      long_name="X-component of atmospheric stress on sea ice"            standard_name="surface_downward_x_stress"                 unit="N/m2" />
+      <field id="vtau_ai"      long_name="Y-component of atmospheric stress on sea ice"            standard_name="surface_downward_y_stress"                 unit="N/m2" />
+      <field id="utau_oi"      long_name="X-component of ocean stress on sea ice"                  standard_name="sea_ice_base_upward_x_stress"              unit="N/m2" />
+      <field id="vtau_oi"      long_name="Y-component of ocean stress on sea ice"                  standard_name="sea_ice_base_upward_y_stress"              unit="N/m2" />
+      <field id="utau_bi"      long_name="X-component of ocean bottom stress on sea ice -landfast" standard_name="ocean_bottom_upward_x_stress"              unit="N/m2" />
+      <field id="vtau_bi"      long_name="Y-component of ocean bottom stress on sea ice -landfast" standard_name="ocean_bottom_upward_y_stress"              unit="N/m2" />
+      <field id="taum_ice"     long_name="Module of atmospheric stress on sea ice (T-points)"      standard_name="mod_surface_downward_stress"               unit="N/m2" />
+      <field id="utau_ice"     long_name="X-component of ocean stress on sea ice (T-points)"       standard_name="sea_ice_base_upward_x_stress_Tpoints"      unit="N/m2" />
+      <field id="vtau_ice"     long_name="Y-component of ocean stress on sea ice (T-points)"       standard_name="sea_ice_base_upward_y_stress_Tpoints"      unit="N/m2" />
+      <field id="sig1_pnorm"   long_name="P-normalized 1st principal stress component"                                                                       unit=""     />
+      <field id="sig2_pnorm"   long_name="P-normalized 2nd principal stress component"                                                                       unit=""     />
+      <field id="icedlt"       long_name="delta"                                                   standard_name="delta"                                     unit=""     />
+      <field id="normstr"      long_name="Average normal stress in sea ice"                        standard_name="average_normal_stress"                     unit="N/m"  />
+      <field id="sheastr"      long_name="Maximum shear stress in sea ice"                         standard_name="maximum_shear_stress"                      unit="N/m"  />
+      <field id="icestr"       long_name="Compressive sea ice strength"                            standard_name="compressive_strength_of_sea_ice"           unit="N/m"  />
+      <field id="icediv"       long_name="Divergence of the sea-ice velocity field"                standard_name="divergence_of_sea_ice_velocity"            unit="s-1"  />
+      <field id="iceshe"       long_name="Maximum shear of sea-ice velocity field"                 standard_name="maximum_shear_of_sea_ice_velocity"         unit="s-1"  />
+      <field id="aniso"        long_name="anisotropy of sea ice floe orientation (0.5 - 1)"        standard_name="anisotropy"                                unit=""     />
+      <field id="yield11"      long_name="yield surface tensor component 11"                       standard_name="yield11"                                   unit="N/m"  />
+      <field id="yield22"      long_name="yield surface tensor component 22"                       standard_name="yield22"                                   unit="N/m"  />
+      <field id="yield12"      long_name="yield surface tensor component 12"                       standard_name="yield12"                                   unit="N/m"  />
+      <field id="beta_evp"     long_name="Relaxation parameter of ice rheology (beta)"             standard_name="relaxation_parameter_of_ice_rheology"      unit=""  />
+
+      <!-- surface heat fluxes -->
+      <field id="qt_ice"       long_name="total heat flux at ice surface"                          standard_name="surface_downward_heat_flux_in_air"         unit="W/m2" />
+      <field id="qsr_ice"      long_name="solar heat flux at ice surface"                          standard_name="surface_downwelling_shortwave_flux_in_air" unit="W/m2" />
+      <field id="qlw_ice"      long_name="longwave (IR) heat flux at ice surface"                  standard_name="surface_downwelling_longwave_flux_in_air"  unit="W/m2" />
+      <field id="qns_ice"      long_name="non-solar heat flux at ice surface (including E-P)"                                                                unit="W/m2" />
+      <field id="qla_ice"      long_name="latent (sublimation) heat flux at ice surface"                                                                     unit="W/m2" />
+      <field id="qsb_ice"      long_name="sensible heat flux at ice surface"                                                                                 unit="W/m2" />
+      <field id="qtr_ice_bot"  long_name="solar heat flux transmitted through the ice (to the ocean)"                                                        unit="W/m2" />
+      <field id="qtr_ice_top"  long_name="solar heat flux transmitted through the ice surface"                                                               unit="W/m2" />
+      <field id="qt_oce_ai"    long_name="total heat flux at the ocean   surface: interface oce-(ice+atm)"                                                   unit="W/m2" />
+      <field id="qt_atm_oi"    long_name="total heat flux at the oce-ice surface: interface atm-(ice+oce)"                                                   unit="W/m2" />
+      <field id="qemp_ice"     long_name="Downward Heat Flux from E-P over ice"                                                                              unit="W/m2" />
+      <field id="albedo"       long_name="Mean albedo over sea ice and ocean"                                                                                unit=""     />
+      <field id="Cd_ice"       long_name="Drag coefficient over sea-ice"                            standard_name="drag_coefficient_ice"                     unit=""     />
+      <field id="Ce_ice"       long_name="Sublimation coefficient over sea-ice"                     standard_name="evap_coefficient_ice"                     unit=""     />
+      <field id="Ch_ice"       long_name="Sensible heat coefficient over sea-ice"                   standard_name="sensible_heat_coefficient_ice"            unit=""     />
+
+      <!-- trends -->
+      <field id="afxthd"       long_name="sea-ice area fraction change from thermodynamics" standard_name="tendency_of_sea_ice_area_fraction_due_to_dynamics" unit="s-1" />
+      <field id="afxdyn"       long_name="sea-ice area fraction change from dynamics"       standard_name="tendency_of_sea_ice_area_fraction_due_to_dynamics" unit="s-1" />
+      <field id="afxtot"       long_name="area tendency (total)"                                                                                              unit="s-1" />
+
+      <!-- momentum (advection) -->
+      <field id="icemtrp"      long_name="ice  mass transport"                                          unit="kg/m2/s" />
+      <field id="snwmtrp"      long_name="snw  mass transport"                                          unit="kg/m2/s" />
+      <field id="salmtrp"      long_name="salt mass transport"                                          unit="kg/m2/s" />
+      <field id="dihctrp"      long_name="ice heat content transport"                                   unit="W/m2"    />
+      <field id="dshctrp"      long_name="snw heat content transport"                                   unit="W/m2"    />
+
+      <!-- salt fluxes -->
+      <field id="sfxice"       long_name="ice-ocean salt flux from ice growth/melt (neg = growth)"      unit="kg/m2/s" />
+      <field id="sfxbog"       long_name="ice-ocean salt flux from ice bottom growth"                   unit="kg/m2/s" />
+      <field id="sfxbom"       long_name="ice-ocean salt flux from ice bottom melt"                     unit="kg/m2/s" />
+      <field id="sfxsum"       long_name="ice-ocean salt flux from ice surface melt"                    unit="kg/m2/s" />
+      <field id="sfxlam"       long_name="ice-ocean salt flux from ice lateral melt"                    unit="kg/m2/s" />
+      <field id="sfxsni"       long_name="ice-ocean salt flux from snow-ice formation"                  unit="kg/m2/s" />
+      <field id="sfxopw"       long_name="ice-ocean salt flux from ice formation in open water"         unit="kg/m2/s" />
+      <field id="sfxdyn"       long_name="ice-ocean salt flux from ice dynamics (ridging)"              unit="kg/m2/s" />
+      <field id="sfxbri"       long_name="ice-ocean salt flux from brines"                              unit="kg/m2/s" />
+      <field id="sfxres"       long_name="ice-ocean salt flux from undiagnosed processes"               unit="kg/m2/s" />
+      <field id="sfxsub"       long_name="ice-ocean salt flux from ice sublimation"                     unit="kg/m2/s" />
+
+      <!-- mass fluxes -->
+      <field id="vfxice"       long_name="ice-ocean mass flux from ice melt/growth (neg = growth)"      unit="kg/m2/s" />
+      <field id="vfxbog"       long_name="ice-ocean mass flux from ice bottom growth"                   unit="kg/m2/s" />
+      <field id="vfxbom"       long_name="ice-ocean mass flux from ice bottom melt"                     unit="kg/m2/s" />
+      <field id="vfxsum"       long_name="ice-ocean mass flux from ice surface melt"                    unit="kg/m2/s" />
+      <field id="vfxlam"       long_name="ice-ocean mass flux from ice lateral melt"                    unit="kg/m2/s" />
+      <field id="vfxsni"       long_name="ice-ocean mass flux from snow-ice formation"                  unit="kg/m2/s" />
+      <field id="vfxopw"       long_name="ice-ocean mass flux from ice growth in open water"            unit="kg/m2/s" />
+      <field id="vfxdyn"       long_name="ice-ocean mass flux from ice dynamics (ridging)"              unit="kg/m2/s" />
+      <field id="vfxres"       long_name="ice-ocean mass flux from undiagnosed processes"               unit="kg/m2/s" />
+      <field id="vfxpnd"       long_name="ice-ocean mass flux from ice melt ponds"                      unit="kg/m2/s" />
+      <field id="vfxsub"       long_name="ice-atm.  mass flux from ice sublimation"                     unit="kg/m2/s" />
+      <field id="vfxsub_err"   long_name="ice-ocean mass flux from unbalance in sublimation (incl. in qt_oce_ai)" unit="kg/m2/s" />
+      <field id="vfxthin"      long_name="ice-ocean mass flux from ice growth in open water + thin ice(20cm)"     unit="kg/m2/s" />
+
+      <field id="vfxsnw"       long_name="ice-ocean mass flux from snw melt/growth (neg = growth)"      unit="kg/m2/s" />
+      <field id="vfxsnw_sum"   long_name="ice-ocean mass flux from snw surface melt"                    unit="kg/m2/s" />
+      <field id="vfxsnw_sni"   long_name="ice-ocean mass flux from snow-ice formation"                  unit="kg/m2/s" />
+      <field id="vfxsnw_dyn"   long_name="ice-ocean mass flux from dynamics (ridging)"                  unit="kg/m2/s" />
+      <field id="vfxsnw_sub"   long_name="ice-atm.  mass flux from snw sublimation"                     unit="kg/m2/s" />
+      <field id="vfxsnw_pre"   long_name="snw precipitation on ice"                                     unit="kg/m2/s" />
+
+      <!-- heat fluxes -->
+      <field id="hfxbog"       long_name="heat flux used for bottom ice growth (neg.)"                  unit="W/m2" />
+      <field id="hfxbom"       long_name="heat flux used for bottom ice melt (pos.)"                    unit="W/m2" />
+      <field id="hfxsum"       long_name="heat flux used for surface ice melt"                          unit="W/m2" />
+      <field id="hfxopw"       long_name="heat flux used for open water ice formation"                  unit="W/m2" />
+      <field id="hfxdif"       long_name="heat flux used for ice temperature change"                    unit="W/m2" />
+      <field id="hfxsnw"       long_name="heat flux used for snow melt"                                 unit="W/m2" />
+      <field id="hfxerr"       long_name="heat flux error after heat diffusion"                         unit="W/m2" />
+      <!-- heat fluxes associated with mass exchange -->
+      <field id="hfxthd"       long_name="heat fluxes from ice-ocean mass exchange during thermo"       unit="W/m2" />
+      <field id="hfxdyn"       long_name="heat fluxes from ice-ocean mass exchange during dynamic"      unit="W/m2" />
+      <field id="hfxres"       long_name="heat fluxes from undiagnosed processes"                       unit="W/m2" />
+      <field id="hfxsub"       long_name="heat fluxes from ice-atm. mass exchange during sublimation"   unit="W/m2" />
+      <field id="hfxspr"       long_name="heat fluxes from ice-atm. mass exchange during snow precip"   unit="W/m2" />
+
+      <field id="hfxsensib"    long_name="Net sensible heat flux under sea ice (neg = ice cooling)"         standard_name="ice_ocean_heat_flux"                        unit="W/m2" />
+      <field id="hfxcndtop"    long_name="Net conductive heat flux at the ice surface (neg = ice cooling)"  standard_name="conductive_heat_flux_at_sea_ice_surface"    unit="W/m2" />
+      <field id="hfxcndbot"    long_name="Net conductive heat flux at the ice bottom (neg = ice cooling)"   standard_name="conductive_heat_flux_at_sea_ice_bottom"     unit="W/m2" />
+      <field id="hfxmelt"      long_name="Melt heat flux at the ice surface"       unit="W/m2" />
+      <field id="hfxldmelt"    long_name="Heat flux in the lead for ice melting"   unit="W/m2" />
+      <field id="hfxldgrow"    long_name="Heat flux in the lead for ice growth"    unit="W/m2" />
+
+      <!-- diags -->
+      <field id="hfxdhc"        long_name="Heat content variation in snow and ice (neg = ice cooling)"   unit="W/m2" />
+      <!-- available if ln_icediachk=T -->
+      <field id="icedrift_mass" long_name="Ice mass drift (conservation check)"   unit="kg/m2/s" />
+      <field id="icedrift_salt" long_name="Ice salt drift (conservation check)"   unit="kg/m2/s" />
+      <field id="icedrift_heat" long_name="Ice heat drift (conservation check)"   unit="W/m2"    />
+
+      <!-- sbcssm variables -->
+      <field id="sst_m"    unit="degC" />
+      <field id="sss_m"    unit="psu"  />
+      <field id="ssu_m"    unit="m/s"  />
+      <field id="ssv_m"    unit="m/s"  />
+      <field id="ssh_m"    unit="m"    />
+      <field id="e3t_m"    unit="m"    />
+      <field id="frq_m"    unit="-"    />
+
+      <!-- rheology convergence tests -->
+      <field id="uice_cvg"   long_name="sea ice velocity convergence"      standard_name="sea_ice_velocity_convergence"      unit="m/s" />
+
+      <!-- vp rheology convergence tests -->
+      <field id="velo_res" long_name="sea ice velocity residual"                        standard_name="sea_ice_velocity_residual"         unit="N/m2" />
+      <field id="velo_ero" long_name="sea ice velocity error last outer iteration"      standard_name="sea_ice_velocity_outer_error"      unit="m/s" />
+      <field id="uice_eri" long_name="uice velocity error last inner iteration"         standard_name="sea_ice_u_velocity_inner_error"    unit="m/s" />
+      <field id="vice_eri" long_name="vice velocity error last inner iteration"         standard_name="sea_ice_v_velocity_inner_error"    unit="m/s" />
+
+      <!-- ================= -->
+      <!-- Add-ons for SIMIP -->
+      <!-- ================= -->
+      <field id="icemass_cmip" long_name="Sea-ice mass per area"                                   standard_name="sea_ice_amount"                          detect_missing_value="true" unit="kg/m2"  > icemass * icemask   + $missval * (1.-icemask  ) </field>
+      <field id="icethic_cmip" long_name="Sea-ice thickness"                                       standard_name="sea_ice_thickness"                       detect_missing_value="true" unit="m"      > icethic * icemask05 + $missval * (1.-icemask05) </field>
+      <field id="snwmass_cmip" long_name="Snow mass per area"                                      standard_name="liquid_water_content_of_surface_snow"    detect_missing_value="true" unit="kg/m2"  > snwmass * icemask   + $missval * (1.-icemask  ) </field>
+      <field id="snwthic_cmip" long_name="Snow thickness"                                          standard_name="surface_snow_thickness"                  detect_missing_value="true" unit="m"      > snwthic * icemask05 + $missval * (1.-icemask05) </field>
+      <field id="iceconc_pct"  long_name="Sea-ice area fraction in percent"                        standard_name="sea_ice_area_fraction_in_percent"                                    unit="%"      > iceconc * 100.                                  </field>
+      <field id="iceage_cmip"  long_name="Age of sea ice"                                          standard_name="age_of_sea_ice"                          detect_missing_value="true" unit="days"   > iceage  * icemask15 + $missval * (1.-icemask15) </field>
+      <field id="icesalt_cmip" long_name="Sea ice salinity"                                        standard_name="sea_ice_salinity"                        detect_missing_value="true" unit="g/kg"   > icesalt * icemask   + $missval * (1.-icemask  ) </field>
+      <field id="icefrb_cmip"  long_name="Sea-ice freeboard"                                       standard_name="sea_ice_freeboard"                       detect_missing_value="true" unit="m"      > icefrb  * icemask   + $missval * (1.-icemask  ) </field>
+
+      <!-- heat -->
+      <field id="icettop_cmip" long_name="Surface temperature of sea ice"                          standard_name="sea_ice_surface_temperature"             detect_missing_value="true" unit="K"  > (icettop+273.15) * icemask + $missval * (1.-icemask) </field>
+      <field id="icetsni_cmip" long_name="Temperature at snow-ice interface"                       standard_name="sea_ice_snow_interface_temperature"      detect_missing_value="true" unit="K"  > (icetsni+273.15) * icemask + $missval * (1.-icemask) </field>
+      <field id="icetbot_cmip" long_name="Temperature at ice-ocean interface"                      standard_name="sea_ice_bottom_temperature"              detect_missing_value="true" unit="K"  > (icetbot+273.15) * icemask + $missval * (1.-icemask) </field>
+      <field id="icehc_cmip"   long_name="Sea-ice heat content per unit area"                      standard_name="integral_of_sea_ice_temperature_wrt_depth_expressed_as_heat_content" detect_missing_value="true" unit="J/m2" > icehc * icemask + $missval * (1.-icemask) </field>
+      <field id="snwhc_cmip"   long_name="Snow-heat content per unit area"                         standard_name="thermal_energy_content_of_surface_snow"                              detect_missing_value="true" unit="J/m2" > snwhc * icemask + $missval * (1.-icemask) </field>
+
+      <!-- fluxes (mass, heat, salt) -->
+      <field id="vfxsum_cmip"    long_name="Freshwater flux from sea-ice surface"                  standard_name="freshwater_flux_from_ice_surface"        detect_missing_value="true" unit="kg/m2/s"  > vfxsum    * icemask + $missval * (1.-icemask) </field>
+      <field id="vfxice_cmip"    long_name="Freshwater flux from sea ice"                          standard_name="freshwater_flux_from_ice"                detect_missing_value="true" unit="kg/m2/s"  > vfxice    * icemask + $missval * (1.-icemask) </field>
+      <field id="hfxsensib_cmip" long_name="Net sensible heat flux under sea ice"                  standard_name="ice_ocean_heat_flux"                     detect_missing_value="true" unit="W/m2"     > hfxsensib * icemask + $missval * (1.-icemask) </field>
+      <field id="hfxcndtop_cmip" long_name="Net conductive heat flux at the ice surface"           standard_name="conductive_heat_flux_at_sea_ice_surface" detect_missing_value="true" unit="W/m2"     > hfxcndtop * icemask + $missval * (1.-icemask) </field>
+      <field id="hfxcndbot_cmip" long_name="Net conductive heat flux at the ice bottom"            standard_name="conductive_heat_flux_at_sea_ice_bottom"  detect_missing_value="true" unit="W/m2"     > hfxcndbot * icemask + $missval * (1.-icemask) </field>
+      <field id="sfxice_cmip"    long_name="Salt flux from sea ice"                                standard_name="salt_flux_from_ice"                      detect_missing_value="true" unit="kg/m2/s"  > sfxice    * icemask + $missval * (1.-icemask) </field>
+
+      <!-- trends -->
+      <field id="dmithd"       long_name="sea-ice mass change from thermodynamics"                 standard_name="tendency_of_sea_ice_amount_due_to_thermodynamics"                        unit="kg/m2/s" />
+      <field id="dmidyn"       long_name="sea-ice mass change from dynamics"                       standard_name="tendency_of_sea_ice_amount_due_to_dynamics"                              unit="kg/m2/s" />
+      <field id="dmiopw"       long_name="sea-ice mass change through growth in supercooled open water (frazil)" standard_name="tendency_of_sea_ice_amount_due_to_freezing_in_open_water"  unit="kg/m2/s" />
+      <field id="dmibog"       long_name="sea-ice mass change through basal growth"                standard_name="tendency_of_sea_ice_amount_due_to_congelation_ice_accumulation"          unit="kg/m2/s" />
+      <field id="dmisni"       long_name="sea-ice mass change through snow-to-ice conversion"      standard_name="tendency_of_sea_ice_amount_due_to_snow_conversion"                       unit="kg/m2/s" />
+      <field id="dmtsub"       long_name="snow and sea ice mass change through sublimation"        standard_name="tendency_of_snow_and_ice_amount_due_to_sublimation"                      unit="kg/m2/s" />
+      <field id="dmssub"       long_name="sea-ice mass change through evaporation and sublimation" standard_name="water_evaporation_flux"                                                  unit="kg/m2/s" />
+      <field id="dmisub"       long_name="snow mass change through evaporation or sublimation"     standard_name="surface_snow_sublimation_flux"                                           unit="kg/m2/s" />
+      <field id="dmisum"       long_name="sea-ice mass change through surface melting"             standard_name="tendency_of_sea_ice_amount_due_to_surface_melting"                       unit="kg/m2/s" />
+      <field id="dmibom"       long_name="sea-ice mass change through bottom melting"              standard_name="tendency_of_sea_ice_amount_due_to_basal_melting"                         unit="kg/m2/s" />
+      <field id="dmilam"       long_name="sea-ice mass change through lateral melting"             standard_name="tendency_of_sea_ice_amount_due_to_lateral_melting"                       unit="kg/m2/s" />
+      <field id="dmsspr"       long_name="snow mass change through snow fall"                      standard_name="snowfall_flux"                                                           unit="kg/m2/s" />
+      <field id="dmsmel"       long_name="snow mass change through melt"                           standard_name="surface_snow_melt_flux"                                                  unit="kg/m2/s" />
+      <field id="dmsdyn"       long_name="snow mass change through advection by sea-ice dynamics"  standard_name="tendency_of_snow_mass_due_to_sea_ice_dynamics"                           unit="kg/m2/s" />
+      <field id="dmsssi"       long_name="snow mass change through snow-to-ice conversion"         standard_name="tendency_of_snow_mass_due_to_snow_to_ice_conversion"                     unit="kg/m2/s" />
+
+      <!-- momentum (rheology) -->
+      <field id="uice_cmip"    long_name="X-component of sea ice velocity"                         standard_name="sea_ice_x_velocity"                    detect_missing_value="true" unit="m/s"   > uice    * icemask + $missval * (1.-icemask) </field>
+      <field id="vice_cmip"    long_name="Y-component of sea ice velocity"                         standard_name="sea_ice_y_velocity"                    detect_missing_value="true" unit="m/s"   > vice    * icemask + $missval * (1.-icemask) </field>
+      <field id="icevel_cmip"  long_name="Sea-ice speed"                                           standard_name="sea_ice_speed"                         detect_missing_value="true" unit="m/s"   > icevel  * icemask + $missval * (1.-icemask) </field>
+      <field id="utau_ai_cmip" long_name="X-component of atmospheric stress on sea ice"            standard_name="surface_downward_x_stress"             detect_missing_value="true" unit="N/m2"  > utau_ai * icemask + $missval * (1.-icemask) </field>
+      <field id="vtau_ai_cmip" long_name="Y-component of atmospheric stress on sea ice"            standard_name="surface_downward_y_stress"             detect_missing_value="true" unit="N/m2"  > vtau_ai * icemask + $missval * (1.-icemask) </field>
+      <field id="dssh_dx"      long_name="Sea-surface tilt term in force balance (x-component)"    standard_name="sea_surface_tilt_force_on_sea_ice_x"                               unit="N/m2" />
+      <field id="dssh_dy"      long_name="Sea-surface tilt term in force balance (y-component)"    standard_name="sea_surface_tilt_force_on_sea_ice_y"                               unit="N/m2" />
+      <field id="corstrx"      long_name="Coriolis force term in force balance (x-component)"      standard_name="coriolis_force_on_sea_ice_x"                                       unit="N/m2" />
+      <field id="corstry"      long_name="Coriolis force term in force balance (y-component)"      standard_name="coriolis_force_on_sea_ice_y"                                       unit="N/m2" />
+      <field id="intstrx"      long_name="Internal stress term in force balance (x-component)"     standard_name="internal_stress_in_sea_ice_x"                                      unit="N/m2" />
+      <field id="intstry"      long_name="Internal stress term in force balance (y-component)"     standard_name="internal_stress_in_sea_ice_y"                                      unit="N/m2" />
+
+      <!-- momentum (advection) -->
+      <field id="xmtrpice"     long_name="X-component of ice mass transport"                       standard_name="ice_x_transport"          grid_ref="grid_U_2D"              unit="kg/s" />
+      <field id="ymtrpice"     long_name="Y-component of ice mass transport"                       standard_name="ice_y_transport"          grid_ref="grid_V_2D"              unit="kg/s" />
+      <field id="xmtrpsnw"     long_name="X-component of snw mass transport"                       standard_name="snw_x_transport"          grid_ref="grid_U_2D"              unit="kg/s" />
+      <field id="ymtrpsnw"     long_name="Y-component of snw mass transport"                       standard_name="snw_y_transport"          grid_ref="grid_V_2D"              unit="kg/s" />
+      <field id="xatrp"        long_name="X-component of ice area transport"                       standard_name="area_x_transport"         grid_ref="grid_U_2D"              unit="m2/s" />
+      <field id="yatrp"        long_name="Y-component of ice area transport"                       standard_name="area_y_transport"         grid_ref="grid_V_2D"              unit="m2/s" />
+      <field id="xmtrptot"     long_name="X-component of sea-ice mass transport"                   standard_name="sea_ice_x_transport"      grid_ref="grid_U_2D"              unit="kg/s" > xmtrpice + xmtrpsnw </field>
+      <field id="ymtrptot"     long_name="Y-component of sea-ice mass transport"                   standard_name="sea_ice_y_transport"      grid_ref="grid_V_2D"              unit="kg/s" > ymtrpice + ymtrpsnw </field>
+
+      <!-- Ice transport through straits" -->
+      <field id="xmtrpice_ave"     long_name="Monthly average of x-ice mass transport"   field_ref="xmtrpice"          grid_ref="grid_U_2D"        freq_op="1mo" freq_offset="_reset_"  > @xmtrpice </field>
+      <field id="xmtrpice_section"                                                                                     grid_ref="grid_U_scalar"  > xmtrpice_ave </field>
+      <field id="xmtrpice_strait"                                                        field_ref="xmtrpice_section"  grid_ref="grid_U_4strait_ice"  />
+      <field id="xstrait_mifl"                                                           field_ref="xmtrpice_strait"   grid_ref="grid_U_4strait_ice_hsum" unit="kg/s" detect_missing_value="true" > this * maskMFO_u_ice </field>
+
+      <field id="ymtrpice_ave"     long_name="Monthly average of y-ice mass transport"   field_ref="ymtrpice"          grid_ref="grid_V_2D"        freq_op="1mo" freq_offset="_reset_"  > @ymtrpice </field>
+      <field id="ymtrpice_section"                                                                                     grid_ref="grid_V_scalar"  > ymtrpice_ave </field>
+      <field id="ymtrpice_strait"                                                        field_ref="ymtrpice_section"  grid_ref="grid_V_4strait_ice"  />
+      <field id="ystrait_mifl"                                                           field_ref="ymtrpice_strait"   grid_ref="grid_V_4strait_ice_hsum" unit="kg/s" detect_missing_value="true"  > this * maskMFO_v_ice </field>
+
+      <field id="xmtrpsnw_ave"     long_name="Monthly average of x-snow mass transport"  field_ref="xmtrpsnw"          grid_ref="grid_U_2D"        freq_op="1mo" freq_offset="_reset_"  > @xmtrpsnw </field>
+      <field id="xmtrpsnw_section"                                                                                     grid_ref="grid_U_scalar"  > xmtrpsnw_ave </field>
+      <field id="xmtrpsnw_strait"                                                        field_ref="xmtrpsnw_section"  grid_ref="grid_U_4strait_ice"  />
+      <field id="xstrait_msfl"                                                           field_ref="xmtrpsnw_strait"   grid_ref="grid_U_4strait_ice_hsum" unit="kg/s" detect_missing_value="true" > this * maskMFO_u_ice </field>
+
+      <field id="ymtrpsnw_ave"     long_name="Monthly average of y-snow mass transport"  field_ref="ymtrpsnw"          grid_ref="grid_V_2D"        freq_op="1mo" freq_offset="_reset_"  > @ymtrpsnw </field>
+      <field id="ymtrpsnw_section"                                                                                     grid_ref="grid_V_scalar"  > ymtrpsnw_ave </field>
+      <field id="ymtrpsnw_strait"                                                        field_ref="ymtrpsnw_section"  grid_ref="grid_V_4strait_ice"  />
+      <field id="ystrait_msfl"                                                           field_ref="ymtrpsnw_strait"   grid_ref="grid_V_4strait_ice_hsum" unit="kg/s" detect_missing_value="true"  > this * maskMFO_v_ice </field>
+
+      <field id="xatrp_ave"        long_name="Monthly average of x-ice area transport"   field_ref="xatrp"             grid_ref="grid_U_2D"        freq_op="1mo" freq_offset="_reset_"  > @xatrp </field>
+      <field id="xatrp_section"                                                                                        grid_ref="grid_U_scalar"  > xatrp_ave </field>
+      <field id="xatrp_strait"                                                           field_ref="xatrp_section"     grid_ref="grid_U_4strait_ice"  />
+      <field id="xstrait_arfl"                                                           field_ref="xatrp_strait"      grid_ref="grid_U_4strait_ice_hsum" unit="kg/s" detect_missing_value="true" > this * maskMFO_u_ice </field>
+
+      <field id="yatrp_ave"        long_name="Monthly average of y-ice area transport"   field_ref="yatrp"             grid_ref="grid_V_2D"        freq_op="1mo" freq_offset="_reset_"  > @yatrp </field>
+      <field id="yatrp_section"                                                                                        grid_ref="grid_V_scalar"  > yatrp_ave </field>
+      <field id="yatrp_strait"                                                           field_ref="yatrp_section"     grid_ref="grid_V_4strait_ice"  />
+      <field id="ystrait_arfl"                                                           field_ref="yatrp_strait"      grid_ref="grid_V_4strait_ice_hsum" unit="m2/s" detect_missing_value="true"  > this * maskMFO_v_ice </field>
+
+      <field id="strait_mifl"      long_name="Sea ice mass flux through straits"      standard_name="sea_ice_mass_transport_across_line"   unit="kg/s"  freq_op="1mo"  grid_ref="grid_4strait_ice" > xstrait_mifl + ystrait_mifl </field>
+      <field id="strait_msfl"      long_name="Snow mass flux through straits"         standard_name="snow_mass_transport_across_line"      unit="kg/s"  freq_op="1mo"  grid_ref="grid_4strait_ice" > xstrait_msfl + ystrait_msfl </field>
+      <field id="strait_arfl"      long_name="Sea ice area flux through straits"      standard_name="sea_area_mass_transport_across_line"  unit="m2/s"  freq_op="1mo"  grid_ref="grid_4strait_ice" > xstrait_arfl + ystrait_arfl </field>
+
+    </field_group> <!-- SBC_2D -->
+
+    <!-- categories -->
+    <field_group id="SBC_3D" grid_ref="grid_T_ncatice" >
+
+      <!-- standard ice fields -->
+      <field id="iceconc_cat"  long_name="Sea-ice concentration per category"                unit=""        />
+      <field id="icethic_cat"  long_name="Sea-ice thickness per category"                    unit="m"       detect_missing_value="true" />
+      <field id="snwthic_cat"  long_name="Snow thickness per category"                       unit="m"       detect_missing_value="true" />
+      <field id="icesalt_cat"  long_name="Sea-Ice Bulk salinity per category"                unit="g/kg"    detect_missing_value="true" />
+      <field id="icetemp_cat"  long_name="Ice temperature per category"                      unit="degC"    detect_missing_value="true" />
+      <field id="snwtemp_cat"  long_name="Snow temperature per category"                     unit="degC"    detect_missing_value="true" />
+      <field id="icettop_cat"  long_name="Ice/snow surface temperature per category"         unit="degC"    detect_missing_value="true" />
+      <field id="iceapnd_cat"  long_name="Ice melt pond grid fraction per category"          unit=""        />
+      <field id="icevpnd_cat"  long_name="Ice melt pond volume per grid area per category"   unit="m"       />
+      <field id="icehpnd_cat"  long_name="Ice melt pond thickness per category"              unit="m"       detect_missing_value="true" />
+      <field id="icehlid_cat"  long_name="Ice melt pond lid thickness per category"          unit="m"       detect_missing_value="true" />
+      <field id="iceafpnd_cat" long_name="Ice melt pond ice fraction per category"           unit=""        />
+      <field id="iceaepnd_cat" long_name="Ice melt pond effective fraction per category"     unit=""        />
+      <field id="icemask_cat"  long_name="Fraction of time step with sea ice (per category)" unit=""        />
+      <field id="iceage_cat"   long_name="Ice age per category"                              unit="days"    detect_missing_value="true" />
+      <field id="icebrv_cat"   long_name="Brine volume per category"                         unit="%"       detect_missing_value="true" />
+      <field id="icealb_cat"   long_name="Sea-ice or snow albedo"                            unit=""        detect_missing_value="true" />
+
+      <!-- Add-ons for SIMIP -->
+      <field id="iceconc_cat_cmip"     long_name="Sea-ice area fractions in thickness categories"  standard_name="sea_ice_area_fraction_over_categories" detect_missing_value="true" unit=""   > iceconc_cat      * icemask_cat + $missval * (1.-icemask_cat) </field>
+      <field id="icethic_cat_cmip"     long_name="Sea-ice thickness in thickness categories"       standard_name="sea_ice_thickness_over_categories"     detect_missing_value="true" unit="m"  > icethic_cat      * icemask_cat + $missval * (1.-icemask_cat) </field>
+      <field id="snwthic_cat_cmip"     long_name="Snow thickness in thickness categories"          standard_name="snow_thickness_over_categories"        detect_missing_value="true" unit="m"  > snwthic_cat      * icemask_cat + $missval * (1.-icemask_cat) </field>
+      <field id="iceconc_cat_pct_cmip" long_name="Sea-ice area fractions in thickness categories"  standard_name="sea_ice_area_fraction_over_categories" detect_missing_value="true" unit="%"  > iceconc_cat*100. * icemask_cat + $missval * (1.-icemask_cat) </field>
+
+      <!-- heat diffusion convergence tests -->
+      <field id="tice_cvgerr" long_name="sea ice temperature convergence error"      standard_name="sea_ice_temperature_convergence_err" unit="K" />
+      <field id="tice_cvgstp" long_name="sea ice temperature convergence iterations" standard_name="sea_ice_temperature_convergence_stp" unit=""  />
+
+    </field_group> <!-- SBC_3D -->
+
+    <!-- scalar variables -->
+    <field_group id="SBC_scalar"  grid_ref="grid_scalar" >
+      <field id="NH_iceextt"      long_name="Sea ice extent North"                   standard_name="sea_ice_extent_n"                   unit="1e6_km2"  />
+      <field id="SH_iceextt"      long_name="Sea ice extent South"                   standard_name="sea_ice_extent_s"                   unit="1e6_km2"  />
+      <field id="NH_icevolu"      long_name="Sea ice volume North"                   standard_name="sea_ice_volume_n"                   unit="1e3_km3"  />
+      <field id="SH_icevolu"      long_name="Sea ice volume South"                   standard_name="sea_ice_volume_s"                   unit="1e3_km3"  />
+      <field id="NH_icearea"      long_name="Sea ice area North"                     standard_name="sea_ice_area_n"                     unit="1e6_km2"  />
+      <field id="SH_icearea"      long_name="Sea ice area South"                     standard_name="sea_ice_area_s"                     unit="1e6_km2"  />
+
+      <!-- available with ln_icediahsb -->
+      <!-- global forcings  -->
+      <field id="ibgfrcvoltop"    long_name="global mean ice/snow forcing at interface ice/snow-atm (volume equivalent ocean volume)"   unit="km3"      />
+      <field id="ibgfrcvolbot"    long_name="global mean ice/snow forcing at interface ice/snow-ocean (volume equivalent ocean volume)" unit="km3"      />
+      <field id="ibgfrctemtop"    long_name="global mean heat on top of ice/snw/ocean-atm "                                             unit="1e20J"    />
+      <field id="ibgfrctembot"    long_name="global mean heat below ice (on top of ocean) "                                             unit="1e20J"    />
+      <field id="ibgfrcsal"       long_name="global mean ice/snow forcing (salt equivalent ocean volume)"                               unit="pss*km3"  />
+      <field id="ibgfrchfxtop"    long_name="global mean heat flux on top of ice/snw/ocean-atm "                                        unit="W/m2"     />
+      <field id="ibgfrchfxbot"    long_name="global mean heat flux below ice (on top of ocean) "                                        unit="W/m2"     />
+
+      <!-- global drifts (conservation checks) -->
+      <field id="ibgvolume"       long_name="drift in ice/snow volume (equivalent ocean volume)"                                        unit="km3"      />
+      <field id="ibgsaltco"       long_name="drift in ice salt content (equivalent ocean volume)"                                       unit="pss*km3"  />
+      <field id="ibgheatco"       long_name="drift in ice/snow heat content"                                                            unit="1e20J"    />
+      <field id="ibgheatfx"       long_name="drift in ice/snow heat flux"                                                               unit="W/m2"     />
+
+      <!-- global contents -->
+      <field id="ibgvol_tot"      long_name="global mean ice volume"                                                                    unit="km3"      />
+      <field id="sbgvol_tot"      long_name="global mean snow volume"                                                                   unit="km3"      />
+      <field id="ibgarea_tot"     long_name="global mean ice area"                                                                      unit="km2"      />
+      <field id="ibgsalt_tot"     long_name="global mean ice salt content"                                                              unit="pss*km3"  />
+      <field id="ibgheat_tot"     long_name="global mean ice heat content"                                                              unit="1e20J"    />
+      <field id="sbgheat_tot"     long_name="global mean snow heat content"                                                             unit="1e20J"    />
+      <field id="ipbgvol_tot"     long_name="global mean ice pond volume"                                                               unit="km3"      />
+      <field id="ilbgvol_tot"     long_name="global mean ice pond lid volume"                                                           unit="km3"      />
+
+    </field_group>
+
+    <!--
+        ============================================================================================================
+    -->
+    <!-- output variables for my configuration (example) -->
+
+    <field_group id="myvarICE"        grid_ref="grid_T_2D" >
+      <!-- ice mask -->
+      <field field_ref="icemask"          name="simsk"   />
+      <field field_ref="icemask05"        name="simsk05" />
+      <field field_ref="icemask15"        name="simsk15" />
+
+      <!-- general -->
+      <field field_ref="snwvolu"          name="snvolu" />
+      <field field_ref="snwthic"          name="snthic" />
+      <field field_ref="icethic"          name="sithic" />
+      <!--
+          <field field_ref="icethic"          name="sithic_max" operation="maximum" />
+          <field field_ref="icethic"          name="sithic_min" operation="minimum" />
+      -->
+      <field field_ref="fasticepres"      name="fasticepres" />
+      <field field_ref="icevolu"          name="sivolu" />
+      <field field_ref="iceconc"          name="siconc" />
+      <field field_ref="icesalt"          name="sisali" />
+      <field field_ref="iceapnd"          name="siapnd" />
+      <field field_ref="icehpnd"          name="sihpnd" />
+      <field field_ref="icevpnd"          name="sivpnd" />
+      <field field_ref="iceage"           name="siage"  />
+      <field field_ref="sst_m"            name="sst_m"  />
+      <field field_ref="sss_m"            name="sss_m"  />
+
+      <!-- heat -->
+      <field field_ref="icetemp"          name="sitemp" />
+      <field field_ref="snwtemp"          name="sntemp" />
+      <field field_ref="icettop"          name="sittop" />
+      <field field_ref="icetbot"          name="sitbot" />
+      <field field_ref="icetsni"          name="sitsni" />
+
+      <!-- momentum -->
+      <field field_ref="uice"             name="sivelu"  />
+      <field field_ref="vice"             name="sivelv"  />
+      <field field_ref="icevel"           name="sivelo"  />
+      <field field_ref="utau_ai"          name="utau_ai" />
+      <field field_ref="vtau_ai"          name="vtau_ai" />
+      <field field_ref="utau_oi"          name="utau_oi" />
+      <field field_ref="vtau_oi"          name="vtau_oi" />
+
+      <!-- rheology -->
+      <field field_ref="icediv"           name="sidive"  />
+      <field field_ref="iceshe"           name="sishea"  />
+      <field field_ref="icestr"           name="sistre"  />
+      <field field_ref="normstr"          name="normstr" />
+      <field field_ref="sheastr"          name="sheastr" />
+      <field field_ref="sig1_pnorm"       name="sig1_pnorm"/>
+      <field field_ref="sig2_pnorm"       name="sig2_pnorm"/>
+      <field field_ref="icedlt"           name="sidelt" />
+
+      <!-- heat fluxes -->
+      <field field_ref="qt_oce_ai"        name="qt_oce_ai"  />
+      <field field_ref="qt_atm_oi"        name="qt_atm_oi"  />
+      <field field_ref="qtr_ice_top"      name="qtr_ice_top"/>
+      <field field_ref="qtr_ice_bot"      name="qtr_ice_bot"/>
+      <field field_ref="qt_ice"           name="qt_ice"     />
+      <field field_ref="qsr_ice"          name="qsr_ice"    />
+      <field field_ref="qns_ice"          name="qns_ice"    />
+      <field field_ref="qemp_ice"         name="qemp_ice"   />
+      <field field_ref="albedo"           name="albedo"     />
+      <field field_ref="icealb"           name="icealb"     />
+
+      <field field_ref="hfxcndtop"        name="hfxcndtop"  />
+      <field field_ref="hfxcndbot"        name="hfxcndbot"  />
+      <field field_ref="hfxsensib"        name="hfxsensib"  />
+
+      <field field_ref="icehc"         name="icehc"  />
+      <field field_ref="snwhc"         name="snwhc"  />
+      <field field_ref="hfxbog"        name="hfxbog"  />
+      <field field_ref="hfxbom"        name="hfxbom"  />
+      <field field_ref="hfxsum"        name="hfxsum"  />
+      <field field_ref="hfxopw"        name="hfxopw"  />
+      <field field_ref="hfxdif"        name="hfxdif"  />
+      <field field_ref="hfxsnw"        name="hfxsnw"  />
+      <field field_ref="hfxerr"        name="hfxerr"  />
+      <field field_ref="hfxthd"        name="hfxthd"  />
+      <field field_ref="hfxdyn"        name="hfxdyn"  />
+      <field field_ref="hfxres"        name="hfxres"  />
+      <field field_ref="hfxsub"        name="hfxsub"  />
+      <field field_ref="hfxspr"        name="hfxspr"  />
+
+      <!--
+          <field field_ref="hfxdhc"        name="hfxbudget"  operation="average" freq_op="1d" > @qt_atm_oi - @qt_oce_ai -@hfxdhc </field>
+      -->
+
+      <!-- salt fluxes -->
+      <field field_ref="sfxice"           name="sfxice" />
+
+      <!-- mass fluxes -->
+      <field field_ref="vfxice"           name="vfxice" />
+      <field field_ref="vfxsnw"           name="vfxsnw" />
+
+      <field field_ref="vfxbom"           name="vfxbom" />
+      <field field_ref="vfxbog"           name="vfxbog" />
+      <field field_ref="vfxsum"           name="vfxsum" />
+      <field field_ref="vfxopw"           name="vfxopw" />
+      <field field_ref="vfxlam"           name="vfxlam" />
+      <field field_ref="vfxsni"           name="vfxsni" />
+      <field field_ref="vfxdyn"           name="vfxdyn" />
+      <field field_ref="vfxres"           name="vfxres" />
+      <field field_ref="vfxpnd"           name="vfxpnd" />
+      <field field_ref="vfxsub"           name="vfxsub" />
+      <field field_ref="vfxsub_err"       name="vfxsub_err" />
+      <field field_ref="vfxthin"          name="vfxthin" />
+
+    </field_group>
+
+
+    <field_group id="myvarICE_cat"        grid_ref="grid_T_ncatice" >
+
+      <!-- categories -->
+      <field field_ref="icemask_cat"      name="simskcat"/>
+      <field field_ref="snwthic_cat"      name="snthicat"/>
+      <field field_ref="iceconc_cat"      name="siconcat"/>
+      <field field_ref="icethic_cat"      name="sithicat"/>
+      <field field_ref="icesalt_cat"      name="sisalcat"/>
+      <field field_ref="icetemp_cat"      name="sitemcat"/>
+      <field field_ref="snwtemp_cat"      name="sntemcat"/>
+      <field field_ref="icettop_cat"      name="sitopcat"/>
+
+    </field_group>
+
+    <!--============================-->
+    <!--  CONSERVATION diagnostics  -->
+    <!--============================-->
+
+    <field_group id="ICE_globalbudget"  grid_ref="grid_scalar" >
+      <field field_ref="ibgvol_tot"       name="ibgvol_tot"   />
+      <field field_ref="sbgvol_tot"       name="sbgvol_tot"   />
+      <field field_ref="ibgarea_tot"      name="ibgarea_tot"  />
+      <field field_ref="ibgsalt_tot"      name="ibgsalt_tot"  />
+      <field field_ref="ibgheat_tot"      name="ibgheat_tot"  />
+      <field field_ref="sbgheat_tot"      name="sbgheat_tot"  />
+      <field field_ref="ipbgvol_tot"      name="ipbgvol_tot"  />
+      <field field_ref="ilbgvol_tot"      name="ilbgvol_tot"  />
+    </field_group>
+    
+    <field_group id="ICE_budget"        grid_ref="grid_T_2D" >
+      <!-- general -->
+      <field field_ref="icemask"          name="simsk"      />
+      <field field_ref="iceconc"          name="siconc"     />
+      <field field_ref="icetemp"          name="sitemp"     />
+      <field field_ref="snwtemp"          name="sntemp"     />
+      <field field_ref="icettop"          name="sittop"     />
+      <field field_ref="icetbot"          name="sitbot"     />
+      <!-- heat fluxes -->
+      <field field_ref="qt_oce_ai"        name="qt_oce_ai"  />
+      <field field_ref="qt_atm_oi"        name="qt_atm_oi"  />
+      <field field_ref="qtr_ice_top"      name="qtr_ice_top"/>
+      <field field_ref="qtr_ice_bot"      name="qtr_ice_bot"/>
+      <field field_ref="qt_ice"           name="qt_ice"     />
+      <field field_ref="qsr_ice"          name="qsr_ice"    />
+      <field field_ref="qns_ice"          name="qns_ice"    />
+      <field field_ref="qemp_ice"         name="qemp_ice"   />
+      <field field_ref="hfxsub"           name="hfxsub"     />
+      <field field_ref="hfxspr"           name="hfxspr"     />
+      <field field_ref="hfxcndtop"        name="hfxcndtop"  />
+      <field field_ref="hfxcndbot"        name="hfxcndbot"  />
+      <field field_ref="hfxsensib"        name="hfxsensib"  />
+      <field field_ref="hfxmelt"          name="hfxmelt"    />
+      <field field_ref="hfxldmelt"        name="hfxldmelt"  />
+      <field field_ref="hfxldgrow"        name="hfxldgrow"  />
+      <!-- salt fluxes -->
+      <field field_ref="sfxice"           name="sfxice"     />
+      <!-- mass fluxes -->
+      <field field_ref="vfxice"           name="vfxice"     />
+      <field field_ref="vfxsnw"           name="vfxsnw"     />
+      <field field_ref="vfxpnd"           name="vfxpnd"     />
+      <field field_ref="vfxsub"           name="vfxsub"     />
+      <field field_ref="vfxsub_err"       name="vfxsub_err" />
+      <field field_ref="vfxsnw_sub"       name="vfxsnw_sub" />
+      <field field_ref="vfxsnw_pre"       name="vfxsnw_pre" />
+    </field_group>
+
+    
+    <!--============================-->
+    <!-- SIMIP sea ice field groups -->
+    <!--     Notz et al 2016        -->
+    <!--============================-->
+
+    <!-- SIMIP monthly scalar variables -->
+    <field_group id="SImon_scalars"   grid_ref="grid_scalar" >
+      <!-- Integrated quantities -->
+      <field field_ref="NH_iceextt"       name="siextentn"    />
+      <field field_ref="SH_iceextt"       name="siextents"    />
+      <field field_ref="NH_icevolu"       name="sivoln"       />
+      <field field_ref="SH_icevolu"       name="sivols"       />
+      <field field_ref="NH_icearea"       name="siarean"      />
+      <field field_ref="SH_icearea"       name="siareas"      />
+    </field_group>
+
+    <!-- SIMIP daily fields -->
+    <field_group id="SIday_fields"    grid_ref="grid_T_2D" >
+      <field field_ref="icepres"          name="sitimefrac"   />
+      <field field_ref="iceconc_pct"      name="siconc"       />
+      <field field_ref="icethic_cmip"     name="sithick"      />
+      <field field_ref="snwthic_cmip"     name="sisnthick"    />
+      <field field_ref="icettop_cmip"     name="sitemptop"    />
+      <field field_ref="uice_cmip"        name="siu"          />
+      <field field_ref="vice_cmip"        name="siv"          />
+      <field field_ref="icevel_cmip"      name="sispeed"      />
+    </field_group>
+
+    <!-- SIMIP monthly fields -->
+    <field_group id="SImon_fields"    grid_ref="grid_T_2D"  >
+      <!-- Sea-ice state variables -->
+      <field field_ref="icepres"          name="sitimefrac"   />
+      <field field_ref="iceconc_pct"      name="siconc"       />
+      <field field_ref="icemass_cmip"     name="simass"       />
+      <field field_ref="icethic_cmip"     name="sithick"      />
+      <field field_ref="icevolu"          name="sivol"        />
+      <field field_ref="snwmass_cmip"     name="sisnmass"     />
+      <field field_ref="snwthic_cmip"     name="sisnthick"    />
+
+      <!-- additional state variables-->
+      <field field_ref="icettop_cmip"     name="sitemptop"    />
+      <field field_ref="icetsni_cmip"     name="sitempsnic"   />
+      <field field_ref="icetbot_cmip"     name="sitempbot"    />
+      <field field_ref="iceage_cmip"      name="siage"        />
+      <field field_ref="icesalm"          name="sisaltmass"   />
+      <field field_ref="icesalt_cmip"     name="sisali"       />
+      <field field_ref="icefrb_cmip"      name="sifb"         />
+      <field field_ref="icehc_cmip"       name="sihc"         />
+      <field field_ref="snwhc_cmip"       name="sisnhc"       />
+
+      <!-- freshwater fluxes -->
+      <field field_ref="vfxice_cmip"      name="siflfwbot"    />
+      <field field_ref="vfxsum_cmip"      name="siflfwdrain"  />
+
+      <!-- area balance -->
+      <field field_ref="afxthd"           name="sidconcth"    />
+      <field field_ref="afxdyn"           name="sidconcdyn"   />
+
+      <!-- mass balance -->
+      <field field_ref="dmithd"           name="sidmassth"        />
+      <field field_ref="dmidyn"           name="sidmassdyn"       />
+      <field field_ref="dmiopw"           name="sidmassgrowthwat" />
+      <field field_ref="dmibog"           name="sidmassgrowthbot" />
+      <field field_ref="dmisni"           name="sidmasssi"        />
+      <field field_ref="dmisub"           name="sidmassevapsubl"  />
+      <field field_ref="dmisum"           name="sidmassmelttop"   />
+      <field field_ref="dmibom"           name="sidmassmeltbot"   />
+      <field field_ref="dmilam"           name="sidmassmeltlat"   />
+      <field field_ref="dmsspr"           name="sndmasssnf"       />
+      <field field_ref="dmsmel"           name="sndmassmelt"      />
+      <field field_ref="dmssub"           name="sndmasssubl"      />
+      <field field_ref="dmsdyn"           name="sndmassdyn"       />
+      <field field_ref="dmsssi"           name="sndmasssi"        />
+
+      <!-- heat balance -->
+      <field field_ref="hfxsensib"        name="siflsensupbot"    />
+      <field field_ref="hfxcndtop"        name="siflcondtop"      />
+      <field field_ref="hfxcndbot"        name="siflcondbot"      />
+
+      <!-- salt balance -->
+      <field field_ref="sfxice_cmip"      name="siflsaltbot"      />
+
+      <!-- sea-ice dynamics -->
+      <field field_ref="uice_cmip"        name="siu"              />
+      <field field_ref="vice_cmip"        name="siv"              />
+      <field field_ref="icevel_cmip"      name="sispeed"          />
+      <field field_ref="utau_ai_cmip"     name="sistrxdtop"       />
+      <field field_ref="vtau_ai_cmip"     name="sistrydtop"       />
+      <field field_ref="utau_oi"          name="sistrxubot"       />
+      <field field_ref="vtau_oi"          name="sistryubot"       />
+      <field field_ref="icestr"           name="sicompstren"      />
+      <field field_ref="dssh_dx"          name="siforcetiltx"     />
+      <field field_ref="dssh_dy"          name="siforcetilty"     />
+      <field field_ref="corstrx"          name="siforcecoriolx"   />
+      <field field_ref="corstry"          name="siforcecorioly"   />
+      <field field_ref="intstrx"          name="siforceintstrx"   />
+      <field field_ref="intstry"          name="siforceintstry"   />
+      <field field_ref="xmtrptot"         name="sidmasstranx"     />
+      <field field_ref="ymtrptot"         name="sidmasstrany"     />
+      <field field_ref="normstr"          name="sistresave"       operation="instant" />
+      <field field_ref="sheastr"          name="sistremax"        operation="instant" />
+      <field field_ref="icediv"           name="sidivvel"         operation="instant" />
+      <field field_ref="iceshe"           name="sishevel"         operation="instant" />
+
+      <!-- sea ice fluxes across straits: 2D arrays to be post-processed  -->
+      <field field_ref="xmtrpice"         name="simassacrossline_x" />
+      <field field_ref="ymtrpice"         name="simassacrossline_y" />
+      <field field_ref="xmtrpsnw"         name="snmassacrossline_x" />
+      <field field_ref="ymtrpsnw"         name="snmassacrossline_y" />
+      <field field_ref="xatrp"            name="siareaacrossline_x" />
+      <field field_ref="yatrp"            name="siareaacrossline_y" />
+
+      <!-- category-dependent fields -->
+      <field field_ref="iceconc_cat_pct_cmip" name="siitdconc"    />
+      <field field_ref="icethic_cat_cmip"     name="siitdthick"   />
+      <field field_ref="snwthic_cat_cmip"     name="siitdsnthick" />
+    </field_group>
+
+  </field_group> <!-- SBC -->
+
+</field_definition>
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/field_def_nemo-innerttrc.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/field_def_nemo-innerttrc.xml	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/field_def_nemo-innerttrc.xml	(revision 6658)
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<!-- $id$ -->
+
+<!--
+============================================================================================================
+=                                  definition of all existing variables                                    =
+=                                            DO NOT CHANGE                                                 =
+============================================================================================================
+-->
+<field_definition level="1" prec="4" operation="average" enabled=".TRUE." default_value="1.e20" > <!-- time step automaticaly defined -->
+
+  <!--
+      ============================================================================================================
+      Inert tracers variables
+      ============================================================================================================
+  -->
+
+
+  <field_group id="inerttrc" grid_ref="grid_T_2D">
+
+    <!-- CFC11 : variables available with ln_cfc11 -->
+    <field id="CFC11"        long_name="Chlorofluoro carbon11 Concentration"      unit="umol/m3"   grid_ref="grid_T_3D" />
+    <field id="CFC11_e3t"    long_name="CFC11 * e3t"                              unit="umol/m2"   grid_ref="grid_T_3D"  > CFC11 * e3t </field >
+    <field id="qtr_CFC11"    long_name="Air-sea flux of CFC-11"                   unit="mol/m2/s"   />
+    <field id="qint_CFC11"   long_name="Cumulative air-sea flux of CFC-11"        unit="mol/m2"     />
+
+    <!-- CFC12 : variables available with ln_cfc12 -->
+    <field id="CFC12"        long_name="Chlorofluoro carbon12 Concentration"      unit="umol/m3"   grid_ref="grid_T_3D" />
+    <field id="CFC12_e3t"    long_name="CFC12 * e3t"                              unit="umol/m2"   grid_ref="grid_T_3D"  > CFC12 * e3t </field >
+    <field id="qtr_CFC12"    long_name="Air-sea flux of CFC12"                    unit="mol/m2/s"   />
+    <field id="qint_CFC12"   long_name="Cumulative air-sea flux of CFC12"         unit="mol/m2"     />
+
+    <!-- SF6 : variables available with ln_sf6 -->
+    <field id="SF6"          long_name="Sulfur hexafluoride Concentration"        unit="umol/m3"   grid_ref="grid_T_3D" />
+    <field id="SF6_e3t"      long_name="SF6 * e3t"                                unit="umol/m2"   grid_ref="grid_T_3D"  > SF6 * e3t </field >
+    <field id="qtr_SF6"      long_name="Air-sea flux of SF6"                      unit="mol/m2/s"   />
+    <field id="qint_SF6"     long_name="Cumulative air-sea flux of SF6"           unit="mol/m2"     />
+
+    <!-- C14 : variables available with ln_c14 -->
+    <field id="RC14"         long_name="Radiocarbon ratio"                        unit="-"         grid_ref="grid_T_3D"  />
+    <field id="RC14_e3t"     long_name="RC14 * e3t"                               unit="m"         grid_ref="grid_T_3D"   > RC14 * e3t </field >
+    <field id="DeltaC14"     long_name="Delta C14"                                unit="permil"    grid_ref="grid_T_3D"  />
+    <field id="C14Age"       long_name="Radiocarbon age"                          unit="yr"        grid_ref="grid_T_3D"  />
+    <field id="RAge"         long_name="Reservoir Age"                            unit="yr"       />
+    <field id="qtr_c14"      long_name="Air-sea flux of C14"                      unit="1/m2/s"   />
+    <field id="qint_c14"     long_name="Cumulative air-sea flux of C14"           unit="1/m2"     />
+    <field id="AtmCO2"       long_name="Global atmospheric CO2"                   unit="ppm"      />
+    <field id="AtmC14"       long_name="Global atmospheric DeltaC14"              unit="permil"   />
+    <field id="K_C14"        long_name="Global 14C/C exchange velocity"           unit="m/yr"     />
+    <field id="K_CO2"        long_name="Global CO2 piston velocity"               unit="cm/h"     />
+    <field id="C14Inv"       long_name="global Radiocarbon ocean inventory"       unit="10^26 atoms"   />
+
+    <!-- AGE : variables available with ln_age -->
+    <field id="Age"          long_name="Sea water age since surface contact"      unit="yr"        grid_ref="grid_T_3D"  />
+    <field id="Age_e3t"      long_name="Age * e3t"                                unit="yr * m"   grid_ref="grid_T_3D"    > Age * e3t </field >
+
+  </field_group>
+
+</field_definition>
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/field_def_nemo-oce.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/field_def_nemo-oce.xml	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/field_def_nemo-oce.xml	(revision 6658)
@@ -0,0 +1,1353 @@
+<?xml version="1.0"?>
+<!-- $id$ -->
+
+<field_definition level="1" prec="4" operation="average" enabled=".TRUE." default_value="1.e20" > <!-- time step automaticaly defined -->
+
+  <!--
+      =====================================================================================================
+      =                                   Configurable diagnostics                                        =
+      =====================================================================================================
+  -->
+
+  <field_group id="diamlr_fields">
+
+    <!--
+        =====================================================================================================
+        Configuration of multiple-linear-regression analysis (diamlr)
+        =====================================================================================================
+
+This field group configures diamlr for tidal harmonic analysis of field
+ssh: in addition to a regressor for fitting the mean value (diamlr_r101),
+it includes the regressors for the analysis of the tidal constituents
+that are available in the tidal-forcing implementation (see
+./src/OCE/SBC/tide.h90).
+
+    -->
+
+    <!-- Time -->
+    <field id="diamlr_time" grid_ref="diamlr_grid_T_2D" prec="8" />
+
+    <!-- Regressors for tidal harmonic analysis -->
+    <field id="diamlr_r001"  field_ref="diamlr_time" expr="sin( __TDE_M2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:M2"   />
+    <field id="diamlr_r002"  field_ref="diamlr_time" expr="cos( __TDE_M2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:M2"   />
+    <field id="diamlr_r003"  field_ref="diamlr_time" expr="sin( __TDE_N2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:N2"   />
+    <field id="diamlr_r004"  field_ref="diamlr_time" expr="cos( __TDE_N2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:N2"   />
+    <field id="diamlr_r005"  field_ref="diamlr_time" expr="sin( __TDE_2N2_omega__  * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:2N2"  />
+    <field id="diamlr_r006"  field_ref="diamlr_time" expr="cos( __TDE_2N2_omega__  * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:2N2"  />
+    <field id="diamlr_r007"  field_ref="diamlr_time" expr="sin( __TDE_S2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:S2"   />
+    <field id="diamlr_r008"  field_ref="diamlr_time" expr="cos( __TDE_S2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:S2"   />
+    <field id="diamlr_r009"  field_ref="diamlr_time" expr="sin( __TDE_K2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:K2"   />
+    <field id="diamlr_r010"  field_ref="diamlr_time" expr="cos( __TDE_K2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:K2"   />
+    <field id="diamlr_r011"  field_ref="diamlr_time" expr="sin( __TDE_K1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:K1"   />
+    <field id="diamlr_r012"  field_ref="diamlr_time" expr="cos( __TDE_K1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:K1"   />
+    <field id="diamlr_r013"  field_ref="diamlr_time" expr="sin( __TDE_O1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:O1"   />
+    <field id="diamlr_r014"  field_ref="diamlr_time" expr="cos( __TDE_O1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:O1"   />
+    <field id="diamlr_r015"  field_ref="diamlr_time" expr="sin( __TDE_Q1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:Q1"   />
+    <field id="diamlr_r016"  field_ref="diamlr_time" expr="cos( __TDE_Q1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:Q1"   />
+    <field id="diamlr_r017"  field_ref="diamlr_time" expr="sin( __TDE_P1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:P1"   />
+    <field id="diamlr_r018"  field_ref="diamlr_time" expr="cos( __TDE_P1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:P1"   />
+    <field id="diamlr_r019"  field_ref="diamlr_time" expr="sin( __TDE_M4_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:M4"   />
+    <field id="diamlr_r020"  field_ref="diamlr_time" expr="cos( __TDE_M4_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:M4"   />
+    <field id="diamlr_r021"  field_ref="diamlr_time" expr="sin( __TDE_Mf_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:Mf"   />
+    <field id="diamlr_r022"  field_ref="diamlr_time" expr="cos( __TDE_Mf_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:Mf"   />
+    <field id="diamlr_r023"  field_ref="diamlr_time" expr="sin( __TDE_Mm_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:Mm"   />
+    <field id="diamlr_r024"  field_ref="diamlr_time" expr="cos( __TDE_Mm_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:Mm"   />
+    <field id="diamlr_r025"  field_ref="diamlr_time" expr="sin( __TDE_Msqm_omega__ * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:Msqm" />
+    <field id="diamlr_r026"  field_ref="diamlr_time" expr="cos( __TDE_Msqm_omega__ * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:Msqm" />
+    <field id="diamlr_r027"  field_ref="diamlr_time" expr="sin( __TDE_Mtm_omega__  * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:Mtm"  />
+    <field id="diamlr_r028"  field_ref="diamlr_time" expr="cos( __TDE_Mtm_omega__  * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:Mtm"  />
+    <field id="diamlr_r029"  field_ref="diamlr_time" expr="sin( __TDE_S1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:S1"   />
+    <field id="diamlr_r030"  field_ref="diamlr_time" expr="cos( __TDE_S1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:S1"   />
+    <field id="diamlr_r031"  field_ref="diamlr_time" expr="sin( __TDE_MU2_omega__  * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:MU2"  />
+    <field id="diamlr_r032"  field_ref="diamlr_time" expr="cos( __TDE_MU2_omega__  * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:MU2"  />
+    <field id="diamlr_r033"  field_ref="diamlr_time" expr="sin( __TDE_NU2_omega__  * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:NU2"  />
+    <field id="diamlr_r034"  field_ref="diamlr_time" expr="cos( __TDE_NU2_omega__  * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:NU2"  />
+    <field id="diamlr_r035"  field_ref="diamlr_time" expr="sin( __TDE_L2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:L2"   />
+    <field id="diamlr_r036"  field_ref="diamlr_time" expr="cos( __TDE_L2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:L2"   />
+    <field id="diamlr_r037"  field_ref="diamlr_time" expr="sin( __TDE_T2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:T2"   />
+    <field id="diamlr_r038"  field_ref="diamlr_time" expr="cos( __TDE_T2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:T2"   />
+    <field id="diamlr_r101"  field_ref="diamlr_time" expr="diamlr_time^0.0"                         enabled=".TRUE."  comment="mean"              />
+
+    <!-- Fields selected for regression analysis -->
+    <field id="diamlr_f001" field_ref="ssh" enabled=".TRUE." />
+
+  </field_group>
+
+  <!--
+      ============================================================================================================
+      =                                  definition of all existing variables                                    =
+      =                                            DO NOT CHANGE                                                 =
+      ============================================================================================================
+  -->
+
+  <field_group id="diadetide_fields">
+
+    <!--
+        =====================================================================================================
+        Weight fields for the computation of daily detided model diagnostics (diadetide)
+        =====================================================================================================
+
+    -->
+
+    <field id="diadetide_weight" grid_ref="diadetide_grid_T_2D" enabled=".TRUE." />
+    <field id="diadetide_weight_grid_T_2D" field_ref="diadetide_weight" grid_ref="diadetide_grid_T_2D" enabled=".TRUE." > this </field>
+    <field id="diadetide_weight_grid_U_2D" field_ref="diadetide_weight" grid_ref="diadetide_grid_U_2D" enabled=".TRUE." > this </field>
+    <field id="diadetide_weight_grid_V_2D" field_ref="diadetide_weight" grid_ref="diadetide_grid_V_2D" enabled=".TRUE." > this </field>
+    <field id="diadetide_weight_grid_T_3D" field_ref="diadetide_weight" grid_ref="diadetide_grid_2D_to_grid_T_3D" enabled=".TRUE." > this </field>
+    <field id="diadetide_weight_grid_U_3D" field_ref="diadetide_weight" grid_ref="diadetide_grid_2D_to_grid_U_3D" enabled=".TRUE." > this </field>
+    <field id="diadetide_weight_grid_V_3D" field_ref="diadetide_weight" grid_ref="diadetide_grid_2D_to_grid_V_3D" enabled=".TRUE." > this </field>
+    <field id="diadetide_weight_grid_W_3D" field_ref="diadetide_weight" grid_ref="diadetide_grid_2D_to_grid_W_3D" enabled=".TRUE." > this </field>
+
+  </field_group>
+
+  <!--
+      ============================================================================================================
+      Physical ocean model variables
+      ============================================================================================================
+  -->
+
+  <!-- T grid -->
+
+  <field_group id="grid_T" grid_ref="grid_T_2D" >
+    <field id="e3t"          long_name="T-cell thickness"                    standard_name="cell_thickness"        unit="m"   grid_ref="grid_T_3D" />
+    <field id="e3ts"         long_name="T-cell thickness"   field_ref="e3t"  standard_name="cell_thickness"        unit="m"   grid_ref="grid_T_SFC"/>
+    <field id="e3t_0"        long_name="Initial T-cell thickness"            standard_name="ref_cell_thickness"    unit="m"   grid_ref="grid_T_3D" />
+    <field id="e3tb"         long_name="bottom T-cell thickness"             standard_name="bottom_cell_thickness" unit="m"   grid_ref="grid_T_2D"/>
+    <field id="e3t_300"      field_ref="e3t"                grid_ref="grid_T_zoom_300"       detect_missing_value="true" />
+    <field id="e3t_vsum300"  field_ref="e3t_300"            grid_ref="grid_T_vsum"   detect_missing_value="true" />
+    <field id="masscello"    long_name="Sea Water Mass per unit area"   standard_name="sea_water_mass_per_unit_area"   unit="kg/m2"   grid_ref="grid_T_3D"/>
+    <field id="volcello"     long_name="Ocean Volume"                   standard_name="ocean_volume"   unit="m3"       grid_ref="grid_T_3D"/>
+    <field id="toce"         long_name="temperature"                         standard_name="sea_water_potential_temperature"   unit="degC"     grid_ref="grid_T_3D"/>
+    <field id="toce_e3t"     long_name="temperature (thickness weighted)"                                                      unit="degC"     grid_ref="grid_T_3D" > toce * e3t </field >
+    <field id="soce"         long_name="salinity"                            standard_name="sea_water_practical_salinity"      unit="1e-3"     grid_ref="grid_T_3D"/>
+    <field id="soce_e3t"     long_name="salinity    (thickness weighted)"                                                      unit="1e-3"     grid_ref="grid_T_3D" > soce * e3t </field >
+
+    <field id="toce_e3t_300"      field_ref="toce_e3t"          unit="degree_C"     grid_ref="grid_T_zoom_300"      detect_missing_value="true" />
+    <field id="toce_e3t_vsum300"  field_ref="toce_e3t_300"      unit="degress_C*m"  grid_ref="grid_T_vsum"  detect_missing_value="true" />
+    <field id="toce_vmean300"     field_ref="toce_e3t_vsum300"  unit="degree_C"     grid_ref="grid_T_vsum"  detect_missing_value="true" > toce_e3t_vsum300/e3t_vsum300 </field>
+
+    <!-- AGRIF sponge -->
+    <field id="agrif_spt"         long_name=" AGRIF t-sponge coefficient"   unit=" " />
+
+    <!-- additions to diawri.F90 -->
+    <field id="sssgrad"     long_name="module of surface salinity gradient"              unit="1e-3/m"   grid_ref="grid_T_2D_inner"/>
+    <field id="sssgrad2"    long_name="square of module of surface salinity gradient"    unit="1e-6/m2"  grid_ref="grid_T_2D_inner"/>
+    <field id="ke"          long_name="kinetic energy"          standard_name="specific_kinetic_energy_of_sea_water"   unit="m2/s2"  grid_ref="grid_T_3D" />
+    <field id="ke_int"      long_name="vertical integration of kinetic energy"   unit="m3/s2"  grid_ref="grid_T_2D_inner" />
+
+    <!-- t-eddy viscosity coefficients (ldfdyn) -->
+    <field id="ahmt_2d"      long_name=" surface t-eddy viscosity coefficient"   unit="m2/s or m4/s"                      />
+    <field id="ahmt_3d"      long_name=" 3D      t-eddy viscosity coefficient"   unit="m2/s or m4/s"  grid_ref="grid_T_3D"/>
+
+    <field id="sst"          long_name="Bulk sea surface temperature"                       standard_name="bulk_sea_surface_temperature"        unit="degC"     />
+    <field id="t_skin"       long_name="Skin temperature aka SSST"                          standard_name="skin_temperature"                    unit="degC"     />
+    <field id="sst2"         long_name="square of sea surface temperature"                  standard_name="square_of_sea_surface_temperature"   unit="degC2"     > sst * sst </field >
+    <field id="sstmax"       long_name="max of sea surface temperature"   field_ref="sst"   operation="maximum"                                                 />
+    <field id="sstmin"       long_name="min of sea surface temperature"   field_ref="sst"   operation="minimum"                                                 />
+    <field id="sstgrad"      long_name="module of sst gradient"                                                                                 unit="degC/m"   grid_ref="grid_T_2D_inner" />
+    <field id="sstgrad2"     long_name="square of module of sst gradient"                                                                       unit="degC2/m2" grid_ref="grid_T_2D_inner" />
+    <field id="sbt"          long_name="sea bottom temperature"                                                                                 unit="degC"     grid_ref="grid_T_2D_inner" />
+    <field id="tosmint"      long_name="vertical integral of temperature times density"     standard_name="integral_wrt_depth_of_product_of_density_and_potential_temperature"  unit="(kg m2) degree_C" grid_ref="grid_T_2D_inner" />
+    <field id="sst_wl"       long_name="Delta SST of warm layer"                                                                                unit="degC"     />
+    <field id="sst_cs"       long_name="Delta SST of cool skin"                                                                                 unit="degC"     />
+    <field id="temp_3m"      long_name="temperature at 3m"                                                                                      unit="degC"     />
+
+    <field id="sss"          long_name="sea surface salinity"                               standard_name="sea_surface_salinity"                unit="1e-3"     />
+    <field id="sss2"         long_name="square of sea surface salinity"                                                                         unit="1e-6"      > sss * sss </field >
+    <field id="sssmax"       long_name="max of sea surface salinity"      field_ref="sss"   operation="maximum"                                                 />
+    <field id="sssmin"       long_name="min of sea surface salinity"      field_ref="sss"   operation="minimum"                                                 />
+    <field id="sbs"          long_name="sea bottom salinity"                                                                                    unit="0.001"   grid_ref="grid_T_2D_inner" />
+    <field id="somint"       long_name="vertical integral of salinity times density"        standard_name="integral_wrt_depth_of_product_of_density_and_salinity"  unit="(kg m2) x (1e-3)" grid_ref="grid_T_2D_inner" />
+
+    <field id="taubot"       long_name="bottom stress module"   unit="N/m2"   grid_ref="grid_T_2D_inner" />
+
+    <!-- Case EOS = TEOS-10 : output potential temperature -->
+    <field id="toce_pot"     long_name="Sea Water Potential Temperature"              standard_name="sea_water_potential_temperature"   unit="degC"     grid_ref="grid_T_3D"/>
+    <field id="toce_pot_e3t" long_name="Potential temperature (thickness weighted)"   standard_name="sea_water_potential_temperature"   unit="degC"     grid_ref="grid_T_3D" > toce_pot * e3t </field >
+    <field id="sst_pot"      long_name="potential sea surface temperature"             standard_name="sea_surface_temperature"             unit="degC"     />
+    <field id="tosmint_pot"  long_name="vertical integral of potential temperature times density"   standard_name="integral_wrt_depth_of_product_of_density_and_potential_temperature"  unit="(kg m2) degree_C" />
+
+    <field id="ht"           long_name="water column height at T point"                     standard_name="water_column_height_T"                      unit="m" />
+    <field id="ssh"          long_name="sea surface height"                                 standard_name="sea_surface_height_above_geoid"             unit="m" />
+    <field id="ssh2"         long_name="square of sea surface height"                       standard_name="square_of_sea_surface_height_above_geoid"   unit="m2" > ssh * ssh </field >
+    <field id="wetdep"       long_name="wet depth"                                          standard_name="wet_depth"                                  unit="m" />
+    <field id="sshmax"       long_name="max of sea surface height"        field_ref="ssh"   operation="maximum"                                                 />
+
+    <field id="mldkz5"       long_name="Turbocline depth (Kz = 5e-4)"                       standard_name="ocean_mixed_layer_thickness_defined_by_vertical_tracer_diffusivity"                unit="m"          />
+    <field id="mldr10_1"     long_name="Mixed Layer Depth (dsigma = 0.01 wrt 10m)"          standard_name="ocean_mixed_layer_thickness_defined_by_sigma_theta"                                unit="m"          />
+    <field id="mldr10_1max"  long_name="Max of Mixed Layer Depth (dsigma = 0.01 wrt 10m)"   field_ref="mldr10_1"   operation="maximum"                                                                          />
+    <field id="mldr10_1min"  long_name="Min of Mixed Layer Depth (dsigma = 0.01 wrt 10m)"   field_ref="mldr10_1"   operation="minimum"                                                                          />
+    <field id="heatc"        long_name="Heat content vertically integrated"                 standard_name="integral_of_sea_water_potential_temperature_wrt_depth_expressed_as_heat_content"   unit="J/m2"      grid_ref="grid_T_2D_inner" />
+    <field id="heatc_2"      long_name="Heat content vertically integrated"  field_ref="toce_e3t"   grid_ref="grid_T_vsum"  standard_name="integral_of_sea_water_potential_temperature_wrt_depth_expressed_as_heat_content"   unit="J/m2"     detect_missing_value="true" > this * $rho0 * $cpocean  </field >
+    <field id="saltc"        long_name="Salt content vertically integrated"                                                                                                                   unit="PSU*kg/m2"    grid_ref="grid_T_2D_inner" />
+    <field id="salt2c"       long_name="square of Salt content vertically integrated"                                                                                                         unit="PSU2*kg/m2"   grid_ref="grid_T_2D_inner" />
+
+    <!-- EOS -->
+    <field id="alpha"        long_name="thermal expansion"                                                         unit="degC-1" grid_ref="grid_T_3D" />
+    <field id="beta"         long_name="haline contraction"                                                        unit="1e3"    grid_ref="grid_T_3D" />
+    <field id="rhop"         long_name="potential density (sigma0)"        standard_name="sea_water_sigma_theta"   unit="kg/m3"  grid_ref="grid_T_3D" />
+
+    <!-- Energy - horizontal divergence -->
+    <field id="sKE"          long_name="surface kinetic energy"  standard_name="specific_kinetic_energy_of_sea_water"   unit="m2/s2"  grid_ref="grid_T_2D_inner" />
+    <field id="hdiv"         long_name="horizontal divergence"                                                          unit="s-1"    grid_ref="grid_T_3D" />
+
+    <!-- variables available with MLE -->
+    <field id="Lf_NHpf"      long_name="MLE: Lf = N H / f"   unit="m" />
+
+    <!-- next variables available with ln_zad_Aimp=.true. -->
+    <field id="Courant"      long_name="Courant number"                                                                 unit="#"   grid_ref="grid_T_3D" />
+    <field id="wimp"         long_name="Implicit vertical velocity"                                                     unit="m/s" grid_ref="grid_T_3D" />
+    <field id="wexp"         long_name="Explicit vertical velocity"                                                     unit="m/s" grid_ref="grid_T_3D" />
+    <field id="wi_cff"       long_name="Fraction of implicit vertical velocity"                                         unit="#"   grid_ref="grid_T_3D" />
+
+    <!-- next variables available with diahth -->
+    <field id="mlddzt"       long_name="Thermocline Depth (depth of max dT/dz)"         standard_name="depth_at_maximum_upward_derivative_of_sea_water_potential_temperature"             unit="m"                         />
+    <field id="maxdzT"       long_name="Maximum of dT/dz)"                              standard_name="maximum_upward_derivative_of_sea_water_potential_temperature"                      unit="degC/m"                    />
+    <field id="mldr10_3"     long_name="Mixed Layer Depth (dsigma = 0.03 wrt 10m)"      standard_name="ocean_mixed_layer_thickness_defined_by_sigma_theta"                                unit="m"                         />
+    <field id="mldr0_1"      long_name="Mixed Layer Depth (dsigma = 0.01 wrt sfc)"      standard_name="ocean_mixed_layer_thickness_defined_by_sigma_theta"                                unit="m"                         />
+    <field id="mldr0_3"      long_name="Mixed Layer Depth (dsigma = 0.03 wrt sfc)"      standard_name="ocean_mixed_layer_thickness_defined_by_sigma_theta"                                unit="m"                         />
+    <field id="mld_dt02"     long_name="Mixed Layer Depth (|dT| = 0.2 wrt 10m)"         standard_name="ocean_mixed_layer_thickness_defined_by_temperature"                                unit="m"                         />
+    <field id="topthdep"     long_name="Top of Thermocline Depth (dT = -0.2 wrt 10m)"   standard_name="ocean_mixed_layer_thickness_defined_by_temperature"                                unit="m"                         />
+    <field id="pycndep"      long_name="Pycnocline Depth (dsigma[dT=-0.2] wrt 10m)"     standard_name="ocean_mixed_layer_thickness_defined_by_sigma_theta"                                unit="m"                         />
+    <field id="BLT"          long_name="Barrier Layer Thickness"                                                                                                                          unit="m"   > topthdep - pycndep </field>
+    <field id="tinv"         long_name="Max of vertical invertion of temperature"                                                                                                         unit="degC"                      />
+    <field id="depti"        long_name="Depth of max. vert. inv. of temperature"                                                                                                          unit="m"                         />
+    <field id="20d"          long_name="Depth of 20C isotherm"                          standard_name="depth_of_isosurface_of_sea_water_potential_temperature"                            unit="m"    />
+    <field id="26d"          long_name="Depth of 26C isotherm"                          standard_name="depth_of_isosurface_of_sea_water_potential_temperature"                            unit="m"    />
+    <field id="28d"          long_name="Depth of 28C isotherm"                          standard_name="depth_of_isosurface_of_sea_water_potential_temperature"                            unit="m"    />
+    <field id="hc300"        long_name="Heat content 0-300m"                            standard_name="integral_of_sea_water_potential_temperature_wrt_depth_expressed_as_heat_content"   unit="J/m2"                      />
+    <field id="hc700"        long_name="Heat content 0-700m"                            standard_name="integral_of_sea_water_potential_temperature_wrt_depth_expressed_as_heat_content"   unit="J/m2"                      />
+    <field id="hc2000"       long_name="Heat content 0-2000m"                           standard_name="integral_of_sea_water_potential_temperature_wrt_depth_expressed_as_heat_content"   unit="J/m2"                      />
+
+    <!-- variables available with diaar5 -->
+    <field id="botpres"      long_name="Sea Water Pressure at Sea Floor"          standard_name="sea_water_pressure_at_sea_floor"                    unit="dbar" />
+    <field id="sshdyn"       long_name="dynamic sea surface height"               standard_name="dynamic_sea_surface_height_above_geoid"             unit="m"    />
+    <field id="sshdyn2"      long_name="square of dynamic sea surface height"     standard_name="dynamic_sea_surface_height_above_geoid_squared"     unit="m2"    > sshdyn * sshdyn </field>
+    <field id="tnpeo"      long_name="Tendency of ocean potential energy content"                                                                    unit="W/m2" />
+
+    <!-- variables available ln_linssh=.FALSE. -->
+    <field id="tpt_dep"      long_name="T-point depth"                  standard_name="depth_below_geoid"   unit="m"   grid_ref="grid_T_3D" />
+    <field id="e3tdef"       long_name="T-cell thickness deformation"                                       unit="%"   grid_ref="grid_T_3D" />
+
+    <!-- variables available with ln_diacfl=.true. -->
+    <field id="cfl_cu"       long_name="u-courant number"   unit="#" />
+    <field id="cfl_cv"       long_name="v-courant number"   unit="#" />
+    <field id="cfl_cw"       long_name="w-courant number"   unit="#" />
+
+    <!-- variables available with ln_zdfmfc=.true. -->
+    <field id="mf_Tp"       long_name="plume_temperature"      standard_name="plume_temperature"     unit="degC"   grid_ref="grid_T_3D" />
+    <field id="mf_Sp"       long_name="plume_salinity"         standard_name="plume_salinity"        unit="1e-3"   grid_ref="grid_T_3D" />
+    <field id="mf_mf"       long_name="mass flux"              standard_name="mf_mass_flux"          unit="m"      grid_ref="grid_T_3D" />
+
+    <!-- fluxes from damping -->
+    <field id="sflx_dmp_cea"  long_name="salt flux due to damping"  standard_name="salt_flux_due_to_damping"          unit="g/m2/s"   />
+    <field id="hflx_dmp_cea"  long_name="heat flux due to damping"  standard_name="heat_flux_due_to_damping"          unit="W/m2"     />
+
+    <!-- * variable related to ice shelf forcing * -->
+
+    <!-- * fwf * -->
+    <field id="fwfisf_cav"      long_name="Ice shelf fresh water flux ( from isf to oce )"                    unit="kg/m2/s"  />
+    <field id="fwfisf_par"      long_name="Ice shelf fresh water flux ( from isf to oce )"                    unit="kg/m2/s"  />
+    <field id="fwfisf3d_cav"    long_name="3d Ice shelf fresh water flux ( from isf to oce )"                 unit="kg/m2/s"  grid_ref="grid_T_3D" />
+    <field id="fwfisf3d_par"    long_name="3d Ice shelf fresh water flux ( from isf to oce )"                 unit="kg/m2/s"  grid_ref="grid_T_3D" />
+
+    <!-- * heat fluxes * -->
+    <field id="qoceisf_cav"     long_name="Ice shelf ocean  heat flux ( from isf to oce )"                    unit="W/m2"     />
+    <field id="qoceisf_par"     long_name="Ice shelf ocean  heat flux ( from isf to oce )"                    unit="W/m2"     />
+    <field id="qlatisf_cav"     long_name="Ice shelf latent heat flux ( from isf to oce )"                    unit="W/m2"     />
+    <field id="qlatisf_par"     long_name="Ice shelf latent heat flux ( from isf to oce )"                    unit="W/m2"     />
+    <field id="qhcisf_cav"      long_name="Ice shelf heat content flux of injected water ( from isf to oce )" unit="W/m2"     />
+    <field id="qhcisf_par"      long_name="Ice shelf heat content flux of injected water ( from isf to oce )" unit="W/m2"     />
+    <field id="qoceisf3d_cav"   long_name="Ice shelf ocean  heat flux ( from isf to oce )"                    unit="W/m2"     grid_ref="grid_T_3D" />
+    <field id="qoceisf3d_par"   long_name="Ice shelf ocean  heat flux ( from isf to oce )"                    unit="W/m2"     grid_ref="grid_T_3D" />
+    <field id="qlatisf3d_cav"   long_name="Ice shelf latent heat flux ( from isf to oce )"                    unit="W/m2"     grid_ref="grid_T_3D" />
+    <field id="qlatisf3d_par"   long_name="Ice shelf latent heat flux ( from isf to oce )"                    unit="W/m2"     grid_ref="grid_T_3D" />
+    <field id="qhcisf3d_cav"    long_name="Ice shelf heat content flux of injected water ( from isf to oce )" unit="W/m2"     grid_ref="grid_T_3D" />
+    <field id="qhcisf3d_par"    long_name="Ice shelf heat content flux of injected water ( from isf to oce )" unit="W/m2"     grid_ref="grid_T_3D" />
+    <field id="qconisf"         long_name="Conductive heat flux through the ice shelf ( from isf to oce )"    unit="W/m2"     />
+
+    <!-- top boundary layer properties -->
+    <field id="isftfrz_cav"     long_name="freezing point temperature at ocean/isf interface"                unit="degC"     />
+    <field id="isftfrz_par"     long_name="freezing point temperature in the parametrization boundary layer" unit="degC"     />
+    <field id="isfthermald_cav" long_name="thermal driving of ice shelf melting"          unit="degC"     />
+    <field id="isfthermald_par" long_name="thermal driving of ice shelf melting"          unit="degC"     />
+    <field id="isfgammat"       long_name="Ice shelf heat-transfert velocity"             unit="m/s"      />
+    <field id="isfgammas"       long_name="Ice shelf salt-transfert velocity"             unit="m/s"      />
+    <field id="ttbl_cav"        long_name="temperature in Losch tbl"                      unit="degC"     />
+    <field id="ttbl_par"        long_name="temperature in the parametrisation boundary layer" unit="degC" />
+    <field id="stbl"            long_name="salinity in the Losh tbl"                      unit="1e-3"     />
+    <field id="utbl"            long_name="zonal current in the Losh tbl at T point"      unit="m/s"      />
+    <field id="vtbl"            long_name="merid current in the Losh tbl at T point"      unit="m/s"      />
+    <field id="isfustar"        long_name="ustar at T point used in ice shelf melting"    unit="m/s"      />
+
+  </field_group> <!-- grid_T -->
+
+  <!-- Tides -->
+
+  <field_group id="Tides_T" grid_ref="grid_T_2D" operation="once" >
+    <!-- Tidal potential -->
+    <field id="tide_pot"      long_name="Total tidal potential" unit="m" />
+    <field id="tide_pot_M2"   long_name="M2 tidal potential"    unit="m" />
+    <field id="tide_pot_N2"   long_name="N2 tidal potential"    unit="m" />
+    <field id="tide_pot_2N2"  long_name="2N2 tidal potential"   unit="m" />
+    <field id="tide_pot_S2"   long_name="S2 tidal potential"    unit="m" />
+    <field id="tide_pot_K2"   long_name="K2 tidal potential"    unit="m" />
+    <field id="tide_pot_K1"   long_name="K1 tidal potential"    unit="m" />
+    <field id="tide_pot_O1"   long_name="O1 tidal potential"    unit="m" />
+    <field id="tide_pot_Q1"   long_name="Q1 tidal potential"    unit="m" />
+    <field id="tide_pot_P1"   long_name="P1 tidal potential"    unit="m" />
+    <field id="tide_pot_M4"   long_name="M4 tidal potential"    unit="m" />
+    <field id="tide_pot_Mf"   long_name="Mf tidal potential"    unit="m" />
+    <field id="tide_pot_Mm"   long_name="Mm tidal potential"    unit="m" />
+    <field id="tide_pot_Msqm" long_name="Msqm tidal potential"  unit="m" />
+    <field id="tide_pot_Mtm"  long_name="Mtm tidal potential"   unit="m" />
+    <field id="tide_pot_S1"   long_name="S1 tidal potential"    unit="m" />
+    <field id="tide_pot_MU2"  long_name="MU2 tidal potential"   unit="m" />
+    <field id="tide_pot_NU2"  long_name="NU2 tidal potential"   unit="m" />
+    <field id="tide_pot_L2"   long_name="L2 tidal potential"    unit="m" />
+    <field id="tide_pot_T2"   long_name="T2 tidal potential"    unit="m" />
+  </field_group>
+
+  <!-- OSMOSIS variables (available with ln_zdfosm=.true.) -->
+
+  <field_group id="OSMOSIS_T" grid_ref="grid_T_2D">
+    <field id="hml"                 long_name="mixed layr depth"                         unit="m"       />
+    <field id="hbl"                 long_name="boundary layer depth"                     unit="m"       />
+    <field id="dh"                  long_name="Pycnocline thickness"                     unit=" m"      />
+    <field id="ibld"                long_name="index of boundary layer depth"            unit="#"       />
+    <field id="imld"                long_name="index of mixed layer depth"               unit="#"       />
+    <field id="jp_ext"              long_name="flag =1 if pycnocline well resolved"      unit="#"       />
+    <field id="j_ddh"               long_name="index of mixed layer depth"               unit="#"       />
+    <field id="zshear"              long_name="shear production of TKE "                 unit="m^3/s^3" />
+    <field id="zhbl"                long_name="boundary layer depth -grid"               unit="m"       />
+    <field id="zhml"                long_name="mixed layer depth - grid"                 unit="m"       />
+    <field id="zdh"                 long_name="Pycnocline  depth - grid"                 unit=" m"      />
+    <field id="zustke"              long_name="magnitude of stokes drift  at T-points"   unit="m/s"     />
+    <field id="us_x"                long_name="i component of active Stokes drift"       unit="m/s"     />
+    <field id="us_y"                long_name="j component of active Stokes drift"       unit="m/s"     />
+    <field id="dstokes"             long_name="stokes drift  depth scale"                unit="m"       />
+    <field id="zwth0"               long_name="surface non-local temperature flux"       unit="deg m/s" />
+    <field id="zws0"                long_name="surface non-local salinity flux"          unit="psu m/s" />
+    <field id="zwb0"                long_name="surface non-local buoyancy flux"          unit="m^2/s^3" />
+    <field id="zwstrc"              long_name="convective velocity scale"                unit="m/s"     />
+    <field id="zustar"              long_name="friction velocity"                        unit="m/s"     />
+    <field id="zwstrl"              long_name="langmuir velocity scale"                  unit="m/s"     />
+    <field id="zvstr"               long_name="mixed velocity scale"                     unit="m/s"     />
+    <field id="zla"                 long_name="langmuir number"                          unit="m/s"     />
+    <field id="wind_wave_abs_power" long_name="\rho |U_s| x u*^2"                        unit="mW"      />
+    <field id="wind_wave_power"     long_name="U_s \dot  tau"                            unit="mW"      />
+    <field id="wind_power"          long_name="\rho  u*^3"                               unit="mW"      />
+
+    <!-- interior BL OSMOSIS diagnostics -->
+    <field id="zwbav"               long_name="av turb flux of buoyancy in ml"           unit="m^2/s^3" />
+    <field id="zt_ml"               long_name="av T in ml"                               unit="deg"     />
+    <field id="zhol"                long_name="Hoenekker number"                         unit="#"       />
+    <field id="zws_ent"            long_name="entrainment turb flux of S"                unit="10^-3 m/s" />
+    <field id="zwth_ent"            long_name="entrainment turb flux of T"               unit="deg m/s" />
+    <field id="zwb_ent"            long_name="entrainment turb flux of buoyancy"         unit="m^2/s^-3" />
+
+    <field id="zdt_bl"             long_name="temperature jump at base of BL"            unit="deg"      />
+    <field id="zds_bl"             long_name="salinity jump at base of BL"               unit="10^-3"    />
+    <field id="zdb_bl"             long_name="buoyancy jump at base of BL"               unit="m/s^2"    />
+    <field id="zdu_bl"             long_name="u jump at base of BL"                      unit="m/s"      />
+    <field id="zdv_bl"             long_name="v jump at base of BL"                      unit="m/s"      />
+    <field id="zdt_ml"             long_name="temperature jump at base of ML"            unit="deg"      />
+    <field id="zds_ml"             long_name="salinity jump at base of ML"               unit="10^-3"    />
+    <field id="zdb_ml"             long_name="buoyancy jump at base of ML"               unit="m/s^2"    />
+    <field id="pb_coup"            long_name="bottom coupling velocity"                  unit="m/s"      />
+    <!-- extra OSMOSIS diagnostics for debugging -->
+    <field id="zsc_uw_1_0"       long_name="zsc u-momentum flux on T after Stokes"                       unit="m^2/s^2" />
+    <field id="zsc_uw_1_f"       long_name="zsc u-momentum flux on T after Coriolis"                       unit="m^2/s^2" />
+    <field id="zsc_vw_1_f"       long_name="zsc v-momentum flux on T after Coriolis"                       unit="m^2/s^2" />
+    <field id="zsc_uw_2_f"       long_name="2nd zsc u-momentum flux on T after Coriolis"                       unit="m^2/s^2" />
+    <field id="zsc_vw_2_f"       long_name="2nd zsc v-momentum flux on T after Coriolis"                       unit="m^2/s^2" />
+
+    <!-- FK_OSM OSMOSIS diagnostics (require also ln_osm_mle=.true.-->
+    <field id="hmle"          long_name="OBL FK-layer thickness"                                     unit="m"        />
+    <field id="mld_prof"              long_name="FK-layer depth index"                  unit="#" />
+    <field id="zmld"          long_name="target FK-layer thickness"                                     unit="m"        />
+    <field id="zwb_fk"          long_name="FK b-flux"                                     unit="m^2 s^-3"        />
+    <field id="zwb_fk_b"          long_name="layer averaged FK b-flux"                 unit="m^2 s^-3"       />
+    <field id="zdiff_mle"          long_name="max FK diffusivity in MLE"       unit=" 10^-4 m^2 s^-1"       />
+    <field id="zvel_mle"          long_name="FK velocity scale in MLE"       unit=" m s^-1"       />
+  </field_group>
+
+  <field_group id="OSMOSIS_W" grid_ref="grid_W_3D" >
+    <field id="zviscos"       long_name="BL viscosity"   unit="m^2/s" />
+    <field id="ghamt"       long_name="non-local temperature flux"                       unit="deg m/s" />
+    <field id="ghams"       long_name="non-local salinity flux"                          unit="psu m/s" />
+    <field id="zdtdz_pyc"   long_name="Pycnocline temperature gradient"                  unit=" deg/m"  />
+    <field id="zdsdz_pyc"   long_name="Pycnocline salinity gradient"                  unit=" 10^-3/m"  />
+    <field id="zdbdz_pyc"   long_name="Pycnocline buoyancy gradient"                  unit=" s^-2"  />
+    <field id="zdudz_pyc"   long_name="Pycnocline u gradient"                  unit=" s^-2"  />
+    <field id="zdvdz_pyc"   long_name="Pycnocline v gradient"                  unit=" s^-2"  />
+
+    <!-- extra OSMOSIS diagnostics for debugging -->
+    <field id="ghamu_00"       long_name="initial non-local u-momentum flux"   unit="m^2/s^2" />
+    <field id="ghamv_00"       long_name="initial non-local v-momentum flux"   unit="m^2/s^2" />
+    <field id="ghamu_0"       long_name="after dstokes non-local u-momentum flux"   unit="m^2/s^2" />
+    <field id="ghamu_f"       long_name="after Coriolis non-local u-momentum flux"   unit="m^2/s^2" />
+    <field id="ghamv_f"       long_name="after Coriolis  non-local v-momentum flux"   unit="m^2/s^2" />
+    <field id="ghamu_b"       long_name="after buoyancy added non-local u-momentum flux"   unit="m^2/s^2" />
+    <field id="ghamv_b"       long_name="after buoyancy added  non-local v-momentum flux"  unit="m^2/s^2" />
+    <field id="ghamu_1"       long_name="after entrainment non-local u-momentum flux"   unit="m^2/s^2" />
+    <field id="ghamv_1"       long_name="after entrainment  non-local v-momentum flux"  unit="m^2/s^2" />
+  </field_group>
+
+  <field_group id="OSMOSIS_U" grid_ref="grid_U_2D" >
+    <field id="ghamu"       long_name="non-local u-momentum flux"   grid_ref="grid_U_3D" unit="m^2/s^2" />
+    <!-- FK_OSM OSMOSIS diagnostics (require also ln_osm_mle=.true.-->
+    <field id="zdtdx"          long_name="FK  T x-gradient"                                     unit=" deg C m^-1"        />
+    <field id="zdsdx"          long_name="FK  S x-gradient"                                     unit=" 10^-3 m^-1"        />
+    <field id="dbdx_mle"          long_name="FK  B x-gradient"                                     unit=" s^-2"        />
+  </field_group>
+
+  <field_group id="OSMOSIS_V" grid_ref="grid_V_2D" >
+    <field id="ghamv"       long_name="non-local v-momentum flux"   grid_ref="grid_V_3D" unit="m^2/s^2" />
+    <!-- FK_OSM OSMOSIS diagnostics (require also ln_osm_mle=.true.-->
+    <field id="zdtdy"          long_name="FK T y-gradient"                                     unit=" deg C m^-1"        />
+    <field id="zdsdy"          long_name="FK S y-gradient"                                     unit=" 10^-3 m^-1"        />
+    <field id="dbdy_mle"          long_name="FK B y-gradient"                                     unit=" s^-2"        />
+  </field_group>
+
+  <!-- SBC -->
+  <field_group id="SBC" > <!-- time step automaticaly defined based on nn_fsbc -->
+
+    <field_group id="SBC_2D" grid_ref="grid_T_2D" >
+
+      <field id="empmr"        long_name="Net Upward Water Flux"                standard_name="water_flux_out_of_sea_ice_and_sea_water"                              unit="kg/m2/s"   />
+      <field id="empbmr"       long_name="Net Upward Water Flux at pre. tstep"  standard_name="water_flux_out_of_sea_ice_and_sea_water"                              unit="kg/m2/s"   />
+      <field id="emp_oce"      long_name="Evap minus Precip over ocean"         standard_name="evap_minus_precip_over_sea_water"                                     unit="kg/m2/s"   />
+      <field id="emp_ice"      long_name="Evap minus Precip over ice"           standard_name="evap_minus_precip_over_sea_ice"                                       unit="kg/m2/s"   />
+      <field id="saltflx"      long_name="Downward salt flux"                                                                                                        unit="g/m2/s"    />
+      <field id="fmmflx"       long_name="Water flux due to freezing/melting"                                                                                        unit="kg/m2/s"   />
+      <field id="snowpre"      long_name="Snow precipitation"                   standard_name="snowfall_flux"                                                        unit="kg/m2/s"   />
+      <field id="runoffs"      long_name="River Runoffs"                        standard_name="water_flux_into_sea_water_from_rivers"                                unit="kg/m2/s"   />
+      <field id="precip"       long_name="Total precipitation"                  standard_name="precipitation_flux"                                                   unit="kg/m2/s"   />
+      <field id="wclosea"      long_name="closed sea empmr correction"          standard_name="closea_empmr"                                                         unit="kg/m2/s"   />
+
+      <field id="qt"           long_name="Net Downward Heat Flux"                standard_name="surface_downward_heat_flux_in_sea_water"                              unit="W/m2"                           />
+      <field id="qns"          long_name="non solar Downward Heat Flux"                                                                                               unit="W/m2"                           />
+      <field id="qsr"          long_name="Shortwave Radiation"                   standard_name="net_downward_shortwave_flux_at_sea_water_surface"                     unit="W/m2"                           />
+      <field id="qsr3d"        long_name="Shortwave Radiation 3D distribution"   standard_name="downwelling_shortwave_flux_in_sea_water"                              unit="W/m2"      grid_ref="grid_T_3D" />
+      <field id="qrp"          long_name="Surface Heat Flux: Damping"            standard_name="heat_flux_into_sea_water_due_to_newtonian_relaxation"                 unit="W/m2"                           />
+      <field id="qclosea"      long_name="closed sea heat content flux"          standard_name="closea_heat_content_downward_flux"                                    unit="W/m2"     />
+      <field id="erp"          long_name="Surface Water Flux: Damping"           standard_name="water_flux_out_of_sea_water_due_to_newtonian_relaxation"              unit="kg/m2/s"                        />
+      <field id="taum"         long_name="wind stress module"                    standard_name="magnitude_of_surface_downward_stress"                                 unit="N/m2"                           />
+      <field id="wspd"         long_name="wind speed module"                     standard_name="wind_speed"                                                           unit="m/s"                            />
+
+      <!-- * variable relative to atmospheric pressure forcing : available with ln_apr_dyn -->
+      <field id="ssh_ib"       long_name="Inverse barometer sea surface height"  standard_name="sea_surface_height_correction_due_to_air_pressure_at_low_frequency"   unit="m"        />
+
+      <!-- *_oce variables available with ln_blk_clio or ln_blk_core -->
+      <field id="rho_air"      long_name="Air density at 10m above sea surface"         standard_name="rho_air_10m"                                        unit="kg/m3" />
+      <field id="dt_skin"      long_name="SSST-SST temperature difference"              standard_name="SSST-SST"                                             unit="K"   />
+      <field id="qlw_oce"      long_name="Longwave Downward Heat Flux over open ocean"  standard_name="surface_net_downward_longwave_flux"                 unit="W/m2"  />
+      <field id="qsb_oce"      long_name="Sensible Downward Heat Flux over open ocean"  standard_name="surface_downward_sensible_heat_flux"                unit="W/m2"  />
+      <field id="qla_oce"      long_name="Latent Downward Heat Flux over open ocean"    standard_name="surface_downward_latent_heat_flux"                  unit="W/m2"  />
+      <field id="evap_oce"     long_name="Evaporation over open ocean"                  standard_name="evaporation"                                        unit="kg/m2/s" />
+      <field id="qt_oce"       long_name="total flux at ocean surface"                  standard_name="surface_downward_heat_flux_in_sea_water"            unit="W/m2"  />
+      <field id="qsr_oce"      long_name="solar heat flux at ocean surface"             standard_name="net_downward_shortwave_flux_at_sea_water_surface"   unit="W/m2"  />
+      <field id="qns_oce"      long_name="non-solar heat flux at ocean surface (including E-P)"                                                            unit="W/m2"  />
+      <field id="qemp_oce"     long_name="Downward Heat Flux from E-P over open ocean"                                                                     unit="W/m2"  />
+      <field id="taum_oce"     long_name="wind stress module over open ocean"           standard_name="magnitude_of_surface_downward_stress"               unit="N/m2"  />
+      <field id="utau_oce"     long_name="Wind Stress along i-axis over open ocean (T-points)"  standard_name="surf_down_x_stress_open_oce_Tpoints"        unit="N/m2"   />
+      <field id="vtau_oce"     long_name="Wind Stress along j-axis over open ocean (T-points)"  standard_name="surf_down_y_stress_open_oce_Tpoints"        unit="N/m2"    />
+
+      <!-- variables computed by the bulk parameterization algorithms (ln_blk) -->
+      <field id="Cd_oce"      long_name="Drag coefficient over open ocean"              standard_name="drag_coefficient_water"                unit=""  />
+      <field id="Ce_oce"      long_name="Evaporaion coefficient over open ocean"        standard_name="evap_coefficient_water"                unit=""  />
+      <field id="Ch_oce"      long_name="Sensible heat coefficient over open ocean"     standard_name="sensible_heat_coefficient_water"       unit=""  />
+      <field id="theta_zt"    long_name="Potential air temperature at z=zt"             standard_name="potential_air_temperature_at_zt"       unit="degC" />
+      <field id="q_zt"        long_name="Specific air humidity at z=zt"                 standard_name="specific_air_humidity_at_zt"           unit="kg/kg" />
+      <field id="theta_zu"    long_name="Potential air temperature at z=zu"             standard_name="potential_air_temperature_at_zu"       unit="degC" />
+      <field id="q_zu"        long_name="Specific air humidity at z=zu"                 standard_name="specific_air_humidity_at_zu"           unit="kg/kg" />
+      <field id="ssq"         long_name="Saturation specific humidity of air at z=0"    standard_name="surface_air_saturation_spec_humidity"  unit="kg/kg" />
+      <field id="wspd_blk"    long_name="Bulk wind speed at z=zu"                       standard_name="bulk_wind_speed_at_zu"                 unit="m/s"   />
+      <!-- ln_blk + key_si3 -->
+      <field id="Cd_ice"      long_name="Drag coefficient over ice"                     standard_name="drag_coefficient_ice"                 unit=""  />
+      <field id="Ce_ice"      long_name="Evaporaion coefficient over ice"               standard_name="evap_coefficient_ice"                 unit=""  />
+      <field id="Ch_ice"      long_name="Sensible heat coefficient over ice"            standard_name="sensible_heat_coefficient_ice"        unit=""  />
+
+      <!-- available key_oasis3 -->
+      <field id="snow_ao_cea"  long_name="Snow over ice-free ocean (cell average)"   standard_name="snowfall_flux"                             unit="kg/m2/s"  />
+      <field id="snow_ai_cea"  long_name="Snow over sea-ice (cell average)"          standard_name="snowfall_flux"                             unit="kg/m2/s"  />
+      <field id="subl_ai_cea"  long_name="Sublimation over sea-ice (cell average)"   standard_name="surface_snow_and_ice_sublimation_flux"     unit="kg/m2/s"  />
+      <field id="icealb_cea"   long_name="Ice albedo (cell average)"                 standard_name="sea_ice_albedo"                            unit="1"        />
+      <field id="calving_cea"  long_name="Calving"                                   standard_name="water_flux_into_sea_water_from_icebergs"   unit="kg/m2/s"  />
+      <field id="iceberg_cea"  long_name="Iceberg"                                   standard_name="water_flux_into_sea_water_from_icebergs"   unit="kg/m2/s"  />
+      <field id="iceshelf_cea" long_name="Iceshelf"                                  standard_name="water_flux_into_sea_water_from_iceshelf"   unit="kg/m2/s"  />
+
+
+      <!-- available if key_oasis3 + conservative method -->
+      <field id="rain"          long_name="Liquid precipitation"                                     standard_name="rainfall_flux"                                                                 unit="kg/m2/s"  />
+      <field id="rain_ao_cea"   long_name="Liquid precipitation over ice-free ocean (cell average)"  standard_name="rainfall_flux"                                                                 unit="kg/m2/s"  />
+      <field id="evap_ao_cea"   long_name="Evaporation over ice-free ocean (cell average)"           standard_name="water_evaporation_flux"                                                        unit="kg/m2/s"  />
+      <field id="isnwmlt_cea"   long_name="Snow over Ice melting (cell average)"                     standard_name="surface_snow_melt_flux"                                                        unit="kg/m2/s"  />
+      <field id="fsal_virt_cea" long_name="Virtual salt flux due to ice formation (cell average)"    standard_name="virtual_salt_flux_into_sea_water_due_to_sea_ice_thermodynamics"                unit="kg/m2/s"  />
+      <field id="fsal_real_cea" long_name="Real salt flux due to ice formation (cell average)"       standard_name="downward_sea_ice_basal_salt_flux"                                              unit="kg/m2/s"  />
+      <field id="hflx_rain_cea" long_name="heat flux due to rainfall"                                standard_name="temperature_flux_due_to_rainfall_expressed_as_heat_flux_into_sea_water"        unit="W/m2"     />
+      <field id="hflx_evap_cea" long_name="heat flux due to evaporation"                             standard_name="temperature_flux_due_to_evaporation_expressed_as_heat_flux_out_of_sea_water"   unit="W/m2"     />
+      <field id="hflx_subl_cea" long_name="heat flux due to sublimation (from atm. forcings)"        standard_name="temperature_flux_due_to_sublimation_expressed_as_heat_flux_out_of_sea_ice"     unit="W/m2"     />
+      <field id="hflx_prec_cea" long_name="heat flux due to all precip"                              standard_name="temperature_flux_due_to_all_precip_expressed_as_heat_flux_into_sea_water"      unit="W/m2"     />
+      <field id="hflx_snow_cea" long_name="heat flux due to snow falling"                            standard_name="heat_flux_onto_ocean_and_ice_due_to_snow_thermodynamics"                       unit="W/m2"     />
+      <field id="hflx_snow_ai_cea" long_name="heat flux due to snow falling over ice"                standard_name="heat_flux_onto_ice_due_to_snow_thermodynamics"                                 unit="W/m2"     />
+      <field id="hflx_snow_ao_cea" long_name="heat flux due to snow falling over ice-free ocean"     standard_name="heat_flux_onto_sea_water_due_to_snow_thermodynamics"                           unit="W/m2"     />
+      <field id="hflx_ice_cea"  long_name="heat flux due to ice thermodynamics"                      standard_name="heat_flux_into_sea_water_due_to_sea_ice_thermodynamics"                        unit="W/m2"     />
+      <field id="hflx_rnf_cea"  long_name="heat flux due to runoffs"                                 standard_name="temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water"          unit="W/m2"     />
+      <field id="sflx_rnf_cea"  long_name="salt flux due to runoffs"                                 standard_name="salt_flux_due_to_runoffs"                                                      unit="g/m2/s"   />
+      <field id="hflx_cal_cea"  long_name="heat flux due to calving"                                 standard_name="heat_flux_into_sea_water_due_to_calving"                                       unit="W/m2"     />
+      <field id="hflx_icb_cea"  long_name="heat flux due to iceberg"                                 standard_name="heat_flux_into_sea_water_due_to_icebergs"                                      unit="W/m2"     />
+      <field id="hflx_isf_cea"  long_name="heat flux due to iceshelf"                                standard_name="heat_flux_into_sea_water_due_to_iceshelf"                                      unit="W/m2"     />
+      <field id="bicemel_cea"   long_name="Rate of Melt at Sea Ice Base (cell average)"              standard_name="tendency_of_sea_ice_amount_due_to_basal_melting"                               unit="kg/m2/s"  />
+      <field id="licepro_cea"   long_name="Lateral Sea Ice Growth Rate (cell average)"               standard_name="tendency_of_sea_ice_amount_due_to_lateral_growth_of_ice_floes"                 unit="kg/m2/s"  />
+      <field id="snowmel_cea"   long_name="Snow Melt Rate (cell average)"                            standard_name="surface_snow_melt_flux"                                                        unit="kg/m2/s"  />
+      <field id="sntoice_cea"   long_name="Snow-Ice Formation Rate (cell average)"                   standard_name="tendency_of_sea_ice_amount_due_to_snow_conversion"                             unit="kg/m2/s"  />
+      <field id="ticemel_cea"   long_name="Rate of Melt at Upper Surface of Sea Ice (cell average)"  standard_name="tendency_of_sea_ice_amount_due_to_surface_melting"                             unit="kg/m2/s"  />
+
+      <!-- fluxes from relaxation and freshwater budget -->
+      <field id="sflx_ssr_cea"  long_name="salt flux due to restoring"    standard_name="salt_flux_due_to_restoring"    unit="g/m2/s"   />
+      <field id="hflx_ssr_cea"  long_name="heat flux due to restoring"    standard_name="heat_flux_due_to_restoring"    unit="W/m2"     />
+      <field id="vflx_ssr_cea"  long_name="volume flux due to restoring"  standard_name="volume_flux_due_to_restoring"  unit="kg/m2/s"  />
+      <field id="hflx_fwb_cea"  long_name="heat flux due to fwb"          standard_name="heat_flux_due_to_fwb"          unit="W/m2"     />
+      <field id="vflx_fwb_cea"  long_name="volume flux due to fwb"        standard_name="volume_flux_due_to_fwb"        unit="kg/m2/s"  />
+      
+      <!-- ice field (nn_ice=1)  -->
+      <field id="ice_cover"    long_name="Ice fraction"                                                 standard_name="sea_ice_area_fraction"                              unit="1"            />
+
+      <!-- dilution -->
+      <field id="emp_x_sst"    long_name="Concentration/Dilution term on SST"                                                                                              unit="kg*degC/m2/s" />
+      <field id="emp_x_sss"    long_name="Concentration/Dilution term on SSS"                                                                                              unit="kg*1e-3/m2/s" />
+      <field id="rnf_x_sst"    long_name="Runoff term on SST"                                                                                                              unit="kg*degC/m2/s" />
+      <field id="rnf_x_sss"    long_name="Runoff term on SSS"                                                                                                              unit="kg*1e-3/m2/s" />
+
+      <!-- sbcssm variables -->
+      <field id="sst_m"    unit="degC" />
+      <field id="sss_m"    unit="psu"  />
+      <field id="ssu_m"    unit="m/s"  />
+      <field id="ssv_m"    unit="m/s"  />
+      <field id="ssh_m"    unit="m"    />
+      <field id="e3t_m"    unit="m"    />
+      <field id="frq_m"    unit="-"    />
+
+    </field_group>
+
+
+  </field_group> <!-- SBC -->
+
+  <!-- ABL -->
+  <field_group id="ABL" > <!-- time step automaticaly defined based on nn_fsbc -->
+
+    <!-- variables available with ABL on atmospheric T grid-->
+    <field_group id="grid_ABL3D" grid_ref="grid_TA_3D" >
+      <field id="u_abl"      long_name="ABL i-horizontal velocity"     standard_name="abl_x_velocity" unit="m/s"      />
+      <field id="v_abl"      long_name="ABL j-horizontal velocity"     standard_name="abl_y_velocity" unit="m/s"      />
+      <field id="t_abl"      long_name="ABL potential temperature"     standard_name="abl_theta"      unit="K"        />
+      <field id="q_abl"      long_name="ABL specific humidity"         standard_name="abl_qspe"       unit="kg/kg"    />
+      <!-- debug (to be removed) -->
+      <field id="u_dta"      long_name="DTA i-horizontal velocity"     standard_name="dta_x_velocity" unit="m/s"      />
+      <field id="v_dta"      long_name="DTA j-horizontal velocity"     standard_name="dta_y_velocity" unit="m/s"      />
+      <field id="t_dta"      long_name="DTA potential temperature"     standard_name="dta_theta"      unit="K"        />
+      <field id="q_dta"      long_name="DTA specific humidity"         standard_name="dta_qspe"       unit="kg/kg"    />
+      <field id="u_geo"      long_name="GEO i-horizontal velocity"     standard_name="geo_x_velocity" unit="m/s"      />
+      <field id="v_geo"      long_name="GEO j-horizontal velocity"     standard_name="geo_y_velocity" unit="m/s"      />
+      <field id="tke_abl"    long_name="ABL turbulent kinetic energy"  standard_name="abl_tke"        unit="m2/s2"    />
+      <field id="avm_abl"    long_name="ABL turbulent viscosity"       standard_name="abl_avm"        unit="m2/s"     />
+      <field id="avt_abl"    long_name="ABL turbulent diffusivity"     standard_name="abl_avt"        unit="m2/s"     />
+      <field id="mxlm_abl"   long_name="ABL master mixing length"      standard_name="abl_mxlm"       unit="m"        />
+      <field id="mxld_abl"   long_name="ABL dissipative mixing length" standard_name="abl_mxld"       unit="m"        />
+    </field_group>
+
+    <field_group id="grid_ABL2D" grid_ref="grid_TA_2D" >
+      <field id="pblh"       long_name="ABL height"                    standard_name="abl_height"     unit="m"        />
+      <field id="uz1_abl"    long_name="ABL i-horizontal velocity"     standard_name="abl_x_velocity" unit="m/s"      />
+      <field id="vz1_abl"    long_name="ABL j-horizontal velocity"     standard_name="abl_y_velocity" unit="m/s"      />
+      <field id="uvz1_abl"   long_name="ABL wind speed module"         standard_name="abl_wind_speed" unit="m/s"       > sqrt( uz1_abl^2 + vz1_abl^2 ) </field>
+      <field id="tz1_abl"    long_name="ABL potential temperature"     standard_name="abl_theta"      unit="K"        />
+      <field id="qz1_abl"    long_name="ABL specific humidity"         standard_name="abl_qspe"       unit="kg/kg"    />
+      <field id="uz1_dta"    long_name="DTA i-horizontal velocity"     standard_name="dta_x_velocity" unit="m/s"      />
+      <field id="vz1_dta"    long_name="DTA j-horizontal velocity"     standard_name="dta_y_velocity" unit="m/s"      />
+      <field id="uvz1_dta"   long_name="DTA wind speed module"         standard_name="dta_wind_speed" unit="m/s"       > sqrt( uz1_dta^2 + vz1_dta^2 ) </field>
+      <field id="tz1_dta"    long_name="DTA potential temperature"     standard_name="dta_theta"      unit="K"        />
+      <field id="qz1_dta"    long_name="DTA specific humidity"         standard_name="dta_qspe"       unit="kg/kg"    />
+      <!-- debug (to be removed) -->
+      <field id="uz1_geo"    long_name="GEO i-horizontal velocity"     standard_name="geo_x_velocity" unit="m/s"      />
+      <field id="vz1_geo"    long_name="GEO j-horizontal velocity"     standard_name="geo_y_velocity" unit="m/s"      />
+      <field id="uvz1_geo"   long_name="GEO wind speed module"         standard_name="geo_wind_speed" unit="m/s"       > sqrt( uz1_geo^2 + vz1_geo^2 ) </field>
+    </field_group>
+
+  </field_group> <!-- ABL -->
+
+
+  <!-- U grid -->
+
+  <field_group id="grid_U"   grid_ref="grid_U_2D">
+    <field id="hu"            long_name="water column height at U point"                         standard_name="water_column_height_U"       unit="m" />
+    <field id="e2u"           long_name="U-cell width in meridional direction"                   standard_name="cell_width"                  unit="m"                               />
+    <field id="e3u"           long_name="U-cell thickness"                                       standard_name="cell_thickness"              unit="m"          grid_ref="grid_U_3D" />
+    <field id="e3u_0"         long_name="Initial U-cell thickness"                               standard_name="ref_cell_thickness"          unit="m"          grid_ref="grid_U_3D"/>
+    <field id="utau"          long_name="Wind Stress along i-axis"                               standard_name="surface_downward_x_stress"   unit="N/m2"                            />
+    <field id="uoce"          long_name="ocean current along i-axis"                             standard_name="sea_water_x_velocity"        unit="m/s"        grid_ref="grid_U_3D" />
+    <field id="uoce_e3u"      long_name="ocean current along i-axis  (thickness weighted)"                                                   unit="m/s"        grid_ref="grid_U_3D"  > uoce * e3u </field>
+    <field id="uoce_e3u_vsum" long_name="ocean current along i-axis * e3u summed on the vertical"  field_ref="uoce_e3u"    unit="m3/s"       grid_ref="grid_U_vsum" detect_missing_value="true" />
+    <field id="uocetr_vsum"   long_name="ocean transport along i-axis  summed on the vertical"         field_ref="e2u"       unit="m3/s"> this * uoce_e3u_vsum  </field>
+
+    <field id="uocetr_vsum_op"    long_name="ocean current along i-axis * e3u * e2u summed on the vertical"  read_access="true"  freq_op="1mo"    field_ref="e2u"       unit="m3/s"> @uocetr_vsum </field>
+    <field id="uocetr_vsum_cumul" long_name="ocean current along i-axis * e3u * e2u cumulated from southwest point" freq_offset="_reset_" operation="instant" freq_op="1mo"  unit="m3/s" />
+    <field id="msftbarot"         long_name="ocean_barotropic_mass_streamfunction"   unit="kg s-1" > uocetr_vsum_cumul * $rho0 </field>
+
+
+    <field id="ssu"          long_name="ocean surface current along i-axis"                                                                 unit="m/s"                             />
+    <field id="sbu"          long_name="ocean bottom current along i-axis"                                                                  unit="m/s"  grid_ref="grid_U_2D_inner" />
+    <field id="ubar"         long_name="ocean barotropic current along i-axis"                                                              unit="m/s"                             />
+    <field id="uocetr_eff"   long_name="Effective ocean transport along i-axis"                 standard_name="ocean_volume_x_transport"    unit="m3/s"       grid_ref="grid_U_3D" />
+    <field id="uocet"        long_name="ocean transport along i-axis times temperature (CRS)"                                               unit="degC*m/s"   grid_ref="grid_U_3D" />
+    <field id="uoces"        long_name="ocean transport along i-axis times salinity (CRS)"                                                  unit="1e-3*m/s"   grid_ref="grid_U_3D" />
+    <field id="ssuww"        long_name="ocean surface wind work along i-axis"                   standard_name="surface_x_wind_work"         unit="N/m*s"                            > utau * ssu </field>
+    <!-- AGRIF sponge -->
+    <field id="agrif_spu"    long_name=" AGRIF u-sponge coefficient"   unit=" " />
+    <!-- u-eddy diffusivity coefficients (available if ln_traldf_OFF=F) -->
+    <field id="ahtu_2d"      long_name=" surface u-eddy diffusivity coefficient"   unit="m2/s or m4/s" />
+    <field id="ahtu_3d"      long_name=" 3D u-EIV coefficient"                     unit="m2/s or m4/s"      grid_ref="grid_U_3D"/>
+    <!-- u-eiv diffusivity coefficients (available if ln_ldfeiv=F) -->
+    <field id="aeiu_2d"      long_name=" surface u-EIV coefficient"                unit="m2/s" />
+    <field id="aeiu_3d"      long_name=" 3D u-EIV coefficient"                     unit="m2/s"              grid_ref="grid_U_3D"/>
+
+    <!-- variables available with MLE (ln_mle=T) -->
+    <field id="psiu_mle"     long_name="MLE streamfunction along i-axis"   unit="m3/s"   grid_ref="grid_U_3D" />
+
+    <!-- uoce_eiv: available EIV (ln_ldfeiv=T and ln_ldfeiv_dia=T) -->
+    <field id="uoce_eiv"      long_name="EIV ocean current along i-axis"                                  standard_name="bolus_sea_water_x_velocity"                     unit="m/s"   grid_ref="grid_U_3D" />
+    <field id="ueiv_masstr"   long_name="EIV Ocean Mass X Transport"                                      standard_name="bolus_ocean_mass_x_transport"                   unit="kg/s"  grid_ref="grid_U_3D" />
+    <field id="ueiv_heattr"   long_name="ocean bolus heat transport along i-axis"                         standard_name="ocean_heat_x_transport_due_to_bolus_advection"  unit="W"                         />
+    <field id="ueiv_salttr"   long_name="ocean bolus salt transport along i-axis"                         standard_name="ocean_salt_x_transport_due_to_bolus_advection"  unit="Kg"                        />
+    <field id="ueiv_heattr3d" long_name="ocean bolus heat transport along i-axis"                         standard_name="ocean_heat_x_transport_due_to_bolus_advection"  unit="W"     grid_ref="grid_U_3D" />
+    <field id="ueiv_salttr3d" long_name="ocean bolus salt transport along i-axis"                         standard_name="ocean_salt_x_transport_due_to_bolus_advection"  unit="kg"    grid_ref="grid_U_3D" />
+
+    <!-- uoce_bbl: available with ln_trabbl=T and nn_bbl_adv=1 -->
+    <field id="uoce_bbl"     long_name="BBL ocean current along i-axis"    unit="m/s"  />
+    <!-- ahu_bbl : available with ln_trabbl=T and nn_bbl_ldf=1 -->
+    <field id="ahu_bbl"      long_name="BBL diffusive flux along i-axis"   unit="m3/s" />
+
+    <!-- variables available with WAVE (ln_wave=T) -->
+    <field id="ustokes"      long_name="Stokes Drift Velocity i-axis"      standard_name="StokesDrift_x_velocity"      unit="m/s"        grid_ref="grid_U_3D" />
+    <field id="ustokes_e3u"  long_name="Stokes Drift Velocity i-axis  (thickness weighted)"                            unit="m/s"        grid_ref="grid_U_3D"  > ustokes * e3u </field>
+
+    <!-- variable for ice shelves -->
+    <field id="utbl"         long_name="zonal current in the Losh tbl"     unit="m/s" />
+
+    <!-- variables available with diaar5 -->
+    <field id="u_masstr"      long_name="Ocean Mass X Transport"                                          standard_name="ocean_mass_x_transport"                         unit="kg/s"   grid_ref="grid_U_3D" />
+    <field id="u_masstr_vint" long_name="vertical integral of ocean eulerian mass transport along i-axis" standard_name="vertical_integral_of_ocean_mass_x_transport"    unit="kg/s"   grid_ref="grid_U_2D_inner" />
+    <field id="u_heattr"      long_name="ocean eulerian heat transport along i-axis"                      standard_name="ocean_heat_x_transport"                         unit="W"      grid_ref="grid_U_2D_inner" />
+    <field id="u_salttr"      long_name="ocean eulerian salt transport along i-axis"                      standard_name="ocean_salt_x_transport"                         unit="1e-3*kg/s" grid_ref="grid_U_2D_inner" />
+    <field id="uadv_heattr"   long_name="ocean advective heat transport along i-axis"                     standard_name="advectice_ocean_heat_x_transport"               unit="W"                         />
+    <field id="uadv_salttr"   long_name="ocean advective salt transport along i-axis"                     standard_name="advectice_ocean_salt_x_transport"               unit="1e-3*kg/s"                 />
+    <field id="udiff_heattr"  long_name="ocean diffusion heat transport along i-axis"                     standard_name="ocean_heat_x_transport_due_to_diffusion"        unit="W"                         />
+    <field id="udiff_salttr"  long_name="ocean diffusion salt transport along i-axis"                     standard_name="ocean_salt_x_transport_due_to_diffusion"        unit="1e-3*kg/s"                 />
+  </field_group>
+
+  <!-- V grid -->
+
+  <field_group id="grid_V"   grid_ref="grid_V_2D">
+    <field id="e1v"          long_name="V-cell width in longitudinal direction"                 standard_name="cell_width"                  unit="m"                              />
+    <field id="e3v"          long_name="V-cell thickness"                                       standard_name="cell_thickness"              unit="m"          grid_ref="grid_V_3D" />
+    <field id="e3v_0"        long_name="Initial V-cell thickness"                               standard_name="ref_cell_thickness"          unit="m"          grid_ref="grid_V_3D" />
+    <field id="hv"            long_name="water column height at V point"                        standard_name="water_column_height_V"       unit="m" />
+    <field id="vtau"         long_name="Wind Stress along j-axis"                               standard_name="surface_downward_y_stress"   unit="N/m2"                            />
+    <field id="voce"         long_name="ocean current along j-axis"                             standard_name="sea_water_y_velocity"        unit="m/s"        grid_ref="grid_V_3D" />
+    <field id="voce_e3v"     long_name="ocean current along j-axis  (thickness weighted)"                                                   unit="m/s"        grid_ref="grid_V_3D"  > voce * e3v </field>
+    <field id="ssv"          long_name="ocean surface current along j-axis"                                                                 unit="m/s"                             />
+    <field id="sbv"          long_name="ocean bottom current along j-axis"                                                                  unit="m/s"  grid_ref="grid_V_2D_inner" />
+    <field id="vbar"         long_name="ocean barotropic current along j-axis"                                                              unit="m/s"                             />
+    <field id="vocetr_eff"   long_name="Effective ocean transport along j-axis"                 standard_name="ocean_volume_y_transport"    unit="m3/s"       grid_ref="grid_V_3D" />
+    <field id="vocet"        long_name="ocean transport along j-axis times temperature (CRS)"                                               unit="degC*m/s"   grid_ref="grid_V_3D" />
+    <field id="voces"        long_name="ocean transport along j-axis times salinity (CRS)"                                                  unit="1e-3*m/s"   grid_ref="grid_V_3D" />
+    <field id="ssvww"        long_name="ocean surface wind work along j-axis"                   standard_name="surface_y_wind_work"         unit="N/m*s"                            > vtau * ssv </field>
+    <!-- AGRIF sponge -->
+    <field id="agrif_spv"    long_name=" AGRIF v-sponge coefficient"   unit=" " />
+    <!-- v-eddy diffusivity coefficients (available if ln_traldf_OFF=F) -->
+    <field id="ahtv_2d"      long_name=" surface v-eddy diffusivity coefficient"     unit="m2/s or (m4/s)^1/2" />
+    <field id="ahtv_3d"      long_name=" 3D v-eddy diffusivity coefficient"          unit="m2/s or (m4/s)^1/2"           grid_ref="grid_V_3D"/>
+    <!-- v-eiv diffusivity coefficients (available if ln_ldfeiv=F) -->
+    <field id="aeiv_2d"      long_name=" surface v-EIV coefficient"                  unit="m2/s" />
+    <field id="aeiv_3d"      long_name=" 3D v-EIV coefficient"                       unit="m2/s"                         grid_ref="grid_V_3D" />
+
+    <!-- variables available with MLE (ln_mle=T) -->
+    <field id="psiv_mle"     long_name="MLE streamfunction along j-axis"   unit="m3/s"   grid_ref="grid_V_3D" />
+
+    <!-- voce_eiv: available EIV (ln_ldfeiv=T and ln_ldfeiv_dia=T)  -->
+    <field id="voce_eiv"     long_name="EIV ocean current along j-axis"  standard_name="bolus_sea_water_y_velocity"     unit="m/s"   grid_ref="grid_V_3D" />
+    <field id="veiv_masstr"  long_name="EIV Ocean Mass Y Transport"      standard_name="bolus_ocean_mass_y_transport"   unit="kg/s"  grid_ref="grid_V_3D" />
+    <field id="veiv_heattr"   long_name="ocean bolus heat transport along j-axis"       standard_name="ocean_heat_y_transport_due_to_bolus_advection"   unit="W"                         />
+    <field id="veiv_salttr"   long_name="ocean bolus salt transport along j-axis"       standard_name="ocean_salt_x_transport_due_to_bolus_advection"   unit="Kg"                        />
+    <field id="veiv_heattr3d" long_name="ocean bolus heat transport along j-axis"       standard_name="ocean_heat_y_transport_due_to_bolus_advection"   unit="W"    grid_ref="grid_V_3D" />
+    <field id="veiv_salttr3d" long_name="ocean bolus salt transport along j-axis"       standard_name="ocean_salt_y_transport_due_to_bolus_advection"   unit="kg"   grid_ref="grid_V_3D" />
+
+
+    <!-- voce_bbl: available with ln_trabbl=T and nn_bbl_adv=1 -->
+    <field id="voce_bbl"     long_name="BBL ocean current along j-axis"    unit="m/s"  />
+    <!-- ahu_bbl : available with ln_trabbl=T and nn_bbl_ldf=1 -->
+    <field id="ahv_bbl"      long_name="BBL diffusive flux along j-axis"   unit="m3/s" />
+
+    <!-- variables available with WAVE (ln_wave=T) -->
+    <field id="vstokes"      long_name="Stokes Drift Velocity j-axis"      standard_name="StokesDrift_y_velocity"      unit="m/s"        grid_ref="grid_V_3D" />
+    <field id="vstokes_e3v"  long_name="Stokes Drift Velocity j-axis  (thickness weighted)"                            unit="m/s"        grid_ref="grid_V_3D"  > vstokes * e3v </field>
+
+    <!-- variable for ice shelves -->
+    <field id="vtbl"         long_name="meridional current in the Losh tbl"   unit="m/s" />
+
+    <!-- variables available with diaar5 -->
+    <field id="v_masstr"      long_name="ocean eulerian mass transport along j-axis"    standard_name="ocean_mass_y_transport"                          unit="kg/s" grid_ref="grid_V_3D" />
+    <field id="v_heattr"      long_name="ocean eulerian heat transport along j-axis"    standard_name="ocean_heat_y_transport"                          unit="W"          grid_ref="grid_V_2D_inner" />
+    <field id="v_salttr"      long_name="ocean eulerian salt transport along i-axis"    standard_name="ocean_salt_y_transport"                          unit="1e-3*kg/s"  grid_ref="grid_V_2D_inner" />
+    <field id="vadv_heattr"   long_name="ocean advective heat transport along j-axis"   standard_name="advectice_ocean_heat_y_transport"                unit="W"                         />
+    <field id="vadv_salttr"   long_name="ocean advective salt transport along j-axis"   standard_name="advectice_ocean_salt_y_transport"                unit="1e-3*kg/s"                 />
+    <field id="vdiff_heattr"  long_name="ocean diffusion heat transport along j-axis"   standard_name="ocean_heat_y_transport_due_to_diffusion"         unit="W"                         />
+    <field id="vdiff_salttr"  long_name="ocean diffusion salt transport along j-axis"   standard_name="ocean_salt_y_transport_due_to_diffusion"         unit="1e-3*kg/s"                 />
+  </field_group>
+
+  <!-- W grid -->
+
+  <field_group id="grid_W" grid_ref="grid_W_3D">
+    <field id="e3w"          long_name="W-cell thickness"                              standard_name="cell_thickness"                         unit="m"    />
+    <field id="woce"         long_name="ocean vertical velocity"                       standard_name="upward_sea_water_velocity"              unit="m/s"  />
+    <field id="woce_e3w"     long_name="ocean vertical velocity * e3w"                                                                        unit="m2/s"  > woce * e3w </field>
+    <field id="wocetr_eff"   long_name="effective ocean vertical transport"                                                                   unit="m3/s" />
+
+    <!-- woce_eiv: available with EIV  (ln_ldfeiv=T and ln_ldfeiv_dia=T)  -->
+    <field id="woce_eiv"     long_name="EIV ocean vertical velocity"                    standard_name="bolus_upward_sea_water_velocity"       unit="m/s"  />
+    <field id="weiv_masstr"  long_name="EIV Upward Ocean Mass Transport"  standard_name="bolus_upward_ocean_mass_transport"             unit="kg/s"   />
+    <field id="weiv_heattr3d" long_name="ocean bolus heat transport"    standard_name="ocean_heat_z_transport_due_to_bolus_advection"   unit="W"    />
+    <field id="weiv_salttr3d" long_name="ocean bolus salt transport"    standard_name="ocean_salt_z_transport_due_to_bolus_advection"   unit="kg"   />
+
+    <field id="avt"          long_name="vertical eddy diffusivity"                      standard_name="ocean_vertical_heat_diffusivity"       unit="m2/s" />
+    <field id="avt_e3w"      long_name="vertical heat diffusivity * e3w"                unit="m3/s" > avt * e3w </field>
+    <field id="logavt"       long_name="logarithm of vertical eddy diffusivity"         standard_name="ocean_vertical_heat_diffusivity"       unit="m2/s" />
+    <field id="avm"          long_name="vertical eddy viscosity"                        standard_name="ocean_vertical_momentum_diffusivity"   unit="m2/s" />
+    <field id="avm_e3w"      long_name="vertical eddy viscosity * e3w"   unit="m3/s" > avm * e3w </field>
+
+    <!-- avs: /= avt with ln_zdfddm=T -->
+    <field id="avs"          long_name="salt vertical eddy diffusivity"                 standard_name="ocean_vertical_salt_diffusivity"       unit="m2/s" />
+    <field id="avs_e3w"      long_name="vertical salt diffusivity * e3w"   unit="m3/s" > avs * e3w </field>
+    <field id="logavs"       long_name="logarithm of salt vertical eddy diffusivity"    standard_name="ocean_vertical_heat_diffusivity"       unit="m2/s" />
+
+    <!-- avt_evd and avm_evd: available with ln_zdfevd -->
+    <field id="avt_evd"      long_name="convective enhancement of vertical diffusivity" standard_name="ocean_vertical_tracer_diffusivity_due_to_convection"     unit="m2/s" />
+    <field id="avt_evd_e3w"  long_name="convective enhancement to vertical diffusivity * e3w "    unit="m3/s" > avt_evd * e3w </field>
+    <field id="avm_evd"      long_name="convective enhancement of vertical viscosity"   standard_name="ocean_vertical_momentum_diffusivity_due_to_convection"   unit="m2/s" />
+
+    <!-- mf_app and mf_wp: available with ln_zdfmfc -->
+    <field id="mf_app"      long_name="convective area"        standard_name="mf_convective_area"    unit="%"      grid_ref="grid_W_3D" />
+    <field id="mf_wp"       long_name="convective velocity"    standard_name="mf_convective_velo"    unit="m/s"    grid_ref="grid_W_3D" />
+
+
+    <!-- avt_tide: available with ln_zdfiwm=T -->
+    <field id="av_ratio"     long_name="S over T diffusivity ratio"                     standard_name="salinity_over_temperature_diffusivity_ratio"                     unit="1"    />
+    <field id="av_wave"      long_name="internal wave-induced vertical diffusivity"     standard_name="ocean_vertical_tracer_diffusivity_due_to_internal_waves"         unit="m2/s" />
+    <field id="bflx_iwm"     long_name="internal wave-induced buoyancy flux"            standard_name="buoyancy_flux_due_to_internal_waves"                             unit="W/kg" />
+    <field id="pcmap_iwm"    long_name="power consumed by wave-driven mixing"           standard_name="vertically_integrated_power_consumption_by_wave_driven_mixing"   unit="W/m2"      grid_ref="grid_W_2D" />
+    <field id="emix_iwm"     long_name="power density available for mixing"             standard_name="power_available_for_mixing_from_breaking_internal_waves"         unit="W/kg" />
+
+    <!-- variables available with WAVE (ln_wave=T) -->
+    <field id="wstokes"      long_name="Stokes Drift vertical velocity"                 standard_name="upward_StokesDrift_velocity"   unit="m/s" />
+
+    <!-- variables available with diaar5 -->
+    <field id="w_masstr"     long_name="vertical mass transport"                        standard_name="upward_ocean_mass_transport"             unit="kg/s"   />
+    <field id="w_masstr2"    long_name="square of vertical mass transport"              standard_name="square_of_upward_ocean_mass_transport"   unit="kg2/s2" />
+
+    <!-- EOS -->
+    <field id="bn2"          long_name="squared Brunt-Vaisala frequency"                unit="s-2" />
+
+    <!-- dissipation diagnostics (note: ediss_k is only available with tke scheme) -->   
+    <field id="avt_k"        long_name="vertical eddy diffusivity from closure schemes" standard_name="ocean_vertical_eddy_diffusivity"       unit="m2/s" />
+    <field id="avm_k"        long_name="vertical eddy viscosity from closure schemes"   standard_name="ocean_vertical_eddy_viscosity"         unit="m2/s" />
+    <field id="ediss_k"      long_name="Kolmogorov energy dissipation (tke scheme)"     standard_name="Kolmogorov_energy_dissipation"         unit="W/kg" />
+    <field id="eshear_k"     long_name="energy source from vertical shear"              standard_name="energy_source_from_shear"              unit="W/kg" />
+    <field id="estrat_k"     long_name="energy sink from stratification"                standard_name="energy_sink_from_stratification"       unit="W/kg" />
+    
+  </field_group>
+
+  <!-- F grid -->
+  <field_group id="grid_F" grid_ref="grid_F_2D">
+    <field id="e3f"          long_name="F-cell thickness"                      standard_name="cell_thickness"         unit="m"   grid_ref="grid_F_3D" />
+    <field id="e3f_0"        long_name="F-cell thickness"                      standard_name="cell_thickness"         unit="m"   grid_ref="grid_F_3D" />
+    <field id="hf"           long_name="water column height at F point"        standard_name="water_column_height_F"  unit="m"                     />
+    <field id="ssKEf"        long_name="surface kinetic energy at F point"     standard_name="specific_kinetic_energy_of_sea_water"   unit="m2/s2" grid_ref="grid_F_2D_inner" />
+    <field id="ssrelvor"     long_name="surface relative vorticity"            standard_name="relative_vorticity"     unit="1/s"       grid_ref="grid_F_2D_inner" />
+    <field id="ssplavor"     long_name="surface planetary vorticity"           standard_name="planetary_vorticity"    unit="1/s"       />
+    <field id="ssrelpotvor"  long_name="surface relative potential vorticity"  standard_name="relpot_vorticity"       unit="1/m.s"     grid_ref="grid_F_2D_inner" />
+    <field id="ssabspotvor"  long_name="surface absolute potential vorticity"  standard_name="abspot_vorticity"       unit="1/m.s"     grid_ref="grid_F_2D_inner" />
+    <field id="ssEns"        long_name="surface enstrophy"                     standard_name="enstrophy"              unit="1/m2.s2"   grid_ref="grid_F_2D_inner" />
+  </field_group>
+
+  <!-- AGRIF sponge -->
+  <field id="agrif_spf"    long_name=" AGRIF f-sponge coefficient"   unit=" " />
+  <!-- f-eddy viscosity coefficients (ldfdyn) -->
+  <field id="ahmf_2d"      long_name=" surface f-eddy viscosity coefficient"   unit="m2/s or m4/s" />
+  <field id="ahmf_3d"      long_name=" 3D      f-eddy viscosity coefficient"   unit="m2/s or m4/s"  grid_ref="grid_T_3D"/>
+
+  <field_group id="scalar"  grid_ref="grid_scalar"  >
+    <!-- Need to have a salinity reference climatological file : sali_ref_clim_monthly -->
+    <field id="voltot"     long_name="global total volume"                          standard_name="sea_water_volume"                               unit="m3"   />
+    <field id="sshtot"     long_name="global mean ssh"                              standard_name="global_average_sea_level_change"                unit="m"    />
+    <field id="sshsteric"  long_name="global mean ssh steric"                       standard_name="global_average_steric_sea_level_change"         unit="m"    />
+    <field id="sshthster"  long_name="global mean ssh thermosteric"                 standard_name="global_average_thermosteric_sea_level_change"   unit="m"    />
+    <field id="masstot"    long_name="global total mass"                            standard_name="sea_water_mass"                                 unit="kg"   />
+    <field id="temptot"    long_name="global mean temperature"                      standard_name="sea_water_potential_temperature"                unit="degC" />
+    <field id="saltot"     long_name="global mean salinity"                         standard_name="sea_water_salinity"                             unit="1e-3" />
+    <field id="ssttot"     long_name="global mean sea surface temperature"          standard_name="sea_water_conservative_temperature"             unit="degC" />
+    <!-- EOS = TEOS-10 -->
+    <field id="temptot_pot" long_name="global mean potential temperature"            standard_name="sea_water_potential_temperature"               unit="degC" />
+
+    <!-- available with ln_diahsb -->
+    <field id="bgtemper"     long_name="drift in global mean temperature wrt timestep 1"                 standard_name="change_over_time_in_sea_water_potential_temperature"   unit="degC"     />
+    <field id="bgsaline"     long_name="drift in global mean salinity wrt timestep 1"                    standard_name="change_over_time_in_sea_water_practical_salinity"      unit="1e-3"     />
+    <field id="bgheatco"     long_name="drift in global mean heat content wrt timestep 1"                                                                                      unit="1.e20J"   />
+    <field id="bgheatfx"     long_name="drift in global mean heat flux    wrt timestep 1"                                                                                      unit="W/m2"     />
+    <field id="bgsaltco"     long_name="drift in global mean salt content wrt timestep 1"                                                                                      unit="1e-3*km3" />
+    <field id="bgvolssh"     long_name="drift in global mean ssh volume wrt timestep 1"                                                                                        unit="km3"      />
+    <field id="bgvole3t"     long_name="drift in global mean volume variation (e3t) wrt timestep 1"                                                                            unit="km3"      />
+    <field id="bgfrcvol"     long_name="global mean volume from forcing"                                                                                                       unit="km3"      />
+    <field id="bgfrctem"     long_name="global mean heat content from forcing"                                                                                                 unit="1.e20J"   />
+    <field id="bgfrchfx"     long_name="global mean heat flux from forcing"                                                                                                    unit="W/m2"     />
+    <field id="bgfrcsal"     long_name="global mean salt content from forcing"                                                                                                 unit="1e-3*km3" />
+    <field id="bgmistem"     long_name="global mean temperature error due to free surface (linssh true)"                                                                       unit="degC"     />
+    <field id="bgmissal"     long_name="global mean salinity error due to free surface (linssh true)"                                                                          unit="1e-3"     />
+  </field_group>
+
+
+  <!-- transects -->
+  <field_group id="oce_straits">
+    <field id="uoce_e3u_ave"         long_name="Monthly average of u*e3u"                        field_ref="uoce_e3u"                    freq_op="1mo"   freq_offset="_reset_" > @uoce_e3u </field>
+    <field id="uoce_e3u_ave_vsum"    long_name="Vertical sum of u*e3u"                           field_ref="uoce_e3u_ave"         grid_ref="grid_U_vsum"  detect_missing_value="true"   />
+    <field id="uocetr_vsum_section"  long_name="Total 2D transport in i-direction"               field_ref="uoce_e3u_ave_vsum"    grid_ref="grid_U_scalar"  detect_missing_value="true"> this * e2u </field>
+    <field id="uocetr_strait"        long_name="Total transport across lines in i-direction"     field_ref="uocetr_vsum_section"  grid_ref="grid_U_4strait" />
+    <field id="u_masstr_strait"      long_name="Sea water transport across line in i-direction"  field_ref="uocetr_strait"        grid_ref="grid_U_4strait_hsum" unit="kg/s"> this * maskMFO_u * $rho0 </field>
+
+    <field id="voce_e3v_ave"         long_name="Monthly average of v*e3v"                        field_ref="voce_e3v"                    freq_op="1mo"   freq_offset="_reset_" > @voce_e3v </field>
+    <field id="voce_e3v_ave_vsum"    long_name="Vertical sum of v*e3v"                           field_ref="voce_e3v_ave"         grid_ref="grid_V_vsum"  detect_missing_value="true"    />
+    <field id="vocetr_vsum_section"  long_name="Total 2D transport of in j-direction"            field_ref="voce_e3v_ave_vsum"    grid_ref="grid_V_scalar"  detect_missing_value="true"> this * e1v </field>
+    <field id="vocetr_strait"        long_name="Total transport across lines in j-direction"     field_ref="vocetr_vsum_section"  grid_ref="grid_V_4strait"  />
+    <field id="v_masstr_strait"      long_name="Sea water transport across line in j-direction"  field_ref="vocetr_strait"        grid_ref="grid_V_4strait_hsum" unit="kg/s"> this * maskMFO_v * $rho0 </field>
+
+    <field id="masstr_strait"        long_name="Sea water transport across line"                                                  grid_ref="grid_4strait"  > u_masstr_strait + v_masstr_strait </field>
+  </field_group>
+
+  <!-- variables available with ln_floats -->
+
+  <field_group id="floatvar" grid_ref="grid_T_nfloat"  operation="instant" >
+    <field id="traj_lon"      long_name="floats longitude"                                                           unit="degrees_east"  />
+    <field id="traj_lat"      long_name="floats latitude"                                                            unit="degrees_north" />
+    <field id="traj_dep"      long_name="floats depth"                                                               unit="m"             />
+    <field id="traj_temp"     long_name="floats temperature"       standard_name="sea_water_potential_temperature"   unit="degC"          />
+    <field id="traj_salt"     long_name="floats salinity"          standard_name="sea_water_practical_salinity"      unit="1e-3"          />
+    <field id="traj_dens"     long_name="floats in-situ density"   standard_name="sea_water_density"                 unit="kg/m3"         />
+    <field id="traj_group"    long_name="floats group"                                                               unit="1"             />
+  </field_group>
+
+  <!-- variables available with iceberg trajectories -->
+
+  <field_group id="icbvar" domain_ref="grid_T"  >
+    <field id="berg_melt"          long_name="icb melt rate of icebergs"                       unit="kg/m2/s"                    />
+    <field id="berg_melt_hcflx"    long_name="icb heat flux to ocean due to melting heat content"   unit="J/m2/s"                />
+    <field id="berg_melt_qlat"     long_name="icb heat flux to ocean due to melting latent heat"    unit="J/m2/s"                />
+    <field id="berg_buoy_melt"     long_name="icb buoyancy component of iceberg melt rate"     unit="kg/m2/s"                    />
+    <field id="berg_eros_melt"     long_name="icb erosion component of iceberg melt rate"      unit="kg/m2/s"                    />
+    <field id="berg_conv_melt"     long_name="icb convective component of iceberg melt rate"   unit="kg/m2/s"                    />
+    <field id="berg_virtual_area"  long_name="icb virtual coverage by icebergs"                unit="m2"                         />
+    <field id="bits_src"           long_name="icb mass source of bergy bits"                   unit="kg/m2/s"                    />
+    <field id="bits_melt"          long_name="icb melt rate of bergy bits"                     unit="kg/m2/s"                    />
+    <field id="bits_mass"          long_name="icb bergy bit density field"                     unit="kg/m2"                      />
+    <field id="berg_mass"          long_name="icb iceberg density field"                       unit="kg/m2"                      />
+    <field id="calving"            long_name="icb calving mass input"                          unit="kg/s"                       />
+    <field id="berg_floating_melt" long_name="icb melt rate of icebergs + bits"                unit="kg/m2/s"                    />
+    <field id="berg_real_calving"  long_name="icb calving into iceberg class"                  unit="kg/s"     axis_ref="icbcla" />
+    <field id="berg_stored_ice"    long_name="icb accumulated ice mass by class"               unit="kg"       axis_ref="icbcla" />
+  </field_group>
+
+  <!-- Poleward transport : ptr -->
+  <field_group id="diaptr" >
+    <field id="zomsf"         long_name="Overturning Stream-Function : All basins"                     unit="Sv"         grid_ref="grid_znl_W_3D" />
+    <field id="zotem"         long_name="Zonal Mean Temperature : All basins"                          unit="degree_C"   grid_ref="grid_znl_T_3D" />
+    <field id="zosal"         long_name="Zonal Mean Salinity : All basins"                             unit="0.001"      grid_ref="grid_znl_T_3D" />
+    <field id="zosrf"         long_name="Zonal Mean Surface : All basins"                              unit="m2"         grid_ref="grid_znl_T_3D" />
+    <field id="sophtove"      long_name="Overturning Heat Transport: All basins"                       unit="PW"         grid_ref="grid_znl_T_2D" />
+    <field id="sopstove"      long_name="Overturning Salt Transport: All basins"                       unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+    <field id="sophtbtr"      long_name="Barotropic Heat Transport: All basins"                        unit="PW"         grid_ref="grid_znl_T_2D" />
+    <field id="sopstbtr"      long_name="Barotropic Salt Transport: All basins"                        unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+    <field id="sophtadv"      long_name="Advective Heat Transport: All basins"                         unit="PW"         grid_ref="grid_znl_T_2D" />
+    <field id="sopstadv"      long_name="Advective Salt Transport: All basins"                         unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+    <field id="sophtldf"      long_name="Diffusive Heat Transport: All basins"                         unit="PW"         grid_ref="grid_znl_T_2D" />
+    <field id="sopstldf"      long_name="Diffusive Salt Transport: All basins"                         unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+    <field id="sophtvtr"      long_name="Heat Transport : All basins"                                  unit="PW"         grid_ref="grid_znl_T_2D" />
+    <field id="sopstvtr"      long_name="Salt Transport : All basins"                                  unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+    <field id="sophteiv"      long_name="Heat Transport from mesoscale eddy advection: All basins"     unit="PW"         grid_ref="grid_znl_T_2D" />
+    <field id="sopsteiv"      long_name="Salt Transport from mesoscale eddy advection : All basins"    unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+    <field id="sopstadv"      long_name="Advective Salt Transport"                                     unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+    <field id="sophtgyre"     long_name="Overturning heat transport due to gyre" field_ref="sophtove"  unit="W"          grid_ref="grid_znl_T_2D" > sophtvtr - sophtove  </field>
+    <field id="sopstgyre"     long_name="Overturning salt transport due to gyre" field_ref="sopstove"  unit="kg/s"       grid_ref="grid_znl_T_2D" > sophtvtr - sopstove  </field>
+  </field_group>
+
+  <field_group id="constant_fields"  grid_ref="grid_T_2D"  operation="once" >
+    <field id="bathy"       long_name="Sea floor depth below geoid"               standard_name="sea_floor_depth_below_geoid"               unit="m"/>
+    <field id="areacello"   long_name="Horizontal area of ocean grid cells"       standard_name="cell_area"                                 unit="m2" />
+    <field id="hfgeou"      long_name="Upward geothermal heat flux at sea floor"  standard_name="upward_geothermal_heat_flux_at_sea_floor"  unit="W/m2"/>
+    <field id="basins"      long_name="ocean tracer region masks"                 standard_name="ocean_tracer_region_masks"   unit="none" grid_ref="grid_basin"  />
+  </field_group>
+
+
+  <!--
+      ============================================================================================================
+      Physical ocean model trend diagnostics : temperature, KE, PE, momentum
+      ============================================================================================================
+  -->
+
+  <!-- variables available with ln_tra_trd -->
+  <!-- Asselin trends  calculated on odd time steps-->
+  <field_group id="trendT_odd"  grid_ref="grid_T_3D">
+    <field id="ttrd_atf"      long_name="temperature-trend: asselin time filter"       unit="degree_C/s" />
+    <field id="strd_atf"      long_name="salinity   -trend: asselin time filter"       unit="0.001/s" />
+    <!-- Thickness weighted versions: -->
+    <field id="ttrd_atf_e3t"      unit="degC/s * m"  >  ttrd_atf * e3t </field>
+    <field id="strd_atf_e3t"      unit="1e-3/s * m"  >  strd_atf * e3t </field>
+    <!-- OMIP  layer-integrated trends -->
+    <field id="ttrd_atf_li"      long_name="layer integrated heat-trend: asselin time filter "       unit="W/m^2" > ttrd_atf_e3t * 1026.0 * 3991.86795711963  </field>
+    <field id="strd_atf_li"      long_name="layer integrated salt   -trend: asselin time filter "       unit="kg/(m^2 s)" > strd_atf_e3t * 1026.0 * 0.001 </field>
+  </field_group>
+
+  <!-- Other trends  calculated on even time steps-->
+  <field_group id="trendT_even" grid_ref="grid_T_3D">
+    <field id="ttrd_xad"      long_name="temperature-trend: i-advection"                                                                                          unit="degC/s"                        />
+    <field id="strd_xad"      long_name="salinity   -trend: i-advection"                                                                                          unit="1e-3/s"                        />
+    <field id="ttrd_yad"      long_name="temperature-trend: j-advection"                                                                                          unit="degC/s"                        />
+    <field id="strd_yad"      long_name="salinity   -trend: j-advection"                                                                                          unit="1e-3/s"                        />
+    <field id="ttrd_zad"      long_name="temperature-trend: k-advection"                                                                                          unit="degC/s"                        />
+    <field id="strd_zad"      long_name="salinity   -trend: k-advection"                                                                                          unit="1e-3/s"                        />
+    <field id="ttrd_ad"       long_name="temperature-trend: advection"               standard_name="tendency_of_sea_water_temperature_due_to_advection"           unit="degC/s"                         > sqrt( ttrd_xad^2 + ttrd_yad^2 + ttrd_zad^2 ) </field>
+    <field id="strd_ad"       long_name="salinity   -trend: advection"               standard_name="tendency_of_sea_water_salinity_due_to_advection"              unit="1e-3/s"                         > sqrt( strd_xad^2 + strd_yad^2 + strd_zad^2 ) </field>
+    <field id="ttrd_totad"    long_name="temperature-trend: total advection"         standard_name="tendency_of_sea_water_salinity_due_to_advection"              unit="degC/s"                        />
+    <field id="strd_totad"    long_name="salinity   -trend: total advection"         standard_name="tendency_of_sea_water_salinity_due_to_advection"              unit="1e-3/s"                        />
+    <field id="ttrd_sad"      long_name="temperature-trend: surface adv. (linssh true)"                                                                           unit="degC/s"   grid_ref="grid_T_2D" />
+    <field id="strd_sad"      long_name="salinity   -trend: surface adv. (linssh true)"                                                                           unit="1e-3/s"   grid_ref="grid_T_2D" />
+    <field id="ttrd_ldf"      long_name="temperature-trend: lateral  diffusion"      standard_name="tendency_of_sea_water_temperature_due_to_horizontal_mixing"   unit="degC/s"                        />
+    <field id="strd_ldf"      long_name="salinity   -trend: lateral  diffusion"      standard_name="tendency_of_sea_water_salinity_due_to_horizontal_mixing"      unit="1e-3/s"                        />
+    <field id="ttrd_zdf"      long_name="temperature-trend: vertical diffusion"      standard_name="tendency_of_sea_water_temperature_due_to_vertical_mixing"     unit="degC/s"                        />
+    <field id="strd_zdf"      long_name="salinity   -trend: vertical diffusion"      standard_name="tendency_of_sea_water_salinity_due_to_vertical_mixing"        unit="1e-3/s"                        />
+    <field id="ttrd_evd"      long_name="temperature-trend: EVD convection"                                                                                       unit="degC/s"                        />
+    <field id="strd_evd"      long_name="salinity   -trend: EVD convection"                                                                                       unit="1e-3/s"                        />
+
+    <!-- ln_traldf_iso=T only (iso-neutral diffusion) -->
+    <field id="ttrd_iso"      long_name="temperature-trend: isopycnal diffusion"                             unit="degC/s" > ttrd_ldf + ttrd_zdf - ttrd_zdfp </field>
+    <field id="strd_iso"      long_name="salinity   -trend: isopycnal diffusion"                             unit="1e-3/s" > strd_ldf + strd_zdf - strd_zdfp </field>
+    <field id="ttrd_zdfp"     long_name="temperature-trend: pure vert. diffusion"   unit="degC/s" />
+    <field id="strd_zdfp"     long_name="salinity   -trend: pure vert. diffusion"   unit="1e-3/s" />
+
+    <!-- ln_zdfosm=T only (OSMOSIS-OBL) -->
+    <field id="ttrd_osm"      long_name="temperature-trend: OSM-OSBL non-local forcing"                             unit="degC/s" />
+    <field id="strd_osm"      long_name="salinity   -trend: OSM-OSBL non-local forcing"                             unit="1e-3/s" />
+
+
+    <!-- -->
+    <field id="ttrd_dmp"      long_name="temperature-trend: interior restoring"        unit="degC/s" />
+    <field id="strd_dmp"      long_name="salinity   -trend: interior restoring"        unit="1e-3/s" />
+    <field id="ttrd_bbl"      long_name="temperature-trend: bottom boundary layer"     unit="degC/s" />
+    <field id="strd_bbl"      long_name="salinity   -trend: bottom boundary layer"     unit="1e-3/s" />
+    <field id="ttrd_npc"      long_name="temperature-trend: non-penetrative conv."     unit="degC/s" />
+    <field id="strd_npc"      long_name="salinity   -trend: non-penetrative conv."     unit="1e-3/s" />
+    <field id="ttrd_qns"      long_name="temperature-trend: non-solar flux + runoff"   unit="degC/s" grid_ref="grid_T_2D" />
+    <field id="strd_cdt"      long_name="salinity   -trend: C/D term       + runoff"   unit="degC/s" grid_ref="grid_T_2D" />
+    <field id="ttrd_qsr"      long_name="temperature-trend: solar penetr. heating"     unit="degC/s" />
+    <field id="ttrd_bbc"      long_name="temperature-trend: geothermal heating"        unit="degC/s" />
+
+    <!-- Thickness weighted versions: -->
+    <field id="ttrd_xad_e3t"      unit="degC/s * m" >  ttrd_xad * e3t </field>
+    <field id="strd_xad_e3t"      unit="1e-3/s * m" >  strd_xad * e3t </field>
+    <field id="ttrd_yad_e3t"      unit="degC/s * m" >  ttrd_yad * e3t </field>
+    <field id="strd_yad_e3t"      unit="1e-3/s * m" >  strd_yad * e3t </field>
+    <field id="ttrd_zad_e3t"      unit="degC/s * m" >  ttrd_zad * e3t </field>
+    <field id="strd_zad_e3t"      unit="1e-3/s * m" >  strd_zad * e3t </field>
+    <field id="ttrd_ad_e3t"       unit="degC/s * m" >  ttrd_ad  * e3t </field>
+    <field id="strd_ad_e3t"       unit="1e-3/s * m" >  strd_ad  * e3t </field>
+    <field id="ttrd_totad_e3t"    unit="degC/s * m" >  ttrd_totad  * e3t </field>
+    <field id="strd_totad_e3t"    unit="1e-3/s * m" >  strd_totad  * e3t </field>
+    <field id="ttrd_ldf_e3t"      unit="degC/s * m" >  ttrd_ldf * e3t </field>
+    <field id="strd_ldf_e3t"      unit="1e-3/s * m" >  strd_ldf * e3t </field>
+    <field id="ttrd_zdf_e3t"      unit="degC/s * m" >  ttrd_zdf * e3t </field>
+    <field id="strd_zdf_e3t"      unit="1e-3/s * m" >  strd_zdf * e3t </field>
+    <field id="ttrd_evd_e3t"      unit="degC/s * m" >  ttrd_evd * e3t </field>
+    <field id="strd_evd_e3t"      unit="1e-3/s * m" >  strd_evd * e3t </field>
+
+    <!-- ln_traldf_iso=T only (iso-neutral diffusion) -->
+    <field id="ttrd_iso_e3t"      unit="degC/s * m"  >  ttrd_iso * e3t </field>
+    <field id="strd_iso_e3t"      unit="1e-3/s * m"  >  strd_iso * e3t </field>
+    <field id="ttrd_zdfp_e3t"     unit="degC/s * m"  >  ttrd_zdfp * e3t </field>
+    <field id="strd_zdfp_e3t"     unit="1e-3/s * m"  >  strd_zdfp * e3t </field>
+
+    <!-- ln_zdfosm=T only (OSMOSIS-OBL) -->
+    <field id="ttrd_osm_e3t"      long_name="temperature-trend: OSM-OSBL non-local forcing"                             unit="degC/s * m" >  ttrd_osm * e3t </field>
+    <field id="strd_osm_e3t"      long_name="salinity   -trend: OSM-OSBL non-local forcing"                             unit="1e-3/s * m" >  strd_osm * e3t </field>
+
+    <!-- -->
+    <field id="ttrd_dmp_e3t"      unit="degC/s * m"  >  ttrd_dmp * e3t </field>
+    <field id="strd_dmp_e3t"      unit="1e-3/s * m"  >  strd_dmp * e3t </field>
+    <field id="ttrd_bbl_e3t"      unit="degC/s * m"  >  ttrd_bbl * e3t </field>
+    <field id="strd_bbl_e3t"      unit="1e-3/s * m"  >  strd_bbl * e3t </field>
+    <field id="ttrd_npc_e3t"      unit="degC/s * m"  >  ttrd_npc * e3t </field>
+    <field id="strd_npc_e3t"      unit="1e-3/s * m"  >  strd_npc * e3t </field>
+    <field id="ttrd_qns_e3t"      unit="degC/s * m"  >  ttrd_qns * e3ts </field>
+    <field id="strd_cdt_e3t"      unit="degC/s * m"  >  strd_cdt * e3ts </field>
+    <field id="ttrd_qsr_e3t"      unit="degC/s * m"  >  ttrd_qsr * e3t </field>
+    <field id="ttrd_bbc_e3t"      unit="degC/s * m"  >  ttrd_bbc * e3t </field>
+
+    <!-- OMIP  layer-integrated trends -->
+    <field id="ttrd_totad_li"    long_name="layer integrated heat-trend: total advection"         unit="W/m^2"     > ttrd_totad_e3t * 1026.0 * 3991.86795711963 </field>
+    <field id="strd_totad_li"    long_name="layer integrated salt-trend: total advection"         unit="kg/(m^2 s)"    > strd_totad_e3t * 1026.0 * 0.001  </field>
+    <field id="ttrd_osm_li"    long_name="layer integrated heat-trend: non-local OSM"         unit="W/m^2"     > ttrd_osm_e3t * 1026.0 * 3991.86795711963 </field>
+    <field id="strd_osm_li"    long_name="layer integrated salt-trend: non-local OSM"         unit="kg/(m^2 s)"    > strd_osm_e3t * 1026.0 * 0.001  </field>
+    <field id="ttrd_evd_li"      long_name="layer integrated heat-trend: EVD convection"          unit="W/m^2"    > ttrd_evd_e3t * 1026.0 * 3991.86795711963 </field>
+    <field id="strd_evd_li"      long_name="layer integrated salt-trend: EVD convection"          unit="kg/(m^2 s)"  > strd_evd_e3t * 1026.0 * 0.001  </field>
+    <field id="ttrd_iso_li"      long_name="layer integrated heat-trend: isopycnal diffusion"     unit="W/m^2" > ttrd_iso_e3t * 1026.0 * 3991.86795711963 </field>
+    <field id="strd_iso_li"      long_name="layer integrated salt-trend: isopycnal diffusion"     unit="kg/(m^2 s)" > strd_iso_e3t * 1026.0 * 0.001  </field>
+    <field id="ttrd_zdfp_li"     long_name="layer integrated heat-trend: pure vert. diffusion"    unit="W/m^2" > ttrd_zdfp_e3t * 1026.0 * 3991.86795711963 </field>
+    <field id="strd_zdfp_li"     long_name="layer integrated salt-trend: pure vert. diffusion"    unit="kg/(m^2 s)" > strd_zdfp_e3t * 1026.0 * 0.001  </field>
+    <field id="ttrd_qns_li"      long_name="layer integrated heat-trend: non-solar flux + runoff" unit="W/m^2" grid_ref="grid_T_2D"> ttrd_qns_e3t * 1026.0 * 3991.86795711963 </field>
+    <field id="ttrd_qsr_li"      long_name="layer integrated heat-trend: solar flux"              unit="W/m^2"  grid_ref="grid_T_3D"> ttrd_qsr_e3t * 1026.0 * 3991.86795711963 </field>
+    <field id="ttrd_bbl_li"      long_name="layer integrated heat-trend: bottom boundary layer "  unit="W/m^2" > ttrd_bbl_e3t * 1026.0 * 3991.86795711963 </field>
+    <field id="strd_bbl_li"      long_name="layer integrated salt-trend: bottom boundary layer "  unit="kg/(m^2 s)" > strd_bbl_e3t * 1026.0 * 0.001  </field>
+    <field id="ttrd_evd_li"      long_name="layer integrated heat-trend: evd convection "         unit="W/m^2" >ttrd_evd_e3t * 1026.0 * 3991.86795711963  </field>
+    <field id="strd_evd_li"      long_name="layer integrated salt-trend: evd convection "         unit="kg/(m^2 s)" > strd_evd_e3t * 1026.0 * 0.001  </field>
+
+  </field_group>
+
+  <!--  Total trends calculated every time step-->
+  <field_group id="trendT" grid_ref="grid_T_3D">
+    <field id="ttrd_tot"      long_name="temperature-trend: total model trend"         unit="degC/s" />
+    <field id="strd_tot"      long_name="salinity   -trend: total model trend"         unit="1e-3/s" />
+    <!-- Thickness weighted versions: -->
+    <field id="ttrd_tot_e3t"      unit="degC/s * m"  >  ttrd_tot * e3t </field>
+    <field id="strd_tot_e3t"      unit="1e-3/s * m"  >  strd_tot * e3t </field>
+    <!-- OMIP  layer-integrated total trends -->
+    <field id="ttrd_tot_li"      long_name="layer integrated heat-trend: total model trend :"         unit="W/m^2" > ttrd_tot_e3t * 1026.0 * 3991.86795711963 </field>
+    <field id="strd_tot_li"      long_name="layer integrated salt-trend: total model trend :"         unit="kg/(m^2 s)" > strd_tot_e3t * 1026.0 * 0.001  </field>
+
+    <!-- **** these trends have not been apportioned to all/even/odd ts yet **** -->
+    <!-- variables available with ln_KE_trd -->
+    <field id="ketrd_hpg"     long_name="ke-trend: hydrostatic pressure gradient"          unit="W/s^3"                        />
+    <field id="ketrd_spg"     long_name="ke-trend: surface     pressure gradient"          unit="W/s^3"                        />
+    <field id="ketrd_spgexp"  long_name="ke-trend: surface pressure gradient (explicit)"   unit="W/s^3"                        />
+    <field id="ketrd_spgflt"  long_name="ke-trend: surface pressure gradient (filter)"     unit="W/s^3"                        />
+    <field id="ssh_flt"       long_name="filtered contribution to ssh (dynspg_flt)"        unit="m"       grid_ref="grid_T_2D" />
+    <field id="w0"            long_name="surface vertical velocity"                        unit="m/s"     grid_ref="grid_T_2D" />
+    <field id="pw0_exp"       long_name="surface pressure flux due to ssh"                 unit="W/s^2"   grid_ref="grid_T_2D" />
+    <field id="pw0_flt"       long_name="surface pressure flux due to filtered ssh"        unit="W/s^2"   grid_ref="grid_T_2D" />
+    <field id="ketrd_keg"     long_name="ke-trend: KE gradient         or hor. adv."       unit="W/s^3"                        />
+    <field id="ketrd_rvo"     long_name="ke-trend: relative  vorticity or metric term"     unit="W/s^3"                        />
+    <field id="ketrd_pvo"     long_name="ke-trend: planetary vorticity"                    unit="W/s^3"                        />
+    <field id="ketrd_zad"     long_name="ke-trend: vertical  advection"                    unit="W/s^3"                        />
+    <field id="ketrd_udx"     long_name="ke-trend: U.dx[U]"                                unit="W/s^3"                        />
+    <field id="ketrd_ldf"     long_name="ke-trend: lateral   diffusion"                    unit="W/s^3"                        />
+    <field id="ketrd_zdf"     long_name="ke-trend: vertical  diffusion"                    unit="W/s^3"                        />
+    <field id="ketrd_tau"     long_name="ke-trend: wind stress "                           unit="W/s^3"   grid_ref="grid_T_2D" />
+    <field id="ketrd_bfr"     long_name="ke-trend: bottom friction (explicit)"             unit="W/s^3"                        />
+    <field id="ketrd_bfri"    long_name="ke-trend: bottom friction (implicit)"             unit="W/s^3"                        />
+    <field id="ketrd_atf"     long_name="ke-trend: asselin time filter trend"              unit="W/s^3"                        />
+    <field id="ketrd_convP2K" long_name="ke-trend: conversion (potential to kinetic)"      unit="W/s^3"                        />
+    <field id="KE"            long_name="kinetic energy: u(n)*u(n+1)/2"                    unit="W/s^2"                        />
+
+    <!-- variables available when explicit lateral mixing is used (ln_dynldf_OFF=F) -->
+    <field id="dispkexyfo"    long_name="KE-trend: lateral  mixing induced dissipation"   standard_name="ocean_kinetic_energy_dissipation_per_unit_area_due_to_xy_friction"                   unit="W/m^2" grid_ref="grid_T_2D" />
+    <field id="dispkevfo"     long_name="KE-trend: vertical mixing induced dissipation"   standard_name="ocean_kinetic_energy_dissipation_per_unit_area_due_to_vertical_friction"             unit="W/m^2" grid_ref="grid_T_2D" />
+    <!-- variables available with ln_traadv_eiv=T and ln_diaeiv=T -->
+    <field id="eketrd_eiv"    long_name="EKE-trend due to parameterized eddy advection"   standard_name="tendency_of_ocean_eddy_kinetic_energy_content_due_to_parameterized_eddy_advection"   unit="W/m^2" grid_ref="grid_T_2D" />
+
+    <!-- variables available with ln_PE_trd -->
+    <field id="petrd_xad"     long_name="pe-trend: i-advection"                unit="W/m^3"                        />
+    <field id="petrd_yad"     long_name="pe-trend: j-advection"                unit="W/m^3"                        />
+    <field id="petrd_zad"     long_name="pe-trend: k-advection"                unit="W/m^3"                        />
+    <field id="petrd_sad"     long_name="pe-trend: surface adv. (linssh true)" unit="W/m^3"   grid_ref="grid_T_2D" />
+    <field id="petrd_ldf"     long_name="pe-trend: lateral  diffusion"         unit="W/m^3"                        />
+    <field id="petrd_zdf"     long_name="pe-trend: vertical diffusion"         unit="W/m^3"                        />
+    <field id="petrd_zdfp"    long_name="pe-trend: pure vert. diffusion"       unit="W/m^3"                        />
+    <field id="petrd_dmp"     long_name="pe-trend: interior restoring"         unit="W/m^3"                        />
+    <field id="petrd_bbl"     long_name="pe-trend: bottom boundary layer"      unit="W/m^3"                        />
+    <field id="petrd_npc"     long_name="pe-trend: non-penetrative conv."      unit="W/m^3"                        />
+    <field id="petrd_nsr"     long_name="pe-trend: surface forcing + runoff"   unit="W/m^3"                        />
+    <field id="petrd_qsr"     long_name="pe-trend: solar penetr. heating"      unit="W/m^3"                        />
+    <field id="petrd_bbc"     long_name="pe-trend: geothermal heating"         unit="W/m^3"                        />
+    <field id="petrd_atf"     long_name="pe-trend: asselin time filter"        unit="W/m^3"                        />
+    <field id="PEanom"        long_name="potential energy anomaly"             unit="1"                            />
+    <field id="alphaPE"       long_name="partial deriv. of PEanom wrt T"       unit="degC-1"                       />
+    <field id="betaPE"        long_name="partial deriv. of PEanom wrt S"       unit="1e3"                          />
+  </field_group>
+
+  <field_group id="trendU" grid_ref="grid_U_3D">
+    <!-- variables available with ln_dyn_trd -->
+    <field id="utrd_hpg"       long_name="i-trend: hydrostatic pressure gradient"          unit="m/s^2"                        />
+    <field id="utrd_spg"       long_name="i-trend: surface     pressure gradient"          unit="m/s^2"                        />
+    <field id="utrd_spgexp"    long_name="i-trend: surface pressure gradient (explicit)"   unit="m/s^2"                        />
+    <field id="utrd_spgflt"    long_name="i-trend: surface pressure gradient (filtered)"   unit="m/s^2"                        />
+    <field id="utrd_keg"       long_name="i-trend: KE gradient         or hor. adv."       unit="m/s^2"                        />
+    <field id="utrd_rvo"       long_name="i-trend: relative  vorticity or metric term"     unit="m/s^2"                        />
+    <field id="utrd_pvo"       long_name="i-trend: planetary vorticity"                    unit="m/s^2"                        />
+    <field id="utrd_zad"       long_name="i-trend: vertical  advection"                    unit="m/s^2"                        />
+    <field id="utrd_udx"       long_name="i-trend: U.dx[U]"                                unit="m/s^2"                        />
+    <field id="utrd_ldf"       long_name="i-trend: lateral   diffusion"                    unit="m/s^2"                        />
+    <field id="utrd_zdf"       long_name="i-trend: vertical  diffusion"                    unit="m/s^2"                        />
+    <field id="utrd_tau"       long_name="i-trend: wind stress "                           unit="m/s^2"   grid_ref="grid_U_2D" />
+    <field id="utrd_bfr"       long_name="i-trend: bottom friction (explicit)"             unit="m/s^2"                        />
+    <field id="utrd_bfri"      long_name="i-trend: bottom friction (implicit)"             unit="m/s^2"                        />
+    <field id="utrd_tot"       long_name="i-trend: total momentum trend before atf"        unit="m/s^2"                        />
+    <field id="utrd_atf"       long_name="i-trend: asselin time filter trend"              unit="m/s^2"                        />
+  </field_group>
+
+  <field_group id="trendV" grid_ref="grid_V_3D">
+    <!-- variables available with ln_dyn_trd -->
+    <field id="vtrd_hpg"       long_name="j-trend: hydrostatic pressure gradient"          unit="m/s^2"                        />
+    <field id="vtrd_spg"       long_name="j-trend: surface     pressure gradient"          unit="m/s^2"                        />
+    <field id="vtrd_spgexp"    long_name="j-trend: surface pressure gradient (explicit)"   unit="m/s^2"                        />
+    <field id="vtrd_spgflt"    long_name="j-trend: surface pressure gradient (filtered)"   unit="m/s^2"                        />
+    <field id="vtrd_keg"       long_name="j-trend: KE gradient         or hor. adv."       unit="m/s^2"                        />
+    <field id="vtrd_rvo"       long_name="j-trend: relative  vorticity or metric term"     unit="m/s^2"                        />
+    <field id="vtrd_pvo"       long_name="j-trend: planetary vorticity"                    unit="m/s^2"                        />
+    <field id="vtrd_zad"       long_name="j-trend: vertical  advection"                    unit="m/s^2"                        />
+    <field id="vtrd_vdy"       long_name="i-trend: V.dx[V]"                                unit="m/s^2"                        />
+    <field id="vtrd_ldf"       long_name="j-trend: lateral   diffusion"                    unit="m/s^2"                        />
+    <field id="vtrd_zdf"       long_name="j-trend: vertical  diffusion"                    unit="m/s^2"                        />
+    <field id="vtrd_tau"       long_name="j-trend: wind stress "                           unit="m/s^2"   grid_ref="grid_V_2D" />
+    <field id="vtrd_bfr"       long_name="j-trend: bottom friction (explicit)"             unit="m/s^2"                        />
+    <field id="vtrd_bfri"      long_name="j-trend: bottom friction (implicit)"             unit="m/s^2"                        />
+    <field id="vtrd_tot"       long_name="j-trend: total momentum trend before atf"        unit="m/s^2"                        />
+    <field id="vtrd_atf"       long_name="j-trend: asselin time filter trend"              unit="m/s^2"                        />
+  </field_group>
+
+  <!-- shared variables available with TOP interface -->
+  <field_group id="top_shared" grid_ref="grid_T_3D">
+    <field id="xeps"           long_name="Broadband light attenuation"                     unit="-"                            />
+    <field id="Heup"           long_name="Euphotic layer depth"                            unit="m"     grid_ref="grid_T_2D"   />
+  </field_group>
+
+
+  <!--
+      ============================================================================================================
+      Definitions for iodef_demo.xml
+      ============================================================================================================
+  -->
+
+  <field_group id="TRD" >
+    <field field_ref="ttrd_totad_li"   name="opottempadvect"  />
+    <field field_ref="ttrd_iso_li"     name="opottemppmdiff"  />
+    <field field_ref="ttrd_zdfp_li"    name="opottempdiff"  />
+    <field field_ref="ttrd_evd_li"     name="opottempevd" />
+    <field field_ref="strd_evd_li"     name="osaltevd" />
+    <field field_ref="ttrd_qns_li"     name="opottempqns"  />
+    <field field_ref="ttrd_qsr_li"     name="rsdoabsorb" operation="accumulate" />
+    <field field_ref="strd_totad_li"   name="osaltadvect" />
+    <field field_ref="strd_iso_li"     name="osaltpmdiff"  />
+    <field field_ref="strd_zdfp_li"    name="osaltdiff" />
+  </field_group>
+
+  <field_group id="mooring" >
+    <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"      />
+    <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                   />
+    <field field_ref="uoce"         name="uo"       long_name="sea_water_x_velocity"                 />
+    <field field_ref="voce"         name="vo"       long_name="sea_water_y_velocity"                 />
+    <field field_ref="woce"         name="wo"       long_name="sea_water_z_velocity"                 />
+    <field field_ref="avt"          name="difvho"   long_name="ocean_vertical_heat_diffusivity"      />
+    <field field_ref="avm"          name="difvmo"   long_name="ocean_vertical_momentum_diffusivity"  />
+
+    <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       />
+    <field field_ref="sst2"         name="tossq"    long_name="square_of_sea_surface_temperature"             />
+    <field field_ref="sstgrad"      name="tosgrad"  long_name="module_of_sea_surface_temperature_gradient"    />
+    <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="empmr"        name="wfo"      long_name="water_flux_into_sea_water"                     />
+    <field field_ref="qsr"          name="rsntds"   long_name="surface_net_downward_shortwave_flux"           />
+    <field field_ref="qt"           name="tohfls"   long_name="surface_net_downward_total_heat_flux"          />
+    <field field_ref="taum"                                                                                   />
+    <field field_ref="20d"                                                                                    />
+    <field field_ref="mldkz5"                                                                                 />
+    <field field_ref="mldr10_1"                                                                               />
+    <field field_ref="mldr10_3"                                                                               />
+    <field field_ref="mldr0_1"                                                                                />
+    <field field_ref="mldr0_3"                                                                                />
+    <field field_ref="mld_dt02"                                                                               />
+    <field field_ref="topthdep"                                                                               />
+    <field field_ref="pycndep"                                                                                />
+    <field field_ref="tinv"                                                                                   />
+    <field field_ref="depti"                                                                                  />
+    <field field_ref="BLT"          name="blt"      long_name="barrier_layer_thickness"                       />
+    <field field_ref="utau"         name="tauuo"    long_name="surface_downward_x_stress"                     />
+    <field field_ref="vtau"         name="tauvo"    long_name="surface_downward_y_stress"                     />
+  </field_group>
+
+  <field_group id="groupT" >
+    <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"               />
+    <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                            />
+    <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       />
+    <field field_ref="sst2"         name="tossq"    long_name="square_of_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="empmr"        name="wfo"      long_name="water_flux_into_sea_water"                     />
+    <field field_ref="qsr"          name="rsntds"   long_name="surface_net_downward_shortwave_flux"           />
+    <field field_ref="qt"           name="tohfls"   long_name="surface_net_downward_total_heat_flux"          />
+    <field field_ref="taum"                                                                                   />
+    <field field_ref="20d"                                                                                    />
+    <field field_ref="mldkz5"                                                                                 />
+    <field field_ref="mldr10_1"                                                                               />
+    <field field_ref="mldr10_3"                                                                               />
+    <field field_ref="mld_dt02"                                                                               />
+    <field field_ref="topthdep"                                                                               />
+    <field field_ref="pycndep"                                                                                />
+    <field field_ref="tinv"                                                                                   />
+    <field field_ref="depti"                                                                                  />
+    <field field_ref="BLT"          name="blt"      long_name="Barrier Layer Thickness"                       />
+  </field_group>
+
+  <field_group id="groupU" >
+    <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity"      />
+    <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
+  </field_group>
+
+  <field_group id="groupV" >
+    <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity"      />
+    <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />
+  </field_group>
+
+  <field_group id="groupW" >
+    <field field_ref="woce"         name="wo"       long_name="ocean vertical velocity"  />
+  </field_group>
+
+  <!-- TMB diagnostic output -->
+  <field_group  id="1h_grid_T_tmb" grid_ref="grid_T_2D" operation="instant">
+    <field id="top_temp"           name="votemper_top"  unit="degC"  />
+    <field id="mid_temp"           name="votemper_mid"  unit="degC"  />
+    <field id="bot_temp"           name="votemper_bot"  unit="degC"  />
+    <field id="top_sal"            name="vosaline_top"  unit="psu"   />
+    <field id="mid_sal"            name="vosaline_mid"  unit="psu"   />
+    <field id="bot_sal"            name="vosaline_bot"  unit="psu"   />
+    <field id="sshnmasked"         name="sossheig"      unit="m"     />
+  </field_group>
+
+  <field_group  id="1h_grid_U_tmb" grid_ref="grid_U_2D" operation="instant">
+    <field id="top_u"           name="vozocrtx_top"  unit="m/s"  />
+    <field id="mid_u"           name="vozocrtx_mid"  unit="m/s"  />
+    <field id="bot_u"           name="vozocrtx_bot"  unit="m/s"  />
+    <field id="baro_u"          name="vobtcrtx"      unit="m/s"  />
+  </field_group>
+
+  <field_group  id="1h_grid_V_tmb" grid_ref="grid_V_2D" operation="instant">
+    <field id="top_v"           name="vomecrty_top"  unit="m/s"  />
+    <field id="mid_v"           name="vomecrty_mid"  unit="m/s"  />
+    <field id="bot_v"           name="vomecrty_bot"  unit="m/s"  />
+    <field id="baro_v"          name="vobtcrty"      unit="m/s"  />
+  </field_group>
+
+  <!-- 25h diagnostic output -->
+  <field_group id="25h_grid_T" grid_ref="grid_T_3D_inner" operation="instant">
+    <field id="temper25h"         name="potential temperature 25h mean"    unit="degC" />
+    <field id="tempis25h"         name="insitu temperature 25h mean"    unit="degC" />
+    <field id="salin25h"          name="salinity 25h mean"                 unit="psu"  />
+    <field id="ssh25h"            name="sea surface height 25h mean"  grid_ref="grid_T_2D_inner"      unit="m"    />
+  </field_group>
+
+  <field_group id="25h_grid_U" grid_ref="grid_U_3D_inner" operation="instant" >
+    <field id="vozocrtx25h"         name="i current 25h mean"    unit="m/s"   />
+  </field_group>
+
+  <field_group id="25h_grid_V" grid_ref="grid_V_3D_inner" operation="instant">
+    <field id="vomecrty25h"         name="j current 25h mean"    unit="m/s"    />
+  </field_group>
+
+  <field_group id="25h_grid_W" grid_ref="grid_W_3D_inner" operation="instant">
+    <field id="vovecrtz25h"         name="k current 25h mean"                 unit="m/s"      />
+    <field id="avt25h"              name="vertical diffusivity25h mean"       unit="m2/s" />
+    <field id="avm25h"              name="vertical viscosity 25h mean"        unit="m2/s" />
+    <field id="tke25h"              name="turbulent kinetic energy 25h mean" />
+    <field id="mxln25h"             name="mixing length 25h mean"             unit="m" />
+  </field_group>
+
+  <!--
+      ============================================================================================================
+  -->
+  <!-- output variables for my configuration (example) -->
+
+  <field_group id="myvarOCE" >
+    <!-- grid T -->
+    <field field_ref="e3t"          name="e3t"      long_name="vertical scale factor"           />
+    <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"  />
+
+    <!-- grid U -->
+    <field field_ref="e3u"          name="e3u"     long_name="vertical scale factor"            />
+    <field field_ref="ssu"          name="uos"     long_name="sea_surface_x_velocity"           />
+
+    <!-- grid V -->
+    <field field_ref="e3v"          name="e3v"     long_name="vertical scale factor"            />
+    <field field_ref="ssv"          name="vos"     long_name="sea_surface_y_velocity"           />
+  </field_group>
+
+  <!--============================-->
+  <!--  CONSERVATION diagnostics  -->
+  <!--============================-->
+  <!-- BE CAREFUL: this group (OCE_budget) cannot be called in file_def.xml as such (unless nn_fsbc=1)
+                   If doing so, the last output (in time) of the netcdf file 
+		   would be corrupted (NaN values). However calling each of these
+		   variables directly in the file_def.xml works. It is probably 
+		   because there is a mix up of sbc variables with other variables
+    -->
+  <field_group id="OCE_budget"        grid_ref="grid_T_2D" >
+    <field field_ref="sst"                 name="tos"          />
+    <field field_ref="sss"                 name="sos"          />
+    <field field_ref="ssh"                 name="zos"          />
+    <!-- mass flux -->
+    <field field_ref="empmr"               name="empmr"        />
+    <field field_ref="runoffs"             name="runoffs"      />
+    <field field_ref="emp_ice"             name="emp_ice"      />
+    <field field_ref="emp_oce"             name="emp_oce"      />
+    <field field_ref="iceshelf_cea"        name="iceshelf"     />
+    <field field_ref="iceberg_cea"         name="iceberg"      />
+    <field field_ref="calving_cea"         name="calving"      />
+    <!-- <field field_ref="berg_floating_melt"  name="calving" /> -->
+    <field field_ref="precip"              name="precip"       />
+    <field field_ref="snowpre"             name="snowpre"      />
+    <field field_ref="rain"                name="rain"         />
+    <field field_ref="evap_ao_cea"         name="evap_ao"      />
+    <field field_ref="subl_ai_cea"         name="subl_ai"      />
+    <field field_ref="snow_ai_cea"         name="snow_ai"      />
+    <field field_ref="snow_ao_cea"         name="snow_ao"      />
+    <!-- heat flux -->
+    <field field_ref="qsr"                 name="qsr"          />
+    <field field_ref="qns"                 name="qns"          />
+    <field field_ref="qt_oce"              name="qt_oce"       />
+    <field field_ref="qemp_oce"            name="qemp_oce"     />
+    <field field_ref="hflx_rain_cea"       name="hflx_rain"    />
+    <field field_ref="hflx_evap_cea"       name="hflx_evap"    />
+    <field field_ref="hflx_snow_cea"       name="hflx_snow"    />
+    <field field_ref="hflx_snow_ao_cea"    name="hflx_snow_ao" />
+    <field field_ref="hflx_snow_ai_cea"    name="hflx_snow_ai" />
+    <field field_ref="hflx_rnf_cea"        name="hflx_rnf"     />
+    <field field_ref="hflx_icb_cea"        name="hflx_icb"     />
+    <field field_ref="hflx_isf_cea"        name="hflx_isf"     />
+    <!-- salt flux (includes ssr) -->
+    <field field_ref="saltflx"             name="saltflx"      />
+    <field field_ref="sflx_rnf_cea"        name="sflx_rnf"     />
+    <!-- relaxation and damping -->
+    <field field_ref="hflx_ssr_cea"        name="hflx_ssr"     />
+    <field field_ref="vflx_ssr_cea"        name="vflx_ssr"     />
+    <field field_ref="sflx_ssr_cea"        name="sflx_ssr"     />
+    <field field_ref="hflx_dmp_cea"        name="hflx_dmp"     />
+    <field field_ref="sflx_dmp_cea"        name="sflx_dmp"     />
+    <field field_ref="hflx_fwb_cea"        name="hflx_fwb"     />
+    <field field_ref="vflx_fwb_cea"        name="vflx_fwb"     />
+  </field_group>
+
+  <field_group id="OCE_globalbudget"  grid_ref="grid_scalar" >
+    <field field_ref="voltot"              name="scvoltot"     />
+    <field field_ref="saltot"              name="scsaltot"     />
+    <field field_ref="temptot"             name="sctemtot"     />
+  </field_group>
+
+  
+</field_definition>
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/field_def_nemo-pisces.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/field_def_nemo-pisces.xml	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/field_def_nemo-pisces.xml	(revision 6658)
@@ -0,0 +1,343 @@
+<?xml version="1.0"?>
+<!-- $id$ -->
+
+<!--
+============================================================================================================
+=                                  definition of all existing variables                                    =
+=                                            DO NOT CHANGE                                                 =
+============================================================================================================
+-->
+<field_definition level="1" prec="4" operation="average" enabled=".TRUE." default_value="1.e20" > <!-- time step automaticaly defined -->
+
+  <!--
+      ============================================================================================================
+      Biogeochemistry model variables
+      ============================================================================================================
+  -->
+
+  <!-- ptrc on T grid -->
+
+  <field_group id="ptrc_T" grid_ref="grid_T_3D">
+    <!-- PISCES standard : variables available with ln_p4z  -->
+    <field id="DIC"          long_name="Dissolved inorganic Concentration"        unit="mmol/m3" />
+    <field id="DIC_e3t"      long_name="DIC * e3t"                                unit="mmol/m2" > DIC * e3t </field >
+    <field id="Alkalini"     long_name="Total Alkalinity Concentration"           unit="mmol/m3" />
+    <field id="Alkalini_e3t" long_name="Alkalini * e3t"                           unit="mmol/m2"  > Alkalini * e3t </field >
+    <field id="O2"           long_name="Oxygen Concentration"                     unit="mmol/m3" />
+    <field id="O2_e3t"       long_name="O2 * e3t"                                 unit="mmol/m2"  > O2 * e3t </field >
+    <field id="CaCO3"        long_name="Calcite Concentration"                    unit="mmol/m3" />
+    <field id="CaCO3_e3t"    long_name="CaCO3 * e3t"                              unit="mmol/m2"  > CaCO3 * e3t </field >
+    <field id="PO4"          long_name="Phosphate Concentration"                  unit="mmol/m3" />
+    <field id="PO4_e3t"      long_name="PO4 * e3t"                                unit="mmol/m2"  > PO4 * e3t </field >
+    <field id="POC"          long_name="Small organic carbon Concentration"       unit="mmol/m3" />
+    <field id="POC_e3t"      long_name="POC * e3t"                                unit="mmol/m2"  > POC * e3t </field >
+    <field id="Si"           long_name="Silicate Concentration"                   unit="mmol/m3" />
+    <field id="Si_e3t"       long_name="Si * e3t"                                 unit="mmol/m2"  > Si * e3t </field >
+    <field id="PHY"          long_name="(Nano)Phytoplankton Concentration"        unit="mmol/m3" />
+    <field id="PHY_e3t"      long_name="PHY * e3t"                                unit="mmol/m2"  > PHY * e3t </field >
+    <field id="ZOO"          long_name="(Micro)Zooplankton Concentration"         unit="mmol/m3" />
+    <field id="ZOO_e3t"      long_name="ZOO2 * e3t"                               unit="mmol/m2"  > ZOO * e3t </field >
+    <field id="DOC"          long_name="Dissolved organic Concentration"          unit="mmol/m3" />
+    <field id="DOC_e3t"      long_name="DOC * e3t"                                unit="mmol/m2"  > DOC * e3t </field >
+    <field id="PHY2"         long_name="Diatoms Concentration"                    unit="mmol/m3" />
+    <field id="PHY2_e3t"     long_name="PHY2 * e3t"                               unit="mmol/m2"  > PHY2 * e3t </field >
+    <field id="ZOO2"         long_name="Mesozooplankton Concentration"            unit="mmol/m3" />
+    <field id="ZOO2_e3t"     long_name="ZOO2 * e3t"                               unit="mmol/m2"  > ZOO2 * e3t </field >
+    <field id="DSi"          long_name="Diatoms Silicate Concentration"           unit="mmol/m3" />
+    <field id="DSi_e3t"      long_name="Dsi * e3t"                                unit="mmol/m2"  > DSi * e3t </field >
+    <field id="Fer"          long_name="Dissolved Iron Concentration"             unit="mmol/m3" />
+    <field id="Fer_e3t"      long_name="Fer * e3t"                                unit="mmol/m2"  > Fer * e3t </field >
+    <field id="BFe"          long_name="Big iron particles Concentration"         unit="mmol/m3" />
+    <field id="BFe_e3t"      long_name="BFe * e3t"                                unit="mmol/m2"  > BFe * e3t </field >
+    <field id="GOC"          long_name="Big organic carbon Concentration"         unit="mmol/m3" />
+    <field id="GOC_e3t"      long_name="GOC * e3t"                                unit="mmol/m2"  > GOC * e3t </field >
+    <field id="SFe"          long_name="Small iron particles Concentration"       unit="mmol/m3" />
+    <field id="SFe_e3t"      long_name="SFe * e3t"                                unit="mmol/m2"  > SFe * e3t </field >
+    <field id="DFe"          long_name="Diatoms iron  Concentration"              unit="mmol/m3" />
+    <field id="DFe_e3t"      long_name="DFe * e3t"                                unit="mmol/m2"  > DFe * e3t </field >
+    <field id="GSi"          long_name="Sinking biogenic Silicate Concentration"  unit="mmol/m3" />
+    <field id="GSi_e3t"      long_name="GSi * e3t"                                unit="mmol/m2"  > GSi * e3t </field >
+    <field id="NFe"          long_name="Nano iron Concentration"                  unit="mmol/m3" />
+    <field id="NFe_e3t"      long_name="NFe * e3t"                                unit="mmol/m2"  > NFe * e3t </field >
+    <field id="NCHL"         long_name="Nano chlorophyl Concentration"            unit="gChl/m3"   />
+    <field id="NCHL_e3t"     long_name="NCHL * e3t"                               unit="mmol/m2"  > NCHL * e3t </field >
+    <field id="DCHL"         long_name="Diatoms chlorophyl Concentration"         unit="gChl/m3"   />
+    <field id="DCHL_e3t"     long_name="DCHL * e3t"                               unit="mmol/m2"  > DCHL * e3t </field >
+    <field id="NO3"          long_name="Nitrate Concentration"                    unit="mmol/m3" />
+    <field id="NO3_e3t"      long_name="NO3 * e3t"                                unit="mmol/m2"  > NO3 * e3t </field >
+    <field id="NH4"          long_name="Ammonium Concentration"                   unit="mmol/m3" />
+    <field id="NH4_e3t"      long_name="NH4 * e3t"                                unit="mmol/m2"  > NH4 * e3t </field >
+
+    <!-- PISCES quota : variables available with ln_p5z  -->
+
+    <field id="DON"          long_name="Dissolved organic N Concentration"        unit="mmol/m3" />
+    <field id="DON_e3t"      long_name="DON * e3t"                                unit="mmol/m2"  > DON * e3t </field >
+    <field id="DOP"          long_name="Dissolved organic P Concentration"        unit="mmol/m3" />
+    <field id="DOP_e3t"      long_name="DOP * e3t"                                unit="mmol/m2"  > DOP * e3t </field >
+    <field id="PON"          long_name="Small PON Concentration"                  unit="mmol/m3" />
+    <field id="PON_e3t"      long_name="PON * e3t"                                unit="mmol/m2"  > PON * e3t </field >
+    <field id="POP"          long_name="Small POP Concentration"                  unit="mmol/m3" />
+    <field id="POP_e3t"      long_name="POP * e3t"                                unit="mmol/m2"  > POP * e3t </field >
+    <field id="GON"          long_name="Big PON Concentration"                    unit="mmol/m3" />
+    <field id="GON_e3t"      long_name="GON * e3t"                                unit="mmol/m2"  > GON * e3t </field >
+    <field id="GOP"          long_name="Big POP Concentration"                    unit="mmol/m3" />
+    <field id="GOP_e3t"      long_name="GOP * e3t"                                unit="mmol/m2"  > GOP * e3t </field >
+    <field id="PHYN"         long_name="Nanophytoplankton N biomass"              unit="mmol/m3" />
+    <field id="PHYN_e3t"     long_name="PHYN * e3t"                               unit="mmol/m2"  > PHYN * e3t </field >
+    <field id="PHYP"         long_name="Nanophytoplankton P biomass"              unit="mmol/m3" />
+    <field id="PHYP_e3t"     long_name="PHYP * e3t"                               unit="mmol/m2"  > PHYP * e3t </field >
+    <field id="DIAN"         long_name="Diatoms N biomass"                        unit="mmol/m3" />
+    <field id="DIAN_e3t"     long_name="DIAN * e3t"                               unit="mmol/m2"  > DIAN * e3t </field >
+    <field id="DIAP"         long_name="Diatoms P biomass"                        unit="mmol/m3" />
+    <field id="DIAP_e3t"     long_name="DIAP * e3t"                               unit="mmol/m2"  > DIAP * e3t </field >
+    <field id="PIC"          long_name="Picophytoplankton C biomass"              unit="mmol/m3" />
+    <field id="PIC_e3t"      long_name="PIC * e3t"                                unit="mmol/m2"  > PIC * e3t </field >
+    <field id="PICN"         long_name="Picophytoplankton N biomass"              unit="mmol/m3" />
+    <field id="PICN_e3t"     long_name="PICN * e3t"                               unit="mmol/m2"  > PICN * e3t </field >
+    <field id="PICP"         long_name="Picophytoplankton P biomass"              unit="mmol/m3" />
+    <field id="PICP_e3t"     long_name="PICP * e3t"                               unit="mmol/m2"  > PICP * e3t </field >
+    <field id="PFe"          long_name="Picophytoplankton Fe biomass"             unit="mmol/m3" />
+    <field id="PFe_e3t"      long_name="PFe * e3t"                                unit="mmol/m2"  > PFe * e3t </field >
+    <field id="PCHL"         long_name="Picophytoplankton Chl biomass"            unit="gChl/m3" />
+    <field id="PCHL_e3t"     long_name="PCHL * e3t"                               unit="mmol/m2"  > PCHL * e3t </field >
+
+    <!-- PISCES with ligand parametisation : variables available namelist paramter ln_ligand -->
+    <field id="LGW"         long_name="Weak ligands concentration"                unit="mmol/m3" />
+    <field id="LGW_e3t"     long_name="LGW * e3t"                                 unit="mmol/m2"  > LGW * e3t </field >
+
+    <!-- PISCES light : variables available with ln_p2z  -->
+    <field id="DET"         long_name="Detritus"                                 unit="mmol-N/m3" />
+    <field id="DET_e3t"     long_name="DET * e3t"                                unit="mmol-N/m2"  > DET * e3t </field >
+    <field id="DOM"         long_name="Dissolved Organic Matter"                 unit="mmol-N/m3" />
+    <field id="DOM_e3t"     long_name="DOM * e3t"                                unit="mmol-N/m2"  > DOM * e3t </field >
+
+  </field_group>
+
+  <!-- SEDIMENT variables on T sediment grid  -->
+  <field_group id="sed_T" grid_ref="grid_T_3DS">
+    <field id="SedDIC"          long_name="Dissolved inorganic Concentration"        unit="mmol/m3" />
+    <field id="SedAlkalini"     long_name="Total Alkalinity Concentration"           unit="mmol/m3" />
+    <field id="SedO2"           long_name="Oxygen Concentration"                     unit="mmol/m3" />
+    <field id="SedCaCO3"        long_name="Calcite Concentration"                    unit="%" />
+    <field id="SedPOS"          long_name="Semi-ref POC Concentration"               unit="%" />
+    <field id="SedPOR"          long_name="Refractory POC Concentration"             unit="%" />
+    <field id="SedPO4"          long_name="Phosphate Concentration"                  unit="mmol/m3" />
+    <field id="SedPOC"          long_name="Labile POC Concentration"                 unit="%" />
+    <field id="SedSil"          long_name="Silicate Concentration"                   unit="mmol/m3" />
+    <field id="SedFe2"          long_name="Fe2+ Concentration"                       unit="mmol/m3" />
+    <field id="SedBSi"          long_name="Biogenic Silicate Concentration"          unit="%" />
+    <field id="SedNO3"          long_name="Nitrate Concentration"                    unit="mmol/m3" />
+    <field id="SedNH4"          long_name="Ammonium Concentration"                   unit="mmol/m3" />
+    <field id="SedH2S"          long_name="H2S Concentration"                        unit="mmol/m3" />
+    <field id="SedSO4"          long_name="SO4 Concentration"                        unit="mmol/m3" />
+    <field id="SedClay"         long_name="Clay Concentration"                       unit="%" />
+    <field id="SedFeO"          long_name="Fe(OH)3 Concentration"                    unit="%" />
+    <field id="SedFeS"          long_name="FeS Concentration"                        unit="%" />
+    <field id="SedpH"           long_name="PH"                                       unit="1"          />
+    <field id="SedCO3por"       long_name="Bicarbonates"                             unit="mol/m3" />
+    <field id="Sedligand"       long_name="Ligands"                                  unit="mol/m3" />
+    <field id="SaturCO3"        long_name="CO3 Saturation"                           unit="-" />	    
+  </field_group>
+
+  <!-- SEDIMENT additional variables on T sediment grid  -->
+  <field_group id="Diag_S" grid_ref="grid_T_2D">
+      <field id="FlxSi"       long_name="Si sediment flux"                        unit="mol/cm2/s"     />
+       <field id="FlxO2"       long_name="O2 sediment flux"                        unit="mol/cm2/s"     />
+       <field id="FlxDIC"      long_name="DIC sediment flux"                       unit="mol/cm2/s"     />
+       <field id="FlxNO3"      long_name="NO3 sediment flux"                       unit="mol/cm2/s"     />
+       <field id="FlxPO4"      long_name="PO4 sediment flux"                       unit="mol/cm2/s"     />
+       <field id="FlxAlkalini" long_name="Alkalinity sediment flux"                unit="mol/cm2/s"     />
+       <field id="FlxNH4"      long_name="Ammonium sediment flux"                  unit="mol/cm2/s"     />
+       <field id="FlxH2S"      long_name="H2S sediment flux"                       unit="mol/cm2/s"     />
+       <field id="FlxSO4"      long_name="SO4 sediment flux"                       unit="mol/cm2/s"     />
+       <field id="FlxFe2"      long_name="Fe2+ sediment flux"                      unit="mol/cm2/s"     />
+       <field id="FlxLig"      long_name="Ligand sediment flux"                    unit="mol/cm2/s"     />
+       <field id="dzdep"       long_name="Sedimentation rate"                      unit="cm/s"     />
+       <field id="sflxclay"    long_name="Clay sedimentation rate"                 unit="g/cm2/s"     />
+       <field id="sflxbsi"     long_name="BSi sedimentation rate"                  unit="g/cm2/s"     />
+       <field id="sflxpoc"     long_name="POC sedimentation rate"                  unit="g/cm2/s"     />
+       <field id="sflxcal"     long_name="Calcite sedimentation rate"              unit="g/cm2/s"     />
+       <field id="sflxfeo"     long_name="Fe(OH)3 Sedimentation rate"              unit="mol/cm2/s"     />
+       <field id="FlxClay"     long_name="Clay burial rate"                        unit="g/cm2/s"     />
+       <field id="FlxCaCO3"    long_name="Calcite burial rate"                     unit="g/cm2/s"     />
+       <field id="FlxBSi"      long_name="BSi burial rate"                         unit="g/cm2/s"     />
+       <field id="FlxPOC"      long_name="POC burial rate"                         unit="g/cm2/s"     />
+       <field id="FlxFeO"      long_name="Fe(OH)3 burial rate"                     unit="g/cm2/s"     />
+       <field id="FlxFeS"      long_name="FeS burial rate"                         unit="g/cm2/s"     />
+       <field id="FlxPOR"      long_name="POR burial rate"                         unit="g/cm2/s"     />
+       <field id="FlxPOS"      long_name="POS burial rate"                         unit="g/cm2/s"     />
+       <field id="Flxtot"      long_name="total burial flux"                       unit="g/cm2/s"     />
+       <field id="Rstepros"    long_name="Number of iterations"                    unit="-"     />
+  </field_group>
+
+  <!-- PISCES additional diagnostics on T grid  -->
+
+  <field_group id="diad_T" grid_ref="grid_T_2D">
+    <field id="PH"          long_name="PH"                                      unit="1"          grid_ref="grid_T_3D" />
+    <field id="CO3"         long_name="Bicarbonates"                            unit="mol/m3"     grid_ref="grid_T_3D" />
+    <field id="CO3sat"      long_name="CO3 saturation"                          unit="mol/m3"     grid_ref="grid_T_3D" />
+    <field id="PAR"         long_name="Photosynthetically Available Radiation"  unit="W/m2"       grid_ref="grid_T_3D" />
+    <field id="PPPHYN"      long_name="Primary production of nanophyto"         unit="molC/m3/s"  grid_ref="grid_T_3D" />
+    <field id="PPPHYP"      long_name="Primary production of picophyto"         unit="molC/m3/s"  grid_ref="grid_T_3D" />
+    <field id="PPPHYD"      long_name="Primary production of diatoms"           unit="molC/m3/s"  grid_ref="grid_T_3D" />
+    <field id="PPNEWN"      long_name="New Primary production of nanophyto"     unit="molC/m3/s"  grid_ref="grid_T_3D" />
+    <field id="PPNEWP"      long_name="New Primary production of picophyto"     unit="molC/m3/s"  grid_ref="grid_T_3D" />
+    <field id="PPNEWD"      long_name="New Primary production of diatoms"       unit="molC/m3/s"  grid_ref="grid_T_3D" />
+    <field id="PBSi"        long_name="Primary production of Si diatoms"        unit="molC/m3/s"  grid_ref="grid_T_3D" />
+    <field id="PFeN"        long_name="Primary production of nano iron"         unit="molC/m3/s"  grid_ref="grid_T_3D" />
+    <field id="PFeP"        long_name="Primary production of pico iron"         unit="molC/m3/s"  grid_ref="grid_T_3D" />
+    <field id="PFeD"        long_name="Primary production of diatoms iron"      unit="mol/m3/s"   grid_ref="grid_T_3D" />
+    <field id="xfracal"     long_name="Calcifying fraction"                     unit="1"          grid_ref="grid_T_3D" />
+    <field id="PCAL"        long_name="Calcite production"                      unit="mol/m3/s"   grid_ref="grid_T_3D" />
+    <field id="DCAL"        long_name="Calcite dissolution"                     unit="mol/m3/s"   grid_ref="grid_T_3D" />
+    <field id="GRAZ1"       long_name="Grazing by microzooplankton"             unit="mol/m3/s"   grid_ref="grid_T_3D" />
+    <field id="GRAZ2"       long_name="Grazing by mesozooplankton"              unit="mol/m3/s"   grid_ref="grid_T_3D" />
+    <field id="REMIN"       long_name="Oxic remineralization of OM"             unit="mol/m3/s"   grid_ref="grid_T_3D" />
+    <field id="DENIT"       long_name="Anoxic remineralization of OM"           unit="mol/m3/s"   grid_ref="grid_T_3D" />
+    <field id="REMINP"       long_name="Oxic remineralization rate of POC"      unit="d-1"        grid_ref="grid_T_3D" />
+    <field id="REMING"       long_name="Oxic remineralization rate of GOC"      unit="d-1"        grid_ref="grid_T_3D" />
+    <field id="Nfix"        long_name="Nitrogen fixation"                       unit="mol/m3/s"   grid_ref="grid_T_3D" />
+    <field id="Mumax"       long_name="Maximum growth rate"                     unit="s-1"        grid_ref="grid_T_3D" />
+    <field id="MuN"         long_name="Realized growth rate for nanophyto"      unit="s-1"        grid_ref="grid_T_3D" />
+    <field id="MuP"         long_name="Realized growth rate for picophyto"      unit="s-1"        grid_ref="grid_T_3D" />
+    <field id="MuD"         long_name="Realized growth rate for diatomes"       unit="s-1"        grid_ref="grid_T_3D" />
+    <field id="MunetN"      long_name="Net growth rate for nanophyto"           unit="s-1"        grid_ref="grid_T_3D" />
+    <field id="MunetP"      long_name="Net growth rate for picophyto"           unit="s-1"        grid_ref="grid_T_3D" />
+    <field id="MunetD"      long_name="Net growth rate for diatomes"            unit="s-1"        grid_ref="grid_T_3D" />
+    <field id="LNnut"       long_name="Nutrient limitation term in Nanophyto"   unit=""           grid_ref="grid_T_3D" />
+    <field id="LPnut"       long_name="Nutrient limitation term in Picophyto"   unit="-"          grid_ref="grid_T_3D" />
+    <field id="LDnut"       long_name="Nutrient limitation term in Diatoms"     unit=""           grid_ref="grid_T_3D" />
+    <field id="LNFe"        long_name="Iron limitation term in Nanophyto"       unit=""           grid_ref="grid_T_3D" />
+    <field id="LPFe"        long_name="Iron limitation term in Picophyto"       unit="-"          grid_ref="grid_T_3D" />
+    <field id="LDFe"        long_name="Iron limitation term in Diatoms"         unit=""           grid_ref="grid_T_3D" />
+    <field id="LNlight"     long_name="Light limitation term in Nanophyto"      unit=""           grid_ref="grid_T_3D" />
+    <field id="LPlight"     long_name="Light limitation term in Picophyto"      unit="-"          grid_ref="grid_T_3D" />
+    <field id="LDlight"     long_name="Light limitation term in Diatoms"        unit=""           grid_ref="grid_T_3D" />
+    <field id="SIZEN"       long_name="Mean relative size of nanophyto."        unit="-"          grid_ref="grid_T_3D" />
+    <field id="SIZEP"       long_name="Mean relative size of picophyto."        unit="-"          grid_ref="grid_T_3D" />
+    <field id="SIZED"       long_name="Mean relative size of diatoms"           unit="-"          grid_ref="grid_T_3D" />
+    <field id="RASSD"       long_name="Size of the protein machinery (Diat.)"   unit="-"          grid_ref="grid_T_3D" />
+    <field id="RASSN"       long_name="Size of the protein machinery (Nano.)"   unit="-"          grid_ref="grid_T_3D" />
+    <field id="RASSP"       long_name="Size of the protein machinery (Pico.)"   unit="-"          grid_ref="grid_T_3D" />
+    <field id="Fe3"         long_name="Iron III concentration"                  unit="nmol/m3"    grid_ref="grid_T_3D" />
+    <field id="FeL1"        long_name="Complexed Iron concentration with L1"    unit="nmol/m3"    grid_ref="grid_T_3D" />
+    <field id="TL1"         long_name="Total L1 concentration"                  unit="nmol/m3"    grid_ref="grid_T_3D" />
+    <field id="pdust"       long_name="dust concentration"                      unit="g/m3"                            />
+    <field id="Totlig"      long_name="Total ligand concentation"               unit="nmol/m3"    grid_ref="grid_T_3D" />
+    <field id="Biron"       long_name="Bioavailable iron"                       unit="nmol/m3"    grid_ref="grid_T_3D" />
+    <field id="Sdenit"      long_name="Nitrate reduction in the sediments"      unit="mol/m2/s"                        />
+    <field id="Ironice"     long_name="Iron input/uptake due to sea ice"        unit="mol/m2/s"                        />
+    <field id="SedCal"      long_name="Calcite burial in the sediments"         unit="molC/m2/s"                       />
+    <field id="SedSi"       long_name="Silicon burial in the sediments"         unit="molSi/m2/s"                      />
+    <field id="SedC"        long_name="Organic C burial in the sediments"       unit="molC/m2/s"                       />
+    <field id="HYDR"        long_name="Iron input from hydrothemal vents"       unit="mol/m2/s"   grid_ref="grid_T_3D" />
+    <field id="EPC100"      long_name="Export of carbon particles at 100 m"     unit="mol/m2/s"                        />
+    <field id="EPFE100"     long_name="Export of biogenic iron at 100 m"        unit="mol/m2/s"                        />
+    <field id="EPSI100"     long_name="Export of Silicate at 100 m"             unit="mol/m2/s"                        />
+    <field id="EPCAL100"    long_name="Export of Calcite at 100 m"              unit="mol/m2/s"                        />
+    <field id="EXPC"        long_name="Export of carbon"                        unit="mol/m2/s"   grid_ref="grid_T_3D" />
+    <field id="EXPFE"       long_name="Export of biogenic iron"                 unit="mol/m2/s"   grid_ref="grid_T_3D" />
+    <field id="EXPSI"       long_name="Export of Silicate"                      unit="mol/m2/s"   grid_ref="grid_T_3D" />
+    <field id="EXPCAL"      long_name="Export of Calcite"                       unit="mol/m2/s"   grid_ref="grid_T_3D" />
+    <field id="Cflx"        long_name="DIC flux"                                unit="mol/m2/s"                        />
+    <field id="Oflx"        long_name="Oxygen flux"                             unit="mol/m2/s"                        />
+    <field id="Kg"          long_name="Gas transfer"                            unit="mol/m2/s/uatm"                   />
+    <field id="Dpco2"       long_name="Delta CO2"                               unit="uatm"                            />
+    <field id="pCO2sea"     long_name="surface ocean pCO2"                      unit="uatm"                            />
+    <field id="Dpo2"        long_name="Delta O2"                                unit="uatm"                            />
+    <field id="Heup"        long_name="Euphotic layer depth"                    unit="m"                               />
+    <field id="AtmCo2"      long_name="Atmospheric CO2 concentration"           unit="ppm"                             />
+    <field id="Irondep"     long_name="Iron deposition from dust"               unit="mol/m2/s"                        />
+    <field id="Ironsed"     long_name="Iron deposition from sediment"           unit="mol/m2/s"            grid_ref="grid_T_3D" />
+    <field id="FESCAV"      long_name="Scavenging of Iron"                      unit="mmol-Fe/m3/s"        grid_ref="grid_T_3D" />
+    <field id="FECOLL"      long_name="Colloidal Pumping of FeL"                unit="mmol-FeL/m3/s"       grid_ref="grid_T_3D" />
+    <field id="LGWCOLL"     long_name="Coagulation loss of ligands"             unit="mmol-L/m3/s"         grid_ref="grid_T_3D" />
+    <field id="REMINF"      long_name="Oxic remineralization suppy of Fe"       unit="mmol-Fe/m3/s"        grid_ref="grid_T_3D" />
+    <field id="BACT"        long_name="Bacterial Biomass"                       unit="mmol/m3"             grid_ref="grid_T_3D" />
+    <field id="FEBACT"      long_name="Bacterial uptake of Fe"                  unit="molFe/m3/s"          grid_ref="grid_T_3D" />
+    <field id="FEPREC"      long_name="Precipitation of Fe"                     unit="molFe/m3/s"          grid_ref="grid_T_3D" />
+    <field id="LPRODR"      long_name="OM remineralisation ligand production rate" unit="nmol-L/m3/s"      grid_ref="grid_T_3D" />
+    <field id="LPRODP"      long_name="phytoplankton ligand production rate"    unit="nmol-L/m3/s"         grid_ref="grid_T_3D" />
+    <field id="LIGREM"      long_name="Remineralisation loss of ligands"        unit="nmol-L/m3/s"         grid_ref="grid_T_3D" />
+    <field id="LIGPR"       long_name="Photochemical loss of ligands"           unit="nmol-L/m3/s"         grid_ref="grid_T_3D" />
+    <field id="LDETP"       long_name="Ligand destruction during phytoplankton uptake" unit="nmol-L/m3/s"  grid_ref="grid_T_3D" />
+    <field id="LPRODZ2"     long_name="mesozooplankton ligand production rate"  unit="nmol-L/m3/s"         grid_ref="grid_T_3D" />
+    <field id="LPRODZ"      long_name="microzooplankton ligand production rate" unit="nmol-L/m3/s"         grid_ref="grid_T_3D" />
+    <field id="FEZOO"       long_name="microzooplankton iron recycling rate"    unit="nmol-FeL/m3/s"       grid_ref="grid_T_3D" />
+    <field id="FEZOO2"      long_name="mesozooplankton iron recycling rate"     unit="nmol-FeL/m3/s"       grid_ref="grid_T_3D" />
+
+    <!-- PISCES tracers trends -->
+    <field id="INTdtAlk"    long_name="Vertically int. of change of alkalinity"             unit="mol/m2/s"                     />
+    <field id="INTdtDIC"    long_name="Vertically int. of change of dissic    "             unit="mol/m2/s"                     />
+    <field id="INTdtFer"    long_name="Vertically int. of change of iron      "             unit="mol/m2/s"                     />
+    <field id="INTdtDIN"    long_name="Vertically int. of change of nitrogen  "             unit="mol/m2/s"                     />
+    <field id="INTdtDIP"    long_name="Vertically int. of change of phophate  "             unit="mol/m2/s"                     />
+    <field id="INTdtSil"    long_name="Vertically int. of change of silicon   "             unit="mol/m2/s"                     />
+
+
+    <!-- dbio_T on T grid : variables available with diaar5 -->
+    <field id="TCHL"        long_name="Total chlorophyll"                                   unit="gChl/m3"   grid_ref="grid_T_3D" > NCHL_e3t / e3t +  DCHL_e3t / e3t  </field>
+    <field id="TCHL2"       long_name="Square of Total chlorophyll"                         unit="gChl2/m6"  grid_ref="grid_T_3D" > TCHL * TCHL  </field>
+    <field id="TPP"         long_name="Total Primary production of phyto"                   unit="mol/m3/s"  grid_ref="grid_T_3D" />
+    <field id="TPNEW"       long_name="New Primary production of phyto"                     unit="mol/m3/s"  grid_ref="grid_T_3D" />
+    <field id="TPBFE"       long_name="Total biogenic iron production"                      unit="mol/m3/s"  grid_ref="grid_T_3D" />
+    <field id="INTDIC"      long_name="DIC content"                                         unit="kg/m2"                          />
+    <field id="O2MIN"       long_name="Oxygen minimum concentration"                        unit="mol/m3"                          />
+    <field id="ZO2MIN"      long_name="Depth of oxygen minimum concentration"               unit="m"                              />
+    <field id="Nfix_e3t"    long_name="Nfix * e3t"                                          unit="mol/m2/s" grid_ref="grid_T_3D" > Nfix * e3t </field >
+    <field id="PPPHYN_e3t"  long_name="PPPHYN * e3t"                                        unit="mol/m2/s" grid_ref="grid_T_3D" > PPPHYN * e3t </field >
+    <field id="PPPHYD_e3t"  long_name="PPPHYD * e3t"                                        unit="mol/m2/s" grid_ref="grid_T_3D" > PPPHYD * e3t </field >
+    <field id="PPPHYP_e3t"  long_name="PPPHYP * e3t"                                        unit="mol/m2/s" grid_ref="grid_T_3D" > PPPHYP * e3t </field >
+    <field id="TPP_e3t"     long_name="TPP * e3t"                                           unit="mol/m2/s" grid_ref="grid_T_3D" > TPP * e3t </field >
+    <field id="TPNEW_e3t"   long_name="TPNEW * e3t"                                         unit="mol/m2/s" grid_ref="grid_T_3D" > TPNEW * e3t </field >
+    <field id="TPBFE_e3t"   long_name="TPBFE * e3t"                                         unit="mol/m2/s" grid_ref="grid_T_3D" > TPBFE * e3t </field >
+    <field id="TPBSI_e3t"   long_name="TPBSi * e3t"                                         unit="mol/m2/s" grid_ref="grid_T_3D" > PBSi * e3t </field >
+    <field id="INTNFIX"     long_name="Nitrogen fixation rate : vert. integrated"           unit="mol/m2/s"  field_ref="Nfix_e3t"    grid_ref="grid_T_vsum"  detect_missing_value="true" />
+    <field id="INTPPPHYN"   long_name="Vertically integrated primary production by nanophy" unit="mol/m2/s"  field_ref="PPPHYN_e3t"  grid_ref="grid_T_vsum"  detect_missing_value="true" />
+    <field id="INTPPPHYD"   long_name="Vertically integrated primary production by diatom"  unit="mol/m2/s"  field_ref="PPPHYD_e3t"  grid_ref="grid_T_vsum"  detect_missing_value="true" />
+    <field id="INTPPPHYP"   long_name="Vertically integrated primary production by picophy" unit="mol/m2/s"  field_ref="PPPHYP_e3t"  grid_ref="grid_T_vsum"  detect_missing_value="true" />
+    <field id="INTPP"       long_name="Vertically integrated primary production by phyto"   unit="mol/m2/s"  field_ref="TPP_e3t"     grid_ref="grid_T_vsum"  detect_missing_value="true" />
+    <field id="INTPNEW"     long_name="Vertically integrated new primary production"        unit="mol/m2/s"  field_ref="TPNEW_e3t"   grid_ref="grid_T_vsum"  detect_missing_value="true" />
+    <field id="INTPBFE"     long_name="Vertically integrated of biogenic iron production"   unit="mol/m2/s"  field_ref="TPBFE_e3t"   grid_ref="grid_T_vsum"  detect_missing_value="true" />
+    <field id="INTPBSI"     long_name="Vertically integrated of biogenic Si production"     unit="mol/m2/s"  field_ref="TPBSi_e3t"   grid_ref="grid_T_vsum"  detect_missing_value="true" />
+
+    <!-- PISCES light : variables available with key_pisces_reduced -->
+    <field id="FNO3PHY"     long_name="FNO3PHY"                                 unit=""          grid_ref="grid_T_3D" />
+    <field id="FNH4PHY"     long_name="FNH4PHY"                                 unit=""          grid_ref="grid_T_3D" />
+    <field id="FNH4NO3"     long_name="FNH4NO3"                                 unit=""          grid_ref="grid_T_3D" />
+    <field id="TNO3PHY"     long_name="TNO3PHY"                                 unit=""  />
+    <field id="TNH4PHY"     long_name="TNH4PHY"                                 unit=""  />
+    <field id="TPHYDOM"     long_name="TPHYDOM"                                 unit=""  />
+    <field id="TPHYNH4"     long_name="TPHYNH4"                                 unit=""  />
+    <field id="TPHYZOO"     long_name="TPHYZOO"                                 unit=""  />
+    <field id="TPHYDET"     long_name="TPHYDET"                                 unit=""  />
+    <field id="TDETZOO"     long_name="TDETZOO"                                 unit=""  />
+    <field id="TZOODET"     long_name="TZOODET"                                 unit=""  />
+    <field id="TZOOBOD"     long_name="TZOOBOD"                                 unit=""  />
+    <field id="TZOONH4"     long_name="TZOONH4"                                 unit=""  />
+    <field id="TZOODOM"     long_name="TZOODOM"                                 unit=""  />
+    <field id="TNH4NO3"     long_name="TNH4NO3"                                 unit=""  />
+    <field id="TDOMNH4"     long_name="TDOMNH4"                                 unit=""  />
+    <field id="TDETNH4"     long_name="TDETNH4"                                 unit=""  />
+    <field id="TPHYTOT"     long_name="TPHYTOT"                                 unit=""  />
+    <field id="TZOOTOT"     long_name="TZOOTOT"                                 unit=""  />
+    <field id="SEDPOC"      long_name="SEDPOC"                                  unit=""  />
+    <field id="TDETSED"     long_name="TDETSED"                                 unit=""  />
+  </field_group>
+
+  <field_group id="tracer_scalar"  grid_ref="grid_scalar"  >
+    <!-- PISCES scalar  -->
+    <field id="pno3tot"         long_name="Global mean nitrate concentration"                  unit="mol/m3"   />
+    <field id="ppo4tot"         long_name="global mean phosphorus concentration"               unit="mol/m3"   />
+    <field id="psiltot"         long_name="Global mean silicate concentration"                 unit="mol/m3"   />
+    <field id="palktot"         long_name="Global mean alkalinity concentration"               unit="mol/m3"   />
+    <field id="pfertot"         long_name="Global mean iron concentration"                     unit="mol/m3"   />
+    <field id="tcflx"           long_name="Total Flux of Carbon out of the ocean"              unit="mol/s"   />
+    <field id="tcflxcum"        long_name="Cumulative total Flux of Carbon out of the ocean"   unit="mol/s"   />
+    <field id="tcexp"           long_name="Total Carbon export at 100m"                        unit="mol/s"   />
+    <field id="tintpp"          long_name="Global total integrated primary production"         unit="mol/s"   />
+    <field id="tnfix"           long_name="Global total nitrogen fixation"                     unit="mol/s"   />
+    <field id="tdenit"          long_name="Total denitrification"                              unit="mol/s"   />
+  </field_group>
+
+</field_definition>
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-ice_ORCA1.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-ice_ORCA1.xml	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-ice_ORCA1.xml	(revision 6658)
@@ -0,0 +1,141 @@
+<?xml version="1.0"?>
+    <!-- $id$ -->
+    
+ <!--
+============================================================================================================
+=                                           output files definition                                        =
+=                                            Define your own files for ice3                                =
+=                                         put the variables you want...                                    =
+============================================================================================================
+  -->
+    
+    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="4" >
+    
+      <file_group id="1ts_ice" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
+      <file_group id="1h_ice" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
+      <file_group id="2h_ice" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
+      <file_group id="3h_ice" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
+      <file_group id="4h_ice" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
+      <file_group id="6h_ice" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->        
+      <file_group id="1d_ice" output_freq="1d"  output_level="_AUTO_" enabled="_AUTO_"/>  <!-- 5d files -->   	
+      <file_group id="5d_ice" output_freq="5d"  output_level="_AUTO_" enabled="_AUTO_"/>  <!-- 5d files -->   	
+
+      <file_group id="1m_ice" output_freq="1mo" output_level="_AUTO_" enabled="_AUTO_"> <!-- real monthly files -->
+
+       <file id="file51" name_suffix="_icemod" description="ice variables" >
+
+       <!-- ice mask -->
+         <field field_ref="icemask"       name="simsk"   level="1" />
+         <field field_ref="icemask05"     name="simsk05" level="1" />
+         <field field_ref="icemask15"     name="simsk15" level="1" />
+
+       <!-- general -->
+         <field field_ref="snwvolu"       name="snvolu" level="1"  />
+         <field field_ref="icethic"       name="sithic" long_name="sea_ice_thickness" level="1"        />
+         <field field_ref="iceconc"       name="siconc" level="1"  />
+         <field field_ref="snwthic"       name="snthic"     long_name="surface_snow_thickness" level="1"  />
+         <field field_ref="icevolu"       name="sivolu" level="1"  />
+         <field field_ref="icesalt"       name="sisali" level="1" />
+         <field field_ref="iceapnd"       name="siapnd" level="1" />
+         <field field_ref="icevpnd"       name="sivpnd" level="1" />
+         <field field_ref="sst_m"         name="sst_m"  level="1"  />
+         <field field_ref="sss_m"         name="sss_m"  level="1" />
+
+       <!-- heat -->
+         <field field_ref="icetemp"       name="sitemp" level="1" />
+         <field field_ref="snwtemp"       name="sntemp" level="1" />
+         <field field_ref="icettop"       name="sittop" level="1" />
+         <field field_ref="icetbot"       name="sitbot" level="1" />
+         <field field_ref="icetsni"       name="sitsni" level="1" />
+         <field field_ref="icettop"       name="sistem" level="1" />
+         <field field_ref="icehc"         name="siheco" level="1" />
+         <field field_ref="snwhc"         name="snheco" level="1" />
+
+
+     <!-- momentum -->
+         <field field_ref="uice"          name="sivelu"  level="1" />
+         <field field_ref="vice"          name="sivelv"  level="1" />
+         <field field_ref="icevel"        name="sivelo"  level="1" />
+         <field field_ref="utau_ai"       name="utau_ai" level="2" />
+         <field field_ref="vtau_ai"       name="vtau_ai" level="2" />
+         <field field_ref="utau_oi"       name="utau_oi" level="2" />
+         <hield field_ref="vtau_oi"       name="vtau_oi" level="2" />
+
+       <!-- rheology -->
+         <field field_ref="icediv"            name="sidive"  level="2" />
+         <field field_ref="iceshe"           name="sishea"  level="1" />
+         <field field_ref="icestr"           name="sistre"  level="2" />
+         <field field_ref="normstr"          name="normstr" level="2"/>
+	 <field field_ref="sheastr"          name="sheastr" level="2" />
+         <field field_ref="sig1_pnorm"       name="sig1_pnorm"  level="2" />
+         <field field_ref="sig2_pnorm"       name="sig2_pnorm" level="2"/>
+       <!-- heat fluxes -->
+         <field field_ref="qt_oce_ai"        name="qt_oce_ai"   level="2" />
+         <field field_ref="qt_atm_oi"        name="qt_atm_oi"   level="2"  />
+         <field field_ref="qtr_ice_top"      name="qtr_ice_top" level="2" />
+         <field field_ref="qtr_ice_bot"      name="qtr_ice_bot" level="2" />
+         <field field_ref="qt_ice"           name="qt_ice"      level="2" />
+         <field field_ref="qsr_ice"          name="qsr_ice"     level="2" />
+         <field field_ref="qns_ice"          name="qns_ice"     level="2" />
+         <field field_ref="qemp_ice"         name="qemp_ice"    level="2" />
+         <field field_ref="albedo"           name="albedo"      level="2" />
+
+         <field field_ref="hfxcndtop"        name="hfxcndtop"  level="2" />
+         <field field_ref="hfxcndbot"        name="hfxcndbot"  level="2" />
+         <field field_ref="hfxsensib"        name="hfxsensib"  level="2" />
+         <field field_ref="hfxsub"           name="hfxsub"     level="2" />
+         <field field_ref="hfxspr"           name="hfxspr"     level="2" />
+         <field field_ref="hfxmelt"          name="hfxmelt"    level="2" />
+         <field field_ref="hfxldmelt"        name="hfxldmelt" level="2" />
+         <field field_ref="hfxldgrow"        name="hfxldgrow"  level="2" />
+       <!-- salt fluxes -->
+         <field field_ref="sfxice"           name="sfxice" level="1" />
+         <field field_ref="sfxsni"           name="sfxsni" level="1" />
+        <!-- mass fluxes -->
+         <field field_ref="vfxice"           name="vfxice" level="2" />
+         <field field_ref="vfxsnw"           name="vfxsnw" level="2" />
+         <field field_ref="vfxsub"           name="vfxsub" level="2" />
+         <field field_ref="vfxsub_err"       name="vfxsub_err" level="2" />
+         <field field_ref="vfxsnw_pre"       name="vfxsnw_pre" level="2" />
+         <field field_ref="vfxsnw_sub"       name="vfxsnw_sub" level="2" />
+	 <field field_ref="vfxpnd"           name="vfxpnd" level="2" />
+
+     <!-- outputs by category -->
+         <field field_ref="icemask_cat"      name="simskcat"  level="2" />
+         <field field_ref="snwthic_cat"      name="snthicat"  level="2" />
+         <field field_ref="iceconc_cat"      name="siconcat"  level="2" />
+         <field field_ref="icethic_cat"      name="sithicat"  level="2" />
+         <field field_ref="icesalt_cat"      name="sisalcat"  level="2" />
+         <field field_ref="icetemp_cat"      name="sitemcat"  level="2" />
+         <field field_ref="snwtemp_cat"      name="sntemcat"  level="2" />
+         <field field_ref="icettop_cat"      name="sitopcat"  level="2" />
+
+       </file>
+
+     <!-- To compute transport through straits : need to read ice mask at ice iteration at freq_offset = 1mo - nn_fsbc -->
+
+        <file id="file52" name_suffix="_strait_ice" description="transport variables through straits" >
+          <field field_ref="strait_mifl"      name="simassacrossline"  freq_offset="1mo-2ts" />
+          <field field_ref="strait_msfl"      name="snmassacrossline"  freq_offset="1mo-2ts" />
+          <field field_ref="strait_arfl"      name="siareaacrossline"  freq_offset="1mo-2ts" />
+        </file>
+
+      </file_group>
+
+   <!-- To compute transport through straits : need to read ice mask at ice iteration at freq_offset = - nn_fsbc + 1 -->
+      <file id="maskMFO" name="maskMFO" enabled="true" mode="read" output_freq="1mo" cyclic="true"  >
+         <field id="maskMFO_u_ice" operation="instant"  freq_offset="-1ts"  grid_ref="grid_U_4strait_ice" />
+         <field id="maskMFO_v_ice" operation="instant"  freq_offset="-1ts"  grid_ref="grid_V_4strait_ice" />
+      </file>
+
+
+      <file_group id="2m_ice" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
+      <file_group id="3m_ice" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
+      <file_group id="4m_ice" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
+      <file_group id="6m_ice" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
+      <file_group id="1y_ice"  output_freq="1y" output_level="_AUTO_" enabled="_AUTO_"/> <!-- real yearly files -->
+      <file_group id="2y_ice"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
+      <file_group id="5y_ice"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
+      <file_group id="10y_ice" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
+
+   </file_definition>
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-ice_ORCA1_tuning.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-ice_ORCA1_tuning.xml	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-ice_ORCA1_tuning.xml	(revision 6658)
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+    <!-- $id$ -->
+    
+ <!--
+============================================================================================================
+=                                           output files definition                                        =
+=                                            Define your own files for ice3                                =
+=                                         put the variables you want...                                    =
+============================================================================================================
+  -->
+    
+    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="4" >
+    
+      <file_group id="1ts_ice" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
+      <file_group id="1h_ice" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
+      <file_group id="2h_ice" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
+      <file_group id="3h_ice" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
+      <file_group id="4h_ice" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
+      <file_group id="6h_ice" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->        
+      <file_group id="1d_ice" output_freq="1d"  output_level="_AUTO_" enabled="_AUTO_"/>  <!-- 5d files -->
+      <file_group id="5d_ice" output_freq="5d"  output_level="_AUTO_" enabled="_AUTO_"/>  <!-- 5d files -->
+
+      <file_group id="1m_ice" output_freq="1mo" output_level="_AUTO_" enabled="_AUTO_"> <!-- real monthly files -->
+
+       <file id="file51" name_suffix="_icemod" description="ice variables" >
+
+       <!-- ice mask -->
+         <field field_ref="icemask"       name="simsk"   level="1" />
+         <field field_ref="icemask05"     name="simsk05" level="1" />
+	 <field field_ref="icemask15"     name="simsk15" level="1" />
+
+	 <field field_ref="NH_icearea"    name="siarean"     level="1"  />  <!-- P2 (1e6 km2) sea_ice_area : total area of sea ice in the Northern hemisphere -->
+         <field field_ref="SH_icearea"    name="siareas"     level="1"  />  <!-- P2 (1e6 km2) sea_ice_area : total area of sea ice in the Sorthern hemisphere -->
+         <field field_ref="NH_iceextt"    name="siextentn"   level="1"  /> <!-- P2 (1e6 km2) sea_ice_extent : Total area of all Northern-Hemisphere grid cells that are covered by at least 15 % areal fraction of sea ice -->
+         <field field_ref="SH_iceextt"    name="siextents"   level="1"  /> <!-- P2 (1e6 km2) sea_ice_extent : Total area of all Sorthern-Hemisphere grid cells that are covered by at least 15 % areal fraction of sea ice -->
+         <field field_ref="NH_icevolu"    name="sivoln"      level="1"  /> <!-- P2 (1e3 km3) sea_ice_volume : total volume of sea ice in the Nouthern hemisphere -->
+         <field field_ref="SH_icevolu"    name="sivols"      level="1"  /> <!-- P2 (1e3 km3) sea_ice_volume : total volume of sea ice in the Southern hemisphere -->
+
+       <!-- general -->
+         <field field_ref="icethic"       name="sithic" long_name="sea_ice_thickness" level="1"        />
+         <field field_ref="iceconc"       name="siconc" level="1"  />
+         <field field_ref="snwthic"       name="snthic"     long_name="surface_snow_thickness" level="1"  />
+         <field field_ref="sst_m"         name="sst"  level="1"  />
+         <field field_ref="sss_m"         name="sss"  level="1" />
+
+       <!-- thermo -->
+	 <field field_ref="icesalt"       name="sisali" level="1" />
+         <field field_ref="icetemp"       name="sitemp" level="1" />
+         <field field_ref="icettop"       name="sistem" level="1" />
+         <field field_ref="snwtemp"       name="sntemp" level="1" />
+         <field field_ref="icehc"         name="siheco" level="1" />
+         <field field_ref="snwhc"         name="snheco" level="1" />
+
+     <!-- momentum -->
+         <field field_ref="uice"          name="sivelu"  level="1" />
+         <field field_ref="vice"          name="sivelv"  level="1" />
+
+       <!-- heat fluxes -->
+         <field field_ref="qt_oce_ai"     name="hfxout"   level="1" />
+         <field field_ref="qt_atm_oi"     name="hfxin"   level="1"  />
+
+       </file>
+
+     <!-- To compute transport through straits : need to read ice mask at ice iteration at freq_offset = 1mo - nn_fsbc -->
+
+        <file id="file52" name_suffix="_strait_ice" description="transport variables through straits" >
+          <field field_ref="strait_mifl"      name="simassacrossline"  freq_offset="1mo-2ts" />
+          <field field_ref="strait_msfl"      name="snmassacrossline"  freq_offset="1mo-2ts" />
+          <field field_ref="strait_arfl"      name="siareaacrossline"  freq_offset="1mo-2ts" />
+        </file>
+
+      </file_group>
+
+   <!-- To compute transport through straits : need to read ice mask at ice iteration at freq_offset = - nn_fsbc + 1 -->
+      <file id="maskMFO" name="maskMFO" enabled="true" mode="read" output_freq="1mo" cyclic="true"  >
+         <field id="maskMFO_u_ice" operation="instant"  freq_offset="-1ts"  grid_ref="grid_U_4strait_ice" />
+         <field id="maskMFO_v_ice" operation="instant"  freq_offset="-1ts"  grid_ref="grid_V_4strait_ice" />
+      </file>
+
+
+      <file_group id="2m_ice" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
+      <file_group id="3m_ice" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
+      <file_group id="4m_ice" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
+      <file_group id="6m_ice" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
+      <file_group id="1y_ice"  output_freq="1y" output_level="_AUTO_" enabled="_AUTO_"/> <!-- real yearly files -->
+      <file_group id="2y_ice"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
+      <file_group id="5y_ice"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
+      <file_group id="10y_ice" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
+
+   </file_definition>
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-ice_ORCA2.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-ice_ORCA2.xml	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-ice_ORCA2.xml	(revision 6658)
@@ -0,0 +1,136 @@
+<?xml version="1.0"?>
+    <!-- $id$ -->
+    
+ <!--
+============================================================================================================
+=                                           output files definition                                        =
+=                                            Define your own files for ice3                                =
+=                                         put the variables you want...                                    =
+============================================================================================================
+  -->
+    
+    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="4" >
+    
+      <file_group id="1ts_ice" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
+      <file_group id="1h_ice" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
+      <file_group id="2h_ice" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
+      <file_group id="3h_ice" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
+      <file_group id="4h_ice" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
+      <file_group id="6h_ice" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->        
+      <file_group id="1d_ice" output_freq="1d"  output_level="_AUTO_" enabled="_AUTO_"/>  <!-- 5d files -->   	
+      <file_group id="5d_ice" output_freq="5d"  output_level="_AUTO_" enabled="_AUTO_"/>  <!-- 5d files -->   	
+
+      <file_group id="1m_ice" output_freq="1mo" output_level="_AUTO_" enabled="_AUTO_"> <!-- real monthly files -->
+
+       <file id="file51" name_suffix="_icemod" description="ice variables" >
+
+       <!-- ice mask -->
+         <field field_ref="icemask"       name="simsk"   level="1" />
+         <field field_ref="icemask05"     name="simsk05" level="1" />
+         <field field_ref="icemask15"     name="simsk15" level="1" />
+
+       <!-- general -->
+         <field field_ref="snwvolu"       name="snvolu" level="1"  />
+         <field field_ref="icethic"       name="sithic" long_name="sea_ice_thickness" level="1"        />
+         <field field_ref="iceconc"       name="siconc" level="1"  />
+         <field field_ref="snwthic"       name="snthic"     long_name="surface_snow_thickness" level="1"  />
+         <field field_ref="icevolu"       name="sivolu" level="1"  />
+         <field field_ref="icesalt"       name="sisali" level="1" />
+         <field field_ref="iceapnd"       name="siapnd" level="1" />
+         <field field_ref="icevpnd"       name="sivpnd" level="1" />
+         <field field_ref="sst_m"         name="sst_m"  level="1"  />
+         <field field_ref="sss_m"         name="sss_m"  level="1" />
+
+       <!-- heat -->
+         <field field_ref="icetemp"       name="sitemp" level="1" />
+         <field field_ref="snwtemp"       name="sntemp" level="1" />
+         <field field_ref="icettop"       name="sittop" level="1" />
+         <field field_ref="icetbot"       name="sitbot" level="1" />
+         <field field_ref="icetsni"       name="sitsni" level="1" />
+         <field field_ref="icettop"       name="sistem" level="1" />
+         <field field_ref="icehc"         name="siheco" level="1" />
+         <field field_ref="snwhc"         name="snheco" level="1" />
+
+
+     <!-- momentum -->
+         <field field_ref="uice"          name="sivelu"  level="1" />
+         <field field_ref="vice"          name="sivelv"  level="1" />
+         <field field_ref="icevel"        name="sivelo"  level="1" />
+         <field field_ref="utau_ai"       name="utau_ai" level="2" />
+         <field field_ref="vtau_ai"       name="vtau_ai" level="2" />
+         <field field_ref="utau_oi"       name="utau_oi" level="2" />
+         <hield field_ref="vtau_oi"       name="vtau_oi" level="2" />
+
+       <!-- rheology -->
+         <field field_ref="icediv"            name="sidive"  level="2" />
+         <field field_ref="iceshe"           name="sishea"  level="1" />
+         <field field_ref="icestr"           name="sistre"  level="2" />
+         <field field_ref="normstr"          name="normstr" level="2"/>
+         <field field_ref="sheastr"          name="sheastr" level="2" />
+         <field field_ref="isig1"            name="isig1"   level="2" />
+         <field field_ref="isig2"            name="isig2"   level="2" />
+         <field field_ref="isig3"            name="isig3"   level="2" />
+       <!-- heat fluxes -->
+         <field field_ref="qt_oce_ai"        name="qt_oce_ai"   level="2" />
+         <field field_ref="qt_atm_oi"        name="qt_atm_oi"   level="2"  />
+         <field field_ref="qtr_ice_top"      name="qtr_ice_top" level="2" />
+         <field field_ref="qtr_ice_bot"      name="qtr_ice_bot" level="2" />
+         <field field_ref="qt_ice"           name="qt_ice"      level="2" />
+         <field field_ref="qsr_ice"          name="qsr_ice"     level="2" />
+         <field field_ref="qns_ice"          name="qns_ice"     level="2" />
+         <field field_ref="qemp_ice"         name="qemp_ice"    level="2" />
+         <field field_ref="albedo"           name="albedo"      level="2" />
+
+         <field field_ref="hfxcndtop"        name="hfxcndtop"  level="2" />
+         <field field_ref="hfxcndbot"        name="hfxcndbot"  level="2" />
+         <field field_ref="hfxsensib"        name="hfxsensib"  level="2" />
+
+       <!-- salt fluxes -->
+         <field field_ref="sfxice"           name="sfxice" level="1" />
+         <field field_ref="sfxsni"           name="sfxsni" level="1" />
+
+       <!-- mass fluxes -->
+         <field field_ref="vfxice"           name="vfxice" level="2" />
+         <field field_ref="vfxsnw"           name="vfxsnw" level="2" />
+         <field field_ref="vfxsub"           name="vfxsub" level="2" />
+         <field field_ref="vfxsub_err"       name="vfxsub_err" level="2" />
+
+     <!-- outputs by category -->
+         <field field_ref="icemask_cat"      name="simskcat"  level="2" />
+         <field field_ref="snwthic_cat"      name="snthicat"  level="2" />
+         <field field_ref="iceconc_cat"      name="siconcat"  level="2" />
+         <field field_ref="icethic_cat"      name="sithicat"  level="2" />
+         <field field_ref="icesalt_cat"      name="sisalcat"  level="2" />
+         <field field_ref="icetemp_cat"      name="sitemcat"  level="2" />
+         <field field_ref="snwtemp_cat"      name="sntemcat"  level="2" />
+         <field field_ref="icettop_cat"      name="sitopcat"  level="2" />
+
+       </file>
+
+     <!-- To compute transport through straits : need to read ice mask at ice iteration at freq_offset = 1mo - nn_fsbc -->
+
+        <file id="file52" name_suffix="_strait_ice" description="transport variables through straits" >
+          <field field_ref="strait_mifl"      name="simassacrossline"  freq_offset="1mo-4ts" />
+          <field field_ref="strait_msfl"      name="snmassacrossline"  freq_offset="1mo-4ts" />
+          <field field_ref="strait_arfl"      name="siareaacrossline"  freq_offset="1mo-4ts" />
+        </file>
+
+      </file_group>
+
+   <!-- To compute transport through straits : need to read ice mask at ice iteration at freq_offset = - nn_fsbc + 1 -->
+      <file id="maskMFO" name="maskMFO" enabled="true" mode="read" output_freq="1mo" cyclic="true"  >
+         <field id="maskMFO_u_ice" operation="instant"  freq_offset="-3ts"  grid_ref="grid_U_4strait_ice" />
+         <field id="maskMFO_v_ice" operation="instant"  freq_offset="-3ts"  grid_ref="grid_V_4strait_ice" />
+      </file>
+
+
+      <file_group id="2m_ice" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
+      <file_group id="3m_ice" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
+      <file_group id="4m_ice" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
+      <file_group id="6m_ice" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
+      <file_group id="1y_ice"  output_freq="1y" output_level="_AUTO_" enabled="_AUTO_"/> <!-- real yearly files -->
+      <file_group id="2y_ice"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
+      <file_group id="5y_ice"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
+      <file_group id="10y_ice" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
+
+   </file_definition>
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-ice_ORCA2_tuning.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-ice_ORCA2_tuning.xml	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-ice_ORCA2_tuning.xml	(revision 6658)
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+    <!-- $id$ -->
+    
+ <!--
+============================================================================================================
+=                                           output files definition                                        =
+=                                            Define your own files for ice3                                =
+=                                         put the variables you want...                                    =
+============================================================================================================
+  -->
+    
+    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="4" >
+    
+      <file_group id="1ts_ice" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
+      <file_group id="1h_ice" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
+      <file_group id="2h_ice" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
+      <file_group id="3h_ice" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
+      <file_group id="4h_ice" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
+      <file_group id="6h_ice" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->        
+      <file_group id="1d_ice" output_freq="1d"  output_level="_AUTO_" enabled="_AUTO_"/>  <!-- 5d files -->
+      <file_group id="5d_ice" output_freq="5d"  output_level="_AUTO_" enabled="_AUTO_"/>  <!-- 5d files -->
+
+      <file_group id="1m_ice" output_freq="1mo" output_level="_AUTO_" enabled="_AUTO_"> <!-- real monthly files -->
+
+       <file id="file51" name_suffix="_icemod" description="ice variables" >
+
+       <!-- ice mask -->
+         <field field_ref="icemask"       name="simsk"   level="1" />
+         <field field_ref="icemask05"     name="simsk05" level="1" />
+	 <field field_ref="icemask15"     name="simsk15" level="1" />
+
+	 <field field_ref="NH_icearea"    name="siarean"     level="1"  />  <!-- P2 (1e6 km2) sea_ice_area : total area of sea ice in the Northern hemisphere -->
+         <field field_ref="SH_icearea"    name="siareas"     level="1"  />  <!-- P2 (1e6 km2) sea_ice_area : total area of sea ice in the Sorthern hemisphere -->
+         <field field_ref="NH_iceextt"    name="siextentn"   level="1"  /> <!-- P2 (1e6 km2) sea_ice_extent : Total area of all Northern-Hemisphere grid cells that are covered by at least 15 % areal fraction of sea ice -->
+         <field field_ref="SH_iceextt"    name="siextents"   level="1"  /> <!-- P2 (1e6 km2) sea_ice_extent : Total area of all Sorthern-Hemisphere grid cells that are covered by at least 15 % areal fraction of sea ice -->
+         <field field_ref="NH_icevolu"    name="sivoln"      level="1"  /> <!-- P2 (1e3 km3) sea_ice_volume : total volume of sea ice in the Nouthern hemisphere -->
+         <field field_ref="SH_icevolu"    name="sivols"      level="1"  /> <!-- P2 (1e3 km3) sea_ice_volume : total volume of sea ice in the Southern hemisphere -->
+
+       <!-- general -->
+         <field field_ref="icethic"       name="sithic" long_name="sea_ice_thickness" level="1"        />
+         <field field_ref="iceconc"       name="siconc" level="1"  />
+         <field field_ref="snwthic"       name="snthic"     long_name="surface_snow_thickness" level="1"  />
+         <field field_ref="sst_m"         name="sst"  level="1"  />
+         <field field_ref="sss_m"         name="sss"  level="1" />
+
+       <!-- thermo -->
+	 <field field_ref="icesalt"       name="sisali" level="1" />
+         <field field_ref="icetemp"       name="sitemp" level="1" />
+         <field field_ref="icettop"       name="sistem" level="1" />
+         <field field_ref="snwtemp"       name="sntemp" level="1" />
+         <field field_ref="icehc"         name="siheco" level="1" />
+         <field field_ref="snwhc"         name="snheco" level="1" />
+
+     <!-- momentum -->
+         <field field_ref="uice"          name="sivelu"  level="1" />
+         <field field_ref="vice"          name="sivelv"  level="1" />
+
+       <!-- heat fluxes -->
+         <field field_ref="qt_oce_ai"     name="hfxout"   level="1" />
+         <field field_ref="qt_atm_oi"     name="hfxin"   level="1"  />
+
+       </file>
+
+     <!-- To compute transport through straits : need to read ice mask at ice iteration at freq_offset = 1mo - nn_fsbc -->
+
+        <file id="file52" name_suffix="_strait_ice" description="transport variables through straits" >
+          <field field_ref="strait_mifl"      name="simassacrossline"  freq_offset="1mo-4ts" />
+          <field field_ref="strait_msfl"      name="snmassacrossline"  freq_offset="1mo-4ts" />
+          <field field_ref="strait_arfl"      name="siareaacrossline"  freq_offset="1mo-4ts" />
+        </file>
+
+      </file_group>
+
+   <!-- To compute transport through straits : need to read ice mask at ice iteration at freq_offset = - nn_fsbc + 1 -->
+      <file id="maskMFO" name="maskMFO" enabled="true" mode="read" output_freq="1mo" cyclic="true"  >
+         <field id="maskMFO_u_ice" operation="instant"  freq_offset="-3ts"  grid_ref="grid_U_4strait_ice" />
+         <field id="maskMFO_v_ice" operation="instant"  freq_offset="-3ts"  grid_ref="grid_V_4strait_ice" />
+      </file>
+
+
+      <file_group id="2m_ice" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
+      <file_group id="3m_ice" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
+      <file_group id="4m_ice" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
+      <file_group id="6m_ice" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
+      <file_group id="1y_ice"  output_freq="1y" output_level="_AUTO_" enabled="_AUTO_"/> <!-- real yearly files -->
+      <file_group id="2y_ice"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
+      <file_group id="5y_ice"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
+      <file_group id="10y_ice" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
+
+   </file_definition>
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-oce.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-oce.xml	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-oce.xml	(revision 6658)
@@ -0,0 +1,587 @@
+<?xml version="1.0"?>
+
+<!--
+============================================================================================================
+=                                           output files definition                                        =
+=                                            Define your own filesfor ocean dynamics context                                         =
+=                                         put the variables you want...                                    =
+============================================================================================================
+    -->
+   
+    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="4" >
+    
+      <file_group id="1ts_opa" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
+
+      <file_group id="1h_opa" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
+
+      <file_group id="2h_opa" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
+
+      <file_group id="3h_opa" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
+
+      <file_group id="4h_opa" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
+
+      <file_group id="6h_opa" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->     
+    
+      <file_group id="1d_opa" output_freq="1d"  output_level="_AUTO_" enabled="_AUTO_">  <!-- 1d files -->   
+	
+        <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" >
+	  <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"          level="1"              />
+	  <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"             level="1"              />
+	  <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"   level="1"              />
+	  <field field_ref="sst"          name="tosstd"   long_name="sea_surface_temperature_standard_deviation"         operation="average" freq_op="1d" level="1"  > sqrt( @sst2 - @sst * @sst ) </field>
+	  <field field_ref="ssh"          name="zosstd"   long_name="sea_surface_height_above_geoid_standard_deviation"  operation="average" freq_op="1d" level="1" > sqrt( @ssh2 - @ssh * @ssh ) </field>
+	  <field field_ref="sst"          name="sstdcy"   long_name="amplitude of sst diurnal cycle" operation="average" freq_op="1d" level="1" > @sstmax - @sstmin </field>
+	  <field field_ref="mldr10_1"     />
+	  <field field_ref="mldr10_1"     name="mldr10_1dcy"  long_name="amplitude of mldr10_1 diurnal cycle" operation="average" freq_op="1d" level="1" > @mldr10_1max - @mldr10_1min </field>
+	</file>
+       
+        <file id="file2" name_suffix="_scalar" description="scalar variables" >
+
+	  <!-- Volume -->
+          <!-- global contents -->
+	  <field field_ref="voltot"          name="scvoltot"  level="1" />
+	  <field field_ref="sshtot"          name="scsshtot"  level="1" />
+	  <field field_ref="sshsteric"       name="scsshste"  level="1" />
+	  <field field_ref="sshthster"       name="scsshtst"  level="1" />
+	  <field field_ref="masstot"         name="scmastot"  level="1" />
+	  <field field_ref="temptot"         name="sctemtot"  level="1" />
+	  <field field_ref="saltot"          name="scsaltot"  level="1" />
+	  
+	  <!-- global drifts (conservation checks) -->
+	  <field field_ref="bgtemper"        name="bgtemper"  level="1"   />
+	  <field field_ref="bgsaline"        name="bgsaline"  level="1"   />
+	  <field field_ref="bgheatco"        name="bgheatco"  level="1"   />
+	  <field field_ref="bgheatfx"        name="bgheatfx"  level="1"   />
+	  <field field_ref="bgsaltco"        name="bgsaltco"  level="1"   />
+	  <field field_ref="bgvolssh"        name="bgvolssh"  level="1"   />
+	  <field field_ref="bgvole3t"        name="bgvole3t"  level="1"   />
+
+	  <!-- global surface forcings  -->
+	  <field field_ref="bgfrcvol"        name="bgfrcvol"  level="1"   />
+	  <field field_ref="bgfrctem"        name="bgfrctem"  level="1"   />
+	  <field field_ref="bgfrchfx"        name="bgfrchfx"  level="1"   />
+	  <field field_ref="bgfrcsal"        name="bgfrcsal"  level="1"   />
+
+	  <!-- Surface -->
+	  <!-- global contents -->
+          <field field_ref="ibgvol_tot"       name="ibgvol_tot" level="1"   />
+          <field field_ref="sbgvol_tot"       name="sbgvol_tot"  level="1"  />
+          <field field_ref="ibgarea_tot"      name="ibgarea_tot" level="1"  />
+          <field field_ref="ibgsalt_tot"      name="ibgsalt_tot" level="1"  />
+          <field field_ref="ibgheat_tot"      name="ibgheat_tot" level="1"  />
+          <field field_ref="sbgheat_tot"      name="sbgheat_tot" level="1"  />
+          <field field_ref="ipbgvol_tot"      name="ipbgvol_tot" level="1"  />
+          <field field_ref="ilbgvol_tot"      name="ilbgvol_tot" level="1"  />
+	  
+	  <!-- global drifts (conservation checks) -->
+          <field field_ref="ibgvolume"        name="ibgvolume"  level="1"   />
+          <field field_ref="ibgsaltco"        name="ibgsaltco"  level="1"   />
+          <field field_ref="ibgheatco"        name="ibgheatco"  level="1"   />
+          <field field_ref="ibgheatfx"        name="ibgheatfx"  level="1"   />
+	  
+	  <!-- global forcings  -->
+          <field field_ref="ibgfrcvoltop"     name="ibgfrcvoltop" level="1" />
+          <field field_ref="ibgfrcvolbot"     name="ibgfrcvolbot" level="1" />
+          <field field_ref="ibgfrctemtop"     name="ibgfrctemtop" level="1" />
+          <field field_ref="ibgfrctembot"     name="ibgfrctembot" level="1" />
+          <field field_ref="ibgfrcsal"        name="ibgfrcsal"    level="1" />
+          <field field_ref="ibgfrchfxtop"     name="ibgfrchfxtop" level="1" />
+          <field field_ref="ibgfrchfxbot"     name="ibgfrchfxbot" level="1" />
+	  
+        </file>
+	
+	<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"      level="1"      />
+	  <field field_ref="qns_oce"       name="qns_oce"  long_name="downward non solar flux at ocean surface"      level="1"      />
+	  <field field_ref="qsr_ice"       name="qsr_ice"  long_name="downward shortwave flux at ice surface"        level="1"    />
+	  <field field_ref="qns_ice"       name="qns_ice"  long_name="downward non solar flux at ice surface"        level="1"    />
+	  <field field_ref="taum"          name="taum" level="1" />
+	  <field field_ref="wspd"          name="windsp" level="1"  />
+	  <field field_ref="precip"        name="precip" level="1" />
+	  <!-- For heat conservation checking -->
+	  <field field_ref="qt_oce"        name="qt_oce"   long_name="downward total flux at ocean surface"      level="1"      />
+	  <field field_ref="qemp_oce"      name="qemp_oce" long_name="Downward Heat Flux from E-P over open ocean"  level="1"          />
+	  <field field_ref="qt_ice"        name="qt_ice"   long_name="downward total flux at ice surface"        level="1"    />
+	  <field field_ref="qemp_ice"      name="qemp_ice" long_name="Downward Heat Flux from E-P over ice"      level="1"      />
+	  <field field_ref="hflx_rain_cea" name="hflx_rain_cea"    level="1"   />
+	  <field field_ref="hflx_evap_cea" name="hflx_evap_cea"    level="1"   />
+	  <field field_ref="hflx_snow_cea" name="hflx_snow_cea"    level="1"   />
+	  <field field_ref="hflx_cal_cea"  name="hflx_cal_cea"     level="1"  />
+	  <!-- For freshwater conservation checking -->
+	  <field field_ref="empmr"         name="wfo"      long_name="water_flux_into_sea_water"           level="1"           />
+	  <field field_ref="emp_oce"       name="emp_oce"                 level="1"      />
+	  <field field_ref="emp_ice"       name="emp_ice"                 level="1"      />
+	  <field field_ref="runoffs"       name="runoffs"                 level="1"      />
+      <field field_ref="runoffs"       name="friver"   long_name="water_flux_into_sea_water_from_rivers"     level="1" > runoffs - iceberg_cea </field>
+	  <field field_ref="calving_cea"   name="calving" level="1"  />
+          <field field_ref="iceberg_cea"   name="iceberg" level="1" />
+          <field field_ref="iceshelf_cea"  name="iceshelf" level="1" />
+	  <field field_ref="vfxice"        name="vfxice" level="1"  />
+	  <field field_ref="vfxsnw"        name="vfxsnw" level="1" />
+	  <field field_ref="vfxsub"        name="vfxsub" level="1" />
+	  <field field_ref="rain"          name="rain"   level="1"    />
+	  <field field_ref="snow_ao_cea"   name="snow_ao_cea"   level="1"    />
+	  <field field_ref="snow_ai_cea"   name="snow_ai_cea"   level="1"    />
+	  <field field_ref="evap_ao_cea"   name="evap_ao_cea"   level="1"    />
+	  <field field_ref="subl_ai_cea"   name="subl_ai_cea"   level="1"    />
+	  <field field_ref="fmmflx"        name="fmmflx"  level="1" />
+          <field field_ref="fwfisf_par"     name="fwfisf"  level="1" />
+          <field field_ref="hflx_snow_ai_cea" name="hflx_snow_ai"  level="1"  />
+          <field field_ref="hflx_snow_ao_cea" name="hflx_snow_ao" level="1"  />
+          <field field_ref="hflx_ice_cea"     name="hflx_ice"     level="1"  />
+          <field field_ref="qhcisf_par"     name="hflx_isf"     level="1"  />
+          <field field_ref="hflx_rnf_cea"     name="hflx_rnf"     level="1"  />
+	  <!-- For salt conservation checking -->
+          <field field_ref="saltflx"      name="sosflxdo" level="1"  />
+	  <!-- ice and snow -->
+	  <field field_ref="snowpre"      />
+	</file>
+
+      </file_group> 
+
+      <file_group id="5d_opa" output_freq="5d"  output_level="_AUTO_" enabled="_AUTO_">  <!-- 5d files -->   
+
+        <file id="file4" name_suffix="_grid_T" >
+	  <field field_ref="e3t" long_name="T-cell thickness" />
+          <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"   operation="average" freq_op="5d" level="1" > @toce_e3t / @e3t </field>      
+          <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                operation="average" freq_op="5d" level="1" > @soce_e3t / @e3t </field>  
+          <field field_ref="hdiv"         name="hdivtr"   long_name="horizontal divergence transport"   operation="average" freq_op="5d" level="1" > @hdiv * @e3t </field>
+          <field field_ref="mldr10_1"     name="mldr10_1"  level="1" />
+          <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                    level="1"              />
+          <field field_ref="qsr"          name="rsntds"      long_name="surface_net_downward_shortwave_flux"                                         level="1" />
+          <field field_ref="wspd"         name="windsp" level="1"  />
+          <field field_ref="empbmr"       name="wfob"     long_name="water_flux_into_sea_water at prev time-step"  level="1"   />
+	  <field field_ref="empmr"        name="wfo"      long_name="water_flux_into_sea_water"                    level="1"  />
+	  <field field_ref="runoffs"      name="runoffs"                 level="1"      />
+          <field field_ref="runoffs"      name="friver"   long_name="water_flux_into_sea_water_from_rivers"     level="1" > runoffs - iceberg_cea </field>
+          <field field_ref="fmmflx"       name="fmmflx" level="1"  />
+          <field field_ref="iceconc"      name="siconc" level="1"  />
+	</file>
+
+        <file id="file5" name_suffix="_grid_U" description="ocean U grid variables" >
+          <field field_ref="e3u"  level="1"  />
+          <field field_ref="uocetr_eff"   name="uocetr_eff" level="1"  />
+          <field field_ref="ahu_bbl"     level="1"   />
+        </file>
+
+        <file id="file6" name_suffix="_grid_V" description="ocean V grid variables" >
+          <field field_ref="e3v" level="1"  />
+          <field field_ref="vocetr_eff"   name="vocetr_eff" level="1"  />
+          <field field_ref="ahv_bbl"    level="1"    />
+        </file>
+
+        <file id="file7" name_suffix="_grid_W" description="ocean W grid variables" >
+          <field field_ref="e3w"  level="1"  />
+	  <field field_ref="wocetr_eff"   name="wocetr_eff" level="1"  /> 
+          <field field_ref="logavs"       name="difvsolog"  long_name="ocean_vertical_salt_diffusivity" operation="average" freq_op="5d" level="1"  > exp( @logavs ) </field>
+        </file>
+
+        <file id="file8" name_suffix="_trdtra" description="ocean trends variables" >
+          <field field_ref="ttrd_zdfp_e3t"   name="ttrdtr_zdfp"  long_name="Tendency_of_heat_content_from_parameterized_dianeutral_mixing"  unit="W m-2"     level="2"  > this * $cpocean * $rho0  </field>
+          <field field_ref="ttrd_iso_e3t"    name="ttrdtr_iso"   long_name="Tendency_of_heat_content_from_parameterized_eddy_diffusion"     unit="W m-2"     level="2"   > this * $cpocean * $rho0  </field>
+          <field field_ref="ttrd_totad_e3t"  name="ttrdtr_totad" long_name="Tendency_of_heat_content_from_residual_mean_advection"          unit="W m-2"     level="2"   > this * $cpocean * $rho0  </field>
+          <field field_ref="ttrd_tot_e3t"    name="ttrdtr_tot"   long_name="Tendency_of_heat_content_from_all_processes"                    unit="W m-2"     level="2"   > this * $cpocean * $rho0  </field>
+          <field field_ref="strd_zdfp_e3t"   name="strdtr_zdfp"  long_name="Tendency_of_salt_content_from_parameterized_dianeutral_mixing"  unit="kg m-2 s-1" level="2"  > this * $rho0 </field>
+          <field field_ref="strd_iso_e3t"    name="strdtr_iso"   long_name="Tendency_of_salt_content_from_parameterized_eddy_diffusion"     unit="kg m-2 s-1" level="2"  > this * $rho0 </field>
+          <field field_ref="strd_totad_e3t"  name="strdtr_totad" long_name="Tendency_of_salt_content_from_residual_mean_advection"          unit="kg m-2 s-1" level="2"  > this * $rho0  </field>
+          <field field_ref="strd_tot_e3t"    name="strdtr_tot"   long_name="Tendency_of_salt_content_from_all_processes"                    unit="kg m-2 s-1" level="2"  > this * $rho0  </field>
+        </file>
+
+
+      </file_group> 
+	
+      <file_group id="1m_opa" output_freq="1mo" output_level="_AUTO_" enabled="_AUTO_"> <!-- real monthly files -->
+
+        <file id="file9" name_suffix="_grid_T" >
+	  <field field_ref="e3t" long_name="T-cell thickness"  level="2" />
+          <field field_ref="botpres"      name="pbo"      long_name="Pressure_at_sea_floor"             level="2"                              />
+          <!-- pso : sea_water_pressure_at_sea_water_surface = 0 -->
+          <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"     level="1"                            />
+          <field field_ref="ssh2"         name="zossq"    long_name="square_of_sea_surface_height_above_geoid"             level="2" />
+
+          <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"   operation="average" freq_op="1mo"  level="1" > @toce_e3t / @e3t </field>      
+          <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                              level="1" />
+          <field field_ref="sst2"         name="tossq"    long_name="square_of_sea_surface_temperature"                    level="2" />
+          <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                operation="average" freq_op="1mo" level="1" > @soce_e3t / @e3t </field>       
+          <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                                                level="1" />
+	  <!-- diurnal cycle -->
+	  <!-- sst -->
+	  <field field_ref="sst"          name="sstdcymax"   long_name="max of sst diurnal cycle" operation="average" freq_op="1d" level="2" > @sstmax  </field>
+          <field field_ref="sst"          name="sstdcymin"   long_name="min of sst diurnal cycle" operation="average" freq_op="1d" level="2" > @sstmin </field>
+          <field field_ref="sst"          name="sstdcy"      long_name="amplitude of sst diurnal cycle" operation="average" freq_op="1d" level="2" > @sstmax - @sstmin </field>
+	  <!-- sss -->
+	  <field field_ref="sss"          name="sssdcymax"   long_name="max of sss diurnal cycle" operation="average" freq_op="1d" level="2" > @sssmax  </field>
+          <field field_ref="sss"          name="sssdcymin"   long_name="min of sss diurnal cycle" operation="average" freq_op="1d" level="2" > @sssmin </field>
+          <field field_ref="sss"          name="sssdcy"      long_name="amplitude of sss diurnal cycle" operation="average" freq_op="1d" level="2" > @sssmax - @sssmin </field>
+	  <!-- mld -->
+	  <field field_ref="mldr10_1"     name="mld10_1dcymax"   long_name="max of mld diurnal cycle" operation="average" freq_op="1d" level="2" > @mldr10_1max  </field>
+	  <field field_ref="mldr10_1"     name="mld10_1dcymin"   long_name="min of mld diurnal cycle" operation="average" freq_op="1d" level="2" > @mldr10_1min  </field>
+	  <field field_ref="mldr10_1"     name="mld10_1dcy"      long_name="amplitude of mld diurnal cycle" operation="average" freq_op="1d" level="2" > @mldr10_1max - @mldr10_1min  </field>
+	  <!--  -->
+          <field field_ref="rhop"         name="rhopoto"  long_name="sea_water_potential_density"                          level="2" />
+          <!-- no agessc : sea_water_age_since_surface_contact -->
+          <!-- no cfc11  : moles_per_unit_mass_of_cfc11_in_sea_water -->
+          <!-- msftbarot : ocean_barotropic_mass_streamfunction : offline -->
+          <!-- mlotst    :           ocean_mixed_layer_thickness_defined_by_sigma_t : must be done offline -->
+          <!-- mlotstsq  : square_of_ocean_mixed_layer_thickness_defined_by_sigma_t : must be done offline -->
+          <field field_ref="mldkz5"       name="omlmax"   long_name="ocean_mixed_layer_thickness_defined_by_mixing_scheme" level="2" operation="maximum" />
+          <field field_ref="mldkz5"       name="mldkz5"   level="2"  />
+          <field field_ref="mldr10_1"     name="mldr10_1" level="1" />
+          <field field_ref="mldr10_1max"  name="mldr10_1max"  long_name="max of Mixed Layer Depth 0.01 ref.10m"              operation="maximum" level="2"  />
+          <!-- wfonocorr : water_flux_into_sea_water_without_flux_correction : emp - erp -->
+          <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="2" />
+          <field field_ref="qrp"           name="hfcorr"      long_name="heat_flux_correction"                                                        level="1" />
+          <!-- next variables available with key_diahth -->
+          <field field_ref="mlddzt"        level="2" />
+          <field field_ref="maxdzT"        level="2" />
+          <field field_ref="mldr10_3"      level="2" />
+          <field field_ref="mldr0_1"       level="2" />
+          <field field_ref="mldr0_3"       level="2" />
+          <field field_ref="mld_dt02"      level="2" />
+          <field field_ref="topthdep"      level="2" />
+          <field field_ref="pycndep"       level="2" />
+          <field field_ref="BLT"           level="1" />
+          <field field_ref="tinv"          level="1" />
+          <field field_ref="depti"         level="1" />
+          <field field_ref="20d"           name="d20"        level="2" /> 
+	  <field field_ref="hc300"         name="hc300"      level="1" />
+	  <field field_ref="heatc_2"       name="heatc"      level="1"    />
+      <!-- next variables are additional for PISCES offline-->
+          <field field_ref="hdiv"         name="hdivtr"   long_name="horizontal divergence transport"      operation="average" freq_op="1mo" level="2" > @hdiv * @e3t </field>
+          <field field_ref="wspd"         name="windsp" level="2"  />
+          <field field_ref="empbmr"       name="wfob"     long_name="water_flux_into_sea_water at prev time-step"  level="2"   />
+          <field field_ref="fmmflx"       name="fmmflx" level="2"  />
+          <field field_ref="iceconc"      name="siconc" level="2"  />
+	  <!-- For heat conservation checking -->
+	  <field field_ref="qt_oce"        name="qt_oce"   long_name="downward total flux at ocean surface"       level="2"     />
+	  <field field_ref="qemp_oce"      name="qemp_oce" long_name="Downward Heat Flux from E-P over open ocean"   level="2"         />
+	  <field field_ref="qt_ice"        name="qt_ice"   long_name="downward total flux at ice surface"         level="2"   />
+	  <field field_ref="qemp_ice"      name="qemp_ice" long_name="Downward Heat Flux from E-P over ice"        level="2"    />
+          <field field_ref="hflx_rain_cea" name="hflx_rain_cea"    level="2"   />
+          <field field_ref="hflx_evap_cea" name="hflx_evap_cea"    level="2"   />
+          <field field_ref="hflx_snow_cea" name="hflx_snow_cea"    level="2"   />
+          <field field_ref="hflx_snow_ao_cea" name="hflx_snow_ao_cea"    level="2"   />
+          <field field_ref="hflx_snow_ai_cea" name="hflx_snow_ai_cea"    level="2"   />
+          <field field_ref="hflx_cal_cea"  name="hflx_cal_cea"    level="2"   />
+          <field field_ref="hflx_icb_cea"  name="hflx_icb_cea"    level="2"   />
+          <field field_ref="hflx_rnf_cea"  name="hflx_rnf_cea"    level="2"   />
+	  <field field_ref="qhcisf_par"     name="hflx_isf_cea"     level="1"  />
+
+          <!-- For freshwater conservation checking -->
+          <field field_ref="empmr"         name="wfo"      long_name="water_flux_into_sea_water"        level="1"              />
+          <field field_ref="emp_oce"       name="emp_oce"       level="2"                />
+          <field field_ref="emp_ice"       name="emp_ice"       level="2"                />
+          <field field_ref="runoffs"       name="runoffs"        level="2"               />
+          <field field_ref="runoffs"       name="friver"   long_name="water_flux_into_sea_water_from_rivers"     level="1" > runoffs - iceberg_cea </field>
+          <field field_ref="calving_cea"   name="calving" level="2" />
+          <field field_ref="iceberg_cea"   name="iceberg" level="2" />
+          <field field_ref="fwfisf_par"     name="iceshelf" level="2" />
+         <field field_ref="vfxice"           name="vfxice" level="2" />
+         <field field_ref="vfxsnw"           name="vfxsnw" level="2" />
+         <field field_ref="vfxsub"           name="vfxsub" level="2" />
+         <field field_ref="vfxsub_err"       name="vfxsub_err" level="2" />
+         <field field_ref="vfxsnw_pre"       name="vfxsnw_pre" level="2" />
+         <field field_ref="vfxsnw_sub"       name="vfxsnw_sub" level="2" />
+         <field field_ref="vfxpnd"           name="vfxpnd" level="2" />
+          <field field_ref="rain"          name="rain"   level="2"    />
+          <field field_ref="snow_ao_cea"   name="snow_ao_cea"    level="2"   />
+          <field field_ref="snow_ai_cea"   name="snow_ai_cea"    level="2"   />
+          <field field_ref="evap_ao_cea"   name="evap_ao_cea"    level="2"   />
+          <field field_ref="subl_ai_cea"   name="subl_ai_cea"    level="2"   />
+          <field field_ref="precip"       name="precip" level="2" />
+          <field field_ref="snowpre"      name="snowpre" level="2"  />
+          <!-- For salt conservation checking -->
+          <field field_ref="saltflx"      name="sosflxdo" level="2"  />
+        </file>
+
+	<file id="file10" name_suffix="_grid_U" description="ocean U grid variables" >
+	  <field field_ref="e3u"  level="2" />
+	  <field field_ref="ssu"          name="uos"     long_name="sea_surface_x_velocity"  level="2"   />
+	  <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity" operation="average" freq_op="1mo" level="2" > @uoce_e3u / @e3u </field>
+	  <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" level="2" />
+          <field field_ref="uocetr_eff"   name="uocetr_eff"  level="2" />
+          <field field_ref="ahu_bbl"       />
+	</file>
+	
+	<file id="file11" name_suffix="_grid_V" description="ocean V grid variables" >
+	  <field field_ref="e3v" level="2"  />
+	  <field field_ref="ssv"          name="vos"     long_name="sea_surface_y_velocity"    level="2" />
+	  <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity" operation="average" freq_op="1mo" level="2" > @voce_e3v / @e3v </field>
+	  <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" level="2" />
+          <field field_ref="vocetr_eff"   name="vocetr_eff" level="2"  />
+          <field field_ref="ahv_bbl"       />
+	</file>
+	
+	<file id="file12" name_suffix="_grid_W" description="ocean W grid variables" >
+	  <field field_ref="e3w"  level="2" />
+	  <field field_ref="woce"         name="wo"    level="2"  />
+	  <field field_ref="avt"          name="difvho"  long_name="ocean_vertical_heat_diffusivity" level="2" />
+	  <!-- avs: available with key_zdfddm -->
+	  <field field_ref="avs"          name="avs"     level="2"     /> 
+	  <field field_ref="avm"              name="avm"  level="2"       />
+	  <!-- avt_evd: available with ln_zdfevd -->
+	  <field field_ref="avt_evd"        name="avt_evd" level="2"  /> 
+	  <field field_ref="av_wave"      name="av_wave" level="2" /> 
+	  <field field_ref="bn2"             name="bn2"      level="2"      /> 
+	  <field field_ref="wocetr_eff"   name="wocetr_eff" level="2"  /> 
+	  <field field_ref="bflx_iwm"     name="bflx_iwm"   level="2" /> 
+	  <field field_ref="pcmap_iwm"    name="pcmap_iwm"  level="2" /> 
+	  <field field_ref="emix_iwm"     name="emix_iwm"   level="2" /> 	  
+	  <field field_ref="w_masstr"     name="vovematr"  level="2" />
+          <field field_ref="logavs"       name="difvsolog"  long_name="ocean_vertical_salt_diffusivity" operation="average" freq_op="1mo" level="2" > exp( @logavs ) </field>
+	  <field field_ref="avt_e3w"      name="NEMO_difvho"  long_name="ocean_vertical_heat_diffusivity"  operation="average" freq_op="1mo" level="1" > @avt_e3w / @e3w </field>
+	  <field field_ref="avt_e3w"      name="NEMO_difvho_noevd"  long_name="ocean_vertical_heat_diffusivity without evd contribution"  operation="average" freq_op="1mo" level="1" > (@avt_e3w - @avt_evd_e3w) / @e3w </field>
+	  <field field_ref="avs_e3w"      name="NEMO_difvso"  long_name="ocean_vertical_salt_diffusivity"  operation="average" freq_op="1mo" level="1" > @avs_e3w / @e3w </field>
+	  <field field_ref="avs_e3w"      name="NEMO_difvso_noevd"  long_name="ocean_vertical_salt_diffusivity without evd contribution"  operation="average" freq_op="1mo" level="1" > (@avs_e3w - @avt_evd_e3w) / @e3w </field>
+	</file>
+
+	<file id="file13" name_suffix="_scalar" description="scalar variables"  >
+
+	  <!-- Volume -->
+          <!-- global contents -->
+	  <field field_ref="voltot"          name="scvoltot"  level="1" />
+	  <field field_ref="sshtot"          name="scsshtot"  level="1" />
+	  <field field_ref="sshsteric"       name="scsshste"  level="1" />
+	  <field field_ref="sshthster"       name="scsshtst"  level="1" />
+	  <field field_ref="masstot"         name="scmastot"  level="1" />
+	  <field field_ref="temptot"         name="sctemtot"  level="1" />
+	  <field field_ref="saltot"          name="scsaltot"  level="1" />
+	  
+	  <!-- global drifts (conservation checks) -->
+	  <field field_ref="bgtemper"        name="bgtemper"   level="1"  />
+	  <field field_ref="bgsaline"        name="bgsaline"   level="1"  />
+	  <field field_ref="bgheatco"        name="bgheatco"   level="1"  />
+	  <field field_ref="bgheatfx"        name="bgheatfx"   level="1"  />
+	  <field field_ref="bgsaltco"        name="bgsaltco"   level="1"  />
+	  <field field_ref="bgvolssh"        name="bgvolssh"   level="1"  />
+	  <field field_ref="bgvole3t"        name="bgvole3t"   level="1"  />
+
+	  <!-- global surface forcings  -->
+	  <field field_ref="bgfrcvol"        name="bgfrcvol"   level="1"  />
+	  <field field_ref="bgfrctem"        name="bgfrctem"   level="1"  />
+	  <field field_ref="bgfrchfx"        name="bgfrchfx"   level="1"  />
+	  <field field_ref="bgfrcsal"        name="bgfrcsal"   level="1"  />
+
+	  <!-- Surface -->
+	  <!-- global contents -->
+          <field field_ref="ibgvol_tot"       name="ibgvol_tot"  level="1"  />
+          <field field_ref="sbgvol_tot"       name="sbgvol_tot"  level="1"  />
+          <field field_ref="ibgarea_tot"      name="ibgarea_tot" level="1"  />
+          <field field_ref="ibgsalt_tot"      name="ibgsalt_tot" level="1"  />
+          <field field_ref="ibgheat_tot"      name="ibgheat_tot" level="1"  />
+          <field field_ref="sbgheat_tot"      name="sbgheat_tot" level="1"  />
+	  
+	  <!-- global drifts (conservation checks) -->
+          <field field_ref="ibgvolume"        name="ibgvolume"   level="1"  />
+          <field field_ref="ibgsaltco"        name="ibgsaltco"   level="1"  />
+          <field field_ref="ibgheatco"        name="ibgheatco"   level="1"  />
+          <field field_ref="ibgheatfx"        name="ibgheatfx"   level="1"  />
+	  
+	  <!-- global forcings  -->
+          <field field_ref="ibgfrcvoltop"     name="ibgfrcvoltop" level="1" />
+          <field field_ref="ibgfrcvolbot"     name="ibgfrcvolbot" level="1" />
+          <field field_ref="ibgfrctemtop"     name="ibgfrctemtop" level="1" />
+          <field field_ref="ibgfrctembot"     name="ibgfrctembot" level="1" />
+          <field field_ref="ibgfrcsal"        name="ibgfrcsal"    level="1" />
+          <field field_ref="ibgfrchfxtop"     name="ibgfrchfxtop" level="1" />
+          <field field_ref="ibgfrchfxbot"     name="ibgfrchfxbot" level="1" />
+	  
+        </file>
+
+       <file id="file14" name_suffix="_diaptr_T_2D" description="zonal mean variables" >
+          <field field_ref="sophtove"    name="htovovrt"      grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sopstove"    name="sltovovrt"     grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sophtgyre"   name="htovgyre"      grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sopstgyre"   name="sltogyre"      grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sophtbtr"    name="htbtr"         grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sopstbtr"    name="sltbtr"        grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sophtadv"    name="htadv"         grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sopstadv"    name="sltadv"        grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sophtldf"    name="htldf"         grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sopstldf"    name="sltldf"        grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sophtvtr"    name="hfbasin"       grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sopstvtr"    name="sltbasin"      grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sophteiv"    name="hfbasinpmadv"  grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sopsteiv"    name="sltbasinpmadv" grid_ref="grid_ptr_T_2D"  level="2" />
+        </file>
+
+         <file id="file15" name_suffix="_diaptr_T_3D" description="zonal mean variables" >
+          <field field_ref="zotem"       name="znltem"        grid_ref="grid_ptr_T_3D" level="2" />
+          <field field_ref="zosal"       name="znlsal"        grid_ref="grid_ptr_T_3D" level="2" />
+          <field field_ref="zosrf"       name="znlsrf"        grid_ref="grid_ptr_T_3D" level="2" />
+        </file>
+
+	    <file id="file16" name_suffix="_diaptr_W" description="diaptr variables"  >
+          <field field_ref="zomsf"   name="msftyz_glo"  long_name="Overturning Stream-Function : global"       grid_ref="grid_ptr_W_GLO" level="1" />
+          <field field_ref="zomsf"   name="msftyz_atl"  long_name="Overturning Stream-Function : Atlantic"     grid_ref="grid_ptr_W_ATL" level="1" />
+          <field field_ref="zomsf"   name="msftyz_ind"  long_name="Overturning Stream-Function : Indo-PAcific" grid_ref="grid_ptr_W_IND" level="1" />
+        </file>
+
+         <file id="file17" name_suffix="_strait_oce" description="transport variables through straits" >
+           <field field_ref="masstr_strait"      name="mfo"  level="2"    />
+         </file>
+
+        <file id="file18" name_suffix="_trdtra" description="ocean trends variables" >
+          <field field_ref="ttrd_zdfp_e3t"   name="ttrdtr_zdfp"  long_name="Tendency_of_heat_content_from_parameterized_dianeutral_mixing"  unit="W m-2"      level="2"   > this * $cpocean * $rho0  </field>
+          <field field_ref="ttrd_iso_e3t"    name="ttrdtr_iso"   long_name="Tendency_of_heat_content_from_parameterized_eddy_diffusion"     unit="W m-2"      level="2"   > this * $cpocean * $rho0  </field>
+          <field field_ref="ttrd_totad_e3t"  name="ttrdtr_totad" long_name="Tendency_of_heat_content_from_residual_mean_advection"          unit="W m-2"      level="2"   > this * $cpocean * $rho0  </field>
+          <field field_ref="ttrd_tot_e3t"    name="ttrdtr_tot"   long_name="Tendency_of_heat_content_from_all_processes"                    unit="W m-2"      level="2"   > this * $cpocean * $rho0  </field>
+          <field field_ref="strd_zdfp_e3t"   name="strdtr_zdfp"  long_name="Tendency_of_salt_content_from_parameterized_dianeutral_mixing"  unit="kg m-2 s-1" level="2"   > this * $rho0 </field>
+          <field field_ref="strd_iso_e3t"    name="strdtr_iso"   long_name="Tendency_of_salt_content_from_parameterized_eddy_diffusion"     unit="kg m-2 s-1" level="2"  > this * $rho0 </field>
+          <field field_ref="strd_totad_e3t"  name="strdtr_totad" long_name="Tendency_of_salt_content_from_residual_mean_advection"          unit="kg m-2 s-1" level="2"  > this * $rho0  </field>
+          <field field_ref="strd_tot_e3t"    name="strdtr_tot"   long_name="Tendency_of_salt_content_from_all_processes"                    unit="kg m-2 s-1" level="2"  > this * $rho0  </field>
+        </file>
+
+      </file_group>
+
+
+      <file_group id="2m_opa" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
+      <file_group id="3m_opa" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
+      <file_group id="4m_opa" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
+      <file_group id="6m_opa" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
+
+      <file_group id="1y_opa"  output_freq="1y" output_level="_AUTO_" enabled="_AUTO_"> <!-- real yearly files -->
+
+	<file id="file19" name_suffix="_grid_T" description="ocean T grid variables" >
+	  <field field_ref="e3t"  level="2"  />
+	  <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"          level="2"              />
+	  <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"             level="2"              />
+	  <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"   level="2"              />
+	  <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"      operation="average" freq_op="1y" level="2" > @toce_e3t / @e3t </field>        
+	  <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                   operation="average" freq_op="1y" level="2" > @soce_e3t / @e3t </field>         
+	  <field field_ref="sst2"         name="tossq"    long_name="square_of_sea_surface_temperature"           level="2"   />
+	  <field field_ref="ssh2"         name="zossq"    long_name="square_of_sea_surface_height_above_geoid"    level="2"   />
+	  <field field_ref="mldr10_1"  level="2"    />
+	  <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"    level="2"       />
+	  <field field_ref="taum"         name="taum" level="2" />
+	  <field field_ref="wspd"         name="sowindsp"  level="2" />
+	  <field field_ref="precip"       name="soprecip" level="2" />
+	  <!-- available with ln_blk_clio or ln_blk_core -->
+	  <field field_ref="qns_oce"      name="sonshdoo" level="2"  />
+	  <field field_ref="qlw_oce"      name="solwhdoo" level="2"  />
+	  <field field_ref="qsb_oce"      name="sosehdoo" level="2"  />
+	  <field field_ref="qla_oce"      name="solahdoo" level="2"  />
+	  <field field_ref="taum_oce"     name="sowndsto" level="2"  />
+	  <!-- ice and snow -->
+	  <field field_ref="snowpre"      name="isnowpre" level="2"  />
+	  <!-- For heat conservation checking -->
+	  <field field_ref="qt_oce"        name="qt_oce"   long_name="downward total flux at ocean surface"         level="2"   />
+	  <field field_ref="qemp_oce"      name="qemp_oce" long_name="Downward Heat Flux from E-P over open ocean"   level="2"         />
+	  <field field_ref="qt_ice"        name="qt_ice"   long_name="downward total flux at ice surface"          level="2"  />
+	  <field field_ref="qemp_ice"      name="qemp_ice" long_name="Downward Heat Flux from E-P over ice"        level="2"    />
+	  <field field_ref="hflx_rain_cea" name="hflx_rain_cea"     level="2"  />
+	  <field field_ref="hflx_evap_cea" name="hflx_evap_cea"     level="2"  />
+	  <field field_ref="hflx_snow_cea" name="hflx_snow_cea"    level="2"   />
+	  <field field_ref="hflx_cal_cea"  name="hflx_cal_cea"    level="2"   />
+	  <field field_ref="qhcisf_par"     name="hflx_isf"     level="1"  />
+	  <!-- For freshwater conservation checking -->
+	  <field field_ref="empmr"         name="wfo"      long_name="water_flux_into_sea_water"             level="2"         />
+	  <field field_ref="emp_oce"       name="emp_oce"         level="2"              />
+	  <field field_ref="emp_ice"       name="emp_ice"         level="2"              />
+	  <field field_ref="runoffs"       name="runoffs"         level="2"              />
+      <field field_ref="runoffs"       name="friver"   long_name="water_flux_into_sea_water_from_rivers"     level="1" > runoffs - iceberg_cea </field>
+	  <field field_ref="calving_cea"   name="calving" level="2" />
+          <field field_ref="iceberg_cea"   name="iceberg" level="2" />
+          <field field_ref="fwfisf_par"  name="iceshelf" level="2"  />
+	  <field field_ref="vfxice"        name="vfxice" level="2"  />
+	  <field field_ref="vfxsnw"        name="vfxsnw" level="2" />
+	  <field field_ref="vfxsub"        name="vfxsub" level="2" />
+	  <field field_ref="rain"          name="rain"    level="2"   />
+	  <field field_ref="snow_ao_cea"   name="snow_ao_cea"  level="2"     />
+	  <field field_ref="snow_ai_cea"   name="snow_ai_cea"  level="2"     />
+	  <field field_ref="evap_ao_cea"   name="evap_ao_cea"  level="2"     />
+	  <field field_ref="subl_ai_cea"   name="subl_ai_cea"  level="2"     />
+	  <!-- For salt conservation checking -->
+          <field field_ref="saltflx"      name="sosflxdo" level="2"  />
+	</file>
+	
+	<file id="file20" 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"   level="2"  />
+	  <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity"      operation="average" freq_op="1y" level="2" > @uoce_e3u / @e3u </field> 
+	  <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress"  level="2"  />
+	  <field field_ref="uocetr_eff"   name="uocetr_eff" level="2"  />
+	</file>
+	
+	<file id="file21" 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"  level="2"   />
+	  <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity"     operation="average" freq_op="1y" level="2" > @voce_e3v / @e3v </field>
+	  <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" level="2" />
+	  <field field_ref="vocetr_eff"   name="vocetr_eff" level="2"  />
+	</file>
+	
+	<file id="file22" name_suffix="_grid_W" description="ocean W grid variables" >
+	  <field field_ref="e3w"  />
+	  <field field_ref="woce"         name="wo"      long_name="ocean vertical velocity"         level="2" />
+	  <field field_ref="avt"          name="difvho"  long_name="ocean_vertical_heat_diffusivity" level="2" />
+	  <field field_ref="wocetr_eff"   name="wocetr_eff"  level="2" />
+	  <field field_ref="avt_evd"      name="avt_evd"   level="2"  />
+	  <field field_ref="av_wave"      name="av_wave"    level="2" />
+	  <field field_ref="bn2"          name="bn2"       level="2"  />
+	  <field field_ref="bflx_iwm"     name="bflx_iwm"  level="2"  />
+	  <field field_ref="pcmap_iwm"    name="pcmap_iwm" level="2"  />
+	  <field field_ref="emix_iwm"     name="emix_iwm"  level="2"  />
+	  <field field_ref="av_ratio"     name="av_ratio"  level="2"  />
+	</file>
+	
+
+       <file id="file23" name_suffix="_diaptr_T_2D" description="zonal mean variables" >
+          <field field_ref="sophtove"    name="htovovrt"      grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sopstove"    name="sltovovrt"     grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sophtgyre"   name="htovgyre"      grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sopstgyre"   name="sltogyre"      grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sophtbtr"    name="htbtr"         grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sopstbtr"    name="sltbtr"        grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sophtadv"    name="htadv"         grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sopstadv"    name="sltadv"        grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sophtldf"    name="htldf"         grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sopstldf"    name="sltldf"        grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sophtvtr"    name="hfbasin"       grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sopstvtr"    name="sltbasin"      grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sophteiv"    name="hfbasinpmadv"  grid_ref="grid_ptr_T_2D"  level="2" />
+          <field field_ref="sopsteiv"    name="sltbasinpmadv" grid_ref="grid_ptr_T_2D"  level="2" />
+        </file>
+
+         <file id="file24" name_suffix="_diaptr_T_3D" description="zonal mean variables" >
+          <field field_ref="zotem"       name="znltem"        grid_ref="grid_ptr_T_3D" level="2" />
+          <field field_ref="zosal"       name="znlsal"        grid_ref="grid_ptr_T_3D" level="2" />
+          <field field_ref="zosrf"       name="znlsrf"        grid_ref="grid_ptr_T_3D" level="2" />
+        </file>
+
+	<file id="file25" name_suffix="_diaptr_W" description="diaptr variables"  >
+	  <field field_ref="zomsf"          name="msftyz"  grid_ref="grid_ptr_W_3D" level="1" />
+        </file>
+
+        <file id="file26" name_suffix="_trdtra" description="ocean trends variables" >
+          <field field_ref="ttrd_zdfp_e3t"   name="ttrdtr_zdfp"  long_name="Tendency_of_heat_content_from_parameterized_dianeutral_mixing"  unit="W m-2"      level="2"  > this * $cpocean * $rho0  </field>
+          <field field_ref="ttrd_iso_e3t"    name="ttrdtr_iso"   long_name="Tendency_of_heat_content_from_parameterized_eddy_diffusion"     unit="W m-2"      level="2"  > this * $cpocean * $rho0  </field>
+          <field field_ref="ttrd_totad_e3t"  name="ttrdtr_totad" long_name="Tendency_of_heat_content_from_residual_mean_advection"          unit="W m-2"      level="2"  > this * $cpocean * $rho0  </field>
+          <field field_ref="ttrd_tot_e3t"    name="ttrdtr_tot"   long_name="Tendency_of_heat_content_from_all_processes"                    unit="W m-2"      level="2"  > this * $cpocean * $rho0  </field>
+          <field field_ref="strd_zdfp_e3t"   name="strdtr_zdfp"  long_name="Tendency_of_salt_content_from_parameterized_dianeutral_mixing"  unit="kg m-2 s-1" level="2"  > this * $rho0 </field>
+          <field field_ref="strd_iso_e3t"    name="strdtr_iso"   long_name="Tendency_of_salt_content_from_parameterized_eddy_diffusion"     unit="kg m-2 s-1" level="2"  > this * $rho0 </field>
+          <field field_ref="strd_totad_e3t"  name="strdtr_totad" long_name="Tendency_of_salt_content_from_residual_mean_advection"          unit="kg m-2 s-1" level="2"  > this * $rho0  </field>
+          <field field_ref="strd_tot_e3t"    name="strdtr_tot"   long_name="Tendency_of_salt_content_from_all_processes"                    unit="kg m-2 s-1" level="2"  > this * $rho0  </field>
+        </file>
+
+      </file_group>
+      
+      <!--  To compute transport through straits : need to read mask file ( every month is the best otherwise costly ) -->
+      <file id="maskMFO"  name="maskMFO" enabled="true" mode="read" output_freq="1mo" cyclic="true"  >
+        <field id="maskMFO_u" operation="instant" freq_offset="1mo" grid_ref="grid_U_4strait" />
+        <field id="maskMFO_v" operation="instant" freq_offset="1mo" grid_ref="grid_V_4strait" />
+      </file>
+
+      <file_group id="2y_opa"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
+      <file_group id="5y_opa"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
+      <file_group id="10y_opa" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
+
+    </file_definition>
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-oce_tuning.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-oce_tuning.xml	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-oce_tuning.xml	(revision 6658)
@@ -0,0 +1,157 @@
+<?xml version="1.0"?>
+
+<!--
+============================================================================================================
+=                                           output files definition                                        =
+=                                            Define your own filesfor ocean dynamics context                                         =
+=                                         put the variables you want...                                    =
+============================================================================================================
+    -->
+   
+    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="4" >
+    
+      <file_group id="1ts_opa" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
+
+      <file_group id="1h_opa" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
+
+      <file_group id="2h_opa" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
+
+      <file_group id="3h_opa" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
+
+      <file_group id="4h_opa" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
+
+      <file_group id="6h_opa" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->     
+ 
+      <file_group id="1d_opa" output_freq="1d"  output_level="_AUTO_" enabled="_AUTO_">  <!-- 1d files -->   
+      </file_group> 
+
+      <file_group id="5d_opa" output_freq="5d"  output_level="_AUTO_" enabled="_AUTO_">  <!-- 5d files -->
+      </file_group> 
+	
+      <file_group id="1m_opa" output_freq="1mo" output_level="_AUTO_" enabled="_AUTO_"> <!-- real monthly files -->
+
+        <file id="file9" name_suffix="_grid_T" >
+	  <field field_ref="e3t" long_name="T-cell thickness"  level="2" />
+          <field field_ref="ssh"          name="zos"         long_name="sea_surface_height_above_geoid"     level="1"                            />
+          <field field_ref="sst_pot"      name="tos"         long_name="sea_surface potential_temperature"                              level="1" />
+          <field field_ref="sss"          name="sos"         long_name="sea_surface_salinity"                                                level="1" />
+          <field field_ref="toce_pot"     name="toce100"     long_name="sea_water_potential_temperature at 100m"   operation="average" freq_op="1mo"  level="1" grid_ref="grid_T_100" > @toce_pot_e3t / @e3t </field>      
+          <field field_ref="toce_pot"     name="toce200"   long_name="sea_water_potential_temperature at 200m"   operation="average" freq_op="1mo"  level="1" grid_ref="grid_T_200" > @toce_pot_e3t / @e3t </field>      
+          <field field_ref="toce_pot"     name="toce300"   long_name="sea_water_potential_temperature at 300m"   operation="average" freq_op="1mo"  level="1" grid_ref="grid_T_300" > @toce_pot_e3t / @e3t </field>      
+          <field field_ref="toce_pot"     name="toce500"   long_name="sea_water_potential_temperature at 500m"   operation="average" freq_op="1mo"  level="1" grid_ref="grid_T_500" > @toce_pot_e3t / @e3t </field>      
+          <field field_ref="toce_pot"     name="toce700"   long_name="sea_water_potential_temperature at 700m"   operation="average" freq_op="1mo"  level="1" grid_ref="grid_T_700" > @toce_pot_e3t / @e3t </field>      
+          <field field_ref="toce_pot"     name="toce1000"   long_name="sea_water_potential_temperature at 1000m"   operation="average" freq_op="1mo"  level="1" grid_ref="grid_T_1000" > @toce_pot_e3t / @e3t </field>      
+          <field field_ref="toce_pot"     name="toce2000"   long_name="sea_water_potential_temperature at 2000m"   operation="average" freq_op="1mo"  level="1" grid_ref="grid_T_2000" > @toce_pot_e3t / @e3t </field>      
+          <field field_ref="toce_pot"     name="toce3000"   long_name="sea_water_potential_temperature at 3000m"   operation="average" freq_op="1mo"  level="1" grid_ref="grid_T_3000" > @toce_pot_e3t / @e3t </field>      
+          <field field_ref="toce_pot"     name="toce4000"   long_name="sea_water_potential_temperature at 4000m"   operation="average" freq_op="1mo"  level="1" grid_ref="grid_T_4000" > @toce_pot_e3t / @e3t </field>      
+          <field field_ref="soce"         name="so100"      long_name="sea_water_salinity at 100m"                operation="average" freq_op="1mo" level="1"  grid_ref="grid_T_100"  > @soce_e3t / @e3t </field>       
+          <field field_ref="soce"         name="so200"      long_name="sea_water_salinity at 200m"                operation="average" freq_op="1mo" level="1"  grid_ref="grid_T_200"  > @soce_e3t / @e3t </field>       
+          <field field_ref="soce"         name="so300"      long_name="sea_water_salinity at 300m"                operation="average" freq_op="1mo" level="1"  grid_ref="grid_T_300"  > @soce_e3t / @e3t </field>       
+          <field field_ref="soce"         name="so500"      long_name="sea_water_salinity at 500m"                operation="average" freq_op="1mo" level="1"  grid_ref="grid_T_500"  > @soce_e3t / @e3t </field>       
+          <field field_ref="soce"         name="so700"      long_name="sea_water_salinity at 700m"                operation="average" freq_op="1mo" level="1"  grid_ref="grid_T_700"  > @soce_e3t / @e3t </field>       
+          <field field_ref="soce"         name="so1000"     long_name="sea_water_salinity at 1000m"                operation="average" freq_op="1mo" level="1"  grid_ref="grid_T_1000"  > @soce_e3t / @e3t </field>       
+          <field field_ref="soce"         name="so2000"     long_name="sea_water_salinity at 2000m"                operation="average" freq_op="1mo" level="1"  grid_ref="grid_T_2000"  > @soce_e3t / @e3t </field>       
+          <field field_ref="soce"         name="so3000"     long_name="sea_water_salinity at 3000m"                operation="average" freq_op="1mo" level="1"  grid_ref="grid_T_3000"  > @soce_e3t / @e3t </field>       
+          <field field_ref="soce"         name="so4000"     long_name="sea_water_salinity at 4000m"                operation="average" freq_op="1mo" level="1"  grid_ref="grid_T_4000"  > @soce_e3t / @e3t </field>       
+          <field field_ref="mldr10_1"     name="mldr10_1"   level="1" />
+          <field field_ref="mlddzt"       name="mlddzt"     level="1" />
+          <field field_ref="maxdzT"       name="maxdzT"     level="1" />
+          <field field_ref="20d"          name="d20"        level="1" /> 
+	  <field field_ref="hc300"        name="hc300"      level="1" />
+	  <field field_ref="heatc_2"      name="heatc"      level="1"    />
+	  <field field_ref="qt_oce"       name="qt_oce"     long_name="downward total flux at ocean surface"       level="1"     />
+        </file>
+
+	
+	<file id="file13" name_suffix="_scalar" description="scalar variables"  >
+
+	  <!-- Volume -->
+          <!-- global contents -->
+	  <field field_ref="voltot"          name="scvoltot"  level="1" />
+	  <field field_ref="sshtot"          name="scsshtot"  level="1" />
+	  <field field_ref="sshsteric"       name="scsshste"  level="1" />
+	  <field field_ref="sshthster"       name="scsshtst"  level="1" />
+	  <field field_ref="masstot"         name="scmastot"  level="1" />
+	  <field field_ref="temptot"         name="sctemtot"  level="1" />
+	  <field field_ref="saltot"          name="scsaltot"  level="1" />
+	  
+	  <!-- global drifts (conservation checks) -->
+	  <field field_ref="bgtemper"        name="bgtemper"   level="1"  />
+	  <field field_ref="bgsaline"        name="bgsaline"   level="1"  />
+	  <field field_ref="bgheatco"        name="bgheatco"   level="1"  />
+	  <field field_ref="bgheatfx"        name="bgheatfx"   level="1"  />
+	  <field field_ref="bgsaltco"        name="bgsaltco"   level="1"  />
+	  <field field_ref="bgvolssh"        name="bgvolssh"   level="1"  />
+	  <field field_ref="bgvole3t"        name="bgvole3t"   level="1"  />
+
+	  <!-- global surface forcings  -->
+	  <field field_ref="bgfrcvol"        name="bgfrcvol"   level="1"  />
+	  <field field_ref="bgfrctem"        name="bgfrctem"   level="1"  />
+	  <field field_ref="bgfrchfx"        name="bgfrchfx"   level="1"  />
+	  <field field_ref="bgfrcsal"        name="bgfrcsal"   level="1"  />
+
+	  <!-- Surface -->
+	  <!-- global contents -->
+          <field field_ref="ibgvol_tot"       name="ibgvol_tot"  level="1"  />
+          <field field_ref="sbgvol_tot"       name="sbgvol_tot"  level="1"  />
+          <field field_ref="ibgarea_tot"      name="ibgarea_tot" level="1"  />
+          <field field_ref="ibgsalt_tot"      name="ibgsalt_tot" level="1"  />
+          <field field_ref="ibgheat_tot"      name="ibgheat_tot" level="1"  />
+          <field field_ref="sbgheat_tot"      name="sbgheat_tot" level="1"  />
+	  
+	  <!-- global drifts (conservation checks) -->
+          <field field_ref="ibgvolume"        name="ibgvolume"   level="1"  />
+          <field field_ref="ibgsaltco"        name="ibgsaltco"   level="1"  />
+          <field field_ref="ibgheatco"        name="ibgheatco"   level="1"  />
+          <field field_ref="ibgheatfx"        name="ibgheatfx"   level="1"  />
+	  
+	  <!-- global forcings  -->
+          <field field_ref="ibgfrcvoltop"     name="ibgfrcvoltop" level="1" />
+          <field field_ref="ibgfrcvolbot"     name="ibgfrcvolbot" level="1" />
+          <field field_ref="ibgfrctemtop"     name="ibgfrctemtop" level="1" />
+          <field field_ref="ibgfrctembot"     name="ibgfrctembot" level="1" />
+          <field field_ref="ibgfrcsal"        name="ibgfrcsal"    level="1" />
+          <field field_ref="ibgfrchfxtop"     name="ibgfrchfxtop" level="1" />
+          <field field_ref="ibgfrchfxbot"     name="ibgfrchfxbot" level="1" />
+	  
+        </file>
+
+         <file id="file15" name_suffix="_diaptr_T_3D" description="zonal mean variables" >
+          <field field_ref="zotem"       name="znltem"        grid_ref="grid_ptr_T_3D" level="2" />
+          <field field_ref="zosal"       name="znlsal"        grid_ref="grid_ptr_T_3D" level="2" />
+          <field field_ref="zosrf"       name="znlsrf"        grid_ref="grid_ptr_T_3D" level="2" />
+        </file>
+
+	    <file id="file16" name_suffix="_diaptr_W" description="diaptr variables"  >
+          <field field_ref="zomsf"   name="msftyz_glo"  long_name="Overturning Stream-Function : global"       grid_ref="grid_ptr_W_GLO" level="1" />
+          <field field_ref="zomsf"   name="msftyz_atl"  long_name="Overturning Stream-Function : Atlantic"     grid_ref="grid_ptr_W_ATL" level="1" />
+          <field field_ref="zomsf"   name="msftyz_ind"  long_name="Overturning Stream-Function : Indo-PAcific" grid_ref="grid_ptr_W_IND" level="1" />
+        </file>
+
+         <file id="file17" name_suffix="_strait_oce" description="transport variables through straits" >
+           <field field_ref="masstr_strait"      name="mfo"  level="1"    />
+         </file>
+
+
+      </file_group>
+
+
+      <file_group id="2m_opa" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
+      <file_group id="3m_opa" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
+      <file_group id="4m_opa" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
+      <file_group id="6m_opa" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
+
+      <file_group id="1y_opa"  output_freq="1y" output_level="_AUTO_" enabled="_AUTO_"> <!-- real yearly files -->
+      </file_group>
+      
+      <!--  To compute transport through straits : need to read mask file ( every month is the best otherwise costly ) -->
+      <file id="maskMFO"  name="maskMFO" enabled="true" mode="read" output_freq="1mo" cyclic="true"  >
+        <field id="maskMFO_u" operation="instant" freq_offset="1mo" grid_ref="grid_U_4strait" />
+        <field id="maskMFO_v" operation="instant" freq_offset="1mo" grid_ref="grid_V_4strait" />
+      </file>
+
+      <file_group id="2y_opa"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
+      <file_group id="5y_opa"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
+      <file_group id="10y_opa" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
+
+    </file_definition>
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-pisces.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-pisces.xml	(revision 6656)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-pisces.xml	(revision 6658)
@@ -26,16 +26,16 @@
       <file_group id="1d_pis" output_freq="1d"  output_level="_AUTO_" enabled="_AUTO_" >  <!-- 1d files -->   
 
-        <file id="file17" name_suffix="_bioscalar" description="pisces sms variables" >
-          <field field_ref="tdenit"   name="tdenit"   grid_ref="grid_1point" unit="TgN/yr" operation="instant" level="2" > tdenit * 14. * 86400. * 365. / 1e12 </field>
-          <field field_ref="tnfix"    name="tnfix"    grid_ref="grid_1point" unit="TgN/yr" operation="instant" level="2" > tnfix * 14. * 86400. * 365. / 1e12 </field>
-          <field field_ref="tcflx"    name="tcflx"    grid_ref="grid_1point" unit="PgC/yr" operation="instant" level="2" > tcflx * -1. * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="tcflxcum" name="tcflxcum" grid_ref="grid_1point" unit="PgC"    operation="instant" level="2" > tcflxcum * -1. * 12. / 1e15 </field>
-          <field field_ref="tcexp"    name="tcexp"    grid_ref="grid_1point" unit="PgC/yr" operation="instant" level="2" > tcexp * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="tintpp"   name="tintpp"   grid_ref="grid_1point" unit="PgC/yr" operation="instant" level="2" > tintpp * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="pno3tot"  name="pno3tot"  grid_ref="grid_1point" unit="umolN"  operation="instant" level="2" > pno3tot * 16. / 122. * 1e6 </field>
-          <field field_ref="ppo4tot"  name="ppo4tot"  grid_ref="grid_1point" unit="umolP"  operation="instant" level="2" > ppo4tot * 1. / 122. * 1e6 </field>
-          <field field_ref="psiltot"  name="psiltot"  grid_ref="grid_1point" unit="umolC"  operation="instant" level="2" > psiltot * 1e6  </field>
-          <field field_ref="palktot"  name="palktot"  grid_ref="grid_1point" unit="umolC"  operation="instant" level="2" > palktot * 1e6  </field>
-          <field field_ref="pfertot"  name="pfertot"  grid_ref="grid_1point" unit="nmolFe" operation="instant" level="2" > pfertot * 1e9  </field>
+        <file id="file31" name_suffix="_bioscalar" description="pisces sms variables" >
+          <field field_ref="tdenit"   name="tdenit"    unit="TgN/yr" operation="instant" level="2" > tdenit * 14. * 86400. * 365. / 1e12 </field>
+          <field field_ref="tnfix"    name="tnfix"     unit="TgN/yr" operation="instant" level="2" > tnfix * 14. * 86400. * 365. / 1e12 </field>
+          <field field_ref="tcflx"    name="tcflx"     unit="PgC/yr" operation="instant" level="2" > tcflx * -1. * 12. * 86400. * 365. / 1e15 </field>
+          <field field_ref="tcflxcum" name="tcflxcum"  unit="PgC"    operation="instant" level="2" > tcflxcum * -1. * 12. / 1e15 </field>
+          <field field_ref="tcexp"    name="tcexp"     unit="PgC/yr" operation="instant" level="2" > tcexp * 12. * 86400. * 365. / 1e15 </field>
+          <field field_ref="tintpp"   name="tintpp"    unit="PgC/yr" operation="instant" level="2" > tintpp * 12. * 86400. * 365. / 1e15 </field>
+          <field field_ref="pno3tot"  name="pno3tot"   unit="umolN"  operation="instant" level="2" > pno3tot * 16. / 117. * 1e6 </field>
+          <field field_ref="ppo4tot"  name="ppo4tot"   unit="umolP"  operation="instant" level="2" > ppo4tot * 1. / 117. * 1e6 </field>
+          <field field_ref="psiltot"  name="psiltot"   unit="umolC"  operation="instant" level="2" > psiltot * 1e6  </field>
+          <field field_ref="palktot"  name="palktot"   unit="umolC"  operation="instant" level="2" > palktot * 1e6  </field>
+          <field field_ref="pfertot"  name="pfertot"   unit="nmolFe" operation="instant" level="2" > pfertot * 1e9  </field>
         </file>
 
@@ -44,16 +44,16 @@
       <file_group id="5d_pis" output_freq="5d"  output_level="_AUTO_" enabled="_AUTO_" >  <!-- 5d files -->   
 
-       <file id="file24" name_suffix="_bioscalar" description="pisces sms variables" >
-          <field field_ref="tdenit"   name="tdenit"   grid_ref="grid_1point" unit="TgN/yr" operation="instant" level="2" > tdenit * 14. * 86400. * 365. / 1e12 </field>
-          <field field_ref="tnfix"    name="tnfix"    grid_ref="grid_1point" unit="TgN/yr" operation="instant" level="2" > tnfix * 14. * 86400. * 365. / 1e12 </field>
-          <field field_ref="tcflx"    name="tcflx"    grid_ref="grid_1point" unit="PgC/yr" operation="instant" level="2" > tcflx * -1. * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="tcflxcum" name="tcflxcum" grid_ref="grid_1point" unit="PgC"    operation="instant" level="2" > tcflxcum * -1. * 12. / 1e15 </field>
-          <field field_ref="tcexp"    name="tcexp"    grid_ref="grid_1point" unit="PgC/yr" operation="instant" level="2" > tcexp * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="tintpp"   name="tintpp"   grid_ref="grid_1point" unit="PgC/yr" operation="instant" level="2" > tintpp * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="pno3tot"  name="pno3tot"  grid_ref="grid_1point" unit="umolN"  operation="instant" level="2" > pno3tot * 16. / 122. * 1e6 </field>
-          <field field_ref="ppo4tot"  name="ppo4tot"  grid_ref="grid_1point" unit="umolP"  operation="instant" level="2" > ppo4tot * 1. / 122. * 1e6 </field>
-          <field field_ref="psiltot"  name="psiltot"  grid_ref="grid_1point" unit="umolC"  operation="instant" level="2" > psiltot * 1e6  </field>
-          <field field_ref="palktot"  name="palktot"  grid_ref="grid_1point" unit="umolC"  operation="instant" level="2" > palktot * 1e6  </field>
-          <field field_ref="pfertot"  name="pfertot"  grid_ref="grid_1point" unit="nmolFe" operation="instant" level="2" > pfertot * 1e9  </field>
+       <file id="file32" name_suffix="_bioscalar" description="pisces sms variables" >
+          <field field_ref="tdenit"   name="tdenit"    unit="TgN/yr" operation="instant" level="2" > tdenit * 14. * 86400. * 365. / 1e12 </field>
+          <field field_ref="tnfix"    name="tnfix"     unit="TgN/yr" operation="instant" level="2" > tnfix * 14. * 86400. * 365. / 1e12 </field>
+          <field field_ref="tcflx"    name="tcflx"     unit="PgC/yr" operation="instant" level="2" > tcflx * -1. * 12. * 86400. * 365. / 1e15 </field>
+          <field field_ref="tcflxcum" name="tcflxcum"  unit="PgC"    operation="instant" level="2" > tcflxcum * -1. * 12. / 1e15 </field>
+          <field field_ref="tcexp"    name="tcexp"     unit="PgC/yr" operation="instant" level="2" > tcexp * 12. * 86400. * 365. / 1e15 </field>
+          <field field_ref="tintpp"   name="tintpp"    unit="PgC/yr" operation="instant" level="2" > tintpp * 12. * 86400. * 365. / 1e15 </field>
+          <field field_ref="pno3tot"  name="pno3tot"   unit="umolN"  operation="instant" level="2" > pno3tot * 16. / 117. * 1e6 </field>
+          <field field_ref="ppo4tot"  name="ppo4tot"   unit="umolP"  operation="instant" level="2" > ppo4tot * 1. / 117. * 1e6 </field>
+          <field field_ref="psiltot"  name="psiltot"   unit="umolC"  operation="instant" level="2" > psiltot * 1e6  </field>
+          <field field_ref="palktot"  name="palktot"   unit="umolC"  operation="instant" level="2" > palktot * 1e6  </field>
+          <field field_ref="pfertot"  name="pfertot"   unit="nmolFe" operation="instant" level="2" > pfertot * 1e9  </field>
         </file>
 
@@ -64,34 +64,34 @@
 
 
-        <file id="file18" name_suffix="_ptrc_T" description="pisces sms variables" >
-          <field field_ref="DIC"       name="DIC"      operation="average" freq_op="1mo" level="2" > @DIC_E3T / @e3t </field>
-          <field field_ref="Alkalini"  name="Alkalini" operation="average" freq_op="1mo" level="2" > @Alkalini_E3T / @e3t </field>
-          <field field_ref="O2"        name="O2"       operation="average" freq_op="1mo" level="2" > @O2_E3T / @e3t </field>
-          <field field_ref="CaCO3"     name="CaCO3"    operation="average" freq_op="1mo" level="2" > @CaCO3_E3T / @e3t </field>
-          <field field_ref="PO4"       name="PO4"      operation="average" freq_op="1mo" level="2" > @PO4_E3T / @e3t </field>
-          <field field_ref="POC"       name="POC"      operation="average" freq_op="1mo" level="2" > @POC_E3T / @e3t </field>
-          <field field_ref="Si"        name="Si"       operation="average" freq_op="1mo" level="2" > @Si_E3T / @e3t </field>
-          <field field_ref="PHY"       name="PHY"      operation="average" freq_op="1mo" level="2" > @PHY_E3T / @e3t </field>
-          <field field_ref="ZOO"       name="ZOO"      operation="average" freq_op="1mo" level="2" > @ZOO_E3T / @e3t </field>
-          <field field_ref="DOC"       name="DOC"      operation="average" freq_op="1mo" level="2" > @DOC_E3T / @e3t </field>
-          <field field_ref="PHY2"      name="PHY2"     operation="average" freq_op="1mo" level="2" > @PHY2_E3T / @e3t </field>
-          <field field_ref="ZOO2"      name="ZOO2"     operation="average" freq_op="1mo" level="2" > @ZOO2_E3T / @e3t </field>
-          <field field_ref="DSi"       name="DSi"      operation="average" freq_op="1mo" level="2" > @DSi_E3T / @e3t </field>
-          <field field_ref="Fer"       name="Fer"      operation="average" freq_op="1mo" level="2" > @Fer_E3T / @e3t </field>
-          <field field_ref="BFe"       name="BFe"      operation="average" freq_op="1mo" level="2" > @BFe_E3T / @e3t </field>
-          <field field_ref="GOC"       name="GOC"      operation="average" freq_op="1mo" level="2" > @GOC_E3T / @e3t </field>
-          <field field_ref="SFe"       name="SFe"      operation="average" freq_op="1mo" level="2" > @SFe_E3T / @e3t </field>
-          <field field_ref="DFe"       name="DFe"      operation="average" freq_op="1mo" level="2" > @DFe_E3T / @e3t </field>
-          <field field_ref="GSi"       name="GSi"      operation="average" freq_op="1mo" level="2" > @GSi_E3T / @e3t </field>
-          <field field_ref="NFe"       name="NFe"      operation="average" freq_op="1mo" level="2" > @NFe_E3T / @e3t </field>
-          <field field_ref="NCHL"      name="NCHL"     operation="average" freq_op="1mo" level="2" > @NCHL_E3T / @e3t </field>
-          <field field_ref="DCHL"      name="DCHL"     operation="average" freq_op="1mo" level="2" > @DCHL_E3T / @e3t </field>
-          <field field_ref="NO3"       name="NO3"      operation="average" freq_op="1mo" level="2" > @NO3_E3T / @e3t </field>
-	  <field field_ref="NH4"       name="NH4"      operation="average" freq_op="1mo" level="2" > @NH4_E3T / @e3t </field>
+        <file id="file33" name_suffix="_ptrc_T" description="pisces sms variables" >
+          <field field_ref="DIC"       name="DIC"      operation="average" freq_op="1mo" level="2" > @DIC_e3t / @e3t </field>
+          <field field_ref="Alkalini"  name="Alkalini" operation="average" freq_op="1mo" level="2" > @Alkalini_e3t / @e3t </field>
+          <field field_ref="O2"        name="O2"       operation="average" freq_op="1mo" level="2" > @O2_e3t / @e3t </field>
+          <field field_ref="CaCO3"     name="CaCO3"    operation="average" freq_op="1mo" level="2" > @CaCO3_e3t / @e3t </field>
+          <field field_ref="PO4"       name="PO4"      operation="average" freq_op="1mo" level="2" > @PO4_e3t / @e3t </field>
+          <field field_ref="POC"       name="POC"      operation="average" freq_op="1mo" level="2" > @POC_e3t / @e3t </field>
+          <field field_ref="Si"        name="Si"       operation="average" freq_op="1mo" level="2" > @Si_e3t / @e3t </field>
+          <field field_ref="PHY"       name="PHY"      operation="average" freq_op="1mo" level="2" > @PHY_e3t / @e3t </field>
+          <field field_ref="ZOO"       name="ZOO"      operation="average" freq_op="1mo" level="2" > @ZOO_e3t / @e3t </field>
+          <field field_ref="DOC"       name="DOC"      operation="average" freq_op="1mo" level="2" > @DOC_e3t / @e3t </field>
+          <field field_ref="PHY2"      name="PHY2"     operation="average" freq_op="1mo" level="2" > @PHY2_e3t / @e3t </field>
+          <field field_ref="ZOO2"      name="ZOO2"     operation="average" freq_op="1mo" level="2" > @ZOO2_e3t / @e3t </field>
+          <field field_ref="DSi"       name="DSi"      operation="average" freq_op="1mo" level="2" > @DSi_e3t / @e3t </field>
+          <field field_ref="Fer"       name="Fer"      operation="average" freq_op="1mo" level="2" > @Fer_e3t / @e3t </field>
+          <field field_ref="BFe"       name="BFe"      operation="average" freq_op="1mo" level="2" > @BFe_e3t / @e3t </field>
+          <field field_ref="GOC"       name="GOC"      operation="average" freq_op="1mo" level="2" > @GOC_e3t / @e3t </field>
+          <field field_ref="SFe"       name="SFe"      operation="average" freq_op="1mo" level="2" > @SFe_e3t / @e3t </field>
+          <field field_ref="DFe"       name="DFe"      operation="average" freq_op="1mo" level="2" > @DFe_e3t / @e3t </field>
+          <field field_ref="GSi"       name="GSi"      operation="average" freq_op="1mo" level="2" > @GSi_e3t / @e3t </field>
+          <field field_ref="NFe"       name="NFe"      operation="average" freq_op="1mo" level="2" > @NFe_e3t / @e3t </field>
+          <field field_ref="NCHL"      name="NCHL"     operation="average" freq_op="1mo" level="2" > @NCHL_e3t / @e3t </field>
+          <field field_ref="DCHL"      name="DCHL"     operation="average" freq_op="1mo" level="2" > @DCHL_e3t / @e3t </field>
+          <field field_ref="NO3"       name="NO3"      operation="average" freq_op="1mo" level="2" > @NO3_e3t / @e3t </field>
+          <field field_ref="NH4"       name="NH4"      operation="average" freq_op="1mo" level="2" > @NH4_e3t / @e3t </field>
        </file>
 
 
 
-       <file id="file19" name_suffix="_diad_T" description="additional pisces diagnostics" >
+       <file id="file34" name_suffix="_diad_T" description="additional pisces diagnostics" >
 
         <field field_ref="PH"         name="PH"       level="2" />
@@ -123,42 +123,21 @@
         <field field_ref="EPCAL100"   name="EPCAL100" level="2"  />
         <field field_ref="xfracal"    name="xfracal"  level="2" />
+        <field field_ref="GRAZ1"      name="GRAZ"     level="2" > this + GRAZ2 </field>
 
        </file>
        
-       <file id="file20" name_suffix="_bioscalar" description="pisces sms variables" >
-          <field field_ref="tdenit"   name="tdenit"   grid_ref="grid_1point" unit="TgN/yr" operation="instant" level="1" > tdenit * 14. * 86400. * 365. / 1e12 </field>
-          <field field_ref="tnfix"    name="tnfix"    grid_ref="grid_1point" unit="TgN/yr" operation="instant" level="1" > tnfix * 14. * 86400. * 365. / 1e12 </field>
-          <field field_ref="tcflx"    name="tcflx"    grid_ref="grid_1point" unit="PgC/yr" operation="instant" level="1" > tcflx * -1. * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="tcflxcum" name="tcflxcum" grid_ref="grid_1point" unit="PgC"    operation="instant" level="1" > tcflxcum * -1. * 12. / 1e15 </field>
-          <field field_ref="tcexp"    name="tcexp"    grid_ref="grid_1point" unit="PgC/yr" operation="instant" level="1" > tcexp * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="tintpp"   name="tintpp"   grid_ref="grid_1point" unit="PgC/yr" operation="instant" level="1" > tintpp * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="pno3tot"  name="pno3tot"  grid_ref="grid_1point" unit="umolN"  operation="instant" level="1" > pno3tot * 16. / 122. * 1e6 </field>
-          <field field_ref="ppo4tot"  name="ppo4tot"  grid_ref="grid_1point" unit="umolP"  operation="instant" level="1" > ppo4tot * 1. / 122. * 1e6 </field>
-          <field field_ref="psiltot"  name="psiltot"  grid_ref="grid_1point" unit="umolC"  operation="instant" level="1" > psiltot * 1e6  </field>
-          <field field_ref="palktot"  name="palktot"  grid_ref="grid_1point" unit="umolC"  operation="instant" level="1" > palktot * 1e6  </field>
-          <field field_ref="pfertot"  name="pfertot"  grid_ref="grid_1point" unit="nmolFe" operation="instant" level="1" > pfertot * 1e9  </field>
-         </file>
-
-	  <!-- enabled if ESM : key_gas -->
-	 <file id="file41" name_suffix="_gastrc" description="pisces gas" enabled=".FALSE." >
-           <field field_ref="DMS"       name="DMS"      operation="average" freq_op="1mo" level="1" > @DMS_E3T / @e3t </field>
-	   <field field_ref="N2O"       name="N2O"      operation="average" freq_op="1mo" level="1" > @N2O_E3T / @e3t </field>
-           <field field_ref="N2Oflx"     name="N2Oflx"      level="2" />
-           <field field_ref="AtmN2o"     name="AtmN2o"      level="2" />
-           <field field_ref="Sinkn2o"    name="Sinkn2o"     level="2" />
-           <field field_ref="Prodn2o"    name="Prodn2o"     level="2" />
-           <field field_ref="DMSflx"     name="DMSflx"      level="2" />
-           <field field_ref="LBDMS"      name="LBDMS"       level="2" />
-           <field field_ref="StLightDMS" name="StLightDMS"  level="2" />
-           <field field_ref="StIronDMS"  name="StIronDMS"   level="2" />
-           <field field_ref="StNutrDMS"  name="StNutrDMS"   level="2" />
-           <field field_ref="StTempDMS"  name="StTempDMS"   level="2" />
-           <field field_ref="Sinkdms"    name="Sinkdms"     level="2" />
-           <field field_ref="Lightdms"   name="Lightdms"    level="2" />
-           <field field_ref="SCquotan"   name="SCquotan"    level="2" />
-           <field field_ref="SCquotad"   name="SCquotad"    level="2" />
-           <field field_ref="Yield"      name="Yield"       level="2" />
-        </file>
-
+       <file id="file35" name_suffix="_bioscalar" description="pisces sms variables" >
+          <field field_ref="tdenit"   name="tdenit"    unit="TgN/yr" operation="instant" level="1" > tdenit * 14. * 86400. * 365. / 1e12 </field>
+          <field field_ref="tnfix"    name="tnfix"     unit="TgN/yr" operation="instant" level="1" > tnfix * 14. * 86400. * 365. / 1e12 </field>
+          <field field_ref="tcflx"    name="tcflx"     unit="PgC/yr" operation="instant" level="1" > tcflx * -1. * 12. * 86400. * 365. / 1e15 </field>
+          <field field_ref="tcflxcum" name="tcflxcum"  unit="PgC"    operation="instant" level="1" > tcflxcum * -1. * 12. / 1e15 </field>
+          <field field_ref="tcexp"    name="tcexp"     unit="PgC/yr" operation="instant" level="1" > tcexp * 12. * 86400. * 365. / 1e15 </field>
+          <field field_ref="tintpp"   name="tintpp"    unit="PgC/yr" operation="instant" level="1" > tintpp * 12. * 86400. * 365. / 1e15 </field>
+          <field field_ref="pno3tot"  name="pno3tot"   unit="umolN"  operation="instant" level="1" > pno3tot * 16. / 117. * 1e6 </field>
+          <field field_ref="ppo4tot"  name="ppo4tot"   unit="umolP"  operation="instant" level="1" > ppo4tot * 1. / 117. * 1e6 </field>
+          <field field_ref="psiltot"  name="psiltot"   unit="umolC"  operation="instant" level="1" > psiltot * 1e6  </field>
+          <field field_ref="palktot"  name="palktot"   unit="umolC"  operation="instant" level="1" > palktot * 1e6  </field>
+          <field field_ref="pfertot"  name="pfertot"   unit="nmolFe" operation="instant" level="1" > pfertot * 1e9  </field>
+        </file>
 
       </file_group>
@@ -173,34 +152,32 @@
 
  
-       <file id="file21" name_suffix="_ptrc_T" description="pisces sms variables" >
-          <field field_ref="DIC"       name="DIC"      operation="average" freq_op="1y" level="1"  > @DIC_E3T / @e3t </field>
-          <field field_ref="Alkalini"  name="Alkalini" operation="average" freq_op="1y" level="1"  > @Alkalini_E3T / @e3t </field>
-          <field field_ref="O2"        name="O2"       operation="average" freq_op="1y" level="1"  > @O2_E3T / @e3t </field>
-          <field field_ref="CaCO3"     name="CaCO3"    operation="average" freq_op="1y" level="2" > @CaCO3_E3T / @e3t </field>
-          <field field_ref="PO4"       name="PO4"      operation="average" freq_op="1y" level="1"  > @PO4_E3T / @e3t </field>
-          <field field_ref="POC"       name="POC"      operation="average" freq_op="1y" level="1"  > @POC_E3T / @e3t </field>
-          <field field_ref="Si"        name="Si"       operation="average" freq_op="1y" level="1"  > @Si_E3T / @e3t </field>
-          <field field_ref="PHY"       name="PHY"      operation="average" freq_op="1y" level="2" > @PHY_E3T / @e3t </field>
-          <field field_ref="ZOO"       name="ZOO"      operation="average" freq_op="1y" level="2" > @ZOO_E3T / @e3t </field>
-          <field field_ref="DOC"       name="DOC"      operation="average" freq_op="1y" level="2" > @DOC_E3T / @e3t </field>
-          <field field_ref="PHY2"      name="PHY2"     operation="average" freq_op="1y" level="2" > @PHY2_E3T / @e3t </field>
-          <field field_ref="ZOO2"      name="ZOO2"     operation="average" freq_op="1y" level="2" > @ZOO2_E3T / @e3t </field>
-          <field field_ref="DSi"       name="DSi"      operation="average" freq_op="1y" level="2" > @DSi_E3T / @e3t </field>
-          <field field_ref="Fer"       name="Fer"      operation="average" freq_op="1y" level="1"  > @Fer_E3T / @e3t </field>
-          <field field_ref="BFe"       name="BFe"      operation="average" freq_op="1y" level="2" > @BFe_E3T / @e3t </field>
-          <field field_ref="GOC"       name="GOC"      operation="average" freq_op="1y" level="1"  > @GOC_E3T / @e3t </field>
-          <field field_ref="SFe"       name="SFe"      operation="average" freq_op="1y" level="2" > @SFe_E3T / @e3t </field>
-          <field field_ref="DFe"       name="DFe"      operation="average" freq_op="1y" level="2" > @DFe_E3T / @e3t </field>
-          <field field_ref="GSi"       name="GSi"      operation="average" freq_op="1y" level="2" > @GSi_E3T / @e3t </field>
-          <field field_ref="NFe"       name="NFe"      operation="average" freq_op="1y" level="2" > @NFe_E3T / @e3t </field>
-          <field field_ref="NCHL"      name="NCHL"     operation="average" freq_op="1y" level="1"  > @NCHL_E3T / @e3t </field>
-          <field field_ref="DCHL"      name="DCHL"     operation="average" freq_op="1y" level="1"  > @DCHL_E3T / @e3t </field>
-          <field field_ref="NO3"       name="NO3"      operation="average" freq_op="1y" level="1"  > @NO3_E3T / @e3t </field>
-          <field field_ref="NH4"       name="NH4"      operation="average" freq_op="1y" level="2" > @NH4_E3T / @e3t </field>
-          <field field_ref="DMS"       name="DMS"      operation="average" freq_op="1y" level="2"  enabled=".TRUE." > @DMS_E3T / @e3t </field>
-          <field field_ref="N2O"       name="N2O"      operation="average" freq_op="1y" level="2"  enabled=".TRUE." > @N2O_E3T / @e3t </field>
+       <file id="file36" name_suffix="_ptrc_T" description="pisces sms variables" >
+          <field field_ref="DIC"       name="DIC"      operation="average" freq_op="1y" level="1"  > @DIC_e3t / @e3t </field>
+          <field field_ref="Alkalini"  name="Alkalini" operation="average" freq_op="1y" level="1"  > @Alkalini_e3t / @e3t </field>
+          <field field_ref="O2"        name="O2"       operation="average" freq_op="1y" level="1"  > @O2_e3t / @e3t </field>
+          <field field_ref="CaCO3"     name="CaCO3"    operation="average" freq_op="1y" level="2" > @CaCO3_e3t / @e3t </field>
+          <field field_ref="PO4"       name="PO4"      operation="average" freq_op="1y" level="1"  > @PO4_e3t / @e3t </field>
+          <field field_ref="POC"       name="POC"      operation="average" freq_op="1y" level="1"  > @POC_e3t / @e3t </field>
+          <field field_ref="Si"        name="Si"       operation="average" freq_op="1y" level="1"  > @Si_e3t / @e3t </field>
+          <field field_ref="PHY"       name="PHY"      operation="average" freq_op="1y" level="2" > @PHY_e3t / @e3t </field>
+          <field field_ref="ZOO"       name="ZOO"      operation="average" freq_op="1y" level="2" > @ZOO_e3t / @e3t </field>
+          <field field_ref="DOC"       name="DOC"      operation="average" freq_op="1y" level="2" > @DOC_e3t / @e3t </field>
+          <field field_ref="PHY2"      name="PHY2"     operation="average" freq_op="1y" level="2" > @PHY2_e3t / @e3t </field>
+          <field field_ref="ZOO2"      name="ZOO2"     operation="average" freq_op="1y" level="2" > @ZOO2_e3t / @e3t </field>
+          <field field_ref="DSi"       name="DSi"      operation="average" freq_op="1y" level="2" > @DSi_e3t / @e3t </field>
+          <field field_ref="Fer"       name="Fer"      operation="average" freq_op="1y" level="1"  > @Fer_e3t / @e3t </field>
+          <field field_ref="BFe"       name="BFe"      operation="average" freq_op="1y" level="2" > @BFe_e3t / @e3t </field>
+          <field field_ref="GOC"       name="GOC"      operation="average" freq_op="1y" level="1"  > @GOC_e3t / @e3t </field>
+          <field field_ref="SFe"       name="SFe"      operation="average" freq_op="1y" level="2" > @SFe_e3t / @e3t </field>
+          <field field_ref="DFe"       name="DFe"      operation="average" freq_op="1y" level="2" > @DFe_e3t / @e3t </field>
+          <field field_ref="GSi"       name="GSi"      operation="average" freq_op="1y" level="2" > @GSi_e3t / @e3t </field>
+          <field field_ref="NFe"       name="NFe"      operation="average" freq_op="1y" level="2" > @NFe_e3t / @e3t </field>
+          <field field_ref="NCHL"      name="NCHL"     operation="average" freq_op="1y" level="1"  > @NCHL_e3t / @e3t </field>
+          <field field_ref="DCHL"      name="DCHL"     operation="average" freq_op="1y" level="1"  > @DCHL_e3t / @e3t </field>
+          <field field_ref="NO3"       name="NO3"      operation="average" freq_op="1y" level="1"  > @NO3_e3t / @e3t </field>
+          <field field_ref="NH4"       name="NH4"      operation="average" freq_op="1y" level="2" > @NH4_e3t / @e3t </field>
        </file>
 
-      <file id="file22" name_suffix="_diad_T" description="additional pisces diagnostics"  >
+      <file id="file37" name_suffix="_diad_T" description="additional pisces diagnostics"  >
 
         <field field_ref="PH"         name="PH"       level="2" />
@@ -232,20 +209,23 @@
         <field field_ref="EPCAL100"   name="EPCAL100" level="1"  />
         <field field_ref="xfracal"    name="xfracal"  level="2" />
-
-        </file>
-
-       <file id="file23" name_suffix="_inerttrc" description="Inert tracer" >
-          <field field_ref="Age"         name="Age"      operation="average" freq_op="1y" level="1"  > @Age_E3T / @e3t </field>
-          <field field_ref="CFC11"       name="CFC11"    operation="average" freq_op="1y" level="2"  > @CFC11_E3T / @e3t </field>
-          <field field_ref="CFC12"       name="CFC12"    operation="average" freq_op="1y" level="1"  > @CFC12_E3T / @e3t </field>
-          <field field_ref="SF6"         name="SF6"      operation="average" freq_op="1y" level="2"  > @SF6_E3T / @e3t </field>
-          <field field_ref="qtr_CFC11"   name="qtrCFC11"  level="2"   />
-          <field field_ref="qint_CFC11"  name="qintCFC11" level="2"   />
+        <field field_ref="GRAZ1"      name="GRAZ"     level="2" > this + GRAZ2 </field>
+
+        </file>
+
+       <file id="file38" name_suffix="_Age" description="Age tracer" enabled=".FALSE." >
+          <field field_ref="Age"         name="Age"      operation="average" freq_op="1y" level="1"  > @Age_e3t / @e3t </field>
+      </file>
+
+       <file id="file39" name_suffix="_CFC11" description="CFC11 tracer" enabled=".FALSE." >
+          <field field_ref="CFC11"       name="CFC11"    operation="average" freq_op="1y" level="1"  > @CFC11_e3t / @e3t </field>
+          <field field_ref="qtr_CFC11"   name="qtrCFC11"  level="1"   />
+          <field field_ref="qint_CFC11"  name="qintCFC11" level="1"   />
+      </file>
+
+       <file id="file40" name_suffix="_CFC12" description="CFC12 tracer" enabled=".FALSE." >
+          <field field_ref="CFC12"       name="CFC12"    operation="average" freq_op="1y" level="1"  > @CFC12_e3t / @e3t </field>
           <field field_ref="qtr_CFC12"   name="qtrCFC12"  level="1"   />
           <field field_ref="qint_CFC12"  name="qintCFC12" level="1"   />
-          <field field_ref="qtr_SF6"     name="qtrSF6"    level="2"   />
-          <field field_ref="qint_SF6"    name="qintSF6"   level="2"   />
       </file>
-
 
       </file_group>
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-pisces_tuning.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-pisces_tuning.xml	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/file_def_nemo-pisces_tuning.xml	(revision 6658)
@@ -0,0 +1,88 @@
+    <!-- $id$ -->
+    
+    <!-- 
+
+============================================================================================================
+=                                           output files definition                                        =
+=                                            Define your own files ocean biogeochemistry                                         =
+=                                         put the variables you want...                                    =
+============================================================================================================
+    -->
+    
+    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="4" >
+    
+      <file_group id="1ts_pis" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
+
+      <file_group id="1h_pis" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
+
+      <file_group id="2h_pis" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
+
+      <file_group id="3h_pis" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
+
+      <file_group id="4h_pis" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
+
+      <file_group id="6h_pis" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->     
+    
+     <file_group id="1d_pis" output_freq="1d"  output_level="_AUTO_" enabled="_AUTO_" >  <!-- 1d files -->
+      </file_group> 
+
+      <file_group id="5d_pis" output_freq="5d"  output_level="_AUTO_" enabled="_AUTO_" >  <!-- 5d files -->
+      </file_group> 
+
+	
+     <file_group id="1m_pis" output_freq="1mo" output_level="_AUTO_" enabled="_AUTO_" > <!-- real monthly files -->
+         <file id="file34" name_suffix="_ptrc_T" description="pisces sms variables" >
+             <field field_ref="TCHL"   name="TCHLS"   long_name="Total chlorophyll at surface "           operation="average" grid_ref="grid_T_SFC"  level="1"  />
+	     <field field_ref="TCHL2"  name="TCHLS2"  long_name="Square of total chlorophyll at surface " operation="average" grid_ref="grid_T_SFC"  level="1"  /> 
+        </file>
+     </file_group>
+
+
+      <file_group id="2m_pis" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
+      <file_group id="3m_pis" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
+      <file_group id="4m_pis" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
+      <file_group id="6m_pis" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
+
+     <file_group id="1y_pis"  output_freq="1y" output_level="_AUTO_" enabled="_AUTO_"> <!-- real yearly files -->
+
+       <file id="file35" name_suffix="_bioscalar" description="pisces sms variables" >
+          <field field_ref="tdenit"   name="tdenit"    unit="TgN/yr" operation="instant" level="1" > tdenit * 14. * 86400. * 365. / 1e12 </field>
+          <field field_ref="tnfix"    name="tnfix"     unit="TgN/yr" operation="instant" level="1" > tnfix * 14. * 86400. * 365. / 1e12 </field>
+          <field field_ref="tcflx"    name="tcflx"     unit="PgC/yr" operation="instant" level="1" > tcflx * -1. * 12. * 86400. * 365. / 1e15 </field>
+          <field field_ref="tcflxcum" name="tcflxcum"  unit="PgC"    operation="instant" level="1" > tcflxcum * -1. * 12. / 1e15 </field>
+          <field field_ref="tcexp"    name="tcexp"     unit="PgC/yr" operation="instant" level="1" > tcexp * 12. * 86400. * 365. / 1e15 </field>
+          <field field_ref="tintpp"   name="tintpp"    unit="PgC/yr" operation="instant" level="1" > tintpp * 12. * 86400. * 365. / 1e15 </field>
+          <field field_ref="pno3tot"  name="pno3tot"   unit="umolN"  operation="instant" level="1" > pno3tot * 16. / 117. * 1e6 </field>
+          <field field_ref="ppo4tot"  name="ppo4tot"   unit="umolP"  operation="instant" level="1" > ppo4tot * 1. / 117. * 1e6 </field>
+          <field field_ref="psiltot"  name="psiltot"   unit="umolC"  operation="instant" level="1" > psiltot * 1e6  </field>
+          <field field_ref="palktot"  name="palktot"   unit="umolC"  operation="instant" level="1" > palktot * 1e6  </field>
+          <field field_ref="pfertot"  name="pfertot"   unit="nmolFe" operation="instant" level="1" > pfertot * 1e9  </field>
+        </file>
+
+       <file id="file36" name_suffix="_ptrc_T" description="pisces sms variables" >
+          <field field_ref="O2"        name="O2"       operation="average" freq_op="1y" level="1"  > @O2_e3t / @e3t </field>
+       </file>
+
+       <file id="file38" name_suffix="_Age" description="Age tracer" enabled=".FALSE." >
+          <field field_ref="Age"         name="Age"      operation="average" freq_op="1y" level="1"  > @Age_e3t / @e3t </field>
+      </file>
+
+       <file id="file39" name_suffix="_CFC11" description="CFC11 tracer" enabled=".FALSE." >
+          <field field_ref="CFC11"       name="CFC11"    operation="average" freq_op="1y" level="1"  > @CFC11_e3t / @e3t </field>
+          <field field_ref="qtr_CFC11"   name="qtrCFC11"  level="1"   />
+          <field field_ref="qint_CFC11"  name="qintCFC11" level="1"   />
+      </file>
+
+       <file id="file40" name_suffix="_CFC12" description="CFC12 tracer" enabled=".FALSE." >
+          <field field_ref="CFC12"       name="CFC12"    operation="average" freq_op="1y" level="1"  > @CFC12_e3t / @e3t </field>
+          <field field_ref="qtr_CFC12"   name="qtrCFC12"  level="1"   />
+          <field field_ref="qint_CFC12"  name="qintCFC12" level="1"   />
+      </file>
+
+      </file_group>
+      <file_group id="2y_pis"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
+      <file_group id="5y_pis"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
+      <file_group id="10y_pis" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
+
+   </file_definition>
+
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/grid_def_nemo.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/grid_def_nemo.xml	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/grid_def_nemo.xml	(revision 6658)
@@ -0,0 +1,519 @@
+<?xml version="1.0"?>
+<!--
+============================================================================================================
+= grid definition = = DO NOT CHANGE =
+============================================================================================================
+-->
+
+<grid_definition>
+
+  <!--  -->
+  <grid id="grid_T_2D" >
+    <domain domain_ref="grid_T" />
+  </grid>
+  <grid id="grid_T_2D_inner" >
+    <domain domain_ref="grid_T_inner" />
+  </grid>
+  <!--  -->
+  <grid id="grid_T_ncatice" >
+    <domain domain_ref="grid_T" />
+    <axis axis_ref="ncatice" />
+  </grid>
+  <grid id="grid_T_ncatice_inner" >
+    <domain domain_ref="grid_T_inner" />
+    <axis axis_ref="ncatice" />
+  </grid>
+  <!--  -->
+  <grid id="grid_T_3D" >
+    <domain domain_ref="grid_T" />
+    <axis axis_ref="deptht" />
+  </grid>
+  <grid id="grid_T_3D_inner" >
+    <domain domain_ref="grid_T_inner" />
+    <axis axis_ref="deptht" />
+  </grid>
+  <!--  -->
+  <grid id="grid_T_3DS" >
+    <domain domain_ref="grid_T" />
+    <axis axis_ref="profsed" />
+  </grid>
+  <grid id="grid_T_3DS_inner" >
+    <domain domain_ref="grid_T_inner" />
+    <axis axis_ref="profsed" />
+  </grid>
+  <!--  -->
+  <grid id="grid_U_2D" >
+    <domain domain_ref="grid_U" />
+  </grid>
+  <grid id="grid_U_2D_inner" >
+    <domain domain_ref="grid_U_inner" />
+  </grid>
+  <!--  -->
+  <grid id="grid_U_3D" >
+    <domain domain_ref="grid_U" />
+    <axis axis_ref="depthu" />
+  </grid>
+  <grid id="grid_U_3D_inner" >
+    <domain domain_ref="grid_U_inner" />
+    <axis axis_ref="depthu" />
+  </grid>
+  <!--  -->
+  <grid id="grid_V_2D" >
+    <domain domain_ref="grid_V" />
+  </grid>
+  <grid id="grid_V_2D_inner" >
+    <domain domain_ref="grid_V_inner" />
+  </grid>
+  <!--  -->
+  <grid id="grid_V_3D" >
+    <domain domain_ref="grid_V" />
+    <axis axis_ref="depthv" />
+  </grid>
+  <grid id="grid_V_3D_inner" >
+    <domain domain_ref="grid_V_inner" />
+    <axis axis_ref="depthv" />
+  </grid>
+  <!--  -->
+  <grid id="grid_W_2D" >
+    <domain domain_ref="grid_W" />
+  </grid>
+  <grid id="grid_W_2D_inner" >
+    <domain domain_ref="grid_W_inner" />
+  </grid>
+  <!--  -->
+  <grid id="grid_W_3D" >
+    <domain domain_ref="grid_W" />
+    <axis axis_ref="depthw" />
+  </grid>
+  <grid id="grid_W_3D_inner" >
+    <domain domain_ref="grid_W_inner" />
+    <axis axis_ref="depthw" />
+  </grid>
+  <!--  -->
+  <grid id="grid_F_2D" >
+    <domain domain_ref="grid_F" />
+  </grid>
+  <grid id="grid_F_2D_inner" >
+    <domain domain_ref="grid_F_inner" />
+  </grid>
+  <!--  -->
+  <grid id="grid_F_3D" >
+    <domain domain_ref="grid_F" />
+    <axis axis_ref="depthf" />
+  </grid>
+  <grid id="grid_F_3D_inner" >
+    <domain domain_ref="grid_F_inner" />
+    <axis axis_ref="depthf" />
+  </grid>
+  <!--  -->
+  <grid id="grid_1point" >
+    <domain domain_ref="1point"/>
+  </grid>
+  <!--  -->
+  <grid id="grid_T_nfloat" >
+    <domain domain_ref="grid_T" />
+    <axis axis_ref="nfloat" />
+  </grid>
+  <!--  -->
+  <grid id="grid_EqT" >
+    <domain domain_ref="EqT" />
+  </grid>
+  <!--  -->
+
+  <grid id="grid_znl_T_2D">
+    <domain domain_ref="gznl" />
+    <axis axis_ref="basin" />
+  </grid>
+
+  <grid id="grid_znl_T_3D">
+    <domain domain_ref="gznl" />
+    <axis axis_ref="deptht"  />
+    <axis axis_ref="basin" />
+  </grid>
+
+  <grid id="grid_znl_W_3D">
+    <domain domain_ref="gznl" />
+    <axis axis_ref="depthw"  />
+    <axis axis_ref="basin" />
+  </grid>
+
+  <grid id="grid_ptr_T_2D">
+    <domain domain_ref="ptr" />
+    <axis axis_ref="basin" />
+  </grid>
+
+  <grid id="grid_ptr_T_3D">
+    <domain  domain_ref="ptr" />
+    <axis axis_ref="deptht"  />
+    <axis axis_ref="basin" />
+  </grid>
+
+  <grid id="grid_ptr_W_3D">
+    <domain  domain_ref="ptr" />
+    <axis axis_ref="depthw"  />
+    <axis axis_ref="basin" />
+  </grid>
+
+  <grid id="grid_ptr_W_GLO">
+    <domain  domain_ref="ptr" />
+    <axis axis_ref="depthw"  />
+    <scalar>
+      <extract_axis position="0" />
+    </scalar>
+  </grid>
+
+  <grid id="grid_ptr_W_ATL">
+    <domain  domain_ref="ptr" />
+    <axis axis_ref="depthw"  />
+    <scalar>
+      <extract_axis position="1" />
+    </scalar>
+  </grid>
+
+  <grid id="grid_ptr_W_IND">
+    <domain  domain_ref="ptr" />
+    <axis axis_ref="depthw"  />
+    <scalar>
+      <extract_axis position="2" />
+    </scalar>
+  </grid>
+
+  <grid id="grid_T_SFC">
+    <domain domain_ref="grid_T" />
+    <scalar>
+      <extract_axis position="0" />
+    </scalar>
+  </grid>
+
+  <grid id="grid_T_100">
+    <domain domain_ref="grid_T" />
+    <scalar>
+      <extract_axis position="24" />
+    </scalar>
+  </grid>
+
+  <grid id="grid_T_200">
+    <domain domain_ref="grid_T" />
+    <scalar>
+      <extract_axis position="31" />
+    </scalar>
+  </grid>
+
+  <grid id="grid_T_300">
+    <domain domain_ref="grid_T" />
+    <scalar>
+      <extract_axis position="35" />
+    </scalar>
+  </grid>
+
+  <grid id="grid_T_500">
+    <domain domain_ref="grid_T" />
+    <scalar>
+      <extract_axis position="40" />
+    </scalar>
+  </grid>
+
+  <grid id="grid_T_700">
+    <domain domain_ref="grid_T" />
+    <scalar>
+      <extract_axis position="43" />
+    </scalar>
+  </grid>
+
+  <grid id="grid_T_1000">
+    <domain domain_ref="grid_T" />
+    <scalar>
+      <extract_axis position="47" />
+    </scalar>
+  </grid>
+
+  <grid id="grid_T_2000">
+    <domain domain_ref="grid_T" />
+    <scalar>
+      <extract_axis position="54" />
+    </scalar>
+  </grid>
+
+  <grid id="grid_T_3000">
+    <domain domain_ref="grid_T" />
+    <scalar>
+      <extract_axis position="60" />
+    </scalar>
+  </grid>
+
+  <grid id="grid_T_4000">
+    <domain domain_ref="grid_T" />
+    <scalar>
+      <extract_axis position="66" />
+    </scalar>
+  </grid>
+
+  <grid id="grid_T_vsum">
+    <domain domain_ref="grid_T"/>
+    <scalar>
+      <reduce_axis operation="sum" />
+    </scalar>
+  </grid>
+
+  <grid id="grid_U_vsum">
+    <domain domain_ref="grid_U"/>
+    <scalar>
+      <reduce_axis operation="sum" />
+    </scalar>
+  </grid>
+
+  <grid id="grid_V_vsum">
+    <domain domain_ref="grid_V"/>
+    <scalar>
+      <reduce_axis operation="sum" />
+    </scalar>
+  </grid>
+
+  <!-- for ORCA2 grid  
+  <grid id="cumul_U">
+    <axis axis_ref="cumul_U" n_glo="182" >
+      <reduce_domain local="true" operation="sum" direction="jDir" />
+      <reduce_axis operation="sum" />
+    </axis>
+    <axis axis_ref="depthu" />
+  </grid>
+  -->
+
+  <!-- for eORCA1 grid -->
+  <grid id="cumul_U">
+    <axis axis_ref="cumul_U" n_glo="360" >
+      <reduce_domain local="true" operation="sum" direction="jDir" />
+      <reduce_axis operation="sum" />
+    </axis>
+   <axis axis_ref="depthu" />
+  </grid>
+
+  <grid id="grid_T_zoom_200">
+    <domain domain_ref="grid_T" />
+    <axis axis_ref="deptht200" />
+  </grid>
+
+
+  <grid id="grid_T_zoom_300">
+    <domain domain_ref="grid_T" />
+    <axis axis_ref="deptht300" />
+  </grid>
+
+    <grid id="grid_T_zoom_500">
+    <domain domain_ref="grid_T" />
+    <axis axis_ref="deptht500" />
+  </grid>
+
+    <grid id="grid_T_zoom_700">
+    <domain domain_ref="grid_T" />
+    <axis axis_ref="deptht700" />
+  </grid>
+
+    <grid id="grid_T_zoom_1000">
+    <domain domain_ref="grid_T" />
+    <axis axis_ref="deptht1000" />
+  </grid>
+
+    <grid id="grid_T_zoom_2000">
+    <domain domain_ref="grid_T" />
+    <axis axis_ref="deptht2000" />
+  </grid>
+
+    <grid id="grid_T_zoom_3000">
+    <domain domain_ref="grid_T" />
+    <axis axis_ref="deptht3000" />
+  </grid>
+
+    <grid id="grid_T_zoom_4000">
+    <domain domain_ref="grid_T" />
+    <axis axis_ref="deptht4000" />
+  </grid>
+
+
+  <grid id="grid_U_scalar" >
+    <domain domain_ref="grid_U" />
+    <scalar/>
+  </grid>
+
+  <grid id="grid_V_scalar" >
+    <domain domain_ref="grid_V" />
+    <scalar/>
+  </grid>
+
+  <grid id="grid_U_4strait">
+    <domain domain_ref="grid_U" />
+    <axis axis_ref="section">
+      <duplicate_scalar/>
+    </axis>
+  </grid>
+
+  <grid id="grid_V_4strait">
+    <domain domain_ref="grid_V" />
+    <axis axis_ref="section">
+      <duplicate_scalar/>
+    </axis>
+  </grid>
+
+  <grid id="grid_U_4strait_hsum">
+    <scalar >
+      <reduce_domain operation="sum" local="true"/>
+      <reduce_scalar operation="sum" />
+    </scalar>
+    <axis axis_ref="section"/>
+  </grid>
+
+  <grid id="grid_V_4strait_hsum">
+    <scalar >
+      <reduce_domain operation="sum" local="true"/>
+      <reduce_scalar operation="sum" />
+    </scalar>
+    <axis axis_ref="section"/>
+  </grid>
+
+  <grid id="grid_4strait">
+    <axis axis_ref="section"/>
+  </grid>
+
+  <grid id="grid_U_4strait_ice">
+    <domain domain_ref="grid_U" />
+    <axis axis_ref="section_ice">
+      <duplicate_scalar/>
+    </axis>
+  </grid>
+
+  <grid id="grid_V_4strait_ice">
+    <domain domain_ref="grid_V" />
+    <axis axis_ref="section_ice">
+      <duplicate_scalar/>
+    </axis>
+  </grid>
+
+  <grid id="grid_U_4strait_ice_hsum">
+    <scalar >
+      <reduce_domain operation="sum" local="true"/>
+      <reduce_scalar operation="sum" />
+    </scalar>
+    <axis axis_ref="section_ice"/>
+  </grid>
+
+  <grid id="grid_V_4strait_ice_hsum">
+    <scalar >
+      <reduce_domain operation="sum" local="true"/>
+      <reduce_scalar operation="sum" />
+    </scalar>
+    <axis axis_ref="section_ice"/>
+  </grid>
+
+  <grid id="grid_4strait_ice">
+    <axis axis_ref="section_ice"/>
+  </grid>
+
+  <!-- scalars -->
+  <grid id="grid_scalar" >
+    <scalar/>
+  </grid>
+
+  <!-- ABL grid definition -->
+  <grid id="grid_TA_2D">
+    <domain domain_ref="grid_T" />
+  </grid>
+  <grid id="grid_TA_3D">
+    <domain domain_ref="grid_T" />
+    <axis  id="ght_abl" />
+  </grid>
+  <grid id="grid_WA_3D">
+    <domain domain_ref="grid_T" />
+    <axis  id="ghw_abl" />
+  </grid>
+  <!--  -->
+
+  <!-- grid definitions for multiple-linear-regression analysis (diamlr) -->
+  <grid id="diamlr_grid_scalar" >
+    <scalar />
+    <scalar />
+  </grid>
+  <grid id="diamlr_grid_T_2D" >
+    <domain domain_ref="grid_T" />
+    <scalar />
+  </grid>
+  <grid id="diamlr_grid_U_2D" >
+    <domain domain_ref="grid_U" />
+    <scalar />
+  </grid>
+  <grid id="diamlr_grid_V_2D" >
+    <domain domain_ref="grid_V" />
+    <scalar />
+  </grid>
+  <grid id="diamlr_grid_W_2D" >
+    <domain domain_ref="grid_W" />
+    <scalar />
+  </grid>
+  <grid id="diamlr_grid_2D_to_grid_T_3D" >
+    <domain domain_ref="grid_T" />
+    <axis axis_ref="deptht">
+      <duplicate_scalar />
+    </axis>
+  </grid>
+  <grid id="diamlr_grid_2D_to_grid_U_3D" >
+    <domain domain_ref="grid_U" />
+    <axis axis_ref="depthu">
+      <duplicate_scalar />
+    </axis>
+  </grid>
+  <grid id="diamlr_grid_2D_to_grid_V_3D" >
+    <domain domain_ref="grid_V" />
+    <axis axis_ref="depthv">
+      <duplicate_scalar />
+    </axis>
+  </grid>
+  <grid id="diamlr_grid_2D_to_grid_W_3D" >
+    <domain domain_ref="grid_W" />
+    <axis axis_ref="depthw">
+      <duplicate_scalar />
+    </axis>
+  </grid>
+  <grid id="diamlr_grid_2D_to_scalar" >
+    <scalar>
+      <reduce_domain operation="average" />
+    </scalar>
+    <scalar />
+  </grid>
+  <!-- grid definitions for the computation of daily detided model diagnostics (diadetide) -->
+  <grid id="diadetide_grid_T_2D" >
+    <domain domain_ref="grid_T" />
+    <scalar />
+  </grid>
+  <grid id="diadetide_grid_U_2D" >
+    <domain domain_ref="grid_U" />
+    <scalar />
+  </grid>
+  <grid id="diadetide_grid_V_2D" >
+    <domain domain_ref="grid_V" />
+    <scalar />
+  </grid>
+  <grid id="diadetide_grid_2D_to_grid_T_3D" >
+    <domain domain_ref="grid_T" />
+    <axis axis_ref="deptht">
+      <duplicate_scalar />
+    </axis>
+  </grid>
+  <grid id="diadetide_grid_2D_to_grid_U_3D" >
+    <domain domain_ref="grid_U" />
+    <axis axis_ref="depthu">
+      <duplicate_scalar />
+    </axis>
+  </grid>
+  <grid id="diadetide_grid_2D_to_grid_V_3D" >
+    <domain domain_ref="grid_V" />
+    <axis axis_ref="depthv">
+      <duplicate_scalar />
+    </axis>
+  </grid>
+  <grid id="diadetide_grid_2D_to_grid_W_3D" >
+    <domain domain_ref="grid_W" />
+    <axis axis_ref="depthw">
+      <duplicate_scalar />
+    </axis>
+  </grid>
+
+</grid_definition>
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ESMCO2_ORCA1_cfg
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ESMCO2_ORCA1_cfg	(revision 6656)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ESMCO2_ORCA1_cfg	(revision 6658)
@@ -1,6 +1,19 @@
-
 !!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-!! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref
+!! NEMO/OCE  Configuration namelist : overwrite default values defined in SHARED/namelist_ref
 !!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!!             ORCA2 - ICE - PISCES configuration                     !!
+!!======================================================================
+!!              ***  Domain & Run management namelists  ***           !!
+!!                                                                    !!
+!!   namrun       parameters of the run
+!!   namdom       space and time domain
+!!   namcfg       parameters of the configuration                       (default: user defined GYRE)
+!!   namwad       Wetting and drying                                    (default: OFF)
+!!   namtsd       data: temperature & salinity                          (default: OFF)
+!!   namcrs       coarsened grid (for outputs and/or TOP)               (ln_crs =T)
+!!   namc1d       1D configuration options                              ("key_c1d")
+!!   namc1d_dyndmp 1D newtonian damping applied on currents             ("key_c1d")
+!!   namc1d_uvd   1D data (currents)                                    ("key_c1d")
+!!======================================================================
 !
 !-----------------------------------------------------------------------
@@ -13,5 +26,4 @@
    nn_leapy    = _AUTOBLOCKER_    !  Leap year calendar (1) or not (0)
    ln_rstart   = _AUTOBLOCKER_    !  start from rest (F) or from a restart file (T)
-   ln_rstart_ts = _AUTOBLOCKER_   !  start from rest for current only (F) or from a restart file (T)
    nn_rstctl   = _AUTOBLOCKER_    !  Restart control => activated only if ln_rstart = T
                            !    = 0 nn_date0 read in namelist ; nn_it000 : read in namelist
@@ -30,342 +42,368 @@
 /
 !-----------------------------------------------------------------------
-&namcfg        !   parameters of the configuration
-!-----------------------------------------------------------------------
-   cp_cfg      =  "orca"               !  name of the configuration
-   jp_cfg      =       1               !  resolution of the configuration
-   jpidta      =     362               !  1st lateral dimension ( >= jpi )
-   jpjdta      =     332               !  2nd    "         "    ( >= jpj )
-   jpkdta      =      75               !  number of levels      ( >= jpk )
-   jpiglo      =     362               !  1st dimension of global domain --> i =jpidta
-   jpjglo      =     332               !  2nd    -                  -    --> j  =jpjdta
-   jperio      =       6               !  lateral cond. type (between 0 and 6)
-/
-!-----------------------------------------------------------------------
-&namzgr        !   vertical coordinate
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzgr_sco    !   s-coordinate or hybrid z-s-coordinate
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdom        !   space and time domain (bathymetry, mesh, timestep)
-!-----------------------------------------------------------------------
-   nn_closea    =   1      !  remove (=0) or keep (=1) closed seas and lakes (ORCA)
-   ln_clodyn    =  _AUTOBLOCKER_      !  
+&namdom        !   time and space domain
+!-----------------------------------------------------------------------
+   rn_rdt      = 2700.     !  time step for the dynamics and tracer
+   ln_meshmask =  _AUTO_
+/
+!-----------------------------------------------------------------------
+&namcfg        !   parameters of the configuration                      (default: use namusr_def in namelist_cfg)
+!-----------------------------------------------------------------------
+   ln_read_cfg = .true.    !  (=T) read the domain configuration file
+      cn_domcfg = "domain_cfg.nc"    ! domain configuration filename
+      !
+      ln_closea    = .true.    !  F => suppress closed seas (defined by closea_mask field) 
+      !                         !       from the bathymetry at runtime.
+/
+!-----------------------------------------------------------------------
+&namtsd        !    Temperature & Salinity Data  (init/dmp)             (default: OFF)
+!-----------------------------------------------------------------------
+   !                       ! =T  read T-S fields for:
+   ln_tsd_dmp  = .false.          !  T-S restoring   (see namtra_dmp)
+
+   cn_dir = './'     !  root directory for the T-S data location
+   !___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
+   !           !  file name              ! frequency (hours) ! variable  ! time interp.!  clim  ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
+   !           !                         !  (if <0  months)  !   name    !   (logical) !  (T/F) ! 'monthly' !                  ! pairing  !    filename   !
+   sn_tem  = 'conservative_temperature_WOA13_decav_Reg1L75_clim', -1 ,'votemper' , .true. , .true. , 'yearly' , 'weights_3D_WOA13d1_2_eorca1_bilinear.nc'  ,   ''    ,    ''
+   sn_sal  = 'absolute_salinity_WOA13_decav_Reg1L75_clim'       , -1 ,'vosaline' , .true. , .true. , 'yearly' , 'weights_3D_WOA13d1_2_eorca1_bilinear.nc'  ,   ''
+/
+!!======================================================================
+!!            ***  Surface Boundary Condition namelists  ***          !!
+!!                                                                    !!
+!!   namsbc          surface boundary condition manager                 (default: NO selection)
+!!   namsbc_flx      flux               formulation                     (ln_flx     =T)
+!!   namsbc_blk      Bulk formulae formulation                          (ln_blk     =T)
+!!   namsbc_cpl      CouPLed            formulation                     ("key_oasis3" )
+!!   namsbc_sas      Stand-Alone Surface module                         (SAS_SRC  only)
+!!   namsbc_iif      Ice-IF: use observed ice cover                     (nn_ice = 1   )
+!!   namtra_qsr      penetrative solar radiation                        (ln_traqsr  =T)
+!!   namsbc_ssr      sea surface restoring term (for T and/or S)        (ln_ssr     =T)
+!!   namsbc_rnf      river runoffs                                      (ln_rnf     =T)
+!!   namsbc_apr      Atmospheric Pressure                               (ln_apr_dyn =T)
+!!   namsbc_isf      ice shelf melting/freezing                         (ln_isfcav  =T : read (ln_read_cfg=T) or set or usr_def_zgr )
+!!   namsbc_iscpl    coupling option between land ice model and ocean   (ln_isfcav  =T)
+!!   namsbc_wave     external fields from wave model                    (ln_wave    =T)
+!!   namberg         iceberg floats                                     (ln_icebergs=T)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&namsbc        !   Surface Boundary Condition manager                   (default: NO selection)
+!-----------------------------------------------------------------------
+   nn_fsbc     = 2         !  frequency of SBC module call
+                           !     (also = the frequency of sea-ice & iceberg model call)
+                     ! Type of air-sea fluxes 
+   ln_cpl      = .true.    !  atmosphere coupled   formulation          ( requires key_oasis3 )
+                     ! Sea-ice :
+   nn_ice      = 2         !  =2 or 3 automatically for SI3 or CICE    ("key_si3" or "key_cice")
+                     ! Misc. options of sbc : 
+   ln_traqsr   = .true.   !  Light penetration in the ocean            (T => fill namtra_qsr)
+   ln_isf      = .true.   !  ice shelf                                 (T   => fill namsbc_isf & namsbc_iscpl)
+/
+!-----------------------------------------------------------------------
+&namsbc_blk    !   namsbc_blk  generic Bulk formula                     (ln_blk =T)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_cpl    !   coupled ocean/atmosphere model                       ("key_oasis3")
+!-----------------------------------------------------------------------
+   nn_cplmodel   =     1   !  Maximum number of models to/from which NEMO is potentially sending/receiving data
+   ln_usecplmask = .false. !  use a coupling mask file to merge data received from several models
+   !                       !   -> file cplmask.nc with the float variable called cplmask (jpi,jpj,nn_cplmodel)
+   nn_cats_cpl   =     5   !  Number of sea ice categories over which coupling is to be carried out (if not 1)
+   !_____________!__________________________!____________!_____________!______________________!________!
+   !             !        description       !  multiple  !    vector   !       vector         ! vector !
+   !             !                          ! categories !  reference  !     orientation      ! grids  !
+!***   send    ***
+   sn_snd_temp   =   'weighted oce and ice' ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_snd_alb    =   'weighted ice'         ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_snd_crt    =   'mixed oce-ice'        ,    'no'    , 'spherical' , 'eastward-northward' ,  'T'
+   sn_snd_co2    =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+!***  receive  ***
+   sn_rcv_w10m   =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_taumod =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_tau    =   'mixed oce-ice'        ,    'no'    , 'cartesian' , 'eastward-northward' ,  'U,V'
+   sn_rcv_dqnsdt =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_qsr    =   'conservative'         ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_qns    =   'conservative'         ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_emp    =   'conservative'         ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_rnf    =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_cal    =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_co2    =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_isf    =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_icb    =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+/
+!-----------------------------------------------------------------------
+&namtra_qsr    !   penetrative solar radiation                          (ln_traqsr =T)
+!-----------------------------------------------------------------------
+   !                       ! type of penetration                        (default: NO selection)
+   ln_qsr_bio  = .true.       !  RGB light penetration (Red-Green-Blue)
    !
-   jphgr_msh   =       0               !  type of horizontal mesh
-   ppglam0     =  999999.0             !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =  999999.0             ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_deg    =  999999.0             !  meridional grid-spacing (degrees)
-   ppe1_m      =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_m      =  999999.0             !  meridional grid-spacing (degrees)
-   ppsur       =   -3958.951371276829  !  ORCA r4, r2 and r05 coefficients
-   ppa0        =     103.9530096000000 ! (default coefficients)
-   ppa1        =       2.415951269000000   !
-   ppkth       =      15.35101370000000    !
-   ppacr       =       7.0             !
-   ppdzmin     =  999999.0             !  Minimum vertical spacing
-   pphmax      =  999999.0             !  Maximum depth
-   ppa2        =     100.7609285000000 !  Double tanh function parameters
-   ppkth2      =      48.02989372000000    !
-   ppacr2      =      13.00000000000   !
-   rn_rdt      = 2700.     !  time step for the dynamics (and tracer if nn_acc=0)
-   rn_hmin     =   20.
-   nn_msh      = _AUTO_    !  AUTO - Create (=1) a mesh file or not (=0)
-/
-!-----------------------------------------------------------------------
-&namsplit       
-!----------------------------------------------------------------------- 
-   ln_bt_fw      =    .FALSE.          !  leap-frog integration of barotropic equations
-   ln_bt_av      =    .TRUE.           !  Time filtering of barotropic variables
-   ln_bt_nn_auto =    .TRUE.           !  Set nn_baro automatically to be just below
-                                       !  a user defined maximum courant number (rn_bt_cmax)
-   nn_baro       =    30               !  Number of iterations of barotropic mode
-                                       !  during rn_rdt seconds. Only used if ln_bt_nn_auto=F
-   rn_bt_cmax    =    0.8              !  Maximum courant number allowed if ln_bt_nn_auto=T 
-   nn_bt_flt     =    1                !  Time filter choice
-                                       !  = 0 None
-                                       !  = 1 Boxcar over   nn_baro barotropic steps
-                                       !  = 2 Boxcar over 2*nn_baro     "        
-/
-!-----------------------------------------------------------------------
-&namcrs        !   Grid coarsening for dynamics output and/or
-               !   passive tracer coarsened online simulations
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtsd    !   data : Temperature  & Salinity
-!-----------------------------------------------------------------------
-   ln_tsd_tradmp = .false.  !  damping of ocean T & S toward T &S input data (T) or not (F)
-   sn_tem  = 'conservative_temperature_WOA13_decav_Reg1L75_clim', -1 ,'votemper' , .true. , .true. , 'yearly' , 'weights_3D_WOA13d1_2_eorca1_bilinear.nc'  ,   ''    ,    ''
-   sn_sal  = 'absolute_salinity_WOA13_decav_Reg1L75_clim'       , -1 ,'vosaline' , .true. , .true. , 'yearly' , 'weights_3D_WOA13d1_2_eorca1_bilinear.nc'  ,   ''    ,    ''
-/
-!-----------------------------------------------------------------------
-&namsbc        !   Surface Boundary Condition (surface module)
-!-----------------------------------------------------------------------
-   nn_fsbc     =  2        !  frequency of surface boundary condition computation
-                           !     (also = the frequency of sea-ice model call)
-   ln_blk_core = .false.   !  CORE bulk formulation                     (T => fill namsbc_core)
-   ln_cpl      = .true.    !  atmosphere coupled   formulation          ( requires key_oasis3 )
-   nn_limflx =   2         !  LIM3 Multi-category heat flux formulation (use -1 if LIM3 is not used)
-                           !  =-1  Use per-category fluxes, bypass redistributor, forced mode only, not yet implemented coupled
-                           !  = 0  Average per-category fluxes (forced and coupled mode)
-                           !  = 1  Average and redistribute per-category fluxes, forced mode only, not yet implemented coupled
-                           !  = 2  Redistribute a single flux over categories (coupled mode only)
-   nn_ice_embd = 1         !  AUTO - 
-                           !  =0 levitating ice (no mass exchange, concentration/dilution effect)
-                           !  =1 levitating ice with mass and salt exchange but no presure effect
-                           !  =2 embedded sea-ice (full salt and mass exchanges and pressure)
-   ln_rnf      = .false.   !  runoffs                                   (T => fill namsbc_rnf)
-   ln_ssr      = .false.   !  Sea Surface Restoring on T and/or S       (T => fill namsbc_ssr)
-   nn_fwb      = 0         !  FreshWater Budget: =0 unchecked
-   nn_isf      = 3         !  ice shelf melting/freezing                (/=0 => fill namsbc_isf)
-                           !  3 = rnf file for isf
-!-----------------------------------------------------------------------
-&namsbc_core   !   namsbc_core  CORE bulk formulae
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtra_qsr    !   penetrative solar radiation
-!-----------------------------------------------------------------------
-   sn_chl      ='merged_ESACCI_BIOMER4V1R1_CHL_REG05',  -1  , 'CHLA' , .true. , .true. , 'yearly' , 'weights_reg05_2_eorca1_bilinear.nc' , '' , ''
-   ln_traqsr   = .true.    !  Light penetration (T) or not (F)
-   ln_qsr_rgb  = .false.    !  RGB (Red-Green-Blue) light penetration
-   ln_qsr_2bd  = .false.   !  2 bands              light penetration
-   ln_qsr_bio  = .true.   !  bio-model light penetration
-/
-!-----------------------------------------------------------------------
-&namsbc_rnf    !   runoffs namelist surface boundary condition
-!-----------------------------------------------------------------------
-!              !  file name           ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation ! land/sea mask !
-!              !                      !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      !
-   sn_rnf      = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc',        -1         , 'sorunoff',   .true.     , .true. , 'yearly'  , ''       , ''       , ''
-   sn_i_rnf    = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc',        -1         , 'Icb_flux',   .true.     , .true. , 'yearly'  , ''       , ''       , ''
-   sn_cnf      = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc',         0         , 'socoeff' ,   .false.    , .true. , 'yearly'  , ''       , ''       , ''
-   sn_s_rnf    = 'runoffs'                         ,        24         , 'rosaline',   .true.     , .true. , 'yearly'  , ''       , ''       , ''
-   sn_t_rnf    = 'runoffs'                         ,        24         , 'rotemper',   .true.     , .true. , 'yearly'  , ''       , ''       , ''
-   sn_dep_rnf  = 'runoffs_eORCA1.0_depths.nc'      ,         0         , 'rodepth' ,   .false.    , .true. , 'yearly'  , ''       , ''       , ''
+/
+!-----------------------------------------------------------------------
+&namsbc_ssr    !   surface boundary condition : sea surface restoring   (ln_ssr =T)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_rnf    !   runoffs                                              (ln_rnf =T)
+!-----------------------------------------------------------------------
+   ln_rnf_mouth = .false.   !  specific treatment at rivers mouths
+      rn_hrnf     =  15.e0    !  depth over which enhanced vertical mixing is used    (ln_rnf_mouth=T)
+      rn_avt_rnf  =   1.e-3   !  value of the additional vertical mixing coef. [m2/s] (ln_rnf_mouth=T)
+   rn_rfact    =   1.e0    !  multiplicative factor for runoff
+   ln_rnf_depth = .false.   !  read in depth information for runoff
+   ln_rnf_tem  = .false.   !  read in temperature information for runoff
+   ln_rnf_sal  = .false.   !  read in salinity information for runoff
+   ln_rnf_depth_ini = .false. ! compute depth at initialisation from runoff file
+      rn_rnf_max  = 0.05  !  max value of the runoff climatologie over global domain ( ln_rnf_depth_ini = .true )
+      rn_dep_max  = 150.      !  depth over which runoffs is spread ( ln_rnf_depth_ini = .true )
+      nn_rnf_depth_file = _AUTO_   !  create (=1) a runoff depth file or not (=0)
 
-   ln_rnf_icb   = .false.    !  read in iceberg flux
-   ln_rnf_mouth = .false.    !  specific treatment at rivers mouths
-   ln_rnf_depth = .true.     !  read in depth information for runoff
-   ln_rnf_tem   = .false.    !  read in temperature information for runoff
-   ln_rnf_sal   = .false.    !  read in salinity information for runoff
-   ln_rnf_depth_ini = .false.!  compute depth at initialisation from runoff file
-   rn_rnf_max   = 0.05       !  max value of the runoff climatology over global domain ( if ln_rnf_depth_ini = .true )
-   rn_dep_max = 150.         !  depth over which runoffs is spread ( ln_rnf_depth_ini = .true )
-   nn_rnf_depth_file =  _AUTO_   ! create (=1) a runoff depth file or not (=0)
-/
-!-----------------------------------------------------------------------
-&namsbc_isf    !  Top boundary layer (ISF)
-!-----------------------------------------------------------------------
-!              ! file name ! frequency (hours) ! variable ! time interpol. !  clim   ! 'yearly'/ ! weights  ! rotation !
-!              !           !  (if <0  months)  !   name   !    (logical)   !  (T/F)  ! 'monthly' ! filename ! pairing  !
-!              !
-   sn_rnfisf     = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc' ,   -12      ,'sornfisf',    .false.      , .true.  , 'yearly'  ,  ''      ,   ''
-   sn_depmax_isf = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc' ,   -12      ,'sodepmax_isf' ,   .false.  , .true.  , 'yearly'  ,  ''      ,   ''
-   sn_depmin_isf = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc' ,   -12      ,'sodepmin_isf' ,   .false.  , .true.  , 'yearly'  ,  ''      ,   ''
-/
-!-----------------------------------------------------------------------
-&namsbc_apr    !   Atmospheric pressure used as ocean forcing or in bulk
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_ssr    !   surface boundary condition : sea surface restoring
-!-----------------------------------------------------------------------
-!              !   file name  ! frequency (hours) ! variable   ! time interpol. !  clim   ! 'yearly'/ ! weights  ! rotation !
-!              !              !  (if <0  months)  !   name     !    (logical)   !  (T/F)  ! 'monthly' ! filename ! pairing  !
-   sn_sss      = 'sss_absolute_salinity_WOA13_decav_Reg1L75_clim', -1. , 'sosaline', .true. , .true. , 'yearly' , 'weights_WOA13d1_2_eorca1_bilinear.nc' , ''
-/
-!-----------------------------------------------------------------------
-&namsbc_alb    !   albedo parameters
-!-----------------------------------------------------------------------
-   nn_ice_alb   =    1   !  parameterization of ice/snow albedo
-                         !     0: Shine & Henderson-Sellers (JGR 1985), giving clear-sky albedo
-                         !     1: "home made" based on Brandt et al. (JClim 2005) and Grenfell & Perovich (JGR 2004),
-                         !        giving cloud-sky albedo
-   rn_alb_sdry  =  0.87  !  dry snow albedo         : 0.80 (nn_ice_alb = 0); 0.85 (nn_ice_alb = 1); obs 0.85-0.87 (cloud-sky)
-   rn_alb_smlt  =  0.82  !  melting snow albedo     : 0.65 ( '' )          ; 0.75 ( '' )          ; obs 0.72-0.82 ( '' )
-   rn_alb_idry  =  0.65  !  dry ice albedo          : 0.72 ( '' )          ; 0.60 ( '' )          ; obs 0.54-0.65 ( '' )
-   rn_alb_imlt  =  0.58  !  bare puddled ice albedo : 0.53 ( '' )          ; 0.50 ( '' )          ; obs 0.49-0.58 ( '' )
-/
-!-----------------------------------------------------------------------
-&namsbc_cpl    !   coupling parameters
-!-----------------------------------------------------------------------
-!                    !     description       !  multiple  !    vector   !      vector          ! vector !
-!                    !                       ! categories !  reference  !    orientation       ! grids  !
-! send
-sn_snd_temp   =       'weighted oce and ice' ,    'no'    ,     ''      ,         ''           ,   ''
-sn_snd_alb    =       'weighted ice'         ,    'no'    ,     ''      ,         ''           ,   ''
-sn_snd_thick  =       'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
-sn_snd_crt    =       'mixed oce-ice'        ,    'no'    , 'cartesian' , 'eastward-northward' ,  'T'
-sn_snd_co2    =       'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
-! receive
-sn_rcv_w10m   =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_taumod =       'none'                 ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_tau    =       'mixed oce-ice'        ,    'no'    , 'cartesian' , 'eastward-northward',  'U,V'
-sn_rcv_dqnsdt =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_qsr    =       'conservative'         ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_qns    =       'conservative'         ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_emp    =       'conservative'         ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_rnf    =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_cal    =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_co2    =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_icb    =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_isf    =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
+   cn_dir = './'  !  root directory for the location of the runoff files
+   !___________!_____________!___________________!___________!_____________!_________!___________!__________!__________!_______________!
+   !           !  file name  ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation ! land/sea mask !
+   !           !             !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      !
+   sn_rnf      = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1.nc',        -1         , 'sorunoff',   .true.     , .true. , 'yearly'  , ''       , ''       , ''
+   sn_cnf      = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1.nc',         0         , 'socoeff' ,   .false.    , .true. , 'yearly'  , ''       , ''       , ''
+   sn_s_rnf    = 'runoffs'            ,        24         , 'rosaline',   .true.     , .true. , 'yearly'  , ''       , ''       , ''
+   sn_t_rnf    = 'runoffs'            ,        24         , 'rotemper',   .true.     , .true. , 'yearly'  , ''       , ''       , ''
+   sn_dep_rnf  = 'runoffs_depths.nc'  ,         0         , 'rodepth' ,   .false.    , .true. , 'yearly'  , ''       , ''       , ''
+/
+!-----------------------------------------------------------------------
+&namsbc_isf    !  Top boundary layer (ISF)                              (ln_isfcav =T : read (ln_read_cfg=T)
+!-----------------------------------------------------------------------             or set or usr_def_zgr )
+   !                 ! type of top boundary layer
+   nn_isf      = 3         !  ice shelf melting/freezing
+                           !  3 = rnf file for ISF  
+   !___________!_____________!___________________!___________!_____________!_________!___________!__________!__________!_______________!
+   !           !  file name  ! frequency (hours) ! variable  ! time interp.!  clim   ! 'yearly'/ ! weights  ! rotation ! land/sea mask !
+   !           !             !  (if <0  months)  !   name    !  (logical)  !  (T/F)  ! 'monthly' ! filename ! pairing  ! filename      !
+   sn_rnfisf     = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1.nc' ,   -12      ,'sornfisf',    .false.      , .true.  , 'yearly'  ,  ''      ,   ''
+   sn_depmax_isf = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1.nc' ,   -12      ,'sodepmax_isf' ,   .false.  , .true.  , 'yearly'  ,  ''      ,   ''
+   sn_depmin_isf = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1.nc' ,   -12      ,'sodepmin_isf' ,   .false.  , .true.  , 'yearly'  ,  ''      ,   ''
+/
+!-----------------------------------------------------------------------
+&namsbc_wave   ! External fields from wave model                        (ln_wave=T)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namberg       !   iceberg parameters                                   (default: OFF)
+!-----------------------------------------------------------------------
+/
+!!======================================================================
+!!               ***  Lateral boundary condition  ***                 !!
+!!                                                                    !!
+!!   namlbc        lateral momentum boundary condition                  (default: NO selection)
+!!   namagrif      agrif nested grid   (read by child model only)       ("key_agrif")
+!!   nam_tide      Tidal forcing                                        (default: OFF)
+!!   nambdy        Unstructured open boundaries                         (default: OFF)
+!!   nambdy_dta    Unstructured open boundaries - external data         (see  nambdy)
+!!   nambdy_tide   tidal forcing at open boundaries                     (default: OFF)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&namlbc        !   lateral momentum boundary condition                  (default: NO selection)
+!-----------------------------------------------------------------------
+   rn_shlat    =    0.     !  no slip
+/
+!-----------------------------------------------------------------------
+&namagrif      !  AGRIF zoom                                            ("key_agrif")
+!-----------------------------------------------------------------------
+/
+!!======================================================================
+!!                ***  Top/Bottom boundary condition  ***             !!
+!!                                                                    !!
+!!   namdrg        top/bottom drag coefficient                          (default: NO selection)
+!!   namdrg_top    top    friction                                      (ln_OFF=F & ln_isfcav=T)
+!!   namdrg_bot    bottom friction                                      (ln_OFF=F)
+!!   nambbc        bottom temperature boundary condition                (default: OFF)
+!!   nambbl        bottom boundary layer scheme                         (default: OFF)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&namdrg        !   top/bottom drag coefficient                          (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_non_lin  = .true.   !  non-linear  drag: Cd = Cd0 |U|
+   ln_loglayer = .false.   !  logarithmic drag: Cd = vkarmn/log(z/z0) |U|
+   !
+   ln_drgimp   = .true.    !  implicit top/bottom friction flag
+/
+!-----------------------------------------------------------------------
+&namdrg_bot    !   BOTTOM friction                                      (ln_OFF =F)
+!-----------------------------------------------------------------------
+   rn_Cd0      =  1.e-3    !  drag coefficient [-]
+   rn_Cdmax    =  0.1      !  drag value maximum [-] (logarithmic drag)
+   rn_ke0      =  2.5e-3   !  background kinetic energy  [m2/s2] (non-linear cases)
+   rn_z0       =  3.e-3    !  roughness [m] (ln_loglayer=T)
+   ln_boost    = .false.   !  =T regional boost of Cd0 ; =F constant
+      rn_boost =  50.         !  local boost factor  [-]
+/
+!-----------------------------------------------------------------------
+&nambbc        !   bottom temperature boundary condition                (default: OFF)
+!-----------------------------------------------------------------------
+   ln_trabbc   = .true.    !  Apply a geothermal heating at the ocean bottom
+      nn_geoflx   =    2      !  geothermal heat flux: = 2 read variable flux [mW/m2]
 
-/
-!-----------------------------------------------------------------------
-&namberg       !   iceberg parameters
-!-----------------------------------------------------------------------
-      ln_icebergs              = .false.
-      ln_bergdia               = .false.              ! Calculate budgets
-      nn_verbose_level         = 0                    ! Turn on more verbose output if level > 0
-      nn_verbose_write         = 120                  ! Timesteps between verbose messages
-      nn_sample_rate           = 1                    ! Timesteps between sampling for trajectory storage
-                                                      ! Initial mass required for an iceberg of each class
-      rn_initial_mass          = 8.8e7, 4.1e8, 3.3e9, 1.8e10, 3.8e10, 7.5e10, 1.2e11, 2.2e11, 3.9e11, 7.4e11
-                                                      ! Proportion of calving mass to apportion to each class  
-      rn_distribution          = 0.24, 0.12, 0.15, 0.18, 0.12, 0.07, 0.03, 0.03, 0.03, 0.02
-                                                      ! Ratio between effective and real iceberg mass (non-dim)
-                                                      ! i.e. number of icebergs represented at a point         
-      rn_mass_scaling          = 2000, 200, 50, 20, 10, 5, 2, 1, 1, 1
-                                                      ! thickness of newly calved bergs (m)
-      rn_initial_thickness     = 40., 67., 133., 175., 250., 250., 250., 250., 250., 250.
-      rn_rho_bergs             = 850.                 ! Density of icebergs
-      rn_LoW_ratio             = 1.5                  ! Initial ratio L/W for newly calved icebergs
-      ln_operator_splitting    = .true.               ! Use first order operator splitting for thermodynamics
-      rn_bits_erosion_fraction = 0.                   ! Fraction of erosion melt flux to divert to bergy bits
-      rn_sicn_shift            = 0.                   ! Shift of sea-ice concn in erosion flux (0<sicn_shift<1)
-      ln_passive_mode          = .false.              ! iceberg - ocean decoupling   
-      nn_test_icebergs         =   8                  ! Create test icebergs of this class (-1 = no)
-                                                      ! Put a test iceberg at each gridpoint in box (lon1,lon2,lat1,lat2)
-      !rn_test_box              = 108.0,  116.0, -66.0, -58.0
-      rn_test_box              = -180.0,  180.0,  70.0,  90.0     !
-      rn_speed_limit           = 0.                   ! CFL speed limit for a berg   
-
-!              ! file name ! frequency (hours) !   variable   ! time interp.   !  clim   ! 'yearly'/ ! weights  ! rotation ! land/sea mask !
-!              !           !  (if <0  months)  !     name     !   (logical)    !  (T/F ) ! 'monthly' ! filename ! pairing  ! filename      !
-      sn_icb =  'calving' ,       -1           , 'calvingmask',  .true.        , .true.  , 'yearly'  , ''       , ''       , ''
-   
-      cn_dir = './' 
-/
-!-----------------------------------------------------------------------
-&namlbc        !   lateral momentum boundary condition
-!-----------------------------------------------------------------------
-   rn_shlat    =    0.0    !  shlat = 0  !  0 < shlat < 2  !  shlat = 2  !  2 < shlat
-/
-!-----------------------------------------------------------------------
-&namcla        !   cross land advection
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nambfr        !   bottom friction
-!-----------------------------------------------------------------------
-   nn_bfr      =    2      !  type of bottom friction :   = 0 : free slip,  = 1 : linear friction
-/
-!-----------------------------------------------------------------------
-&nambbc        !   bottom temperature boundary condition
-!-----------------------------------------------------------------------
-   sn_qgh      ='Goutorbe_ghflux.nc',  -12.  , 'gh_flux'    ,   .false.     , .true. , 'yearly'  , 'weights_Goutorbe1_2_eorca1_bilinear.nc'       , ''       , ''
-   !
-   cn_dir      = './'      !  root directory for the location of the runoff files
-   nn_geoflx   =    2      !  geothermal heat flux: = 0 no flux
-/
-!-----------------------------------------------------------------------
-&nambbl        !   bottom boundary layer scheme
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nameos        !   ocean physical parameters
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtra_adv    !   advection scheme for tracer
-!-----------------------------------------------------------------------
-   ln_traadv_tvd    =  .true.   !  TVD scheme
-   ln_traadv_ubs    =  .false.  !  UBS scheme
-/
-!-----------------------------------------------------------------------
-&namtra_adv_mle !  mixed layer eddy parametrisation (Fox-Kemper param)
-!-----------------------------------------------------------------------
-/
-!----------------------------------------------------------------------------------
-&namtra_ldf    !   lateral diffusion scheme for tracers
-!----------------------------------------------------------------------------------
-   ln_traldf_grif   =  .false.   !  griffies skew flux formulation       (require "key_ldfslp")
-   ln_traldf_gdia   =  .false.   !  griffies operator strfn diagnostics  (require "key_ldfslp")
-   ln_botmix_grif   =  .false.   !  griffies operator with lateral mixing on bottom (require "key_ldfslp")
-   rn_aht_0         =  1000.    !  horizontal eddy diffusivity for tracers [m2/s]
-   rn_aeiv_0        =  1000.    !  eddy induced velocity coefficient [m2/s]    (require "key_traldf_eiv")
-/
-!-----------------------------------------------------------------------
-&namtra_dmp    !   tracer: T & S newtonian damping
-!-----------------------------------------------------------------------
-   ln_tradmp   =  .false.  !  add a damping termn (T) or not (F)
-/
-!-----------------------------------------------------------------------
-&namdyn_adv    !   formulation of the momentum advection
-!-----------------------------------------------------------------------
-   ln_dynadv_vec = .true.  !  vector form (T) or flux form (F)
-   ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme
-   ln_dynadv_ubs = .false. !  flux form - 3rd order UBS      scheme
-   nn_dynkeg     = 1       !  scheme for grad(KE): =0  C2  ; =1  Hollingsworth correction
-/
-!-----------------------------------------------------------------------
-&nam_vvl    !   vertical coordinate options
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdyn_vor    !   option of physics/algorithm (not control by CPP keys)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdyn_hpg    !   Hydrostatic pressure gradient option
-!-----------------------------------------------------------------------
-   ln_hpg_zps  = .false.   !  z-coordinate - partial steps (interpolation)
-   ln_hpg_sco  = .true.    !  s-coordinate (standard jacobian formulation)
-   !ln_hpg_isf  = .true.    !  s-coordinate (sco ) adapted to isf
-   ln_dynhpg_imp = .false. !  time stepping: semi-implicit time scheme  (T)
-                           !           centered      time scheme  (F)
-/
-!-----------------------------------------------------------------------
-&namdyn_ldf    !   lateral diffusion on momentum
-!-----------------------------------------------------------------------
-   rn_ahm_0_lap     = 20000.    !  horizontal laplacian eddy viscosity   [m2/s]
-/
-!-----------------------------------------------------------------------
-&namzdf        !   vertical physics
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_tke    !   turbulent eddy kinetic dependent vertical diffusion  ("key_zdftke")
-!-----------------------------------------------------------------------
-  nn_etau     = 0         !  penetration of tke below the mixed layer (ML) due to internal & intertial waves
-                          !    = 0 no penetration
-                          !    = 1 add a tke source below the ML
-                          !    = 2 add a tke source just at the base of the ML
-                          !    = 3 as = 1 applied on HF part of the stress    ("key_oasis3")
-  nn_mxl0     = 2         ! type of scaling under sea-ice
-                          !    = 0 no scaling under sea-ice
-                          !    = 1 scaling with constant sea-ice thickness
-                          !    = 2  scaling with mean sea-ice thickness
-                          !    = 3  scaling with maximum sea-ice thickness
-  rn_hice    = 10.        ! max constant ice thickness value when scaling under sea-ice ( nn_mxl0=1)
-  ln_lc      = .true.     !  Langmuir cell parameterisation (Axell 2002)
-  rn_lc      =  0.20      !  coef. associated to Langmuir cells
-/
-!-----------------------------------------------------------------------
-&namzdf_ddm    !   double diffusive mixing parameterization             ("key_zdfddm")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_tmx    !   tidal mixing parameterization                        ("key_zdftmx")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_tmx_new    !   new tidal mixing parameterization                ("key_zdftmx_new")
+   cn_dir = './'  !  root directory for the geothermal data location
+   !___________!____________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
+   !           !  file name         ! frequency (hours) ! variable  ! time interp.!  clim  ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
+   !           !                    !  (if <0  months)  !   name    !   (logical) !  (T/F) ! 'monthly' !                  ! pairing  !    filename   !
+   sn_qgh      ='Goutorbe_ghflux.nc',        -12.       , 'gh_flux' ,   .false.   , .true. , 'yearly'  , 'weights_Goutorbe1_2_eorca1_bilinear.nc'       , ''       , ''
+/
+!-----------------------------------------------------------------------
+&nambbl        !   bottom boundary layer scheme                         (default: OFF)
+!-----------------------------------------------------------------------
+   ln_trabbl   = .true.    !  Bottom Boundary Layer parameterisation flag
+      nn_bbl_ldf  =  1        !  diffusive bbl (=1)   or not (=0)
+      nn_bbl_adv  =  0        !  advective bbl (=1/2) or not (=0)
+      rn_ahtbbl   =  1000.    !  lateral mixing coefficient in the bbl  [m2/s]
+      rn_gambbl   =  10.      !  advective bbl coefficient                 [s]
+/
+!!======================================================================
+!!                        Tracer (T-S) namelists                      !!
+!!                                                                    !!
+!!   nameos        equation of state                                    (default: NO selection)
+!!   namtra_adv    advection scheme                                     (default: NO selection)
+!!   namtra_ldf    lateral diffusion scheme                             (default: NO selection)
+!!   namtra_mle    mixed layer eddy param. (Fox-Kemper param.)          (default: OFF)
+!!   namtra_eiv    eddy induced velocity param.                         (default: OFF)
+!!   namtra_dmp    T & S newtonian damping                              (default: OFF)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&nameos        !   ocean Equation Of Seawater                           (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_teos10   = .true.         !  = Use TEOS-10
+/
+!-----------------------------------------------------------------------
+&namtra_adv    !   advection scheme for tracer                          (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_traadv_fct = .true.     !  FCT scheme
+      nn_fct_h   =  2               !  =2/4, horizontal 2nd / 4th order 
+      nn_fct_v   =  2               !  =2/4, vertical   2nd / COMPACT 4th order 
+/
+!-----------------------------------------------------------------------
+&namtra_ldf    !   lateral diffusion scheme for tracers                 (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_traldf_lap   = .true.    !    laplacian operator
+   ln_traldf_iso   = .true.    !  iso-neutral (Standard operator)
+   ln_traldf_msc   = .true.    !  Method of Stabilizing Correction      (both operators)
+   !                       !  Coefficients:
+   nn_aht_ijk_t    = 20        !  space/time variation of eddy coef
+      !                             !   = 20     aht = 1/2  Ud. max(e1,e2)
+      rn_Ud        = 0.018          !  lateral diffusive velocity [m/s] (nn_aht_ijk_t= 0, 10, 20, 30)
+      rn_Ld        = 100.e+3        !  lateral diffusive length   [m]   (nn_aht_ijk_t= 0, 10)
+/
+!-----------------------------------------------------------------------
+&namtra_mle    !   mixed layer eddy parametrisation (Fox-Kemper)        (default: OFF)
+!-----------------------------------------------------------------------
+   ln_mle      = .true.   ! (T) use the Mixed Layer Eddy (MLE) parameterisation
+/
+!-----------------------------------------------------------------------
+&namtra_eiv    !   eddy induced velocity param.                         (default: OFF)
+!-----------------------------------------------------------------------
+   ln_ldfeiv   = .true.    ! use eddy induced velocity parameterization
+      !                        !  Coefficients:
+      nn_aei_ijk_t  = 21          ! space/time variation of the eiv coeficient
+      !                                !   = 21 F(i,j,t)  =Treguier et al. JPO 1997 formulation
+      !                           !  time invariant coefficients:  aei0 = 1/2  Ue*Le 
+      rn_Ue        = 0.018             !  lateral diffusive velocity [m/s] (nn_aht_ijk_t= 0, 10, 20, 30)
+      rn_Le        = 100.e+3           !  lateral diffusive length   [m]   (nn_aht_ijk_t= 0, 10)
+      !
+      ln_ldfeiv_dia =.true.   ! diagnose eiv stream function and velocities
+/
+!-----------------------------------------------------------------------
+&namtra_dmp    !   tracer: T & S newtonian damping                      (default: OFF)
+!-----------------------------------------------------------------------
+   ln_tradmp   =  .false.   !  add a damping term (using resto.nc coef.)
+      nn_zdmp  =    0         !  vertical shape =0    damping throughout the water column
+/
+!!======================================================================
+!!                      ***  Dynamics namelists  ***                  !!
+!!                                                                    !!
+!!   nam_vvl       vertical coordinate options                          (default: z-star)
+!!   namdyn_adv    formulation of the momentum advection                (default: NO selection)
+!!   namdyn_vor    advection scheme                                     (default: NO selection)
+!!   namdyn_hpg    hydrostatic pressure gradient                        (default: NO selection)
+!!   namdyn_spg    surface pressure gradient                            (default: NO selection)
+!!   namdyn_ldf    lateral diffusion scheme                             (default: NO selection)
+!!   namdta_dyn    offline TOP: dynamics read in files                  (OFF_SRC only)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&namdyn_adv    !   formulation of the momentum advection                (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_dynadv_vec = .true.  !  vector form - 2nd centered scheme
+     nn_dynkeg     = 1        ! grad(KE) scheme: =0   C2  ;  =1   Hollingsworth correction
+/
+!-----------------------------------------------------------------------
+&namdyn_vor    !   Vorticity / Coriolis scheme                          (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_dynvor_een = .true.  !  energy & enstrophy scheme
+      nn_een_e3f = 0          ! =0   e3f = mean masked e3t divided by 4
+/
+!-----------------------------------------------------------------------
+&namdyn_hpg    !   Hydrostatic pressure gradient option                 (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_hpg_sco  = .true.   !  s-coordinate (standard jacobian formulation)
+/
+!-----------------------------------------------------------------------
+&namdyn_spg    !   surface pressure gradient                            (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_dynspg_ts  = .true.  !  split-explicit free surface
+/
+!-----------------------------------------------------------------------
+&namdyn_ldf    !   lateral diffusion on momentum                        (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_dynldf_lap =  .true.     !    laplacian operator
+   ln_dynldf_lev =  .true.     !  iso-level
+   nn_ahm_ijk_t  = -30           !  space/time variation of eddy coefficient :
+      !                             !  =-30  read in eddy_viscosity_3D.nc file
+/
+!!======================================================================
+!!                     vertical physics namelists                     !!
+!!                                                                    !!
+!!    namzdf        vertical physics manager                            (default: NO selection)
+!!    namzdf_ric    richardson number vertical mixing                   (ln_zdfric=T)
+!!    namzdf_tke    TKE vertical mixing                                 (ln_zdftke=T)
+!!    namzdf_gls    GLS vertical mixing                                 (ln_zdfgls=T)
+!!    namzdf_osm    OSM vertical diffusion                              (ln_zdfosm=T)
+!!    namzdf_iwm    tidal mixing parameterization                       (ln_zdfiwm=T)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&namzdf        !   vertical physics manager                             (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_zdftke   = .true.       !  Turbulent Kinetic Energy closure       (T =>   fill namzdf_tke)
+   ln_zdfevd   = .true.       !  Enhanced Vertical Diffusion scheme
+      nn_evdm  =    0            !  evd apply on tracer (=0) or on tracer and momentum (=1)
+      rn_evd   =  100.           !  evd mixing coefficient [m2/s]
+   ln_zdfddm   = .true.    ! double diffusive mixing
+      rn_avts  =    1.e-4     !  maximum avs (vertical mixing on salinity)
+      rn_hsbfr =    1.6       !  heat/salt buoyancy flux ratio
+   ln_zdfiwm   = .false.       ! internal wave-induced mixing            (T =>   fill namzdf_iwm)
+   !                       !  Coefficients
+   rn_avm0     =   1.2e-4     !  vertical eddy viscosity   [m2/s]       (background Kz if ln_zdfcst=F)
+   rn_avt0     =   1.2e-5     !  vertical eddy diffusivity [m2/s]       (background Kz if ln_zdfcst=F)
+   nn_avb      =    0         !  profile for background avt & avm (=1) or not (=0)
+   nn_havtb    =    0         !  horizontal shape for avtb (=1) or not (=0)
+/
+!-----------------------------------------------------------------------
+&namzdf_tke    !   turbulent eddy kinetic dependent vertical diffusion  (ln_zdftke =T)
+!-----------------------------------------------------------------------
+      nn_mxl      =   2       !  mixing length: = 0 bounded by the distance to surface and bottom
+      !                       !                 = 1 bounded by the local vertical scale factor
+      !                       !                 = 2 first vertical derivative of mixing length bounded by 1
+      !                       !                 = 3 as =2 with distinct dissipative an mixing length scale
+      nn_etau     =   0       !  penetration of tke below the mixed layer (ML) due to NIWs
+                               !        = 0 none ; = 1 add a tke source below the ML
+                               !        = 2 add a tke source just at the base of the ML
+                               !        = 3 as = 1 applied on HF part of the stress           (ln_cpl=T)
+      rn_eice     =   2       !  below sea ice: =0 ON ; =4 OFF when ice fraction > 1/4   
+      ln_lc      = .true.     !  Langmuir cell parameterisation (Axell 2002)
+      rn_lc      =  0.20      !  coef. associated to Langmuir cells
+/
+!-----------------------------------------------------------------------
+&namzdf_iwm    !    internal wave-driven mixing parameterization        (ln_zdfiwm =T)
 !-----------------------------------------------------------------------
    nn_zpyc     = 2         !  pycnocline-intensified dissipation scales as N (=1) or N^2 (=2)
@@ -373,52 +411,56 @@
    ln_tsdiff   = .true.    !  account for differential T/S mixing (T) or not (F)
 /
-!-----------------------------------------------------------------------
-&namsol        !   elliptic solver / island / free surface
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi)
-!-----------------------------------------------------------------------
-   ln_nnogather=  .true.   !
-   jpni        =   22      !  jpni   number of processors following i (set automatically if < 1)
-   jpnj        =   22      !  jpnj   number of processors following j (set automatically if < 1)
-   jpnij       =  360      !  jpnij  number of local domains (set automatically if < 1), 360 for eORCA1/IPSLCM6-LR
-/
-!-----------------------------------------------------------------------
-&namctl        !   Control prints & Benchmark
-!----------------------------------------------------------------------- 
-/
-!-----------------------------------------------------------------------
-&namptr       !   Poleward Transport Diagnostic
-!-----------------------------------------------------------------------
-   ln_diaptr  = .true.      !  Poleward heat and salt transport (T) or not (F)
-   ln_subbas  = .true.      !  Atlantic/Pacific/Indian basins computation (T) or not
-                            !  (orca configuration only, need input basins mask file named "subbasins.nc"
-/
-!-----------------------------------------------------------------------
-&namhsb       !  Heat and salt budgets
-!-----------------------------------------------------------------------
-   ln_diahsb  = .true.  
-/
-!-----------------------------------------------------------------------
-&namdyn_nept  !   Neptune effect (simplified: lateral and vertical diffusions removed)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nam_vvl    !   vertical coordinate options
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_gls                !   GLS vertical diffusion                   ("key_zdfgls")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtrd        !   diagnostics on dynamics and/or tracer trends
-!              !       and/or mixed-layer trends and/or barotropic vorticity
+!!======================================================================
+!!                  ***  Diagnostics namelists  ***                   !!
+!!                                                                    !!
+!!   namtrd       dynamics and/or tracer trends                         (default: OFF)
+!!   namptr       Poleward Transport Diagnostics                        (default: OFF)
+!!   namhsb       Heat and salt budgets                                 (default: OFF)
+!!   namdiu       Cool skin and warm layer models                       (default: OFF)
+!!   namdiu       Cool skin and warm layer models                       (default: OFF)
+!!   namflo       float parameters                                      (default: OFF)
+!!   nam_diaharm  Harmonic analysis of tidal constituents               (default: OFF)
+!!   nam_diadct   transports through some sections                      (default: OFF)
+!!   nam_diatmb   Top Middle Bottom Output                              (default: OFF)
+!!   nam_dia25h   25h Mean Output                                       (default: OFF)
+!!   namnc4       netcdf4 chunking and compression settings             ("key_netcdf4")
+!!======================================================================
+!-----------------------------------------------------------------------
+&namtrd        !   trend diagnostics                                    (default: OFF)
 !-----------------------------------------------------------------------
    ln_tra_trd  = .true.   ! (T) 3D tracer trend output
 /
-!-----------------------------------------------------------------------
-&namsto       ! Stochastic parametrization of EOS
-!-----------------------------------------------------------------------
-/
+!
+!!======================================================================
+!!               ***  Observation & Assimilation  ***                 !!
+!!                                                                    !!
+!!   namobs       observation and model comparison                      (default: OFF)
+!!   nam_asminc   assimilation increments                               ('key_asminc')
+!!======================================================================
+!
+!!======================================================================
+!!                  ***  Miscellaneous namelists  ***                 !!
+!!                                                                    !!
+!!   nammpp            Massively Parallel Processing                    ("key_mpp_mpi")
+!!   namctl            Control prints                                   (default: OFF)
+!!   namsto            Stochastic parametrization of EOS                (default: OFF)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namctl        !   Control prints                                       (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsto        ! Stochastic parametrization of EOS                      (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namptr        !   Poleward Transport Diagnostic                        (default: OFF)
+!-----------------------------------------------------------------------
+   ln_diaptr   = .true.   !  Poleward heat and salt transport (T) or not (F)
+   ln_subbas   = .true.   !  Atlantic/Pacific/Indian basins computation (T) or not
+/
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ORCA025_cfg
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ORCA025_cfg	(revision 6656)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ORCA025_cfg	(revision 6658)
@@ -1,6 +1,19 @@
-
 !!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-!! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref
+!! NEMO/OCE  Configuration namelist : overwrite default values defined in SHARED/namelist_ref
 !!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!!             ORCA2 - ICE - PISCES configuration                     !!
+!!======================================================================
+!!              ***  Domain & Run management namelists  ***           !!
+!!                                                                    !!
+!!   namrun       parameters of the run
+!!   namdom       space and time domain
+!!   namcfg       parameters of the configuration                       (default: user defined GYRE)
+!!   namwad       Wetting and drying                                    (default: OFF)
+!!   namtsd       data: temperature & salinity                          (default: OFF)
+!!   namcrs       coarsened grid (for outputs and/or TOP)               (ln_crs =T)
+!!   namc1d       1D configuration options                              ("key_c1d")
+!!   namc1d_dyndmp 1D newtonian damping applied on currents             ("key_c1d")
+!!   namc1d_uvd   1D data (currents)                                    ("key_c1d")
+!!======================================================================
 !
 !-----------------------------------------------------------------------
@@ -13,5 +26,4 @@
    nn_leapy    = _AUTOBLOCKER_    !  Leap year calendar (1) or not (0)
    ln_rstart   = _AUTOBLOCKER_    !  start from rest (F) or from a restart file (T)
-   ln_rstart_ts = _AUTOBLOCKER_   !  start from rest for current only (F) or from a restart file (T)
    nn_rstctl   = _AUTOBLOCKER_    !  Restart control => activated only if ln_rstart = T
                            !    = 0 nn_date0 read in namelist ; nn_it000 : read in namelist
@@ -30,117 +42,131 @@
 /
 !-----------------------------------------------------------------------
-&namcfg        !   parameters of the configuration
-!-----------------------------------------------------------------------
-   cp_cfg      =  "orca"               !  name of the configuration
-   jp_cfg      =     025               !  resolution of the configuration
-   jpidta      =    1442               !  1st lateral dimension ( >= jpi )
-   jpjdta      =    1207               !  2nd    "         "    ( >= jpj )
-   jpkdta      =      75               !  number of levels      ( >= jpk )
-   jpiglo      =    1442               !  1st dimension of global domain --> i =jpidta
-   jpjglo      =    1207               !  2nd    -                  -    --> j  =jpjdta
-   jperio      =       6               !  lateral cond. type (between 0 and 6)
-/
-!-----------------------------------------------------------------------
-&namzgr        !   vertical coordinate
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzgr_sco    !   s-coordinate or hybrid z-s-coordinate
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdom        !   space and time domain (bathymetry, mesh, timestep)
-!-----------------------------------------------------------------------
-   nn_closea    =   1      !  remove (=0) or keep (=1) closed seas and lakes (ORCA)
-   ln_clodyn    =  _AUTOBLOCKER_      !  
-   !
-   jphgr_msh   =       0               !  type of horizontal mesh
-   ppglam0     =  999999.0             !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =  999999.0             ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_deg    =  999999.0             !  meridional grid-spacing (degrees)
-   ppe1_m      =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_m      =  999999.0             !  meridional grid-spacing (degrees)
-   ppsur       =   -3958.951371276829  !  ORCA r4, r2 and r05 coefficients
-   ppa0        =     103.9530096000000 ! (default coefficients)
-   ppa1        =       2.415951269000000   !
-   ppkth       =      15.35101370000000    !
-   ppacr       =       7.0             !
-   ppdzmin     =  999999.0             !  Minimum vertical spacing
-   pphmax      =  999999.0             !  Maximum depth
-   ppa2        =     100.7609285000000 !  Double tanh function parameters
-   ppkth2      =      48.02989372000000    !
-   ppacr2      =      13.00000000000   !
-   rn_rdt      =  600.     !  time step for the dynamics (and tracer if nn_acc=0)
-   rn_hmin     =   10.     !  min depth of the ocean (>0) or min number of ocean level (<0)
-   rn_e3zps_min=   25.     !  partial step thickness is set larger than the minimum of
-   rn_e3zps_rat=    0.1    !  rn_e3zps_min and rn_e3zps_rat*e3t, with 0<rn_e3zps_rat<1
-   nn_msh = _AUTO_   !  AUTO - Create (=1) a mesh file or not (=0)
-/
-!-----------------------------------------------------------------------
-&namsplit       
-!----------------------------------------------------------------------- 
-   ln_bt_fw      =    .FALSE.          !  leap-frog integration of barotropic equations
-   ln_bt_av      =    .TRUE.           !  Time filtering of barotropic variables
-   ln_bt_nn_auto =    .TRUE.           !  Set nn_baro automatically to be just below
-                                       !  a user defined maximum courant number (rn_bt_cmax)
-   nn_baro       =    80               !  Number of iterations of barotropic mode
-                                       !  during rn_rdt seconds. Only used if ln_bt_nn_auto=F
-   rn_bt_cmax    =    0.8              !  Maximum courant number allowed if ln_bt_nn_auto=T 
-   nn_bt_flt     =    1                !  Time filter choice
-                                       !  = 0 None
-                                       !  = 1 Boxcar over   nn_baro barotropic steps
-                                       !  = 2 Boxcar over 2*nn_baro     "        
-/
-!-----------------------------------------------------------------------
-&namcrs        !   Grid coarsening for dynamics output and/or
-               !   passive tracer coarsened online simulations
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtsd    !   data : Temperature  & Salinity
-!-----------------------------------------------------------------------
-   ln_tsd_tradmp = .false.  !  damping of ocean T & S toward T &S input data (T) or not (F)
+&namdom        !   time and space domain
+!-----------------------------------------------------------------------
+   rn_rdt      =   600.     !  time step for the dynamics and tracer
+   ln_meshmask =  _AUTO_
+/
+!-----------------------------------------------------------------------
+&namcfg        !   parameters of the configuration                      (default: use namusr_def in namelist_cfg)
+!-----------------------------------------------------------------------
+   ln_read_cfg = .true.    !  (=T) read the domain configuration file
+      cn_domcfg = "domain_cfg.nc"    ! domain configuration filename
+      !
+      ln_closea    = .true.    !  F => suppress closed seas (defined by closea_mask field) 
+      !                         !       from the bathymetry at runtime.
+/
+!-----------------------------------------------------------------------
+&namtsd        !    Temperature & Salinity Data  (init/dmp)             (default: OFF)
+!-----------------------------------------------------------------------
+   !                       ! =T  read T-S fields for:
+   ln_tsd_dmp  = .false.          !  T-S restoring   (see namtra_dmp)
+
+   cn_dir = './'     !  root directory for the T-S data location
+   !___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
+   !           !  file name              ! frequency (hours) ! variable  ! time interp.!  clim  ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
+   !           !                         !  (if <0  months)  !   name    !   (logical) !  (T/F) ! 'monthly' !                  ! pairing  !    filename   !
    sn_tem = 'conservative_temperature_WOA13_decav_Reg1L75_clim' , -1,  'votemper',  .false.       , .true., 'yearly'   , 'weights_3D_WOA13d1_2_eorca025_bilinear.nc', ' ' ,''  !
    sn_sal = 'absolute_salinity_WOA13_decav_Reg1L75_clim'        , -1,  'vosaline',  .false.       , .true., 'yearly'   , 'weights_3D_WOA13d1_2_eorca025_bilinear.nc', ' ' ,''  !
 /
-!-----------------------------------------------------------------------
-&namsbc        !   Surface Boundary Condition (surface module)
-!-----------------------------------------------------------------------
-   nn_fsbc     =  2        !  frequency of surface boundary condition computation
-                           !     (also = the frequency of sea-ice model call)
-   ln_blk_core = .false.   !  CORE bulk formulation                     (T => fill namsbc_core)
+!!======================================================================
+!!            ***  Surface Boundary Condition namelists  ***          !!
+!!                                                                    !!
+!!   namsbc          surface boundary condition manager                 (default: NO selection)
+!!   namsbc_flx      flux               formulation                     (ln_flx     =T)
+!!   namsbc_blk      Bulk formulae formulation                          (ln_blk     =T)
+!!   namsbc_cpl      CouPLed            formulation                     ("key_oasis3" )
+!!   namsbc_sas      Stand-Alone Surface module                         (SAS_SRC  only)
+!!   namsbc_iif      Ice-IF: use observed ice cover                     (nn_ice = 1   )
+!!   namtra_qsr      penetrative solar radiation                        (ln_traqsr  =T)
+!!   namsbc_ssr      sea surface restoring term (for T and/or S)        (ln_ssr     =T)
+!!   namsbc_rnf      river runoffs                                      (ln_rnf     =T)
+!!   namsbc_apr      Atmospheric Pressure                               (ln_apr_dyn =T)
+!!   namsbc_isf      ice shelf melting/freezing                         (ln_isfcav  =T : read (ln_read_cfg=T) or set or usr_def_zgr )
+!!   namsbc_iscpl    coupling option between land ice model and ocean   (ln_isfcav  =T)
+!!   namsbc_wave     external fields from wave model                    (ln_wave    =T)
+!!   namberg         iceberg floats                                     (ln_icebergs=T)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&namsbc        !   Surface Boundary Condition manager                   (default: NO selection)
+!-----------------------------------------------------------------------
+   nn_fsbc     = 2         !  frequency of SBC module call
+                           !     (also = the frequency of sea-ice & iceberg model call)
+                     ! Type of air-sea fluxes 
    ln_cpl      = .true.    !  atmosphere coupled   formulation          ( requires key_oasis3 )
-   nn_limflx =   2         !  LIM3 Multi-category heat flux formulation (use -1 if LIM3 is not used)
-                           !  =-1  Use per-category fluxes, bypass redistributor, forced mode only, not yet implemented coupled
-                           !  = 0  Average per-category fluxes (forced and coupled mode)
-                           !  = 1  Average and redistribute per-category fluxes, forced mode only, not yet implemented coupled
-                           !  = 2  Redistribute a single flux over categories (coupled mode only)
-   nn_ice_embd = 1         !  AUTO - 
-                           !  =0 levitating ice (no mass exchange, concentration/dilution effect)
-                           !  =1 levitating ice with mass and salt exchange but no presure effect
-                           !  =2 embedded sea-ice (full salt and mass exchanges and pressure)
-   ln_rnf      = .false.   !  runoffs                                   (T => fill namsbc_rnf)
-   ln_ssr      = .false.   !  Sea Surface Restoring on T and/or S       (T => fill namsbc_ssr)
-   nn_fwb      = 0         !  FreshWater Budget: =0 unchecked
-   nn_isf      = 3         !  ice shelf melting/freezing                (/=0 => fill namsbc_isf)
-                           !  3 = rnf file for isf
-!-----------------------------------------------------------------------
-&namsbc_core   !   namsbc_core  CORE bulk formulae
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtra_qsr    !   penetrative solar radiation
-!-----------------------------------------------------------------------
+                     ! Sea-ice :
+   nn_ice      = 2         !  =2 or 3 automatically for SI3 or CICE    ("key_si3" or "key_cice")
+                     ! Misc. options of sbc : 
+   ln_traqsr   = .true.   !  Light penetration in the ocean            (T => fill namtra_qsr)
+   ln_isf      = .true.   !  ice shelf                                 (T   => fill namsbc_isf & namsbc_iscpl)
+/
+!-----------------------------------------------------------------------
+&namsbc_blk    !   namsbc_blk  generic Bulk formula                     (ln_blk =T)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_cpl    !   coupled ocean/atmosphere model                       ("key_oasis3")
+!-----------------------------------------------------------------------
+   nn_cplmodel   =     1   !  Maximum number of models to/from which NEMO is potentially sending/receiving data
+   ln_usecplmask = .false. !  use a coupling mask file to merge data received from several models
+   !                       !   -> file cplmask.nc with the float variable called cplmask (jpi,jpj,nn_cplmodel)
+   nn_cats_cpl   =     5   !  Number of sea ice categories over which coupling is to be carried out (if not 1)
+   !_____________!__________________________!____________!_____________!______________________!________!
+   !             !        description       !  multiple  !    vector   !       vector         ! vector !
+   !             !                          ! categories !  reference  !     orientation      ! grids  !
+!***   send    ***
+   sn_snd_temp   =   'weighted oce and ice' ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_snd_alb    =   'weighted ice'         ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_snd_crt    =   'mixed oce-ice'        ,    'no'    , 'spherical' , 'eastward-northward' ,  'T'
+   sn_snd_co2    =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+!***  receive  ***
+   sn_rcv_w10m   =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_taumod =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_tau    =   'mixed oce-ice'        ,    'no'    , 'cartesian' , 'eastward-northward' ,  'U,V'
+   sn_rcv_dqnsdt =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_qsr    =   'conservative'         ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_qns    =   'conservative'         ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_emp    =   'conservative'         ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_rnf    =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_cal    =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_co2    =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_isf    =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_icb    =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+/
+!-----------------------------------------------------------------------
+&namtra_qsr    !   penetrative solar radiation                          (ln_traqsr =T)
+!-----------------------------------------------------------------------
+   !                       ! type of penetration                        (default: NO selection)
+   ln_qsr_rgb  = .true.       !  RGB light penetration (Red-Green-Blue)
+   !
+   cn_dir = './'  !  root directory for the location of the runoff files
+   !___________!_____________!___________________!___________!_____________!_________!___________!__________!__________!_______________!
+   !           !  file name  ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation ! land/sea mask !
+   !           !             !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      !
    sn_chl      ='merged_ESACCI_BIOMER4V1R1_CHL_REG05',  -1  , 'CHLA' , .true. , .true. , 'yearly' , 'weights_reg05_2_eorca025_bilinear.nc' , '' , ''
-   ln_traqsr   = .true.    !  Light penetration (T) or not (F)
-   ln_qsr_rgb  = .true.    !  RGB (Red-Green-Blue) light penetration
-   ln_qsr_2bd  = .false.   !  2 bands              light penetration
-/
-!-----------------------------------------------------------------------
-&namsbc_rnf    !   runoffs namelist surface boundary condition
-!-----------------------------------------------------------------------
-!              !  file name           ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation ! land/sea mask !
-!              !                      !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      !
+/
+!-----------------------------------------------------------------------
+&namsbc_ssr    !   surface boundary condition : sea surface restoring   (ln_ssr =T)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_rnf    !   runoffs                                              (ln_rnf =T)
+!-----------------------------------------------------------------------
+   ln_rnf_mouth = .false.   !  specific treatment at rivers mouths
+      rn_hrnf     =  15.e0    !  depth over which enhanced vertical mixing is used    (ln_rnf_mouth=T)
+      rn_avt_rnf  =   1.e-3   !  value of the additional vertical mixing coef. [m2/s] (ln_rnf_mouth=T)
+   rn_rfact    =   1.e0    !  multiplicative factor for runoff
+   ln_rnf_depth = .false.   !  read in depth information for runoff
+   ln_rnf_tem  = .false.   !  read in temperature information for runoff
+   ln_rnf_sal  = .false.   !  read in salinity information for runoff
+   ln_rnf_depth_ini = .false. ! compute depth at initialisation from runoff file
+      rn_rnf_max  = 0.027394  !  max value of the runoff climatologie over global domain ( ln_rnf_depth_ini = .true )
+      rn_dep_max  = 150.      !  depth over which runoffs is spread ( ln_rnf_depth_ini = .true )
+      nn_rnf_depth_file = _AUTO_   !  create (=1) a runoff depth file or not (=0)
+
+   cn_dir = './'  !  root directory for the location of the runoff files
+   !___________!_____________!___________________!___________!_____________!_________!___________!__________!__________!_______________!
+   !           !  file name  ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation ! land/sea mask !
+   !           !             !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      !
    sn_rnf      = 'eORCA_R025_runoff_v1.2',        -1         , 'sorunoff',   .true.     , .true. , 'yearly'  , ''       , ''  , ''
    sn_i_rnf    = 'eORCA_R025_runoff_v1.2',        -1         , 'Icb_flux',   .true.     , .true. , 'yearly'  , ''       , ''       , ''
@@ -149,219 +175,242 @@
    sn_t_rnf    = 'eORCA_R025_runoff_v1.2',        24         , 'rotemper',   .true.     , .true. , 'yearly'  , ''       , ''  , ''
    sn_dep_rnf  = 'eORCA_R025_runoff_v1.2',         0         , 'rodepth' ,   .false.    , .true. , 'yearly'  , ''       , ''  , ''
-!
-   ln_rnf_icb   = .false.    !  read in iceberg flux
-   ln_rnf_mouth = .false.    !  specific treatment at rivers mouths
-   ln_rnf_depth = .false.     !  read in depth information for runoff
-   ln_rnf_tem   = .false.    !  read in temperature information for runoff
-   ln_rnf_sal   = .false.    !  read in salinity information for runoff
-   ln_rnf_depth_ini = .true. !  compute depth at initialisation from runoff file
-   rn_rnf_max   = 0.027394   !  max value of the runoff climatology over global domain ( if ln_rnf_depth_ini = .true )
-   rn_dep_max = 150.         !  depth over which runoffs is spread ( ln_rnf_depth_ini = .true )
-   nn_rnf_depth_file = _AUTO_  ! create (=1) a runoff depth file or not (=0)
-/
-!-----------------------------------------------------------------------
-&namsbc_isf    !  Top boundary layer (ISF)
-!-----------------------------------------------------------------------
-!              ! file name ! frequency (hours) ! variable ! time interpol. !  clim   ! 'yearly'/ ! weights  ! rotation !
-!              !           !  (if <0  months)  !   name   !    (logical)   !  (T/F)  ! 'monthly' ! filename ! pairing  !
-!              !
-   sn_rnfisf     = 'eORCA_R025_runoff_v1.2' ,   -12      ,'sornfisf',    .false.      , .true.  , 'yearly'  ,  ''      ,   ''
-   sn_depmax_isf = 'eORCA_R025_runoff_v1.2' ,   -12      ,'sodepmax_isf' ,   .false.  , .true.  , 'yearly'  ,  ''      ,   ''
-   sn_depmin_isf = 'eORCA_R025_runoff_v1.2' ,   -12      ,'sodepmin_isf' ,   .false.  , .true.  , 'yearly'  ,  ''      ,   ''
-/
-!-----------------------------------------------------------------------
-&namsbc_apr    !   Atmospheric pressure used as ocean forcing or in bulk
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_ssr    !   surface boundary condition : sea surface restoring
-!-----------------------------------------------------------------------
-!              !   file name  ! frequency (hours) ! variable   ! time interpol. !  clim   ! 'yearly'/ ! weights  ! rotation !
-!              !              !  (if <0  months)  !   name     !    (logical)   !  (T/F)  ! 'monthly' ! filename ! pairing  !
-/
-!-----------------------------------------------------------------------
-&namsbc_alb    !   albedo parameters
-!-----------------------------------------------------------------------
-   nn_ice_alb   =    1   !  parameterization of ice/snow albedo
-                         !     0: Shine & Henderson-Sellers (JGR 1985), giving clear-sky albedo
-                         !     1: "home made" based on Brandt et al. (JClim 2005) and Grenfell & Perovich (JGR 2004),
-                         !        giving cloud-sky albedo
-   rn_alb_sdry  =  0.87  !  dry snow albedo         : 0.80 (nn_ice_alb = 0); 0.85 (nn_ice_alb = 1); obs 0.85-0.87 (cloud-sky)
-   rn_alb_smlt  =  0.82  !  melting snow albedo     : 0.65 ( '' )          ; 0.75 ( '' )          ; obs 0.72-0.82 ( '' )
-   rn_alb_idry  =  0.65  !  dry ice albedo          : 0.72 ( '' )          ; 0.60 ( '' )          ; obs 0.54-0.65 ( '' )
-   rn_alb_imlt  =  0.58  !  bare puddled ice albedo : 0.53 ( '' )          ; 0.50 ( '' )          ; obs 0.49-0.58 ( '' )
-/
-!-----------------------------------------------------------------------
-&namsbc_cpl    !   coupling parameters
-!-----------------------------------------------------------------------
-!                    !     description       !  multiple  !    vector   !      vector          ! vector !
-!                    !                       ! categories !  reference  !    orientation       ! grids  !
-! send
-sn_snd_temp   =       'weighted oce and ice' ,    'no'    ,     ''      ,         ''           ,   ''
-sn_snd_alb    =       'weighted ice'         ,    'no'    ,     ''      ,         ''           ,   ''
-sn_snd_thick  =       'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
-sn_snd_crt    =       'mixed oce-ice'        ,    'no'    , 'cartesian' , 'eastward-northward' ,  'T'
-sn_snd_co2    =       'none'              ,    'no'    ,     ''      ,         ''           ,   ''
-! receive
-sn_rcv_w10m   =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_taumod =       'none'                 ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_tau    =       'mixed oce-ice'        ,    'no'    , 'cartesian' , 'eastward-northward',  'U,V'
-sn_rcv_dqnsdt =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_qsr    =       'conservative'         ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_qns    =       'conservative'         ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_emp    =       'conservative'         ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_rnf    =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_cal    =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_co2    =       'none'              ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_icb    =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_isf    =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
+/
+!-----------------------------------------------------------------------
+&namsbc_isf    !  Top boundary layer (ISF)                              (ln_isfcav =T : read (ln_read_cfg=T)
+!-----------------------------------------------------------------------             or set or usr_def_zgr )
+   !                 ! type of top boundary layer
+   nn_isf      = 3         !  ice shelf melting/freezing
+                           !  3 = rnf file for ISF  
+   !_____________!_________________________!___________________!_______________!_____________!_________!___________!__________!__________!_______________!
+   !             !  file name              ! frequency (hours) ! variable      ! time interp.!  clim   ! 'yearly'/ ! weights  ! rotation ! land/sea mask !
+   !             !                         !  (if <0  months)  !   name        !  (logical)  !  (T/F)  ! 'monthly' ! filename ! pairing  ! filename      !
+   sn_rnfisf     = 'eORCA_R025_runoff_v1.2',          -12      ,'sornfisf'     ,   .false.   , .true.  , 'yearly'  ,  ''      ,   ''
+   sn_depmax_isf = 'eORCA_R025_runoff_v1.2',          -12      ,'sodepmax_isf' ,   .false.   , .true.  , 'yearly'  ,  ''      ,   ''
+   sn_depmin_isf = 'eORCA_R025_runoff_v1.2',          -12      ,'sodepmin_isf' ,   .false.   , .true.  , 'yearly'  ,  ''      ,   ''
+/
+!-----------------------------------------------------------------------
+&namsbc_wave   ! External fields from wave model                        (ln_wave=T)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namberg       !   iceberg parameters                                   (default: OFF)
+!-----------------------------------------------------------------------
+/
+!!======================================================================
+!!               ***  Lateral boundary condition  ***                 !!
+!!                                                                    !!
+!!   namlbc        lateral momentum boundary condition                  (default: NO selection)
+!!   namagrif      agrif nested grid   (read by child model only)       ("key_agrif")
+!!   nam_tide      Tidal forcing                                        (default: OFF)
+!!   nambdy        Unstructured open boundaries                         (default: OFF)
+!!   nambdy_dta    Unstructured open boundaries - external data         (see  nambdy)
+!!   nambdy_tide   tidal forcing at open boundaries                     (default: OFF)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&namlbc        !   lateral momentum boundary condition                  (default: NO selection)
+!-----------------------------------------------------------------------
+   rn_shlat    =    0.     !  no slip
+/
+!-----------------------------------------------------------------------
+&namagrif      !  AGRIF zoom                                            ("key_agrif")
+!-----------------------------------------------------------------------
+/
+!!======================================================================
+!!                ***  Top/Bottom boundary condition  ***             !!
+!!                                                                    !!
+!!   namdrg        top/bottom drag coefficient                          (default: NO selection)
+!!   namdrg_top    top    friction                                      (ln_OFF=F & ln_isfcav=T)
+!!   namdrg_bot    bottom friction                                      (ln_OFF=F)
+!!   nambbc        bottom temperature boundary condition                (default: OFF)
+!!   nambbl        bottom boundary layer scheme                         (default: OFF)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&namdrg        !   top/bottom drag coefficient                          (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_non_lin  = .true.   !  non-linear  drag: Cd = Cd0 |U|
+   ln_loglayer = .false.   !  logarithmic drag: Cd = vkarmn/log(z/z0) |U|
+   !
+   ln_drgimp   = .true.    !  implicit top/bottom friction flag
+/
+!-----------------------------------------------------------------------
+&namdrg_bot    !   BOTTOM friction                                      (ln_OFF =F)
+!-----------------------------------------------------------------------
+   rn_Cd0      =  1.e-3    !  drag coefficient [-]
+   rn_Cdmax    =  0.1      !  drag value maximum [-] (logarithmic drag)
+   rn_ke0      =  2.5e-3   !  background kinetic energy  [m2/s2] (non-linear cases)
+   rn_z0       =  3.e-3    !  roughness [m] (ln_loglayer=T)
+   ln_boost    = .false.   !  =T regional boost of Cd0 ; =F constant
+      rn_boost =  50.         !  local boost factor  [-]
+/
+!-----------------------------------------------------------------------
+&nambbc        !   bottom temperature boundary condition                (default: OFF)
+!-----------------------------------------------------------------------
+   ln_trabbc   = .true.    !  Apply a geothermal heating at the ocean bottom
+      nn_geoflx   =    2      !  geothermal heat flux: = 2 read variable flux [mW/m2]
 
-/
-!-----------------------------------------------------------------------
-&namberg       !   iceberg parameters
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namlbc        !   lateral momentum boundary condition
-!-----------------------------------------------------------------------
-   rn_shlat    =    0.0    !  shlat = 0  !  0 < shlat < 2  !  shlat = 2  !  2 < shlat
-   ln_vorlat   = .false.   !  consistency of vorticity boundary condition with analytical eqs.
-   ln_shlat2d  = .true.    !  use 2D file for shlat
-!              !  file name    ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation !
-!              !               !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  !
-   sn_shlat2d  =  'shlat2d.nc' ,  -12             , 'shlat2d' ,  .false.    , .true.  ,  'yearly' , ''       , ''
-/
-!-----------------------------------------------------------------------
-&namcla        !   cross land advection
-!-----------------------------------------------------------------------
-   nn_cla      =    0      !  advection between 2 ocean pts separates by land
-/
-!-----------------------------------------------------------------------
-&nambfr        !   bottom friction
-!-----------------------------------------------------------------------
-   nn_bfr      =    2      !  type of bottom friction :   = 0 : free slip,  = 1 : linear friction
-                           !                              = 2 : nonlinear friction
-   ln_bfr2d    = .true.    !  horizontal variation of the bottom friction coef (read a 2D mask file )
-   rn_bfrien   =    10.    !  local multiplying factor of bfr (ln_bfr2d=T)
-   ln_bfrimp   = .false.   !  implicit bottom friction (requires ln_zdfexp = .false. if true)
-/
-!-----------------------------------------------------------------------
-&nambbc        !   bottom temperature boundary condition
-!-----------------------------------------------------------------------
-   sn_qgh      ='Goutorbe_ghflux.nc',  -12.  , 'gh_flux'    ,   .false.     , .true. , 'yearly'  , 'weights_Goutorbe1_2_eorca025_bilinear.nc'       , ''       , ''
-   !
-   cn_dir      = './'      !  root directory for the location of the runoff files
-   nn_geoflx   =    2      !  geothermal heat flux: = 0 no flux
-/
-!-----------------------------------------------------------------------
-&nambbl        !   bottom boundary layer scheme
-!-----------------------------------------------------------------------
-   nn_bbl_ldf  =  1      !  diffusive bbl (=1)   or not (=0)
-   nn_bbl_adv  =  1      !  advective bbl (=1/2) or not (=0)
-   rn_ahtbbl   =  1000.  !  lateral mixing coefficient in the bbl  [m2/s]
-   rn_gambbl   =  10.    !  advective bbl coefficient                 [s]
-/
-!-----------------------------------------------------------------------
-&nameos        !   ocean physical parameters
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtra_adv    !   advection scheme for tracer
-!-----------------------------------------------------------------------
-   ln_traadv_tvd    =  .true.   !  TVD scheme
-/
-!-----------------------------------------------------------------------
-&namtra_adv_mle !  mixed layer eddy parametrisation (Fox-Kemper param)
-!-----------------------------------------------------------------------
-   ln_mle    = .true.      ! (T) use the Mixed Layer Eddy (MLE) parameterisation
+   cn_dir = './'  !  root directory for the geothermal data location
+   !___________!____________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
+   !           !  file name         ! frequency (hours) ! variable  ! time interp.!  clim  ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
+   !           !                    !  (if <0  months)  !   name    !   (logical) !  (T/F) ! 'monthly' !                  ! pairing  !    filename   !
+   sn_qgh      ='Goutorbe_ghflux.nc',        -12.       , 'gh_flux' ,   .false.   , .true. , 'yearly'  , 'weights_Goutorbe1_2_eorca1_bilinear.nc'       , ''       , ''
+/
+!-----------------------------------------------------------------------
+&nambbl        !   bottom boundary layer scheme                         (default: OFF)
+!-----------------------------------------------------------------------
+   ln_trabbl   = .true.    !  Bottom Boundary Layer parameterisation flag
+      nn_bbl_ldf  =  1        !  diffusive bbl (=1)   or not (=0)
+      nn_bbl_adv  =  0        !  advective bbl (=1/2) or not (=0)
+      rn_ahtbbl   =  1000.    !  lateral mixing coefficient in the bbl  [m2/s]
+      rn_gambbl   =  10.      !  advective bbl coefficient                 [s]
+/
+!!======================================================================
+!!                        Tracer (T-S) namelists                      !!
+!!                                                                    !!
+!!   nameos        equation of state                                    (default: NO selection)
+!!   namtra_adv    advection scheme                                     (default: NO selection)
+!!   namtra_ldf    lateral diffusion scheme                             (default: NO selection)
+!!   namtra_mle    mixed layer eddy param. (Fox-Kemper param.)          (default: OFF)
+!!   namtra_eiv    eddy induced velocity param.                         (default: OFF)
+!!   namtra_dmp    T & S newtonian damping                              (default: OFF)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&nameos        !   ocean Equation Of Seawater                           (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_teos10   = .true.         !  = Use TEOS-10
+/
+!-----------------------------------------------------------------------
+&namtra_adv    !   advection scheme for tracer                          (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_traadv_fct = .true.     !  FCT scheme
+      nn_fct_h   =  2               !  =2/4, horizontal 2nd / 4th order 
+      nn_fct_v   =  2               !  =2/4, vertical   2nd / COMPACT 4th order 
+/
+!-----------------------------------------------------------------------
+&namtra_ldf    !   lateral diffusion scheme for tracers                 (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_traldf_lap   = .true.    !    laplacian operator
+   ln_traldf_iso   = .true.    !  iso-neutral (Standard operator)
+   ln_traldf_msc   = .true.    !  Method of Stabilizing Correction      (both operators)
+   !                       !  Coefficients:
+   nn_aht_ijk_t    = 20        !  space/time variation of eddy coef
+      !                             !   = 20     aht = 1/2  Ud. max(e1,e2)
+      rn_Ud        = 0.018          !  lateral diffusive velocity [m/s] (nn_aht_ijk_t= 0, 10, 20, 30)
+      rn_Ld        = 25.e+3        !  lateral diffusive length   [m]   (nn_aht_ijk_t= 0, 10)
+/
+!-----------------------------------------------------------------------
+&namtra_mle    !   mixed layer eddy parametrisation (Fox-Kemper)        (default: OFF)
+!-----------------------------------------------------------------------
+   ln_mle      = .true.   ! (T) use the Mixed Layer Eddy (MLE) parameterisation
    rn_ce     = 0.3        ! magnitude of the MLE (typical value: 0.06 to 0.08)
 /
-!----------------------------------------------------------------------------------
-&namtra_ldf    !   lateral diffusion scheme for tracers
-!----------------------------------------------------------------------------------
+!-----------------------------------------------------------------------
+&namtra_eiv    !   eddy induced velocity param.                         (default: OFF)
+!-----------------------------------------------------------------------
+   ln_ldfeiv   = .true.    ! use eddy induced velocity parameterization
+      !                        !  Coefficients:
+      nn_aei_ijk_t  = 21          ! space/time variation of the eiv coeficient
+      !                                !   = 21 F(i,j,t)  =Treguier et al. JPO 1997 formulation
+      !                           !  time invariant coefficients:  aei0 = 1/2  Ue*Le 
+      rn_Ue        = 0.018             !  lateral diffusive velocity [m/s] (nn_aht_ijk_t= 0, 10, 20, 30)
+      rn_Le        = 25.e+3           !  lateral diffusive length   [m]   (nn_aht_ijk_t= 0, 10)
+      !
+      ln_ldfeiv_dia =.true.   ! diagnose eiv stream function and velocities
+/
+!-----------------------------------------------------------------------
+&namtra_dmp    !   tracer: T & S newtonian damping                      (default: OFF)
+!-----------------------------------------------------------------------
+   ln_tradmp   =  .false.   !  add a damping term (using resto.nc coef.)
+      nn_zdmp  =    0         !  vertical shape =0    damping throughout the water column
+/
+!!======================================================================
+!!                      ***  Dynamics namelists  ***                  !!
+!!                                                                    !!
+!!   nam_vvl       vertical coordinate options                          (default: z-star)
+!!   namdyn_adv    formulation of the momentum advection                (default: NO selection)
+!!   namdyn_vor    advection scheme                                     (default: NO selection)
+!!   namdyn_hpg    hydrostatic pressure gradient                        (default: NO selection)
+!!   namdyn_spg    surface pressure gradient                            (default: NO selection)
+!!   namdyn_ldf    lateral diffusion scheme                             (default: NO selection)
+!!   namdta_dyn    offline TOP: dynamics read in files                  (OFF_SRC only)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&namdyn_adv    !   formulation of the momentum advection                (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_dynadv_ubs   = .true.  !  vector form - 2nd centered scheme
+     nn_dynkeg     = 1        ! grad(KE) scheme: =0   C2  ;  =1   Hollingsworth correction
+/
+!-----------------------------------------------------------------------
+&namdyn_vor    !   Vorticity / Coriolis scheme                          (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_dynvor_ene = .true. !  enstrophy conserving scheme
+      nn_een_e3f = 0          ! =0   e3f = mean masked e3t divided by 4
+/
+!-----------------------------------------------------------------------
+&namdyn_hpg    !   Hydrostatic pressure gradient option                 (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_hpg_sco  = .true.   !  s-coordinate (standard jacobian formulation)
+/
+!-----------------------------------------------------------------------
+&namdyn_spg    !   surface pressure gradient                            (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_dynspg_ts  = .true.  !  split-explicit free surface
+/
+!-----------------------------------------------------------------------
+&namdyn_ldf    !   lateral diffusion on momentum                        (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_dynldf_lap =  .true.     !    laplacian operator
+   ln_dynldf_lev =  .true.     !  iso-level
+   nn_ahm_ijk_t  = -30           !  space/time variation of eddy coefficient :
+      !                             !  =-30  read in eddy_viscosity_3D.nc file
+/
+!!======================================================================
+!!                     vertical physics namelists                     !!
+!!                                                                    !!
+!!    namzdf        vertical physics manager                            (default: NO selection)
+!!    namzdf_ric    richardson number vertical mixing                   (ln_zdfric=T)
+!!    namzdf_tke    TKE vertical mixing                                 (ln_zdftke=T)
+!!    namzdf_gls    GLS vertical mixing                                 (ln_zdfgls=T)
+!!    namzdf_osm    OSM vertical diffusion                              (ln_zdfosm=T)
+!!    namzdf_iwm    tidal mixing parameterization                       (ln_zdfiwm=T)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&namzdf        !   vertical physics manager                             (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_zdftke   = .true.       !  Turbulent Kinetic Energy closure       (T =>   fill namzdf_tke)
+   ln_zdfevd   = .true.       !  Enhanced Vertical Diffusion scheme
+      nn_evdm  =    0            !  evd apply on tracer (=0) or on tracer and momentum (=1)
+      rn_evd   =  100.           !  evd mixing coefficient [m2/s]
+   ln_zdfddm   = .true.    ! double diffusive mixing
+      rn_avts  =    1.e-4     !  maximum avs (vertical mixing on salinity)
+      rn_hsbfr =    1.6       !  heat/salt buoyancy flux ratio
+   ln_zdfiwm   = .false.       ! internal wave-induced mixing            (T =>   fill namzdf_iwm)
    !                       !  Coefficients
-   rn_aeiv_0        =  1000.     !  eddy induced velocity coefficient [m2/s]
-   rn_aht_0         =  300.     !  horizontal eddy diffusivity for tracers [m2/s]
-   rn_ahtb_0        =     0.    !  background eddy diffusivity for ldf_iso [m2/s]
-/
-!-----------------------------------------------------------------------
-&namtra_dmp    !   tracer: T & S newtonian damping
-!-----------------------------------------------------------------------
-   ln_tradmp   =  .false.  !  add a damping termn (T) or not (F)
-/
-!-----------------------------------------------------------------------
-&namdyn_adv    !   formulation of the momentum advection
-!-----------------------------------------------------------------------
-   ln_dynadv_vec = .false.  !  vector form (T) or flux form (F)
-   nn_dynkeg     = 1       ! scheme for grad(KE): =0   C2  ;  =1   Hollingsworth correction
-   ln_dynadv_ubs = .true. !  flux form - 3rd order UBS      scheme
-/
-!-----------------------------------------------------------------------
-&nam_vvl    !   vertical coordinate options
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdyn_vor    !   option of physics/algorithm (not control by CPP keys)
-!-----------------------------------------------------------------------
-   ln_dynvor_ene = .true. !  enstrophy conserving scheme
-   ln_dynvor_een = .false. !  enstrophy conserving scheme
-/
-!-----------------------------------------------------------------------
-&namdyn_hpg    !   Hydrostatic pressure gradient option
-!-----------------------------------------------------------------------
-   ln_hpg_zps  = .false.    !  s-coordinate (standard jacobian formulation)
-   ln_hpg_sco  = .true.    !  s-coordinate (standard jacobian formulation)
-                           !           centered      time scheme  (F)
-/
-!-----------------------------------------------------------------------
-&namdyn_ldf    !   lateral diffusion on momentum
-!-----------------------------------------------------------------------
-   !                       !  Type of the operator :
-   ln_dynldf_lap    =  .false.  !  laplacian operator
-   ln_dynldf_bilap  =  .true.   !  bilaplacian operator
-   !                       !  Direction of action  :
-   ln_dynldf_hor    =  .true.   !  horizontal (geopotential)            (require "key_ldfslp" in s-coord.)
-   !                       !  Coefficient
-   rn_ahm_0_blp     =    -6.4e11  !  horizontal bilaplacian eddy viscosity [m4/s]
-   rn_cmsh          =     0.    !  1 or 0 , if 0 -use only shear for Smagorinsky viscosity
-   rn_ahm_m_blp     =    -1.e12 !  upper limit for bilap  abs(ahm) < min( dx^4/128rdt, rn_ahm_m_blp)
-/
-!-----------------------------------------------------------------------
-&namzdf        !   vertical physics
-!-----------------------------------------------------------------------
-   rn_avm0     =   1.e-4   !  vertical eddy viscosity   [m2/s]          (background Kz if not "key_zdfcst")
-   rn_avt0     =   1.e-5   !  vertical eddy diffusivity [m2/s]          (background Kz if not "key_zdfcst")
-   nn_havtb    =    1      !  horizontal shape for avtb (=1) or not (=0)
-   ln_zdfevd   = .true.    !  enhanced vertical diffusion (evd) (T) or not (F)
-   nn_evdm     =    1      !  evd apply on tracer (=0) or on tracer and momentum (=1)
-   rn_avevd    =   10.     !  evd mixing coefficient [m2/s]
-/
-!-----------------------------------------------------------------------
-&namzdf_tke    !   turbulent eddy kinetic dependent vertical diffusion  ("key_zdftke")
-!-----------------------------------------------------------------------
-  nn_etau     = 0         !  penetration of tke below the mixed layer (ML) due to internal & intertial waves
-                          !    = 0 no penetration
-                          !    = 1 add a tke source below the ML
-                          !    = 2 add a tke source just at the base of the ML
-                          !    = 3 as = 1 applied on HF part of the stress    ("key_oasis3")
-  nn_mxl0     = 2         ! type of scaling under sea-ice
-                          !    = 0 no scaling under sea-ice
-                          !    = 1 scaling with constant sea-ice thickness
-                          !    = 2  scaling with mean sea-ice thickness
-                          !    = 3  scaling with maximum sea-ice thickness
-  rn_hice    = 10.        ! max constant ice thickness value when scaling under sea-ice ( nn_mxl0=1)
-  ln_lc      = .true.     !  Langmuir cell parameterisation (Axell 2002)
-  rn_lc      =  0.20      !  coef. associated to Langmuir cells
-/
-!-----------------------------------------------------------------------
-&namzdf_ddm    !   double diffusive mixing parameterization             ("key_zdfddm")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_tmx    !   tidal mixing parameterization                        ("key_zdftmx")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_tmx_new    !   new tidal mixing parameterization                ("key_zdftmx_new")
+   rn_avm0     =   1.2e-4     !  vertical eddy viscosity   [m2/s]       (background Kz if ln_zdfcst=F)
+   rn_avt0     =   1.2e-5     !  vertical eddy diffusivity [m2/s]       (background Kz if ln_zdfcst=F)
+   nn_avb      =    0         !  profile for background avt & avm (=1) or not (=0)
+   nn_havtb    =    0         !  horizontal shape for avtb (=1) or not (=0)
+/
+!-----------------------------------------------------------------------
+&namzdf_tke    !   turbulent eddy kinetic dependent vertical diffusion  (ln_zdftke =T)
+!-----------------------------------------------------------------------
+      nn_mxl      =   2       !  mixing length: = 0 bounded by the distance to surface and bottom
+      !                       !                 = 1 bounded by the local vertical scale factor
+      !                       !                 = 2 first vertical derivative of mixing length bounded by 1
+      !                       !                 = 3 as =2 with distinct dissipative an mixing length scale
+      nn_etau     =   0       !  penetration of tke below the mixed layer (ML) due to NIWs
+                               !        = 0 none ; = 1 add a tke source below the ML
+                               !        = 2 add a tke source just at the base of the ML
+                               !        = 3 as = 1 applied on HF part of the stress           (ln_cpl=T)
+      rn_eice     =   2       !  below sea ice: =0 ON ; =4 OFF when ice fraction > 1/4   
+      ln_lc      = .true.     !  Langmuir cell parameterisation (Axell 2002)
+      rn_lc      =  0.20      !  coef. associated to Langmuir cells
+/
+!-----------------------------------------------------------------------
+&namzdf_iwm    !    internal wave-driven mixing parameterization        (ln_zdfiwm =T)
 !-----------------------------------------------------------------------
    nn_zpyc     = 2         !  pycnocline-intensified dissipation scales as N (=1) or N^2 (=2)
@@ -369,51 +418,56 @@
    ln_tsdiff   = .true.    !  account for differential T/S mixing (T) or not (F)
 /
-!-----------------------------------------------------------------------
-&namsol        !   elliptic solver / island / free surface
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi)
-!-----------------------------------------------------------------------
-   ln_nnogather=  .true.   !
-    jpni        =   85      !  jpni   number of processors following i (set automatically if < 1)
-    jpnj        =   47      !  jpnj   number of processors following j (set automatically if < 1)
-    jpnij       =  2489     !  jpnij  number of local domains (set automatically if < 1)
-/
-!-----------------------------------------------------------------------
-&namctl        !   Control prints & Benchmark
-!----------------------------------------------------------------------- 
-/
-!-----------------------------------------------------------------------
-&namptr       !   Poleward Transport Diagnostic
-!-----------------------------------------------------------------------
-   ln_diaptr  = .true.      !  Poleward heat and salt transport (T) or not (F)
-   ln_subbas  = .true.      !  Atlantic/Pacific/Indian basins computation (T) or not
-                            !  (orca configuration only, need input basins mask file named "subbasins.nc"
-/
-!-----------------------------------------------------------------------
-&namhsb       !  Heat and salt budgets
-!-----------------------------------------------------------------------
-   ln_diahsb  = .false.  
-/
-!-----------------------------------------------------------------------
-&namdyn_nept  !   Neptune effect (simplified: lateral and vertical diffusions removed)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nam_vvl    !   vertical coordinate options
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_gls                !   GLS vertical diffusion                   ("key_zdfgls")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtrd        !   diagnostics on dynamics and/or tracer trends
-!              !       and/or mixed-layer trends and/or barotropic vorticity
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsto       ! Stochastic parametrization of EOS
-!-----------------------------------------------------------------------
-/
+!!======================================================================
+!!                  ***  Diagnostics namelists  ***                   !!
+!!                                                                    !!
+!!   namtrd       dynamics and/or tracer trends                         (default: OFF)
+!!   namptr       Poleward Transport Diagnostics                        (default: OFF)
+!!   namhsb       Heat and salt budgets                                 (default: OFF)
+!!   namdiu       Cool skin and warm layer models                       (default: OFF)
+!!   namdiu       Cool skin and warm layer models                       (default: OFF)
+!!   namflo       float parameters                                      (default: OFF)
+!!   nam_diaharm  Harmonic analysis of tidal constituents               (default: OFF)
+!!   nam_diadct   transports through some sections                      (default: OFF)
+!!   nam_diatmb   Top Middle Bottom Output                              (default: OFF)
+!!   nam_dia25h   25h Mean Output                                       (default: OFF)
+!!   namnc4       netcdf4 chunking and compression settings             ("key_netcdf4")
+!!======================================================================
+!-----------------------------------------------------------------------
+&namtrd        !   trend diagnostics                                    (default: OFF)
+!-----------------------------------------------------------------------
+   ln_tra_trd  = .true.   ! (T) 3D tracer trend output
+/
+!
+!!======================================================================
+!!               ***  Observation & Assimilation  ***                 !!
+!!                                                                    !!
+!!   namobs       observation and model comparison                      (default: OFF)
+!!   nam_asminc   assimilation increments                               ('key_asminc')
+!!======================================================================
+!
+!!======================================================================
+!!                  ***  Miscellaneous namelists  ***                 !!
+!!                                                                    !!
+!!   nammpp            Massively Parallel Processing                    ("key_mpp_mpi")
+!!   namctl            Control prints                                   (default: OFF)
+!!   namsto            Stochastic parametrization of EOS                (default: OFF)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namctl        !   Control prints                                       (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsto        ! Stochastic parametrization of EOS                      (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namptr        !   Poleward Transport Diagnostic                        (default: OFF)
+!-----------------------------------------------------------------------
+   ln_diaptr   = .true.   !  Poleward heat and salt transport (T) or not (F)
+   ln_subbas   = .true.   !  Atlantic/Pacific/Indian basins computation (T) or not
+/
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ORCA1_cfg
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ORCA1_cfg	(revision 6656)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ORCA1_cfg	(revision 6658)
@@ -356,8 +356,8 @@
 !-----------------------------------------------------------------------
    ln_trabbl   = .true.    !  Bottom Boundary Layer parameterisation flag
-      nn_bbl_ldf  =  1        !  diffusive bbl (=1)   or not (=0)
-      nn_bbl_adv  =  0        !  advective bbl (=1/2) or not (=0)
+      nn_bbl_ldf  =  0        !  diffusive bbl (=1)   or not (=0)
+      nn_bbl_adv  =  2        !  advective bbl (=1/2) or not (=0)
       rn_ahtbbl   =  1000.    !  lateral mixing coefficient in the bbl  [m2/s]
-      rn_gambbl   =  10.      !  advective bbl coefficient                 [s]
+      rn_gambbl   =  20.      !  advective bbl coefficient                 [s]
 /
 !!======================================================================
@@ -400,4 +400,6 @@
 !-----------------------------------------------------------------------
    ln_mle      = .true.   ! (T) use the Mixed Layer Eddy (MLE) parameterisation
+   rn_ce       = 0.06     ! magnitude of the MLE (typical value: 0.06 to 0.08)
+   nn_mle      = 1        ! MLE type: =0 standard Fox-Kemper ; =1 new formulation
 /
 !-----------------------------------------------------------------------
@@ -435,5 +437,5 @@
 &namdyn_adv    !   formulation of the momentum advection                (default: NO selection)
 !-----------------------------------------------------------------------
-   ln_dynadv_vec = .true.  !  vector form - 2nd centered scheme
+   ln_dynadv_vec   = .true.  !  vector form - 2nd centered scheme
      nn_dynkeg     = 1        ! grad(KE) scheme: =0   C2  ;  =1   Hollingsworth correction
 /
@@ -480,5 +482,5 @@
       nn_evdm  =    0            !  evd apply on tracer (=0) or on tracer and momentum (=1)
       rn_evd   =  100.           !  evd mixing coefficient [m2/s]
-   ln_zdfddm   = .true.    ! double diffusive mixing
+   ln_zdfddm   = .false.    ! double diffusive mixing
       rn_avts  =    1.e-4     !  maximum avs (vertical mixing on salinity)
       rn_hsbfr =    1.6       !  heat/salt buoyancy flux ratio
@@ -508,5 +510,5 @@
 !-----------------------------------------------------------------------
    ln_mevar    = .false.    !  variable (T) or constant (F) mixing efficiency
-   ln_tsdiff   = .true.    !  account for differential T/S mixing (T) or not (F)
+   ln_tsdiff   = .false.    !  account for differential T/S mixing (T) or not (F)
 
    cn_dir      = './'      !  root directory for the iwm data location
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ORCA2_cfg
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ORCA2_cfg	(revision 6656)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ORCA2_cfg	(revision 6658)
@@ -1,5 +1,19 @@
 !!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-!! NEMO/OPA  Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref
+!! NEMO/OCE  Configuration namelist : overwrite default values defined in SHARED/namelist_ref
 !!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!!             ORCA2 - ICE - PISCES configuration                     !!
+!!======================================================================
+!!              ***  Domain & Run management namelists  ***           !!
+!!                                                                    !!
+!!   namrun       parameters of the run
+!!   namdom       space and time domain
+!!   namcfg       parameters of the configuration                       (default: user defined GYRE)
+!!   namwad       Wetting and drying                                    (default: OFF)
+!!   namtsd       data: temperature & salinity                          (default: OFF)
+!!   namcrs       coarsened grid (for outputs and/or TOP)               (ln_crs =T)
+!!   namc1d       1D configuration options                              ("key_c1d")
+!!   namc1d_dyndmp 1D newtonian damping applied on currents             ("key_c1d")
+!!   namc1d_uvd   1D data (currents)                                    ("key_c1d")
+!!======================================================================
 !
 !-----------------------------------------------------------------------
@@ -22,295 +36,412 @@
    nn_istate   =       0   !  Output the initial state (1) or not (0)
    nn_stock    =  _AUTOBLOCKER_   !  Frequency of creation of a restart file (modulo referenced to 1)
-   nn_write    =    5475   !  Requency of write in the output file   (modulo referenced to nn_it000)
+   nn_write    =    5840   !  Requency of write in the output file   (modulo referenced to nn_it000)
    ln_mskland  = .true.    !  Masks land points in NetCDF outputs
-   ln_mskutil  = .false.    !  Outputs without halos
-   ln_dimgnnn  = .false.   !  DIMG file format: 1 file for all processors (F) or by processor (T)
-   ln_cfmeta   = .false.   !  output additional data to netCDF files required for compliance with the CF metadata standard
-   ln_clobber  = .true.    !  clobber (overwrite) an existing file
-   nn_chunksz  =       0   !  chunksize (bytes) for NetCDF file (works only with iom_nf90 routines)
-/
-!-----------------------------------------------------------------------
-&namcfg        !   parameters of the configuration
-!-----------------------------------------------------------------------
-   cp_cfg      =  "orca"               !  name of the configuration
-   jp_cfg      =       2               !  resolution of the configuration
-   jpidta      =     182               !  1st lateral dimension ( >= jpi )
-   jpjdta      =     149               !  2nd    "         "    ( >= jpj )
-   jpkdta      =      31               !  number of levels      ( >= jpk )
-   jpiglo      =     182               !  1st dimension of global domain --> i =jpidta
-   jpjglo      =     149               !  2nd    -                  -    --> j  =jpjdta
-   jpizoom     =       1               !  left bottom (i,j) indices of the zoom
-   jpjzoom     =       1               !  in data domain indices
-   jperio      =       4               !  lateral cond. type (between 0 and 6)
-/
-!-----------------------------------------------------------------------
-&namzgr        !   vertical coordinate
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdom        !   space and time domain (bathymetry, mesh, timestep)
-!-----------------------------------------------------------------------
-   nn_msh      =    _AUTO_ !  AUTO - create (=1) a mesh file or not (=0)
-   rn_rdt      = 5760.     !  time step for the dynamics (and tracer if nn_acc=0)
-   nn_closea    =   1      !  remove (=0) or keep (=1) closed seas and lakes (ORCA)
+   ln_mskutil  = .true.    !  Outputs without halos
+   ln_cfmeta   = .true.    !  output additional data to netCDF files required for compliance with the CF metadata standard
+/
+!-----------------------------------------------------------------------
+&namdom        !   time and space domain
+!-----------------------------------------------------------------------
+   rn_rdt      = 5400.     !  time step for the dynamics and tracer
+   ln_meshmask =  _AUTO_
+/
+!-----------------------------------------------------------------------
+&namcfg        !   parameters of the configuration                      (default: use namusr_def in namelist_cfg)
+!-----------------------------------------------------------------------
+   ln_read_cfg = .true.    !  (=T) read the domain configuration file
+      cn_domcfg = "domain_cfg.nc"    ! domain configuration filename
+      !
+      ln_closea    = .true.    !  F => suppress closed seas (defined by closea_mask field) 
+      !                         !       from the bathymetry at runtime.
+/
+!-----------------------------------------------------------------------
+&namtsd        !    Temperature & Salinity Data  (init/dmp)             (default: OFF)
+!-----------------------------------------------------------------------
+   !                       ! =T  read T-S fields for:
+   ln_tsd_dmp  = .false.          !  T-S restoring   (see namtra_dmp)
+
+   cn_dir = './'     !  root directory for the T-S data location
+   !___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
+   !           !  file name              ! frequency (hours) ! variable  ! time interp.!  clim  ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
+   !           !                         !  (if <0  months)  !   name    !   (logical) !  (T/F) ! 'monthly' !                  ! pairing  !    filename   !
+   sn_tem = 'data_1m_potential_temperature_nomask',     -1.     ,'votemper',   .true.    , .true. , 'yearly'  ,    ''    ,    ''    ,    ''
+   sn_sal = 'data_1m_salinity_nomask'             ,     -1.     ,'vosaline',   .true.    , .true. , 'yearly'  ,    ''    ,    ''    ,    ''
+/
+!!======================================================================
+!!            ***  Surface Boundary Condition namelists  ***          !!
+!!                                                                    !!
+!!   namsbc          surface boundary condition manager                 (default: NO selection)
+!!   namsbc_flx      flux               formulation                     (ln_flx     =T)
+!!   namsbc_blk      Bulk formulae formulation                          (ln_blk     =T)
+!!   namsbc_cpl      CouPLed            formulation                     ("key_oasis3" )
+!!   namsbc_sas      Stand-Alone Surface module                         (SAS_SRC  only)
+!!   namsbc_iif      Ice-IF: use observed ice cover                     (nn_ice = 1   )
+!!   namtra_qsr      penetrative solar radiation                        (ln_traqsr  =T)
+!!   namsbc_ssr      sea surface restoring term (for T and/or S)        (ln_ssr     =T)
+!!   namsbc_rnf      river runoffs                                      (ln_rnf     =T)
+!!   namsbc_apr      Atmospheric Pressure                               (ln_apr_dyn =T)
+!!   namsbc_isf      ice shelf melting/freezing                         (ln_isfcav  =T : read (ln_read_cfg=T) or set or usr_def_zgr )
+!!   namsbc_iscpl    coupling option between land ice model and ocean   (ln_isfcav  =T)
+!!   namsbc_wave     external fields from wave model                    (ln_wave    =T)
+!!   namberg         iceberg floats                                     (ln_icebergs=T)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&namsbc        !   Surface Boundary Condition manager                   (default: NO selection)
+!-----------------------------------------------------------------------
+   nn_fsbc     = 4         !  frequency of SBC module call
+                           !     (also = the frequency of sea-ice & iceberg model call)
+                     ! Type of air-sea fluxes 
+   ln_cpl      = .true.    !  atmosphere coupled   formulation          ( requires key_oasis3 )
+                     ! Sea-ice :
+   nn_ice      = 2         !  =2 or 3 automatically for SI3 or CICE    ("key_si3" or "key_cice")
+                     ! Misc. options of sbc : 
+   ln_traqsr   = .true.   !  Light penetration in the ocean            (T => fill namtra_qsr)
+/
+!-----------------------------------------------------------------------
+&namsbc_blk    !   namsbc_blk  generic Bulk formula                     (ln_blk =T)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_cpl    !   coupled ocean/atmosphere model                       ("key_oasis3")
+!-----------------------------------------------------------------------
+   nn_cplmodel   =     1   !  Maximum number of models to/from which NEMO is potentially sending/receiving data
+   ln_usecplmask = .false. !  use a coupling mask file to merge data received from several models
+   !                       !   -> file cplmask.nc with the float variable called cplmask (jpi,jpj,nn_cplmodel)
+   nn_cats_cpl   =     5   !  Number of sea ice categories over which coupling is to be carried out (if not 1)
+   !_____________!__________________________!____________!_____________!______________________!________!
+   !             !        description       !  multiple  !    vector   !       vector         ! vector !
+   !             !                          ! categories !  reference  !     orientation      ! grids  !
+!***   send    ***
+   sn_snd_temp   =   'weighted oce and ice' ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_snd_alb    =   'weighted ice'         ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_snd_crt    =   'mixed oce-ice'        ,    'no'    , 'spherical' , 'eastward-northward' ,  'T'
+   sn_snd_co2    =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+!***  receive  ***
+   sn_rcv_w10m   =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_taumod =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_tau    =   'mixed oce-ice'        ,    'no'    , 'cartesian' , 'eastward-northward' ,  'U,V'
+   sn_rcv_dqnsdt =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_qsr    =   'conservative'         ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_qns    =   'conservative'         ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_emp    =   'conservative'         ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_rnf    =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_cal    =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_co2    =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_isf    =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_icb    =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+/
+!-----------------------------------------------------------------------
+&namtra_qsr    !   penetrative solar radiation                          (ln_traqsr =T)
+!-----------------------------------------------------------------------
+   !                       ! type of penetration                        (default: NO selection)
+   ln_qsr_bio  = .true.       !  RGB light penetration (Red-Green-Blue)
    !
-   jphgr_msh   =       0               !  type of horizontal mesh
-   ppglam0     =  999999.0             !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =  999999.0             ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_deg    =  999999.0             !  meridional grid-spacing (degrees)
-   ppe1_m      =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_m      =  999999.0             !  meridional grid-spacing (degrees)
-   ppsur       =   -4762.96143546300   !  ORCA r4, r2 and r05 coefficients
-   ppa0        =     255.58049070440   ! (default coefficients)
-   ppa1        =     245.58132232490   !
-   ppkth       =      21.43336197938   !
-   ppacr       =       3.0             !
-   ppdzmin     =  999999.              !  Minimum vertical spacing
-   pphmax      =  999999.              !  Maximum depth
-   ldbletanh   =  .FALSE.              !  Use/do not use double tanf function for vertical coordinates
-   ppa2        =  999999.              !  Double tanh function parameters
-   ppkth2      =  999999.              !
-   ppacr2      =  999999.              !
-/
-!-----------------------------------------------------------------------
-&namsplit      !   time splitting parameters                            ("key_dynspg_ts")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namcrs        !   Grid coarsening for dynamics output and/or
-               !   passive tracer coarsened online simulations
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtsd    !   data : Temperature  & Salinity
-!-----------------------------------------------------------------------
-   ln_tsd_init   = .true.   !  Initialisation of ocean T & S with T &S input data (T) or not (F)
-   ln_tsd_tradmp = .false.  !  damping of ocean T & S toward T &S input data (T) or not (F)
-/
-!-----------------------------------------------------------------------
-&namsbc        !   Surface Boundary Condition (surface module)
-!-----------------------------------------------------------------------
-   nn_fsbc     = 5         !  frequency of surface boundary condition computation
-                           !     (also = the frequency of sea-ice model call)
-   ln_blk_clio = .false.   !  CLIO bulk formulation                     (T => fill namsbc_clio)
-   ln_blk_core = .false.   !  CORE bulk formulation                     (T => fill namsbc_core)
-   ln_blk_mfs  = .false.   !  MFS bulk formulation                      (T => fill namsbc_mfs )
-   ln_cpl      = .true.    !  atmosphere coupled   formulation          ( requires key_oasis3 )
-   ln_mixcpl   = .false.   !  forced-coupled mixed formulation          ( requires key_oasis3 )
-   ln_apr_dyn  = .false.   !  Patm gradient added in ocean & ice Eqs.   (T => fill namsbc_apr )
-   nn_ice      = 2         !  =0 no ice boundary condition   ,
-                           !  =1 use observed ice-cover      ,
-                           !  =2 ice-model used                         ("key_lim3" or "key_lim2")
-   nn_ice_embd = 0         !  AUTO - 
-                           !  =0 levitating ice (no mass exchange, concentration/dilution effect)
-                           !  =1 levitating ice with mass and salt exchange but no presure effect
-                           !  =2 embedded sea-ice (full salt and mass exchanges and pressure)
-   ln_dm2dc    = .false.   !  daily mean to diurnal cycle on short wave
-   ln_rnf      = .false.   !  runoffs                                   (T => fill namsbc_rnf)
-   ln_ssr      = .false.   !  Sea Surface Restoring on T and/or S       (T => fill namsbc_ssr)
-   nn_fwb      = 0         !  FreshWater Budget: =0 unchecked
-                           !     =1 global mean of e-p-r set to zero at each time step
-                           !     =2 annual global mean of e-p-r set to zero
-                           !     =3 global emp set to zero and spread out over erp area
-   ln_wave = .false.       !  Activate coupling with wave (either Stokes Drift or Drag coefficient, or both)  (T => fill namsbc_wave)
-   ln_cdgw = .false.       !  Neutral drag coefficient read from wave model (T => fill namsbc_wave)
-   ln_sdw  = .false.       !  Computation of 3D stokes drift                (T => fill namsbc_wave)
-/
-!-----------------------------------------------------------------------
-&namsbc_core   !   namsbc_core  CORE bulk formulae
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtra_qsr    !   penetrative solar radiation
-!-----------------------------------------------------------------------
-!              !  file name  ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation ! land/sea mask !
-!              !             !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      !
-   sn_chl      = 'chlorophyll_surface.nc',        -1         , 'CHLA'    ,   .true.     , .true. , 'yearly'  , ''       , ''       , ''
-/
-!-----------------------------------------------------------------------
-&namsbc_rnf    !   runoffs namelist surface boundary condition
-!-----------------------------------------------------------------------
-!              !  file name           ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation ! land/sea mask !
-!              !                      !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      !
+/
+!-----------------------------------------------------------------------
+&namsbc_ssr    !   surface boundary condition : sea surface restoring   (ln_ssr =T)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_rnf    !   runoffs                                              (ln_rnf =T)
+!-----------------------------------------------------------------------
+   ln_rnf_mouth = .false.   !  specific treatment at rivers mouths
+      rn_hrnf     =  15.e0    !  depth over which enhanced vertical mixing is used    (ln_rnf_mouth=T)
+      rn_avt_rnf  =   1.e-3   !  value of the additional vertical mixing coef. [m2/s] (ln_rnf_mouth=T)
+   rn_rfact    =   1.e0    !  multiplicative factor for runoff
+   ln_rnf_depth = .false.   !  read in depth information for runoff
+   ln_rnf_tem  = .false.   !  read in temperature information for runoff
+   ln_rnf_sal  = .false.   !  read in salinity information for runoff
+   ln_rnf_depth_ini = .false. ! compute depth at initialisation from runoff file
+      rn_rnf_max  = 0.05  !  max value of the runoff climatologie over global domain ( ln_rnf_depth_ini = .true )
+      rn_dep_max  = 150.      !  depth over which runoffs is spread ( ln_rnf_depth_ini = .true )
+      nn_rnf_depth_file = _AUTO_   !  create (=1) a runoff depth file or not (=0)
+
+   cn_dir = './'  !  root directory for the location of the runoff files
+   !___________!_____________!___________________!___________!_____________!_________!___________!__________!__________!_______________!
+   !           !  file name  ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation ! land/sea mask !
+   !           !             !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      !
    sn_rnf      = 'ORCA_R2_runoff_clim_v1.0_nomask',        -1         , 'sorunoff',   .true.     , .true. , 'yearly'  , ''       , ''       , ''
    sn_cnf      = 'ORCA_R2_runoff_clim_v1.0_nomask',         0         , 'socoeff' ,   .false.    , .true. , 'yearly'  , ''       , ''       , ''
-   sn_s_rnf    = 'runoffs'                        ,        24         , 'rosaline',   .true.     , .true. , 'yearly'  , ''       , ''       , ''
-   sn_t_rnf    = 'runoffs'                        ,        24         , 'rotemper',   .true.     , .true. , 'yearly'  , ''       , ''       , ''
-   sn_dep_rnf  = 'runoffs_ORCA2_depths.nc'        ,         0         , 'rodepth' ,   .false.    , .true. , 'yearly'  , ''       , ''       , ''
+   sn_s_rnf    = 'runoffs'            ,        24         , 'rosaline',   .true.     , .true. , 'yearly'  , ''       , ''       , ''
+   sn_t_rnf    = 'runoffs'            ,        24         , 'rotemper',   .true.     , .true. , 'yearly'  , ''       , ''       , ''
+   sn_dep_rnf  = 'runoffs_depths.nc'  ,         0         , 'rodepth' ,   .false.    , .true. , 'yearly'  , ''       , ''       , ''
+/
+!-----------------------------------------------------------------------
+&namsbc_isf    !  Top boundary layer (ISF)                              (ln_isfcav =T : read (ln_read_cfg=T)
+!-----------------------------------------------------------------------             or set or usr_def_zgr )
+/
+!-----------------------------------------------------------------------
+&namsbc_wave   ! External fields from wave model                        (ln_wave=T)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namberg       !   iceberg parameters                                   (default: OFF)
+!-----------------------------------------------------------------------
+/
+!!======================================================================
+!!               ***  Lateral boundary condition  ***                 !!
+!!                                                                    !!
+!!   namlbc        lateral momentum boundary condition                  (default: NO selection)
+!!   namagrif      agrif nested grid   (read by child model only)       ("key_agrif")
+!!   nam_tide      Tidal forcing                                        (default: OFF)
+!!   nambdy        Unstructured open boundaries                         (default: OFF)
+!!   nambdy_dta    Unstructured open boundaries - external data         (see  nambdy)
+!!   nambdy_tide   tidal forcing at open boundaries                     (default: OFF)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&namlbc        !   lateral momentum boundary condition                  (default: NO selection)
+!-----------------------------------------------------------------------
+   rn_shlat    =    2.     !  no slip
+/
+!-----------------------------------------------------------------------
+&namagrif      !  AGRIF zoom                                            ("key_agrif")
+!-----------------------------------------------------------------------
+/
+!!======================================================================
+!!                ***  Top/Bottom boundary condition  ***             !!
+!!                                                                    !!
+!!   namdrg        top/bottom drag coefficient                          (default: NO selection)
+!!   namdrg_top    top    friction                                      (ln_OFF=F & ln_isfcav=T)
+!!   namdrg_bot    bottom friction                                      (ln_OFF=F)
+!!   nambbc        bottom temperature boundary condition                (default: OFF)
+!!   nambbl        bottom boundary layer scheme                         (default: OFF)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&namdrg        !   top/bottom drag coefficient                          (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_lin  = .true.   !  linear  drag: Cd = Cd0 Uc0
+/
+!-----------------------------------------------------------------------
+&namdrg_bot    !   BOTTOM friction                                      (ln_OFF =F)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambbc        !   bottom temperature boundary condition                (default: OFF)
+!-----------------------------------------------------------------------
+   ln_trabbc   = .true.    !  Apply a geothermal heating at the ocean bottom
+      nn_geoflx   =    2      !  geothermal heat flux: = 2 read variable flux [mW/m2]
 
-   ln_rnf_mouth = .false.    !  specific treatment at rivers mouths
-   ln_rnf_depth = .true.     !  read in depth information for runoff
-   ln_rnf_tem   = .false.    !  read in temperature information for runoff
-   ln_rnf_sal   = .false.    !  read in salinity information for runoff
-   ln_rnf_depth_ini = .true. !  compute depth at initialisation from runoff file
-   rn_rnf_max   = 0.05       !  max value of the runoff climatology over global domain ( if ln_rnf_depth_ini = .true )
-   rn_dep_max = 150.         !  depth over which runoffs is spread ( ln_rnf_depth_ini = .true )
-   nn_rnf_depth_file = _AUTO_     ! create (=1) a runoff depth file or not (=0)
-/
-!-----------------------------------------------------------------------
-&namsbc_ssr    !   surface boundary condition : sea surface restoring
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_alb    !   albedo parameters
-!-----------------------------------------------------------------------
-   nn_ice_alb   =    0   !  parameterization of ice/snow albedo
-                         !     0: Shine & Henderson-Sellers (JGR 1985), giving clear-sky albedo
-                         !     1: "home made" based on Brandt et al. (JClim 2005) and Grenfell & Perovich (JGR 2004),
-                         !        giving cloud-sky albedo
-   rn_alb_sdry  =  0.80  !  dry snow albedo         : 0.80 (nn_ice_alb = 0); 0.85 (nn_ice_alb = 1); obs 0.85-0.87 (cloud-sky)
-   rn_alb_smlt  =  0.65  !  melting snow albedo     : 0.65 ( '' )          ; 0.75 ( '' )          ; obs 0.72-0.82 ( '' )
-   rn_alb_idry  =  0.72  !  dry ice albedo          : 0.72 ( '' )          ; 0.60 ( '' )          ; obs 0.54-0.65 ( '' )
-   rn_alb_imlt  =  0.50  !  bare puddled ice albedo : 0.53 ( '' )          ; 0.50 ( '' )          ; obs 0.49-0.58 ( '' )
-/
-!-----------------------------------------------------------------------
-&namsbc_cpl    !   coupling parameters
-!-----------------------------------------------------------------------
-!                    !     description       !  multiple  !    vector   !      vector          ! vector !
-!                    !                       ! categories !  reference  !    orientation       ! grids  !
-! send
-sn_snd_temp   =       'weighted oce and ice' ,    'no'    ,     ''      ,         ''           ,   ''
-sn_snd_alb    =       'weighted ice'         ,    'no'    ,     ''      ,         ''           ,   ''
-sn_snd_thick  =       'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
-sn_snd_crt    =       'mixed oce-ice'        ,    'no'    , 'cartesian' , 'eastward-northward' ,  'T'
-sn_snd_co2    =       'none'              ,    'no'    ,     ''      ,         ''           ,   ''
-! receive
-sn_rcv_w10m   =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_taumod =       'none'                 ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_tau    =       'mixed oce-ice'        ,    'no'    , 'cartesian' , 'eastward-northward',  'U,V'
-sn_rcv_dqnsdt =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_qsr    =       'conservative'         ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_qns    =       'conservative'         ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_emp    =       'conservative'         ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_rnf    =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_cal    =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
-sn_rcv_co2    =       'none'              ,    'no'    ,     ''      ,         ''          ,   ''
-/
-/
-!-----------------------------------------------------------------------
-&namberg       !   iceberg parameters
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namlbc        !   lateral momentum boundary condition
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namcla        !   cross land advection
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nambfr        !   bottom friction
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nambbc        !   bottom temperature boundary condition
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nambbl        !   bottom boundary layer scheme
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nameos        !   ocean physical parameters
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtra_adv    !   advection scheme for tracer
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtra_adv_mle !  mixed layer eddy parametrisation (Fox-Kemper param)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtra_adv_mle !  mixed layer eddy parametrisation (Fox-Kemper param)
-!-----------------------------------------------------------------------
-/
-!----------------------------------------------------------------------------------
-&namtra_ldf    !   lateral diffusion scheme for tracers
-!----------------------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtra_dmp    !   tracer: T & S newtonian damping
-!-----------------------------------------------------------------------
-   ln_tradmp   =  .false.  !  add a damping termn (T) or not (F)
-/
-!-----------------------------------------------------------------------
-&namdyn_adv    !   formulation of the momentum advection
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdyn_vor    !   option of physics/algorithm (not control by CPP keys)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdyn_hpg    !   Hydrostatic pressure gradient option
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdyn_ldf    !   lateral diffusion on momentum
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf        !   vertical physics
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_tke    !   turbulent eddy kinetic dependent vertical diffusion  ("key_zdftke")
-!-----------------------------------------------------------------------
-   rn_ebb      =  67.83    !  coef. of the surface input of tke (=67.83 suggested when ln_mxl0=T)
-   rn_mxl0     =   0.01    !  surface  buoyancy lenght scale minimum value
-   nn_etau     =   0       !  penetration of tke below the mixed layer (ML) due to internal & intertial waves
-                           !        = 0 no penetration
-                           !        = 1 add a tke source below the ML
-                           !        = 2 add a tke source just at the base of the ML
-                           !        = 3 as = 1 applied on HF part of the stress    ("key_coupled")
-/
-!-----------------------------------------------------------------------
-&namzdf_ddm    !   double diffusive mixing parameterization             ("key_zdfddm")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_tmx    !   tidal mixing parameterization                        ("key_zdftmx")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsol        !   elliptic solver / island / free surface
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi)
-!-----------------------------------------------------------------------
-   cn_mpi_send =  'I'      !  mpi send/recieve type   ='S', 'B', or 'I' for standard send,
-                           !  buffer blocking send or immediate non-blocking sends, resp.
-   nn_buffer   =   0       !  size in bytes of exported buffer ('B' case), 0 no exportation
-   ln_nnogather=  .false.  !  activate code to avoid mpi_allgather use at the northfold
-   jpni        =   1       !  jpni   number of processors following i (set automatically if < 1)
-   jpnj        =  31       !  jpnj   number of processors following j (set automatically if < 1)
-   jpnij       =  31       !  jpnij  number of local domains (set automatically if < 1)
-/
-!-----------------------------------------------------------------------
-&namctl        !   Control prints & Benchmark
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namptr       !   Poleward Transport Diagnostic
-!-----------------------------------------------------------------------
-   ln_diaptr  = .true.     !  Poleward heat and salt transport (T) or not (F)
-   ln_subbas  = .true.     !  Atlantic/Pacific/Indian basins computation (T) or not
-                           !  (orca configuration only, need input basins mask file named "subbasins.nc"
-/
-!-----------------------------------------------------------------------
-&nam_asminc   !   assimilation increments                               ('key_asminc')
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namhsb       !  Heat and salt budgets
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdyn_nept  !   Neptune effect (simplified: lateral and vertical diffusions removed)
-!-----------------------------------------------------------------------
-/
+   cn_dir = './'  !  root directory for the geothermal data location
+   !___________!____________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
+   !           !  file name         ! frequency (hours) ! variable  ! time interp.!  clim  ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
+   !           !                    !  (if <0  months)  !   name    !   (logical) !  (T/F) ! 'monthly' !                  ! pairing  !    filename   !
+   sn_qgh      ='geothermal_heating.nc'  ,       -12.        , 'heatflow',   .false.   , .true. , 'yearly'  ,   ''             ,   ''     ,   ''
+/
+!-----------------------------------------------------------------------
+&nambbl        !   bottom boundary layer scheme                         (default: OFF)
+!-----------------------------------------------------------------------
+   ln_trabbl   = .true.    !  Bottom Boundary Layer parameterisation flag
+      nn_bbl_ldf  =  1        !  diffusive bbl (=1)   or not (=0)
+      nn_bbl_adv  =  0        !  advective bbl (=1/2) or not (=0)
+      rn_ahtbbl   =  1000.    !  lateral mixing coefficient in the bbl  [m2/s]
+      rn_gambbl   =  10.      !  advective bbl coefficient                 [s]
+/
+!!======================================================================
+!!                        Tracer (T-S) namelists                      !!
+!!                                                                    !!
+!!   nameos        equation of state                                    (default: NO selection)
+!!   namtra_adv    advection scheme                                     (default: NO selection)
+!!   namtra_ldf    lateral diffusion scheme                             (default: NO selection)
+!!   namtra_mle    mixed layer eddy param. (Fox-Kemper param.)          (default: OFF)
+!!   namtra_eiv    eddy induced velocity param.                         (default: OFF)
+!!   namtra_dmp    T & S newtonian damping                              (default: OFF)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&nameos        !   ocean Equation Of Seawater                           (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_teos10   = .true.         !  = Use TEOS-10
+/
+!-----------------------------------------------------------------------
+&namtra_adv    !   advection scheme for tracer                          (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_traadv_fct = .true.     !  FCT scheme
+      nn_fct_h   =  2               !  =2/4, horizontal 2nd / 4th order 
+      nn_fct_v   =  2               !  =2/4, vertical   2nd / COMPACT 4th order 
+/
+!-----------------------------------------------------------------------
+&namtra_ldf    !   lateral diffusion scheme for tracers                 (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_traldf_lap   = .true.    !    laplacian operator
+   ln_traldf_iso   = .true.    !  iso-neutral (Standard operator)
+   ln_traldf_msc   = .true.    !  Method of Stabilizing Correction      (both operators)
+   !                       !  Coefficients:
+   nn_aht_ijk_t    = 20        !  space/time variation of eddy coef
+      !                             !   = 20     aht = 1/2  Ud. max(e1,e2)
+      rn_Ud        = 0.018          !  lateral diffusive velocity [m/s] (nn_aht_ijk_t= 0, 10, 20, 30)
+      rn_Ld        = 200.e+3        !  lateral diffusive length   [m]   (nn_aht_ijk_t= 0, 10)
+/
+!-----------------------------------------------------------------------
+&namtra_mle    !   mixed layer eddy parametrisation (Fox-Kemper)        (default: OFF)
+!-----------------------------------------------------------------------
+   ln_mle      = .true.   ! (T) use the Mixed Layer Eddy (MLE) parameterisation
+/
+!-----------------------------------------------------------------------
+&namtra_eiv    !   eddy induced velocity param.                         (default: OFF)
+!-----------------------------------------------------------------------
+   ln_ldfeiv   = .true.    ! use eddy induced velocity parameterization
+      !                        !  Coefficients:
+      nn_aei_ijk_t  = 21          ! space/time variation of the eiv coeficient
+      !                                !   = 21 F(i,j,t)  =Treguier et al. JPO 1997 formulation
+      !                           !  time invariant coefficients:  aei0 = 1/2  Ue*Le 
+      rn_Ue        = 0.018             !  lateral diffusive velocity [m/s] (nn_aht_ijk_t= 0, 10, 20, 30)
+      rn_Le        = 200.e+3           !  lateral diffusive length   [m]   (nn_aht_ijk_t= 0, 10)
+      !
+      ln_ldfeiv_dia =.true.   ! diagnose eiv stream function and velocities
+/
+!-----------------------------------------------------------------------
+&namtra_dmp    !   tracer: T & S newtonian damping                      (default: OFF)
+!-----------------------------------------------------------------------
+   ln_tradmp   =  .false.   !  add a damping term (using resto.nc coef.)
+      nn_zdmp  =    0         !  vertical shape =0    damping throughout the water column
+/
+!!======================================================================
+!!                      ***  Dynamics namelists  ***                  !!
+!!                                                                    !!
+!!   nam_vvl       vertical coordinate options                          (default: z-star)
+!!   namdyn_adv    formulation of the momentum advection                (default: NO selection)
+!!   namdyn_vor    advection scheme                                     (default: NO selection)
+!!   namdyn_hpg    hydrostatic pressure gradient                        (default: NO selection)
+!!   namdyn_spg    surface pressure gradient                            (default: NO selection)
+!!   namdyn_ldf    lateral diffusion scheme                             (default: NO selection)
+!!   namdta_dyn    offline TOP: dynamics read in files                  (OFF_SRC only)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&namdyn_adv    !   formulation of the momentum advection                (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_dynadv_vec = .true.  !  vector form - 2nd centered scheme
+     nn_dynkeg     = 0        ! grad(KE) scheme: =0   C2  ;  =1   Hollingsworth correction
+/
+!-----------------------------------------------------------------------
+&namdyn_vor    !   Vorticity / Coriolis scheme                          (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_dynvor_een = .true.  !  energy & enstrophy scheme
+      nn_een_e3f = 0          ! =0   e3f = mean masked e3t divided by 4
+/
+!-----------------------------------------------------------------------
+&namdyn_hpg    !   Hydrostatic pressure gradient option                 (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_hpg_sco  = .true.   !  s-coordinate (standard jacobian formulation)
+/
+!-----------------------------------------------------------------------
+&namdyn_spg    !   surface pressure gradient                            (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_dynspg_ts  = .true.  !  split-explicit free surface
+/
+!-----------------------------------------------------------------------
+&namdyn_ldf    !   lateral diffusion on momentum                        (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_dynldf_lap =  .true.     !    laplacian operator
+   ln_dynldf_lev =  .true.     !  iso-level
+   nn_ahm_ijk_t  = -30           !  space/time variation of eddy coefficient :
+      !                             !  =-30  read in eddy_viscosity_3D.nc file
+/
+!!======================================================================
+!!                     vertical physics namelists                     !!
+!!                                                                    !!
+!!    namzdf        vertical physics manager                            (default: NO selection)
+!!    namzdf_ric    richardson number vertical mixing                   (ln_zdfric=T)
+!!    namzdf_tke    TKE vertical mixing                                 (ln_zdftke=T)
+!!    namzdf_gls    GLS vertical mixing                                 (ln_zdfgls=T)
+!!    namzdf_osm    OSM vertical diffusion                              (ln_zdfosm=T)
+!!    namzdf_iwm    tidal mixing parameterization                       (ln_zdfiwm=T)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&namzdf        !   vertical physics manager                             (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_zdftke   = .true.       !  Turbulent Kinetic Energy closure       (T =>   fill namzdf_tke)
+   ln_zdfevd   = .true.       !  Enhanced Vertical Diffusion scheme
+      nn_evdm  =    0            !  evd apply on tracer (=0) or on tracer and momentum (=1)
+      rn_evd   =  100.           !  evd mixing coefficient [m2/s]
+   ln_zdfddm   = .true.    ! double diffusive mixing
+      rn_avts  =    1.e-4     !  maximum avs (vertical mixing on salinity)
+      rn_hsbfr =    1.6       !  heat/salt buoyancy flux ratio
+   ln_zdfiwm   = .false.       ! internal wave-induced mixing            (T =>   fill namzdf_iwm)
+   !                       !  Coefficients
+   rn_avm0     =   1.2e-4     !  vertical eddy viscosity   [m2/s]       (background Kz if ln_zdfcst=F)
+   rn_avt0     =   1.2e-5     !  vertical eddy diffusivity [m2/s]       (background Kz if ln_zdfcst=F)
+   nn_avb      =    0         !  profile for background avt & avm (=1) or not (=0)
+   nn_havtb    =    0         !  horizontal shape for avtb (=1) or not (=0)
+/
+!-----------------------------------------------------------------------
+&namzdf_tke    !   turbulent eddy kinetic dependent vertical diffusion  (ln_zdftke =T)
+!-----------------------------------------------------------------------
+      nn_mxl      =   2       !  mixing length: = 0 bounded by the distance to surface and bottom
+      !                       !                 = 1 bounded by the local vertical scale factor
+      !                       !                 = 2 first vertical derivative of mixing length bounded by 1
+      !                       !                 = 3 as =2 with distinct dissipative an mixing length scale
+      nn_etau     =   0       !  penetration of tke below the mixed layer (ML) due to NIWs
+                               !        = 0 none ; = 1 add a tke source below the ML
+                               !        = 2 add a tke source just at the base of the ML
+                               !        = 3 as = 1 applied on HF part of the stress           (ln_cpl=T)
+      rn_eice     =   2       !  below sea ice: =0 ON ; =4 OFF when ice fraction > 1/4   
+      ln_lc      = .true.     !  Langmuir cell parameterisation (Axell 2002)
+      rn_lc      =  0.20      !  coef. associated to Langmuir cells
+/
+!-----------------------------------------------------------------------
+&namzdf_iwm    !    internal wave-driven mixing parameterization        (ln_zdfiwm =T)
+!-----------------------------------------------------------------------
+   nn_zpyc     = 2         !  pycnocline-intensified dissipation scales as N (=1) or N^2 (=2)
+   ln_mevar    = .true.    !  variable (T) or constant (F) mixing efficiency
+   ln_tsdiff   = .true.    !  account for differential T/S mixing (T) or not (F)
+/
+!!======================================================================
+!!                  ***  Diagnostics namelists  ***                   !!
+!!                                                                    !!
+!!   namtrd       dynamics and/or tracer trends                         (default: OFF)
+!!   namptr       Poleward Transport Diagnostics                        (default: OFF)
+!!   namhsb       Heat and salt budgets                                 (default: OFF)
+!!   namdiu       Cool skin and warm layer models                       (default: OFF)
+!!   namdiu       Cool skin and warm layer models                       (default: OFF)
+!!   namflo       float parameters                                      (default: OFF)
+!!   nam_diaharm  Harmonic analysis of tidal constituents               (default: OFF)
+!!   nam_diadct   transports through some sections                      (default: OFF)
+!!   nam_diatmb   Top Middle Bottom Output                              (default: OFF)
+!!   nam_dia25h   25h Mean Output                                       (default: OFF)
+!!   namnc4       netcdf4 chunking and compression settings             ("key_netcdf4")
+!!======================================================================
+!-----------------------------------------------------------------------
+&namtrd        !   trend diagnostics                                    (default: OFF)
+!-----------------------------------------------------------------------
+   ln_tra_trd  = .true.   ! (T) 3D tracer trend output
+/
+!
+!!======================================================================
+!!               ***  Observation & Assimilation  ***                 !!
+!!                                                                    !!
+!!   namobs       observation and model comparison                      (default: OFF)
+!!   nam_asminc   assimilation increments                               ('key_asminc')
+!!======================================================================
+!
+!!======================================================================
+!!                  ***  Miscellaneous namelists  ***                 !!
+!!                                                                    !!
+!!   nammpp            Massively Parallel Processing                    ("key_mpp_mpi")
+!!   namctl            Control prints                                   (default: OFF)
+!!   namsto            Stochastic parametrization of EOS                (default: OFF)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namctl        !   Control prints                                       (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsto        ! Stochastic parametrization of EOS                      (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namptr        !   Poleward Transport Diagnostic                        (default: OFF)
+!-----------------------------------------------------------------------
+   ln_diaptr   = .true.   !  Poleward heat and salt transport (T) or not (F)
+   ln_subbas   = .true.   !  Atlantic/Pacific/Indian basins computation (T) or not
+/
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ice_ORCA025_cfg
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ice_ORCA025_cfg	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ice_ORCA025_cfg	(revision 6658)
@@ -0,0 +1,91 @@
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!! SI3 configuration namelist: Overwrites SHARED/namelist_ice_ref
+!!              1 - Generic parameters                 (nampar)
+!!              2 - Ice thickness discretization       (namitd)
+!!              3 - Ice dynamics                       (namdyn)
+!!              4 - Ice ridging/rafting                (namdyn_rdgrft)
+!!              5 - Ice rheology                       (namdyn_rhg)
+!!              6 - Ice advection                      (namdyn_adv)
+!!              7 - Ice surface boundary conditions    (namsbc)
+!!              8 - Ice thermodynamics                 (namthd)
+!!              9 - Ice heat diffusion                 (namthd_zdf)
+!!             10 - Ice lateral melting                (namthd_da)
+!!             11 - Ice growth in open water           (namthd_do)
+!!             12 - Ice salinity                       (namthd_sal)
+!!             13 - Ice melt ponds                     (namthd_pnd)
+!!             14 - Ice initialization                 (namini)
+!!             15 - Ice/snow albedos                   (namalb)
+!!             16 - Ice diagnostics                    (namdia)
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!
+!------------------------------------------------------------------------------
+&nampar         !   Generic parameters
+!------------------------------------------------------------------------------
+   cn_icerst_in     = "restart_ice_in"   !  suffix of ice restart name (input)
+   rn_amax_n        =   0.997         !  maximum tolerated ice concentration NH
+   rn_amax_s        =   0.950         !  maximum tolerated ice concentration SH
+/
+!------------------------------------------------------------------------------
+&namitd         !   Ice discretization
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namdyn         !   Ice dynamics
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namdyn_rdgrft  !   Ice ridging/rafting
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namdyn_rhg     !   Ice rheology
+!------------------------------------------------------------------------------
+      ln_aEVP       = .false.          !     adaptive rheology (Kimmritz et al. 2016 & 2017)
+/
+!------------------------------------------------------------------------------
+&namdyn_adv     !   Ice advection
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namsbc         !   Ice surface boundary conditions
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namthd         !   Ice thermodynamics
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namthd_zdf     !   Ice heat diffusion
+!------------------------------------------------------------------------------
+   rn_cnd_s         =   0.30          !  thermal conductivity of the snow (0.31 W/m/K, Maykut and Untersteiner, 1971)
+                                      !     Obs: 0.1-0.5 (Lecomte et al, JAMES 2013)
+/
+!------------------------------------------------------------------------------
+&namthd_da      !   Ice lateral melting
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namthd_do      !   Ice growth in open water
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namthd_sal     !   Ice salinity
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namthd_pnd     !   Melt ponds
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namini         !   Ice initialization
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namalb         !   albedo parameters
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namdia         !   Diagnostics
+!------------------------------------------------------------------------------
+   ln_icediahsb     = .true.         !  output the heat, mass & salt budgets (T) or not (F)
+/
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ice_ORCA2_cfg
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ice_ORCA2_cfg	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_ice_ORCA2_cfg	(revision 6658)
@@ -0,0 +1,87 @@
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!! SI3 configuration namelist: Overwrites SHARED/namelist_ice_ref
+!!              1 - Generic parameters                 (nampar)
+!!              2 - Ice thickness discretization       (namitd)
+!!              3 - Ice dynamics                       (namdyn)
+!!              4 - Ice ridging/rafting                (namdyn_rdgrft)
+!!              5 - Ice rheology                       (namdyn_rhg)
+!!              6 - Ice advection                      (namdyn_adv)
+!!              7 - Ice surface boundary conditions    (namsbc)
+!!              8 - Ice thermodynamics                 (namthd)
+!!              9 - Ice heat diffusion                 (namthd_zdf)
+!!             10 - Ice lateral melting                (namthd_da)
+!!             11 - Ice growth in open water           (namthd_do)
+!!             12 - Ice salinity                       (namthd_sal)
+!!             13 - Ice melt ponds                     (namthd_pnd)
+!!             14 - Ice initialization                 (namini)
+!!             15 - Ice/snow albedos                   (namalb)
+!!             16 - Ice diagnostics                    (namdia)
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!
+!------------------------------------------------------------------------------
+&nampar         !   Generic parameters
+!------------------------------------------------------------------------------
+   cn_icerst_in     = "restart_ice_in"   !  suffix of ice restart name (input)
+/
+!------------------------------------------------------------------------------
+&namitd         !   Ice discretization
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namdyn         !   Ice dynamics
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namdyn_rdgrft  !   Ice ridging/rafting
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namdyn_rhg     !   Ice rheology
+!------------------------------------------------------------------------------
+      ln_aEVP       = .false.          !     adaptive rheology (Kimmritz et al. 2016 & 2017)
+/
+!------------------------------------------------------------------------------
+&namdyn_adv     !   Ice advection
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namsbc         !   Ice surface boundary conditions
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namthd         !   Ice thermodynamics
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namthd_zdf     !   Ice heat diffusion
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namthd_da      !   Ice lateral melting
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namthd_do      !   Ice growth in open water
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namthd_sal     !   Ice salinity
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namthd_pnd     !   Melt ponds
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namini         !   Ice initialization
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namalb         !   albedo parameters
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namdia         !   Diagnostics
+!------------------------------------------------------------------------------
+   ln_icediahsb     = .true.         !  output the heat, mass & salt budgets (T) or not (F)
+/
Index: CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_top_ORCA2_cfg
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_top_ORCA2_cfg	(revision 6656)
+++ CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/PARAM/NEMO/namelist_top_ORCA2_cfg	(revision 6658)
@@ -3,5 +3,5 @@
 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 !-----------------------------------------------------------------------
-&namtrc_run     !   run information
+&namtrc_run      !   run information
 !-----------------------------------------------------------------------
    ln_rsttr      = _AUTO_
@@ -10,83 +10,107 @@
 /
 !-----------------------------------------------------------------------
-&namtrc     !   tracers definition
+&namtrc          !   tracers definition
 !-----------------------------------------------------------------------
-   ln_trcdta     =   .true.  !  Initialisation from data input file (T) or not (F)
-   ln_trcdmp_clo =  .true.   !  restoring on closed seas (T) or not (F) 
-
-!                !    name   !           title of the field              ! initial data ! initial data ! save   !
-!                !           !                                           !  units       ! from file    ! or not ! 
-!                !           !                                           !              ! or not       !        !
-   sn_tracer(1)   = 'DIC     ' , 'Dissolved inorganic Concentration      ',  'mol-C/L' ,  .true.     ,  .true.
-   sn_tracer(2)   = 'Alkalini' , 'Total Alkalinity Concentration         ',  'eq/L '   ,  .true.     ,  .true.
-   sn_tracer(3)   = 'O2      ' , 'Dissolved Oxygen Concentration         ',  'mol-C/L' ,  .true.     ,  .true.
-   sn_tracer(4)   = 'CaCO3   ' , 'Calcite Concentration                  ',  'mol-C/L' ,  .false.    ,  .true.
-   sn_tracer(5)   = 'PO4     ' , 'Phosphate Concentration                ',  'mol-C/L' ,  .true.     ,  .true.
-   sn_tracer(6)   = 'POC     ' , 'Small organic carbon Concentration     ',  'mol-C/L' ,  .false.    ,  .true.
-   sn_tracer(7)   = 'Si      ' , 'Silicate Concentration                 ',  'mol-C/L' ,  .true.     ,  .true.
-   sn_tracer(8)   = 'PHY     ' , 'Nanophytoplankton Concentration        ',  'mol-C/L' ,  .false.    ,  .true.
-   sn_tracer(9)   = 'ZOO     ' , 'Microzooplankton Concentration         ',  'mol-C/L' ,  .false.    ,  .true.
-   sn_tracer(10)  = 'DOC     ' , 'Dissolved organic Concentration        ',  'mol-C/L' ,  .true.     ,  .true.
-   sn_tracer(11)  = 'PHY2    ' , 'Diatoms Concentration                  ',  'mol-C/L' ,  .false.    ,  .true.
-   sn_tracer(12)  = 'ZOO2    ' , 'Mesozooplankton Concentration          ',  'mol-C/L' ,  .false.    ,  .true.
-   sn_tracer(13)  = 'DSi     ' , 'Diatoms Silicate Concentration         ',  'mol-C/L' ,  .false.    ,  .true.
-   sn_tracer(14)  = 'Fer     ' , 'Dissolved Iron Concentration           ',  'mol-C/L' ,  .true.     ,  .true.
-   sn_tracer(15)  = 'BFe     ' , 'Big iron particles Concentration       ',  'mol-C/L' ,  .false.    ,  .true.
-   sn_tracer(16)  = 'GOC     ' , 'Big organic carbon Concentration       ',  'mol-C/L' ,  .false.    ,  .true.
-   sn_tracer(17)  = 'SFe     ' , 'Small iron particles Concentration     ',  'mol-C/L' ,  .false.    ,  .true.
-   sn_tracer(18)  = 'DFe     ' , 'Diatoms iron  Concentration            ',  'mol-C/L' ,  .false.    ,  .true.
-   sn_tracer(19)  = 'GSi     ' , 'Sinking biogenic Silicate Concentration',  'mol-C/L' ,  .false.    ,  .true.
-   sn_tracer(20)  = 'NFe     ' , 'Nano iron Concentration                ',  'mol-C/L' ,  .false.    ,  .true.
-   sn_tracer(21)  = 'NCHL    ' , 'Nano chlorophyl Concentration          ',  'mol-C/L' ,  .false.    ,  .true.
-   sn_tracer(22)  = 'DCHL    ' , 'Diatoms chlorophyl Concentration       ',  'mol-C/L' ,  .false.    ,  .true.
-   sn_tracer(23)  = 'NO3     ' , 'Nitrates Concentration                 ',  'mol-C/L' ,  .true.     ,  .true.
-   sn_tracer(24)  = 'NH4     ' , 'Ammonium Concentration                 ',  'mol-C/L' ,  .false.    ,  .true.
+   jp_bgc        =  24
+!
+   ln_pisces     =  .true.
+   ln_my_trc     =  .false.
+   ln_age        =  _AUTO_
+   ln_cfc11      =  _AUTO_ 
+   ln_cfc12      =  _AUTO_
+   ln_c14        =  .false.
+!
+   ln_trcdta     =  .true.  !  Initialisation from data input file (T) or not (F)
+!                 !           !                                          !             !
+!                 !    name   !           title of the field             !   units     ! initial data from file or not !
+!                 !           !                                          !             !
+   sn_tracer(1)   = 'DIC     ' , 'Dissolved inorganic Concentration      ',  'mol-C/L' ,  .true.
+   sn_tracer(2)   = 'Alkalini' , 'Total Alkalinity Concentration         ',  'eq/L '   ,  .true.
+   sn_tracer(3)   = 'O2      ' , 'Dissolved Oxygen Concentration         ',  'mol-C/L' ,  .true.
+   sn_tracer(4)   = 'CaCO3   ' , 'Calcite Concentration                  ',  'mol-C/L' ,  .false.
+   sn_tracer(5)   = 'PO4     ' , 'Phosphate Concentration                ',  'mol-C/L' ,  .true.
+   sn_tracer(6)   = 'POC     ' , 'Small organic carbon Concentration     ',  'mol-C/L' ,  .false.
+   sn_tracer(7)   = 'Si      ' , 'Silicate Concentration                 ',  'mol-C/L' ,  .true.
+   sn_tracer(8)   = 'PHY     ' , 'Nanophytoplankton Concentration        ',  'mol-C/L' ,  .false.
+   sn_tracer(9)   = 'ZOO     ' , 'Microzooplankton Concentration         ',  'mol-C/L' ,  .false.
+   sn_tracer(10)  = 'DOC     ' , 'Dissolved organic Concentration        ',  'mol-C/L' ,  .true.
+   sn_tracer(11)  = 'PHY2    ' , 'Diatoms Concentration                  ',  'mol-C/L' ,  .false.
+   sn_tracer(12)  = 'ZOO2    ' , 'Mesozooplankton Concentration          ',  'mol-C/L' ,  .false.
+   sn_tracer(13)  = 'DSi     ' , 'Diatoms Silicate Concentration         ',  'mol-C/L' ,  .false.
+   sn_tracer(14)  = 'Fer     ' , 'Dissolved Iron Concentration           ',  'mol-C/L' ,  .true.
+   sn_tracer(15)  = 'BFe     ' , 'Big iron particles Concentration       ',  'mol-C/L' ,  .false.
+   sn_tracer(16)  = 'GOC     ' , 'Big organic carbon Concentration       ',  'mol-C/L' ,  .false.
+   sn_tracer(17)  = 'SFe     ' , 'Small iron particles Concentration     ',  'mol-C/L' ,  .false.
+   sn_tracer(18)  = 'DFe     ' , 'Diatoms iron  Concentration            ',  'mol-C/L' ,  .false.
+   sn_tracer(19)  = 'GSi     ' , 'Sinking biogenic Silicate Concentration',  'mol-C/L' ,  .false.
+   sn_tracer(20)  = 'NFe     ' , 'Nano iron Concentration                ',  'mol-C/L' ,  .false.
+   sn_tracer(21)  = 'NCHL    ' , 'Nano chlorophyl Concentration          ',  'mol-C/L' ,  .false.
+   sn_tracer(22)  = 'DCHL    ' , 'Diatoms chlorophyl Concentration       ',  'mol-C/L' ,  .false.
+   sn_tracer(23)  = 'NO3     ' , 'Nitrates Concentration                 ',  'mol-C/L' ,  .true.
+   sn_tracer(24)  = 'NH4     ' , 'Ammonium Concentration                 ',  'mol-C/L' ,  .false.
+/
+!-----------------------------------------------------------------------
+&namage          !   AGE 
+!-----------------------------------------------------------------------
 /
 !-----------------------------------------------------------------------
 &namtrc_dta      !    Initialisation from data input file
 !-----------------------------------------------------------------------
-!          !  file name  ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation ! land/sea mask !
-!          !             !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      !
-   sn_trcdta(1)  = 'data_DIC_nomask'        ,        -12        ,  'DIC'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(2)  = 'data_Alkalini_nomask'   ,        -12        ,  'Alkalini',    .false.   , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(3)  = 'data_O2_nomask'         ,        -1         ,  'O2'      ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(5)  = 'data_PO4_nomask'        ,        -1         ,  'PO4'     ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(7)  = 'data_Si_nomask'         ,        -1         ,  'Si'      ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(10) = 'data_DOC_nomask'        ,        -12        ,  'DOC'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(14) = 'data_Fer_nomask'        ,        -12        ,  'Fer'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(23) = 'data_NO3_nomask'        ,        -1         ,  'NO3'     ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
-   rn_trfac(1)   =   1.0e-06  !  multiplicative factor
-   rn_trfac(2)   =   1.0e-06  !  -      -      -     -
+!                !  file name          ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation ! land/sea mask !
+!                !                     !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      !
+   sn_trcdta(1)  = 'data_DIC_nomask.nc',        -12        ,  'PiDIC'  ,    .false.   , .true. , 'yearly'  , 'weights_3D_r360x180_bilin.nc'       , ''   , ''
+   sn_trcdta(2)  = 'data_ALK_nomask.nc',        -12        ,  'TALK'   ,    .false.   , .true. , 'yearly'  , 'weights_3D_r360x180_bilin.nc'       , ''   , ''
+   sn_trcdta(3)  = 'data_OXY_nomask.nc',        -1         ,  'O2'     ,    .true.    , .true. , 'yearly'  , 'weights_3D_r360x180_bilin.nc'       , ''   , ''
+   sn_trcdta(5)  = 'data_PO4_nomask.nc',        -1         ,  'PO4'    ,    .true.    , .true. , 'yearly'  , 'weights_3D_r360x180_bilin.nc'       , ''   , ''
+   sn_trcdta(7)  = 'data_SIL_nomask.nc',        -1         ,  'Si'     ,    .true.    , .true. , 'yearly'  , 'weights_3D_r360x180_bilin.nc'       , ''   , ''
+   sn_trcdta(10) = 'data_DOC_nomask.nc',        -1         ,  'DOC'    ,    .true.    , .true. , 'yearly'  , 'weights_3D_r360x180_bilin.nc'       , ''   , ''
+   sn_trcdta(14) = 'data_FER_nomask.nc',        -1         ,  'Fer'    ,    .true.    , .true. , 'yearly'  , 'weights_3D_r360x180_bilin.nc'       , ''   , ''
+   sn_trcdta(23) = 'data_NO3_nomask.nc',        -1         ,  'NO3'    ,    .true.    , .true. , 'yearly'  , 'weights_3D_r360x180_bilin.nc'       , ''   , ''
+   rn_trfac(1)   =   1.028e-06  !  multiplicative factor
+   rn_trfac(2)   =   1.028e-06  !  -      -      -     -
    rn_trfac(3)   =  44.6e-06  !  -      -      -     -
    rn_trfac(5)   = 122.0e-06  !  -      -      -     -
    rn_trfac(7)   =   1.0e-06  !  -      -      -     -
-   rn_trfac(10)  =   1.0      !  -      -      -     -
-   rn_trfac(14)  =   1.0      !  -      -      -     -
+   rn_trfac(10)  =   1.0e-06  !  -      -      -     -
+   rn_trfac(14)  =   1.0e-06  !  -      -      -     -
    rn_trfac(23)  =   7.6e-06  !  -      -      -     -
 /
 !-----------------------------------------------------------------------
-&namtrc_adv    !   advection scheme for passive tracer 
+&namtrc_adv      !   advection scheme for passive tracer                (default: NO selection)
 !-----------------------------------------------------------------------
-   ln_trcadv_tvd     =  .false.  !  TVD scheme
-   ln_trcadv_muscl   =  .true.   !  MUSCL scheme
+   ln_trcadv_mus =  .true.  !  MUSCL scheme
+      ln_mus_ups =  .false.         !  use upstream scheme near river mouths
 /
 !-----------------------------------------------------------------------
-&namtrc_ldf    !   lateral diffusion scheme for passive tracer 
+&namtrc_ldf      !   lateral diffusion scheme for passive tracer        (default: NO selection)
+!-----------------------------------------------------------------------
+   ln_trcldf_tra   = .true.      !  use active tracer setting
+/
+!-----------------------------------------------------------------------
+&namtrc_rad      !  treatment of negative concentrations 
 !-----------------------------------------------------------------------
 /
 !-----------------------------------------------------------------------
-&namtrc_zdf        !   vertical physics
+&namtrc_snk      !  sedimentation of particles
 !-----------------------------------------------------------------------
 /
 !-----------------------------------------------------------------------
-&namtrc_rad        !  treatment of negative concentrations 
+&namtrc_dmp      !   passive tracer newtonian damping   
 !-----------------------------------------------------------------------
 /
 !-----------------------------------------------------------------------
-&namtrc_dia       !   parameters for passive tracer additional diagnostics
+&namtrc_ice      !    Representation of sea ice growth & melt effects
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtrc_trd      !   diagnostics on tracer trends                       ('key_trdtrc')
 !----------------------------------------------------------------------
 /
 !----------------------------------------------------------------------
-&namtrc_bc        !   data for boundary conditions
+&namtrc_bc       !   data for boundary conditions
 !-----------------------------------------------------------------------
 /
+!----------------------------------------------------------------------
+&namtrc_bdy      !   Setup of tracer boundary conditions
+!-----------------------------------------------------------------------
+/
Index: CONFIG/UNIFORM/v7/IPSLCM7/SOURCES/NEMO/context_nemo.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/SOURCES/NEMO/context_nemo.xml	(revision 6656)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<!--
- ============================================================================================== 
-    NEMO context
-============================================================================================== 
--->
-<context id="nemo">
-    <!-- $id$ -->
-    <variable_definition>
-       <!-- Year/Month/Day of time origin for NetCDF files; defaults to 1800-01-01 -->
-       <variable id="ref_year"  type="int"> 1900 </variable>
-       <variable id="ref_month" type="int"> 01 </variable>
-       <variable id="ref_day"   type="int"> 01 </variable>
-       <variable id="rho0"      type="float" > 1026.0 </variable>
-       <variable id="cpocean"   type="float" > 3991.86795711963 </variable>
-       <variable id="convSpsu"  type="float" > 0.99530670233846  </variable>
-       <variable id="rhoic"     type="float" > 917.0 </variable>
-       <variable id="rhosn"     type="float" > 330.0 </variable>
-       <variable id="missval"   type="float" > 1.e20 </variable>
-    </variable_definition>
-
-<!-- Fields definition -->
-    <field_definition src="./field_def_nemo-oce.xml"/>    <!--  NEMO ocean dynamics     -->
-    <field_definition src="./field_def_nemo-ice.xml"/>    <!--  NEMO sea-ice model      -->
-    <field_definition src="./field_def_nemo-pisces.xml"/> <!--  NEMO ocean biology      -->
-    <field_definition src="./field_def_nemo-innerttrc.xml"/> <!--  NEMO ocean biology      -->
-
-<!-- Files definition -->
-    <file_definition src="./file_def_nemo-oce.xml"/>     <!--  NEMO ocean dynamics      -->
-    <file_definition src="./file_def_nemo-ice.xml"/>     <!--  NEMO sea-ice model       -->
-    <file_definition src="./file_def_nemo-pisces.xml"/>     <!--  NEMO sea-ice model       -->
-
-
-<!-- Axis definition -->
-    <axis_definition src="./axis_def_nemo.xml"/>
- 
-<!-- Domain definition -->
-    <domain_definition src="./domain_def_nemo.xml"/>
-
-<!-- Grids definition -->
-    <grid_definition   src="./grid_def_nemo.xml"/>
-  
-
-</context>
Index: CONFIG/UNIFORM/v7/IPSLCM7/SOURCES/NEMO/diahth.F90
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/SOURCES/NEMO/diahth.F90	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/SOURCES/NEMO/diahth.F90	(revision 6658)
@@ -0,0 +1,377 @@
+MODULE diahth
+   !!======================================================================
+   !!                       ***  MODULE  diahth  ***
+   !! Ocean diagnostics: thermocline and 20 degree depth
+   !!======================================================================
+   !! History :  OPA  !  1994-09  (J.-P. Boulanger)  Original code
+   !!                 !  1996-11  (E. Guilyardi)  OPA8 
+   !!                 !  1997-08  (G. Madec)  optimization
+   !!                 !  1999-07  (E. Guilyardi)  hd28 + heat content 
+   !!   NEMO     1.0  !  2002-06  (G. Madec)  F90: Free form and module
+   !!            3.2  !  2009-07  (S. Masson) hc300 bugfix + cleaning + add new diag
+   !!----------------------------------------------------------------------
+   !!   dia_hth      : Compute varius diagnostics associated with the mixed layer
+   !!----------------------------------------------------------------------
+   USE oce             ! ocean dynamics and tracers
+   USE dom_oce         ! ocean space and time domain
+   USE phycst          ! physical constants
+   !
+   USE in_out_manager  ! I/O manager
+   USE lib_mpp         ! MPP library
+   USE iom             ! I/O library
+   USE timing          ! preformance summary
+
+   IMPLICIT NONE
+   PRIVATE
+
+   PUBLIC   dia_hth       ! routine called by step.F90
+   PUBLIC   dia_hth_alloc ! routine called by nemogcm.F90
+
+   LOGICAL, SAVE  ::   l_hth     !: thermocline-20d depths flag
+   
+   ! note: following variables should move to local variables once iom_put is always used 
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hth    !: depth of the max vertical temperature gradient [m]
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hd20   !: depth of 20 C isotherm                         [m]
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hd26   !: depth of 26 C isotherm                         [m]
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hd28   !: depth of 28 C isotherm                         [m]
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   htc3   !: heat content of first 300 m                    [W]
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   htc7   !: heat content of first 700 m                    [W]
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   htc20  !: heat content of first 2000 m                   [W]
+
+
+   !! * Substitutions
+#  include "do_loop_substitute.h90"
+#  include "domzgr_substitute.h90"
+   !!----------------------------------------------------------------------
+   !! NEMO/OCE 4.0 , NEMO Consortium (2018)
+   !! $Id: diahth.F90 15234 2021-09-08 14:07:02Z clem $ 
+   !! Software governed by the CeCILL license (see ./LICENSE)
+   !!----------------------------------------------------------------------
+CONTAINS
+
+   FUNCTION dia_hth_alloc()
+      !!---------------------------------------------------------------------
+      INTEGER :: dia_hth_alloc
+      !!---------------------------------------------------------------------
+      !
+      ALLOCATE( hth(jpi,jpj), hd20(jpi,jpj), hd26(jpi,jpj), hd28(jpi,jpj), &
+         &      htc3(jpi,jpj), htc7(jpi,jpj), htc20(jpi,jpj), STAT=dia_hth_alloc )
+      !
+      CALL mpp_sum ( 'diahth', dia_hth_alloc )
+      IF(dia_hth_alloc /= 0)   CALL ctl_stop( 'STOP', 'dia_hth_alloc: failed to allocate arrays.' )
+      !
+   END FUNCTION dia_hth_alloc
+
+
+   SUBROUTINE dia_hth( kt, Kmm )
+      !!---------------------------------------------------------------------
+      !!                  ***  ROUTINE dia_hth  ***
+      !!
+      !! ** Purpose : Computes
+      !!      the mixing layer depth (turbocline): avt = 5.e-4
+      !!      the depth of strongest vertical temperature gradient
+      !!      the mixed layer depth with density     criteria: rho = rho(10m or surf) + 0.03(or 0.01)
+      !!      the mixed layer depth with temperature criteria: abs( tn - tn(10m) ) = 0.2       
+      !!      the top of the thermochine: tn = tn(10m) - ztem2 
+      !!      the pycnocline depth with density criteria equivalent to a temperature variation 
+      !!                rho = rho10m + (dr/dT)(T,S,10m)*(-0.2 degC) 
+      !!      the barrier layer thickness
+      !!      the maximal verical inversion of temperature and its depth max( 0, max of tn - tn(10m) )
+      !!      the depth of the 20 degree isotherm (linear interpolation)
+      !!      the depth of the 28 degree isotherm (linear interpolation)
+      !!      the heat content of first 300 m
+      !!
+      !! ** Method : 
+      !!-------------------------------------------------------------------
+      INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
+      INTEGER, INTENT( in ) ::   Kmm     ! ocean time level index
+      !!
+      INTEGER                      ::   ji, jj, jk            ! dummy loop arguments
+      REAL(wp)                     ::   zrho3 = 0.03_wp       ! density     criterion for mixed layer depth
+      REAL(wp)                     ::   zrho1 = 0.01_wp       ! density     criterion for mixed layer depth
+      REAL(wp)                     ::   ztem2 = 0.2_wp        ! temperature criterion for mixed layer depth
+      REAL(wp)                     ::   zztmp, zzdep          ! temporary scalars inside do loop
+      REAL(wp)                     ::   zu, zv, zw, zut, zvt  ! temporary workspace
+      REAL(wp), DIMENSION(jpi,jpj) ::   zabs2      ! MLD: abs( tn - tn(10m) ) = ztem2 
+      REAL(wp), DIMENSION(jpi,jpj) ::   ztm2       ! Top of thermocline: tn = tn(10m) - ztem2     
+      REAL(wp), DIMENSION(jpi,jpj) ::   zrho10_3   ! MLD: rho = rho10m + zrho3      
+      REAL(wp), DIMENSION(jpi,jpj) ::   zpycn      ! pycnocline: rho = rho10m + (dr/dT)(T,S,10m)*(-0.2 degC)
+      REAL(wp), DIMENSION(jpi,jpj) ::   ztinv      ! max of temperature inversion
+      REAL(wp), DIMENSION(jpi,jpj) ::   zdepinv    ! depth of temperature inversion
+      REAL(wp), DIMENSION(jpi,jpj) ::   zrho0_3    ! MLD rho = rho(surf) = 0.03
+      REAL(wp), DIMENSION(jpi,jpj) ::   zrho0_1    ! MLD rho = rho(surf) = 0.01
+      REAL(wp), DIMENSION(jpi,jpj) ::   zmaxdzT    ! max of dT/dz
+      REAL(wp), DIMENSION(jpi,jpj) ::   zdelr      ! delta rho equivalent to deltaT = 0.2
+      !!----------------------------------------------------------------------
+      IF( ln_timing )   CALL timing_start('dia_hth')
+
+      IF( kt == nit000 ) THEN
+         l_hth = .FALSE.
+         IF(   iom_use( 'mlddzt'   ) .OR. iom_use( 'mldr0_3'  ) .OR. iom_use( 'mldr0_1'  )    .OR.  & 
+            &  iom_use( 'mld_dt02' ) .OR. iom_use( 'topthdep' ) .OR. iom_use( 'mldr10_3' )    .OR.  &    
+            &  iom_use( '20d'      ) .OR. iom_use( '26d'      ) .OR. iom_use( '28d'      )    .OR.  &    
+            &  iom_use( 'hc300'    ) .OR. iom_use( 'hc700'    ) .OR. iom_use( 'hc2000'   )    .OR.  &    
+            &  iom_use( 'pycndep'  ) .OR. iom_use( 'tinv'     ) .OR. iom_use( 'depti'    )    .OR.  &
+            &  iom_use( 'maxdzT'   )  ) l_hth = .TRUE.
+         !                                      ! allocate dia_hth array
+         IF( l_hth ) THEN 
+            IF( dia_hth_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'dia_hth : unable to allocate standard arrays' )
+            IF(lwp) WRITE(numout,*)
+            IF(lwp) WRITE(numout,*) 'dia_hth : diagnostics of the thermocline depth'
+            IF(lwp) WRITE(numout,*) '~~~~~~~ '
+            IF(lwp) WRITE(numout,*)
+         ENDIF
+      ENDIF
+
+      IF( l_hth ) THEN
+         !
+         IF(  iom_use( 'mlddzt' ) .OR. iom_use( 'mldr0_3' ) .OR. iom_use( 'mldr0_1' ) .OR.  &
+            & iom_use( 'maxdzT' ) ) THEN
+
+            ! initialization
+            ztinv  (:,:) = 0._wp  
+            zdepinv(:,:) = 0._wp  
+            zmaxdzT(:,:) = 0._wp  
+            DO_2D( 1, 1, 1, 1 )
+               zztmp = gdepw(ji,jj,mbkt(ji,jj)+1,Kmm) 
+               hth     (ji,jj) = zztmp
+               zabs2   (ji,jj) = zztmp
+               ztm2    (ji,jj) = zztmp
+               zrho10_3(ji,jj) = zztmp
+               zpycn   (ji,jj) = zztmp
+            END_2D
+            IF( nla10 > 1 ) THEN 
+               DO_2D( 1, 1, 1, 1 )
+                  zztmp = gdepw(ji,jj,mbkt(ji,jj)+1,Kmm) 
+                  zrho0_3(ji,jj) = zztmp
+                  zrho0_1(ji,jj) = zztmp
+               END_2D
+            ENDIF
+      
+            ! Preliminary computation
+            ! computation of zdelr = (dr/dT)(T,S,10m)*(-0.2 degC)
+            DO_2D( 1, 1, 1, 1 )
+               IF( tmask(ji,jj,nla10) == 1. ) THEN
+                  zu  =  1779.50 + 11.250 * ts(ji,jj,nla10,jp_tem,Kmm) - 3.80   * ts(ji,jj,nla10,jp_sal,Kmm)  &
+                     &           - 0.0745 * ts(ji,jj,nla10,jp_tem,Kmm) * ts(ji,jj,nla10,jp_tem,Kmm)   &
+                     &           - 0.0100 * ts(ji,jj,nla10,jp_tem,Kmm) * ts(ji,jj,nla10,jp_sal,Kmm)
+                  zv  =  5891.00 + 38.000 * ts(ji,jj,nla10,jp_tem,Kmm) + 3.00   * ts(ji,jj,nla10,jp_sal,Kmm)  &
+                     &           - 0.3750 * ts(ji,jj,nla10,jp_tem,Kmm) * ts(ji,jj,nla10,jp_tem,Kmm)
+                  zut =    11.25 -  0.149 * ts(ji,jj,nla10,jp_tem,Kmm) - 0.01   * ts(ji,jj,nla10,jp_sal,Kmm)
+                  zvt =    38.00 -  0.750 * ts(ji,jj,nla10,jp_tem,Kmm)
+                  zw  = (zu + 0.698*zv) * (zu + 0.698*zv)
+                  zdelr(ji,jj) = ztem2 * (1000.*(zut*zv - zvt*zu)/zw)
+               ELSE
+                  zdelr(ji,jj) = 0._wp
+               ENDIF
+            END_2D
+
+            ! ------------------------------------------------------------- !
+            ! thermocline depth: strongest vertical gradient of temperature !
+            ! turbocline depth (mixing layer depth): avt = zavt5            !
+            ! MLD: rho = rho(1) + zrho3                                     !
+            ! MLD: rho = rho(1) + zrho1                                     !
+            ! ------------------------------------------------------------- !
+            DO_3DS( 1, 1, 1, 1, jpkm1, 2, -1 )   ! loop from bottom to 2
+               !
+               zzdep = gdepw(ji,jj,jk,Kmm)
+               zztmp = ( ts(ji,jj,jk-1,jp_tem,Kmm) - ts(ji,jj,jk,jp_tem,Kmm) ) &
+                      & / zzdep * tmask(ji,jj,jk)   ! vertical gradient of temperature (dT/dz)
+               zzdep = zzdep * tmask(ji,jj,1)
+
+               IF( zztmp > zmaxdzT(ji,jj) ) THEN                        
+                   zmaxdzT(ji,jj) = zztmp   
+                   hth    (ji,jj) = zzdep                ! max and depth of dT/dz
+               ENDIF
+         
+               IF( nla10 > 1 ) THEN 
+                  zztmp = rhop(ji,jj,jk) - rhop(ji,jj,1)                       ! delta rho(1)
+                  IF( zztmp > zrho3 )   zrho0_3(ji,jj) = zzdep                ! > 0.03
+                  IF( zztmp > zrho1 )   zrho0_1(ji,jj) = zzdep                ! > 0.01
+               ENDIF
+            END_3D
+         
+            CALL iom_put( 'maxdzT', zmaxdzT )        ! max of dT/dz
+            CALL iom_put( 'mlddzt', hth )            ! depth of the thermocline
+
+            IF( nla10 > 1 ) THEN 
+               CALL iom_put( 'mldr0_3', zrho0_3 )   ! MLD delta rho(surf) = 0.03
+               CALL iom_put( 'mldr0_1', zrho0_1 )   ! MLD delta rho(surf) = 0.01
+            ENDIF
+            !
+         ENDIF
+         !
+         IF(  iom_use( 'mld_dt02' ) .OR. iom_use( 'topthdep' ) .OR. iom_use( 'mldr10_3' ) .OR.  &    
+            &  iom_use( 'pycndep' ) .OR. iom_use( 'tinv'     ) .OR. iom_use( 'depti'    )  ) THEN
+            ! ------------------------------------------------------------- !
+            ! MLD: abs( tn - tn(10m) ) = ztem2                              !
+            ! Top of thermocline: tn = tn(10m) - ztem2                      !
+            ! MLD: rho = rho10m + zrho3                                     !
+            ! pycnocline: rho = rho10m + (dr/dT)(T,S,10m)*(-0.2 degC)       !
+            ! temperature inversion: max( 0, max of tn - tn(10m) )          !
+            ! depth of temperature inversion                                !
+            ! ------------------------------------------------------------- !
+            DO_3DS( 1, 1, 1, 1, jpkm1, nlb10, -1 )   ! loop from bottom to nlb10
+               !
+               zzdep = gdepw(ji,jj,jk,Kmm) * tmask(ji,jj,1)
+               !
+               zztmp = ts(ji,jj,nla10,jp_tem,Kmm) - ts(ji,jj,jk,jp_tem,Kmm)  ! - delta T(10m)
+               IF( ABS(zztmp) > ztem2 )      zabs2   (ji,jj) = zzdep   ! abs > 0.2
+               IF(     zztmp  > ztem2 )      ztm2    (ji,jj) = zzdep   ! > 0.2
+               zztmp = -zztmp                                          ! delta T(10m)
+               IF( zztmp >  ztinv(ji,jj) ) THEN                        ! temperature inversion
+                  ztinv(ji,jj) = zztmp   
+                  zdepinv (ji,jj) = zzdep   ! max value and depth
+               ENDIF
+
+               zztmp = rhop(ji,jj,jk) - rhop(ji,jj,nla10)              ! delta rho(10m)
+               IF( zztmp > zrho3        )    zrho10_3(ji,jj) = zzdep   ! > 0.03
+               IF( zztmp > zdelr(ji,jj) )    zpycn   (ji,jj) = zzdep   ! > equi. delta T(10m) - 0.2
+               !
+            END_3D
+
+            CALL iom_put( 'mld_dt02', zabs2    )   ! MLD abs(delta t) - 0.2
+            CALL iom_put( 'topthdep', ztm2     )   ! T(10) - 0.2
+            CALL iom_put( 'mldr10_3', zrho10_3 )   ! MLD delta rho(10m) = 0.03
+            CALL iom_put( 'pycndep' , zpycn    )   ! MLD delta rho equi. delta T(10m) = 0.2
+            CALL iom_put( 'tinv'    , ztinv    )   ! max. temp. inv. (t10 ref) 
+            CALL iom_put( 'depti'   , zdepinv  )   ! depth of max. temp. inv. (t10 ref) 
+            !
+         ENDIF
+ 
+         ! ------------------------------- !
+         !  Depth of 20C/26C/28C isotherm  !
+         ! ------------------------------- !
+         IF( iom_use ('20d') ) THEN  ! depth of the 20 isotherm
+            ztem2 = 20.
+            CALL dia_hth_dep( Kmm, ztem2, hd20 )  
+            CALL iom_put( '20d', hd20 )    
+         ENDIF
+         !
+         IF( iom_use ('26d') ) THEN  ! depth of the 26 isotherm
+            ztem2 = 26.
+            CALL dia_hth_dep( Kmm, ztem2, hd26 )  
+            CALL iom_put( '26d', hd26 )    
+         ENDIF
+         !
+         IF( iom_use ('28d') ) THEN  ! depth of the 28 isotherm
+            ztem2 = 28.
+            CALL dia_hth_dep( Kmm, ztem2, hd28 )  
+            CALL iom_put( '28d', hd28 )    
+         ENDIF
+        
+         ! ----------------------------- !
+         !  Heat content of first 300 m  !
+         ! ----------------------------- !
+         IF( iom_use ('hc300') ) THEN  
+            zzdep = 300.
+            CALL  dia_hth_htc( Kmm, zzdep, ts(:,:,:,jp_tem,Kmm), htc3 )
+            CALL iom_put( 'hc300', rho0_rcp * htc3 )  ! vertically integrated heat content (J/m2)
+         ENDIF
+         !
+         ! ----------------------------- !
+         !  Heat content of first 700 m  !
+         ! ----------------------------- !
+         IF( iom_use ('hc700') ) THEN  
+            zzdep = 700.
+            CALL  dia_hth_htc( Kmm, zzdep, ts(:,:,:,jp_tem,Kmm), htc7 )
+            CALL iom_put( 'hc700', rho0_rcp * htc7 )  ! vertically integrated heat content (J/m2)
+  
+         ENDIF
+         !
+         ! ----------------------------- !
+         !  Heat content of first 2000 m  !
+         ! ----------------------------- !
+         IF( iom_use ('hc2000') ) THEN  
+            zzdep = 2000.
+            CALL  dia_hth_htc( Kmm, zzdep, ts(:,:,:,jp_tem,Kmm), htc20 )
+            CALL iom_put( 'hc2000', rho0_rcp * htc20 )  ! vertically integrated heat content (J/m2)  
+         ENDIF
+         !
+      ENDIF
+
+      !
+      IF( ln_timing )   CALL timing_stop('dia_hth')
+      !
+   END SUBROUTINE dia_hth
+
+   SUBROUTINE dia_hth_dep( Kmm, ptem, pdept )
+      !
+      INTEGER , INTENT(in) :: Kmm      ! ocean time level index
+      REAL(wp), INTENT(in) :: ptem
+      REAL(wp), DIMENSION(jpi,jpj), INTENT(out) :: pdept     
+      !
+      INTEGER  :: ji, jj, jk, iid
+      REAL(wp) :: zztmp, zzdep
+      INTEGER, DIMENSION(jpi,jpj) :: iktem
+      
+      ! --------------------------------------- !
+      ! search deepest level above ptem         !
+      ! --------------------------------------- !
+      iktem(:,:) = 1
+      DO_3D( 1, 1, 1, 1, 1, jpkm1 )   ! beware temperature is not always decreasing with depth => loop from top to bottom
+         zztmp = ts(ji,jj,jk,jp_tem,Kmm)
+         IF( zztmp >= ptem )   iktem(ji,jj) = jk
+      END_3D
+
+      ! ------------------------------- !
+      !  Depth of ptem isotherm         !
+      ! ------------------------------- !
+      DO_2D( 1, 1, 1, 1 )
+         !
+         zzdep = gdepw(ji,jj,mbkt(ji,jj)+1,Kmm)       ! depth of the ocean bottom
+         !
+         iid = iktem(ji,jj)
+         IF( iid /= 1 ) THEN 
+             zztmp =     gdept(ji,jj,iid  ,Kmm)   &                     ! linear interpolation
+               &  + (    gdept(ji,jj,iid+1,Kmm) - gdept(ji,jj,iid,Kmm)                       )   &
+               &  * ( 20.*tmask(ji,jj,iid+1) - ts(ji,jj,iid,jp_tem,Kmm)                       )   &
+               &  / ( ts(ji,jj,iid+1,jp_tem,Kmm) - ts(ji,jj,iid,jp_tem,Kmm) + (1.-tmask(ji,jj,1)) )
+            pdept(ji,jj) = MIN( zztmp , zzdep) * tmask(ji,jj,1)       ! bound by the ocean depth
+         ELSE 
+            pdept(ji,jj) = 0._wp
+         ENDIF
+      END_2D
+      !
+   END SUBROUTINE dia_hth_dep
+
+
+   SUBROUTINE dia_hth_htc( Kmm, pdep, pt, phtc )
+      !
+      INTEGER , INTENT(in) ::   Kmm      ! ocean time level index
+      REAL(wp), INTENT(in) ::   pdep     ! depth over the heat content
+      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(in)    ::   pt   
+      REAL(wp), DIMENSION(jpi,jpj),     INTENT(inout) ::   phtc  
+      !
+      INTEGER  ::   ji, jj, jk, ik
+      REAL(wp), DIMENSION(jpi,jpj) ::   zthick
+      INTEGER , DIMENSION(jpi,jpj) ::   ilevel
+
+
+      ! surface boundary condition
+      
+      IF( .NOT. ln_linssh ) THEN   ;   zthick(:,:) = 0._wp          ;   phtc(:,:) = 0._wp                                   
+      ELSE                         ;   zthick(:,:) = ssh(:,:,Kmm)   ;   phtc(:,:) = pt(:,:,1) * ssh(:,:,Kmm) * tmask(:,:,1)   
+      ENDIF
+      !
+      ilevel(:,:) = 1
+      DO_3D( 1, 1, 1, 1, 1, jpkm1 )
+         IF( ( gdepw(ji,jj,jk+1,Kmm) < pdep ) .AND. ( tmask(ji,jj,jk) == 1 ) ) THEN
+             ilevel(ji,jj) = jk+1
+             zthick(ji,jj) = zthick(ji,jj) + e3t(ji,jj,jk,Kmm)
+             phtc  (ji,jj) = phtc  (ji,jj) + e3t(ji,jj,jk,Kmm) * pt(ji,jj,jk)
+         ENDIF
+      END_3D
+      !
+      DO_2D( 1, 1, 1, 1 )
+         ik = ilevel(ji,jj)
+         IF( tmask(ji,jj,ik) == 1 ) THEN
+            zthick(ji,jj) = MIN ( gdepw(ji,jj,ik+1,Kmm), pdep ) - zthick(ji,jj)   ! remaining thickness to reach dephw pdep
+            phtc(ji,jj)   = phtc(ji,jj) + pt(ji,jj,ik) * zthick(ji,jj)
+         ENDIF
+      END_2D
+      !
+   END SUBROUTINE dia_hth_htc
+
+   !!======================================================================
+END MODULE diahth
Index: CONFIG/UNIFORM/v7/IPSLCM7/SOURCES/NEMO/file_def_nemo-ice_ORCA1.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/SOURCES/NEMO/file_def_nemo-ice_ORCA1.xml	(revision 6656)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?xml version="1.0"?>
-    <!-- $id$ -->
-    
- <!--
-============================================================================================================
-=                                           output files definition                                        =
-=                                            Define your own files for ice3                                =
-=                                         put the variables you want...                                    =
-============================================================================================================
-  -->
-    
-    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="4" >
-    
-      <file_group id="1ts_ice" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
-      <file_group id="1h_ice" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
-      <file_group id="2h_ice" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
-      <file_group id="3h_ice" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
-      <file_group id="4h_ice" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
-      <file_group id="6h_ice" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->        
-      <file_group id="1d_ice" output_freq="1d"  output_level="_AUTO_" enabled="_AUTO_"/>  <!-- 5d files -->   	
-      <file_group id="5d_ice" output_freq="5d"  output_level="_AUTO_" enabled="_AUTO_"/>  <!-- 5d files -->   	
-
-      <file_group id="1m_ice" output_freq="1mo" output_level="_AUTO_" enabled="_AUTO_"> <!-- real monthly files -->
-
-       <file id="file51" name_suffix="_icemod" description="ice variables" >
-
-       <!-- ice mask -->
-         <field field_ref="icemask"       name="simsk"   level="1" />
-         <field field_ref="icemask05"     name="simsk05" level="1" />
-         <field field_ref="icemask15"     name="simsk15" level="1" />
-
-       <!-- general -->
-         <field field_ref="snwvolu"       name="snvolu" level="1"  />
-         <field field_ref="icethic"       name="sithic" long_name="sea_ice_thickness" level="1"        />
-         <field field_ref="iceconc"       name="siconc" level="1"  />
-         <field field_ref="snwthic"       name="snthic"     long_name="surface_snow_thickness" level="1"  />
-         <field field_ref="icevolu"       name="sivolu" level="1"  />
-         <field field_ref="icesalt"       name="sisali" level="1" />
-         <field field_ref="iceapnd"       name="siapnd" level="1" />
-         <field field_ref="icevpnd"       name="sivpnd" level="1" />
-         <field field_ref="sst_m"         name="sst_m"  level="1"  />
-         <field field_ref="sss_m"         name="sss_m"  level="1" />
-
-       <!-- heat -->
-         <field field_ref="icetemp"       name="sitemp" level="1" />
-         <field field_ref="snwtemp"       name="sntemp" level="1" />
-         <field field_ref="icettop"       name="sittop" level="1" />
-         <field field_ref="icetbot"       name="sitbot" level="1" />
-         <field field_ref="icetsni"       name="sitsni" level="1" />
-         <field field_ref="icettop"       name="sistem" level="1" />
-         <field field_ref="icehc"         name="siheco" level="1" />
-         <field field_ref="snwhc"         name="snheco" level="1" />
-
-
-     <!-- momentum -->
-         <field field_ref="uice"          name="sivelu"  level="1" />
-         <field field_ref="vice"          name="sivelv"  level="1" />
-         <field field_ref="icevel"        name="sivelo"  level="1" />
-         <field field_ref="utau_ai"       name="utau_ai" level="2" />
-         <field field_ref="vtau_ai"       name="vtau_ai" level="2" />
-         <field field_ref="utau_oi"       name="utau_oi" level="2" />
-         <hield field_ref="vtau_oi"       name="vtau_oi" level="2" />
-
-       <!-- rheology -->
-         <field field_ref="icediv"            name="sidive"  level="2" />
-         <field field_ref="iceshe"           name="sishea"  level="1" />
-         <field field_ref="icestr"           name="sistre"  level="2" />
-         <field field_ref="normstr"          name="normstr" level="2"/>
-	 <field field_ref="sheastr"          name="sheastr" level="2" />
-         <field field_ref="sig1_pnorm"       name="sig1_pnorm"  level="2" />
-         <field field_ref="sig2_pnorm"       name="sig2_pnorm" level="2"/>
-       <!-- heat fluxes -->
-         <field field_ref="qt_oce_ai"        name="qt_oce_ai"   level="2" />
-         <field field_ref="qt_atm_oi"        name="qt_atm_oi"   level="2"  />
-         <field field_ref="qtr_ice_top"      name="qtr_ice_top" level="2" />
-         <field field_ref="qtr_ice_bot"      name="qtr_ice_bot" level="2" />
-         <field field_ref="qt_ice"           name="qt_ice"      level="2" />
-         <field field_ref="qsr_ice"          name="qsr_ice"     level="2" />
-         <field field_ref="qns_ice"          name="qns_ice"     level="2" />
-         <field field_ref="qemp_ice"         name="qemp_ice"    level="2" />
-         <field field_ref="albedo"           name="albedo"      level="2" />
-
-         <field field_ref="hfxcndtop"        name="hfxcndtop"  level="2" />
-         <field field_ref="hfxcndbot"        name="hfxcndbot"  level="2" />
-         <field field_ref="hfxsensib"        name="hfxsensib"  level="2" />
-         <field field_ref="hfxsub"           name="hfxsub"     level="2" />
-         <field field_ref="hfxspr"           name="hfxspr"     level="2" />
-         <field field_ref="hfxmelt"          name="hfxmelt"    level="2" />
-         <field field_ref="hfxldmelt"        name="hfxldmelt" level="2" />
-         <field field_ref="hfxldgrow"        name="hfxldgrow"  level="2" />
-       <!-- salt fluxes -->
-         <field field_ref="sfxice"           name="sfxice" level="1" />
-         <field field_ref="sfxsni"           name="sfxsni" level="1" />
-        <!-- mass fluxes -->
-         <field field_ref="vfxice"           name="vfxice" level="2" />
-         <field field_ref="vfxsnw"           name="vfxsnw" level="2" />
-         <field field_ref="vfxsub"           name="vfxsub" level="2" />
-         <field field_ref="vfxsub_err"       name="vfxsub_err" level="2" />
-         <field field_ref="vfxsnw_pre"       name="vfxsnw_pre" level="2" />
-         <field field_ref="vfxsnw_sub"       name="vfxsnw_sub" level="2" />
-	 <field field_ref="vfxpnd"           name="vfxpnd" level="2" />
-
-     <!-- outputs by category -->
-         <field field_ref="icemask_cat"      name="simskcat"  level="2" />
-         <field field_ref="snwthic_cat"      name="snthicat"  level="2" />
-         <field field_ref="iceconc_cat"      name="siconcat"  level="2" />
-         <field field_ref="icethic_cat"      name="sithicat"  level="2" />
-         <field field_ref="icesalt_cat"      name="sisalcat"  level="2" />
-         <field field_ref="icetemp_cat"      name="sitemcat"  level="2" />
-         <field field_ref="snwtemp_cat"      name="sntemcat"  level="2" />
-         <field field_ref="icettop_cat"      name="sitopcat"  level="2" />
-
-       </file>
-
-     <!-- To compute transport through straits : need to read ice mask at ice iteration at freq_offset = 1mo - nn_fsbc -->
-
-        <file id="file52" name_suffix="_strait_ice" description="transport variables through straits" >
-          <field field_ref="strait_mifl"      name="simassacrossline"  freq_offset="1mo-2ts" />
-          <field field_ref="strait_msfl"      name="snmassacrossline"  freq_offset="1mo-2ts" />
-          <field field_ref="strait_arfl"      name="siareaacrossline"  freq_offset="1mo-2ts" />
-        </file>
-
-      </file_group>
-
-   <!-- To compute transport through straits : need to read ice mask at ice iteration at freq_offset = - nn_fsbc + 1 -->
-      <file id="maskMFO" name="maskMFO" enabled="true" mode="read" output_freq="1mo" cyclic="true"  >
-         <field id="maskMFO_u_ice" operation="instant"  freq_offset="-1ts"  grid_ref="grid_U_4strait_ice" />
-         <field id="maskMFO_v_ice" operation="instant"  freq_offset="-1ts"  grid_ref="grid_V_4strait_ice" />
-      </file>
-
-
-      <file_group id="2m_ice" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
-      <file_group id="3m_ice" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
-      <file_group id="4m_ice" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
-      <file_group id="6m_ice" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
-      <file_group id="1y_ice"  output_freq="1y" output_level="_AUTO_" enabled="_AUTO_"/> <!-- real yearly files -->
-      <file_group id="2y_ice"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
-      <file_group id="5y_ice"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
-      <file_group id="10y_ice" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
-
-   </file_definition>
Index: CONFIG/UNIFORM/v7/IPSLCM7/SOURCES/NEMO/file_def_nemo-ice_ORCA2.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/SOURCES/NEMO/file_def_nemo-ice_ORCA2.xml	(revision 6656)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0"?>
-    <!-- $id$ -->
-    
- <!--
-============================================================================================================
-=                                           output files definition                                        =
-=                                            Define your own files for ice3                                =
-=                                         put the variables you want...                                    =
-============================================================================================================
-  -->
-    
-    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="4" >
-    
-      <file_group id="1ts_ice" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
-      <file_group id="1h_ice" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
-      <file_group id="2h_ice" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
-      <file_group id="3h_ice" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
-      <file_group id="4h_ice" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
-      <file_group id="6h_ice" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->        
-      <file_group id="1d_ice" output_freq="1d"  output_level="_AUTO_" enabled="_AUTO_"/>  <!-- 5d files -->   	
-      <file_group id="5d_ice" output_freq="5d"  output_level="_AUTO_" enabled="_AUTO_"/>  <!-- 5d files -->   	
-
-      <file_group id="1m_ice" output_freq="1mo" output_level="_AUTO_" enabled="_AUTO_"> <!-- real monthly files -->
-
-       <file id="file51" name_suffix="_icemod" description="ice variables" >
-
-       <!-- ice mask -->
-         <field field_ref="icemask"       name="simsk"   level="1" />
-         <field field_ref="icemask05"     name="simsk05" level="1" />
-         <field field_ref="icemask15"     name="simsk15" level="1" />
-
-       <!-- general -->
-         <field field_ref="snwvolu"       name="snvolu" level="1"  />
-         <field field_ref="icethic"       name="sithic" long_name="sea_ice_thickness" level="1"        />
-         <field field_ref="iceconc"       name="siconc" level="1"  />
-         <field field_ref="snwthic"       name="snthic"     long_name="surface_snow_thickness" level="1"  />
-         <field field_ref="icevolu"       name="sivolu" level="1"  />
-         <field field_ref="icesalt"       name="sisali" level="1" />
-         <field field_ref="iceapnd"       name="siapnd" level="1" />
-         <field field_ref="icevpnd"       name="sivpnd" level="1" />
-         <field field_ref="sst_m"         name="sst_m"  level="1"  />
-         <field field_ref="sss_m"         name="sss_m"  level="1" />
-
-       <!-- heat -->
-         <field field_ref="icetemp"       name="sitemp" level="1" />
-         <field field_ref="snwtemp"       name="sntemp" level="1" />
-         <field field_ref="icettop"       name="sittop" level="1" />
-         <field field_ref="icetbot"       name="sitbot" level="1" />
-         <field field_ref="icetsni"       name="sitsni" level="1" />
-         <field field_ref="icettop"       name="sistem" level="1" />
-         <field field_ref="icehc"         name="siheco" level="1" />
-         <field field_ref="snwhc"         name="snheco" level="1" />
-
-
-     <!-- momentum -->
-         <field field_ref="uice"          name="sivelu"  level="1" />
-         <field field_ref="vice"          name="sivelv"  level="1" />
-         <field field_ref="icevel"        name="sivelo"  level="1" />
-         <field field_ref="utau_ai"       name="utau_ai" level="2" />
-         <field field_ref="vtau_ai"       name="vtau_ai" level="2" />
-         <field field_ref="utau_oi"       name="utau_oi" level="2" />
-         <hield field_ref="vtau_oi"       name="vtau_oi" level="2" />
-
-       <!-- rheology -->
-         <field field_ref="icediv"            name="sidive"  level="2" />
-         <field field_ref="iceshe"           name="sishea"  level="1" />
-         <field field_ref="icestr"           name="sistre"  level="2" />
-         <field field_ref="normstr"          name="normstr" level="2"/>
-         <field field_ref="sheastr"          name="sheastr" level="2" />
-         <field field_ref="isig1"            name="isig1"   level="2" />
-         <field field_ref="isig2"            name="isig2"   level="2" />
-         <field field_ref="isig3"            name="isig3"   level="2" />
-       <!-- heat fluxes -->
-         <field field_ref="qt_oce_ai"        name="qt_oce_ai"   level="2" />
-         <field field_ref="qt_atm_oi"        name="qt_atm_oi"   level="2"  />
-         <field field_ref="qtr_ice_top"      name="qtr_ice_top" level="2" />
-         <field field_ref="qtr_ice_bot"      name="qtr_ice_bot" level="2" />
-         <field field_ref="qt_ice"           name="qt_ice"      level="2" />
-         <field field_ref="qsr_ice"          name="qsr_ice"     level="2" />
-         <field field_ref="qns_ice"          name="qns_ice"     level="2" />
-         <field field_ref="qemp_ice"         name="qemp_ice"    level="2" />
-         <field field_ref="albedo"           name="albedo"      level="2" />
-
-         <field field_ref="hfxcndtop"        name="hfxcndtop"  level="2" />
-         <field field_ref="hfxcndbot"        name="hfxcndbot"  level="2" />
-         <field field_ref="hfxsensib"        name="hfxsensib"  level="2" />
-
-       <!-- salt fluxes -->
-         <field field_ref="sfxice"           name="sfxice" level="1" />
-         <field field_ref="sfxsni"           name="sfxsni" level="1" />
-
-       <!-- mass fluxes -->
-         <field field_ref="vfxice"           name="vfxice" level="2" />
-         <field field_ref="vfxsnw"           name="vfxsnw" level="2" />
-         <field field_ref="vfxsub"           name="vfxsub" level="2" />
-         <field field_ref="vfxsub_err"       name="vfxsub_err" level="2" />
-
-     <!-- outputs by category -->
-         <field field_ref="icemask_cat"      name="simskcat"  level="2" />
-         <field field_ref="snwthic_cat"      name="snthicat"  level="2" />
-         <field field_ref="iceconc_cat"      name="siconcat"  level="2" />
-         <field field_ref="icethic_cat"      name="sithicat"  level="2" />
-         <field field_ref="icesalt_cat"      name="sisalcat"  level="2" />
-         <field field_ref="icetemp_cat"      name="sitemcat"  level="2" />
-         <field field_ref="snwtemp_cat"      name="sntemcat"  level="2" />
-         <field field_ref="icettop_cat"      name="sitopcat"  level="2" />
-
-       </file>
-
-     <!-- To compute transport through straits : need to read ice mask at ice iteration at freq_offset = 1mo - nn_fsbc -->
-
-        <file id="file52" name_suffix="_strait_ice" description="transport variables through straits" >
-          <field field_ref="strait_mifl"      name="simassacrossline"  freq_offset="1mo-4ts" />
-          <field field_ref="strait_msfl"      name="snmassacrossline"  freq_offset="1mo-4ts" />
-          <field field_ref="strait_arfl"      name="siareaacrossline"  freq_offset="1mo-4ts" />
-        </file>
-
-      </file_group>
-
-   <!-- To compute transport through straits : need to read ice mask at ice iteration at freq_offset = - nn_fsbc + 1 -->
-      <file id="maskMFO" name="maskMFO" enabled="true" mode="read" output_freq="1mo" cyclic="true"  >
-         <field id="maskMFO_u_ice" operation="instant"  freq_offset="-3ts"  grid_ref="grid_U_4strait_ice" />
-         <field id="maskMFO_v_ice" operation="instant"  freq_offset="-3ts"  grid_ref="grid_V_4strait_ice" />
-      </file>
-
-
-      <file_group id="2m_ice" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
-      <file_group id="3m_ice" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
-      <file_group id="4m_ice" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
-      <file_group id="6m_ice" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
-      <file_group id="1y_ice"  output_freq="1y" output_level="_AUTO_" enabled="_AUTO_"/> <!-- real yearly files -->
-      <file_group id="2y_ice"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
-      <file_group id="5y_ice"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
-      <file_group id="10y_ice" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
-
-   </file_definition>
Index: CONFIG/UNIFORM/v7/IPSLCM7/SOURCES/NEMO/file_def_nemo-oce.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/SOURCES/NEMO/file_def_nemo-oce.xml	(revision 6656)
+++ 	(revision )
@@ -1,586 +1,0 @@
-<?xml version="1.0"?>
-
-<!--
-============================================================================================================
-=                                           output files definition                                        =
-=                                            Define your own filesfor ocean dynamics context                                         =
-=                                         put the variables you want...                                    =
-============================================================================================================
-    -->
-   
-    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="4" >
-    
-      <file_group id="1ts_opa" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
-
-      <file_group id="1h_opa" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
-
-      <file_group id="2h_opa" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
-
-      <file_group id="3h_opa" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
-
-      <file_group id="4h_opa" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
-
-      <file_group id="6h_opa" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->     
-    
-      <file_group id="1d_opa" output_freq="1d"  output_level="_AUTO_" enabled="_AUTO_">  <!-- 1d files -->   
-	
-        <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" >
-	  <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"          level="1"              />
-	  <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"             level="1"              />
-	  <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"   level="1"              />
-	  <field field_ref="sst"          name="tosstd"   long_name="sea_surface_temperature_standard_deviation"         operation="average" freq_op="1d" level="1"  > sqrt( @sst2 - @sst * @sst ) </field>
-	  <field field_ref="ssh"          name="zosstd"   long_name="sea_surface_height_above_geoid_standard_deviation"  operation="average" freq_op="1d" level="1" > sqrt( @ssh2 - @ssh * @ssh ) </field>
-	  <field field_ref="sst"          name="sstdcy"   long_name="amplitude of sst diurnal cycle" operation="average" freq_op="1d" level="1" > @sstmax - @sstmin </field>
-	  <field field_ref="mldr10_1"     />
-	  <field field_ref="mldr10_1"     name="mldr10_1dcy"  long_name="amplitude of mldr10_1 diurnal cycle" operation="average" freq_op="1d" level="1" > @mldr10_1max - @mldr10_1min </field>
-	</file>
-       
-        <file id="file2" name_suffix="_scalar" description="scalar variables" >
-
-	  <!-- Volume -->
-          <!-- global contents -->
-	  <field field_ref="voltot"          name="scvoltot"  level="1" />
-	  <field field_ref="sshtot"          name="scsshtot"  level="1" />
-	  <field field_ref="sshsteric"       name="scsshste"  level="1" />
-	  <field field_ref="sshthster"       name="scsshtst"  level="1" />
-	  <field field_ref="masstot"         name="scmastot"  level="1" />
-	  <field field_ref="temptot"         name="sctemtot"  level="1" />
-	  <field field_ref="saltot"          name="scsaltot"  level="1" />
-	  
-	  <!-- global drifts (conservation checks) -->
-	  <field field_ref="bgtemper"        name="bgtemper"  level="1"   />
-	  <field field_ref="bgsaline"        name="bgsaline"  level="1"   />
-	  <field field_ref="bgheatco"        name="bgheatco"  level="1"   />
-	  <field field_ref="bgheatfx"        name="bgheatfx"  level="1"   />
-	  <field field_ref="bgsaltco"        name="bgsaltco"  level="1"   />
-	  <field field_ref="bgvolssh"        name="bgvolssh"  level="1"   />
-	  <field field_ref="bgvole3t"        name="bgvole3t"  level="1"   />
-
-	  <!-- global surface forcings  -->
-	  <field field_ref="bgfrcvol"        name="bgfrcvol"  level="1"   />
-	  <field field_ref="bgfrctem"        name="bgfrctem"  level="1"   />
-	  <field field_ref="bgfrchfx"        name="bgfrchfx"  level="1"   />
-	  <field field_ref="bgfrcsal"        name="bgfrcsal"  level="1"   />
-
-	  <!-- Surface -->
-	  <!-- global contents -->
-          <field field_ref="ibgvol_tot"       name="ibgvol_tot" level="1"   />
-          <field field_ref="sbgvol_tot"       name="sbgvol_tot"  level="1"  />
-          <field field_ref="ibgarea_tot"      name="ibgarea_tot" level="1"  />
-          <field field_ref="ibgsalt_tot"      name="ibgsalt_tot" level="1"  />
-          <field field_ref="ibgheat_tot"      name="ibgheat_tot" level="1"  />
-          <field field_ref="sbgheat_tot"      name="sbgheat_tot" level="1"  />
-          <field field_ref="ipbgvol_tot"      name="ipbgvol_tot" level="1"  />
-          <field field_ref="ilbgvol_tot"      name="ilbgvol_tot" level="1"  />
-	  
-	  <!-- global drifts (conservation checks) -->
-          <field field_ref="ibgvolume"        name="ibgvolume"  level="1"   />
-          <field field_ref="ibgsaltco"        name="ibgsaltco"  level="1"   />
-          <field field_ref="ibgheatco"        name="ibgheatco"  level="1"   />
-          <field field_ref="ibgheatfx"        name="ibgheatfx"  level="1"   />
-	  
-	  <!-- global forcings  -->
-          <field field_ref="ibgfrcvoltop"     name="ibgfrcvoltop" level="1" />
-          <field field_ref="ibgfrcvolbot"     name="ibgfrcvolbot" level="1" />
-          <field field_ref="ibgfrctemtop"     name="ibgfrctemtop" level="1" />
-          <field field_ref="ibgfrctembot"     name="ibgfrctembot" level="1" />
-          <field field_ref="ibgfrcsal"        name="ibgfrcsal"    level="1" />
-          <field field_ref="ibgfrchfxtop"     name="ibgfrchfxtop" level="1" />
-          <field field_ref="ibgfrchfxbot"     name="ibgfrchfxbot" level="1" />
-	  
-        </file>
-	
-	<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"      level="1"      />
-	  <field field_ref="qns_oce"       name="qns_oce"  long_name="downward non solar flux at ocean surface"      level="1"      />
-	  <field field_ref="qsr_ice"       name="qsr_ice"  long_name="downward shortwave flux at ice surface"        level="1"    />
-	  <field field_ref="qns_ice"       name="qns_ice"  long_name="downward non solar flux at ice surface"        level="1"    />
-	  <field field_ref="taum"          name="taum" level="1" />
-	  <field field_ref="wspd"          name="windsp" level="1"  />
-	  <field field_ref="precip"        name="precip" level="1" />
-	  <!-- For heat conservation checking -->
-	  <field field_ref="qt_oce"        name="qt_oce"   long_name="downward total flux at ocean surface"      level="1"      />
-	  <field field_ref="qemp_oce"      name="qemp_oce" long_name="Downward Heat Flux from E-P over open ocean"  level="1"          />
-	  <field field_ref="qt_ice"        name="qt_ice"   long_name="downward total flux at ice surface"        level="1"    />
-	  <field field_ref="qemp_ice"      name="qemp_ice" long_name="Downward Heat Flux from E-P over ice"      level="1"      />
-	  <field field_ref="hflx_rain_cea" name="hflx_rain_cea"    level="1"   />
-	  <field field_ref="hflx_evap_cea" name="hflx_evap_cea"    level="1"   />
-	  <field field_ref="hflx_snow_cea" name="hflx_snow_cea"    level="1"   />
-	  <field field_ref="hflx_cal_cea"  name="hflx_cal_cea"     level="1"  />
-	  <!-- For freshwater conservation checking -->
-	  <field field_ref="empmr"         name="wfo"      long_name="water_flux_into_sea_water"           level="1"           />
-	  <field field_ref="emp_oce"       name="emp_oce"                 level="1"      />
-	  <field field_ref="emp_ice"       name="emp_ice"                 level="1"      />
-	  <field field_ref="runoffs"       name="runoffs"                 level="1"      />
-      <field field_ref="runoffs"       name="friver"   long_name="water_flux_into_sea_water_from_rivers"     level="1" > runoffs - iceberg_cea </field>
-	  <field field_ref="calving_cea"   name="calving" level="1"  />
-          <field field_ref="iceberg_cea"   name="iceberg" level="1" />
-          <field field_ref="iceshelf_cea"  name="iceshelf" level="1" />
-	  <field field_ref="vfxice"        name="vfxice" level="1"  />
-	  <field field_ref="vfxsnw"        name="vfxsnw" level="1" />
-	  <field field_ref="vfxsub"        name="vfxsub" level="1" />
-	  <field field_ref="rain"          name="rain"   level="1"    />
-	  <field field_ref="snow_ao_cea"   name="snow_ao_cea"   level="1"    />
-	  <field field_ref="snow_ai_cea"   name="snow_ai_cea"   level="1"    />
-	  <field field_ref="evap_ao_cea"   name="evap_ao_cea"   level="1"    />
-	  <field field_ref="subl_ai_cea"   name="subl_ai_cea"   level="1"    />
-	  <field field_ref="fmmflx"        name="fmmflx"  level="1" />
-          <field field_ref="fwfisf_par"     name="fwfisf"  level="1" />
-          <field field_ref="hflx_snow_ai_cea" name="hflx_snow_ai"  level="1"  />
-          <field field_ref="hflx_snow_ao_cea" name="hflx_snow_ao" level="1"  />
-          <field field_ref="hflx_ice_cea"     name="hflx_ice"     level="1"  />
-          <field field_ref="qhcisf_par"     name="hflx_isf"     level="1"  />
-          <field field_ref="hflx_rnf_cea"     name="hflx_rnf"     level="1"  />
-	  <!-- For salt conservation checking -->
-          <field field_ref="saltflx"      name="sosflxdo" level="1"  />
-	  <!-- ice and snow -->
-	  <field field_ref="snowpre"      />
-	</file>
-
-      </file_group> 
-
-      <file_group id="5d_opa" output_freq="5d"  output_level="_AUTO_" enabled="_AUTO_">  <!-- 5d files -->   
-
-        <file id="file4" name_suffix="_grid_T" >
-	  <field field_ref="e3t" long_name="T-cell thickness" />
-          <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"   operation="average" freq_op="5d" level="1" > @toce_e3t / @e3t </field>      
-          <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                operation="average" freq_op="5d" level="1" > @soce_e3t / @e3t </field>  
-          <field field_ref="hdiv"         name="hdivtr"   long_name="horizontal divergence transport"   operation="average" freq_op="5d" level="1" > @hdiv * @e3t </field>
-          <field field_ref="mldr10_1"     name="mldr10_1"  level="1" />
-          <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                    level="1"              />
-          <field field_ref="qsr"          name="rsntds"      long_name="surface_net_downward_shortwave_flux"                                         level="1" />
-          <field field_ref="wspd"         name="windsp" level="1"  />
-          <field field_ref="empbmr"       name="wfob"     long_name="water_flux_into_sea_water at prev time-step"  level="1"   />
-	  <field field_ref="empmr"        name="wfo"      long_name="water_flux_into_sea_water"                    level="1"  />
-	  <field field_ref="runoffs"      name="runoffs"                 level="1"      />
-          <field field_ref="runoffs"      name="friver"   long_name="water_flux_into_sea_water_from_rivers"     level="1" > runoffs - iceberg_cea </field>
-          <field field_ref="fmmflx"       name="fmmflx" level="1"  />
-          <field field_ref="iceconc"      name="siconc" level="1"  />
-	</file>
-
-        <file id="file5" name_suffix="_grid_U" description="ocean U grid variables" >
-          <field field_ref="e3u"  level="1"  />
-          <field field_ref="uocetr_eff"   name="uocetr_eff" level="1"  />
-          <field field_ref="ahu_bbl"     level="1"   />
-        </file>
-
-        <file id="file6" name_suffix="_grid_V" description="ocean V grid variables" >
-          <field field_ref="e3v" level="1"  />
-          <field field_ref="vocetr_eff"   name="vocetr_eff" level="1"  />
-          <field field_ref="ahv_bbl"    level="1"    />
-        </file>
-
-        <file id="file7" name_suffix="_grid_W" description="ocean W grid variables" >
-          <field field_ref="e3w"  level="1"  />
-	  <field field_ref="wocetr_eff"   name="wocetr_eff" level="1"  /> 
-          <field field_ref="logavs"       name="difvsolog"  long_name="ocean_vertical_salt_diffusivity" operation="average" freq_op="5d" level="1"  > exp( @logavs ) </field>
-        </file>
-
-        <file id="file8" name_suffix="_trdtra" description="ocean trends variables" >
-          <field field_ref="ttrd_zdfp_e3t"   name="ttrdtr_zdfp"  long_name="Tendency_of_heat_content_from_parameterized_dianeutral_mixing"  unit="W m-2"     level="2"  > this * $cpocean * $rho0  </field>
-          <field field_ref="ttrd_iso_e3t"    name="ttrdtr_iso"   long_name="Tendency_of_heat_content_from_parameterized_eddy_diffusion"     unit="W m-2"     level="2"   > this * $cpocean * $rho0  </field>
-          <field field_ref="ttrd_totad_e3t"  name="ttrdtr_totad" long_name="Tendency_of_heat_content_from_residual_mean_advection"          unit="W m-2"     level="2"   > this * $cpocean * $rho0  </field>
-          <field field_ref="ttrd_tot_e3t"    name="ttrdtr_tot"   long_name="Tendency_of_heat_content_from_all_processes"                    unit="W m-2"     level="2"   > this * $cpocean * $rho0  </field>
-          <field field_ref="strd_zdfp_e3t"   name="strdtr_zdfp"  long_name="Tendency_of_salt_content_from_parameterized_dianeutral_mixing"  unit="kg m-2 s-1" level="2"  > this * $rho0 </field>
-          <field field_ref="strd_iso_e3t"    name="strdtr_iso"   long_name="Tendency_of_salt_content_from_parameterized_eddy_diffusion"     unit="kg m-2 s-1" level="2"  > this * $rho0 </field>
-          <field field_ref="strd_totad_e3t"  name="strdtr_totad" long_name="Tendency_of_salt_content_from_residual_mean_advection"          unit="kg m-2 s-1" level="2"  > this * $rho0  </field>
-          <field field_ref="strd_tot_e3t"    name="strdtr_tot"   long_name="Tendency_of_salt_content_from_all_processes"                    unit="kg m-2 s-1" level="2"  > this * $rho0  </field>
-        </file>
-
-
-      </file_group> 
-	
-      <file_group id="1m_opa" output_freq="1mo" output_level="_AUTO_" enabled="_AUTO_"> <!-- real monthly files -->
-
-        <file id="file9" name_suffix="_grid_T" >
-	  <field field_ref="e3t" long_name="T-cell thickness"  level="2" />
-          <field field_ref="botpres"      name="pbo"      long_name="Pressure_at_sea_floor"             level="2"                              />
-          <!-- pso : sea_water_pressure_at_sea_water_surface = 0 -->
-          <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"     level="1"                            />
-          <field field_ref="ssh2"         name="zossq"    long_name="square_of_sea_surface_height_above_geoid"             level="2" />
-
-          <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"   operation="average" freq_op="1mo"  level="1" > @toce_e3t / @e3t </field>      
-          <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                              level="1" />
-          <field field_ref="sst2"         name="tossq"    long_name="square_of_sea_surface_temperature"                    level="2" />
-          <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                operation="average" freq_op="1mo" level="1" > @soce_e3t / @e3t </field>       
-          <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                                                level="1" />
-	  <!-- diurnal cycle -->
-	  <!-- sst -->
-	  <field field_ref="sst"          name="sstdcymax"   long_name="max of sst diurnal cycle" operation="average" freq_op="1d" level="2" > @sstmax  </field>
-          <field field_ref="sst"          name="sstdcymin"   long_name="min of sst diurnal cycle" operation="average" freq_op="1d" level="2" > @sstmin </field>
-          <field field_ref="sst"          name="sstdcy"      long_name="amplitude of sst diurnal cycle" operation="average" freq_op="1d" level="2" > @sstmax - @sstmin </field>
-	  <!-- sss -->
-	  <field field_ref="sss"          name="sssdcymax"   long_name="max of sss diurnal cycle" operation="average" freq_op="1d" level="2" > @sssmax  </field>
-          <field field_ref="sss"          name="sssdcymin"   long_name="min of sss diurnal cycle" operation="average" freq_op="1d" level="2" > @sssmin </field>
-          <field field_ref="sss"          name="sssdcy"      long_name="amplitude of sss diurnal cycle" operation="average" freq_op="1d" level="2" > @sssmax - @sssmin </field>
-	  <!-- mld -->
-	  <field field_ref="mldr10_1"     name="mld10_1dcymax"   long_name="max of mld diurnal cycle" operation="average" freq_op="1d" level="2" > @mldr10_1max  </field>
-	  <field field_ref="mldr10_1"     name="mld10_1dcymin"   long_name="min of mld diurnal cycle" operation="average" freq_op="1d" level="2" > @mldr10_1min  </field>
-	  <field field_ref="mldr10_1"     name="mld10_1dcy"      long_name="amplitude of mld diurnal cycle" operation="average" freq_op="1d" level="2" > @mldr10_1max - @mldr10_1min  </field>
-	  <!--  -->
-          <field field_ref="rhop"         name="rhopoto"  long_name="sea_water_potential_density"                          level="2" />
-          <!-- no agessc : sea_water_age_since_surface_contact -->
-          <!-- no cfc11  : moles_per_unit_mass_of_cfc11_in_sea_water -->
-          <!-- msftbarot : ocean_barotropic_mass_streamfunction : offline -->
-          <!-- mlotst    :           ocean_mixed_layer_thickness_defined_by_sigma_t : must be done offline -->
-          <!-- mlotstsq  : square_of_ocean_mixed_layer_thickness_defined_by_sigma_t : must be done offline -->
-          <field field_ref="mldkz5"       name="omlmax"   long_name="ocean_mixed_layer_thickness_defined_by_mixing_scheme" level="2" operation="maximum" />
-          <field field_ref="mldkz5"       name="mldkz5"   level="2"  />
-          <field field_ref="mldr10_1"     name="mldr10_1" level="1" />
-          <field field_ref="mldr10_1max"  name="mldr10_1max"  long_name="max of Mixed Layer Depth 0.01 ref.10m"              operation="maximum" level="2"  />
-          <!-- wfonocorr : water_flux_into_sea_water_without_flux_correction : emp - erp -->
-          <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="2" />
-          <field field_ref="qrp"           name="hfcorr"      long_name="heat_flux_correction"                                                        level="1" />
-      <!-- next variables available with key_diahth -->
-      <field field_ref="mlddzt"        level="2" />
-      <field field_ref="mldr10_3"      level="2" />
-      <field field_ref="mldr0_1"       level="2" />
-      <field field_ref="mldr0_3"       level="2" />
-      <field field_ref="mld_dt02"      level="2" />
-      <field field_ref="topthdep"      level="2" />
-      <field field_ref="pycndep"       level="2" />
-      <field field_ref="BLT"           level="1" />
-      <field field_ref="tinv"          level="1" />
-      <field field_ref="depti"         level="1" />
-      <!-- <field field_ref="20d"           level="1" /> -->
-      <!-- <field field_ref="28d"           level="1" /> -->
-      <field field_ref="hc300"         level="1" />
-      <!-- next variables are additional for PISCES offline-->
-          <field field_ref="hdiv"         name="hdivtr"   long_name="horizontal divergence transport"      operation="average" freq_op="1mo" level="2" > @hdiv * @e3t </field>
-          <field field_ref="wspd"         name="windsp" level="2"  />
-          <field field_ref="empbmr"       name="wfob"     long_name="water_flux_into_sea_water at prev time-step"  level="2"   />
-          <field field_ref="fmmflx"       name="fmmflx" level="2"  />
-          <field field_ref="iceconc"      name="siconc" level="2"  />
-	  <!-- For heat conservation checking -->
-	  <field field_ref="qt_oce"        name="qt_oce"   long_name="downward total flux at ocean surface"       level="2"     />
-	  <field field_ref="qemp_oce"      name="qemp_oce" long_name="Downward Heat Flux from E-P over open ocean"   level="2"         />
-	  <field field_ref="qt_ice"        name="qt_ice"   long_name="downward total flux at ice surface"         level="2"   />
-	  <field field_ref="qemp_ice"      name="qemp_ice" long_name="Downward Heat Flux from E-P over ice"        level="2"    />
-          <field field_ref="hflx_rain_cea" name="hflx_rain_cea"    level="2"   />
-          <field field_ref="hflx_evap_cea" name="hflx_evap_cea"    level="2"   />
-          <field field_ref="hflx_snow_cea" name="hflx_snow_cea"    level="2"   />
-          <field field_ref="hflx_snow_ao_cea" name="hflx_snow_ao_cea"    level="2"   />
-          <field field_ref="hflx_snow_ai_cea" name="hflx_snow_ai_cea"    level="2"   />
-          <field field_ref="hflx_cal_cea"  name="hflx_cal_cea"    level="2"   />
-          <field field_ref="hflx_icb_cea"  name="hflx_icb_cea"    level="2"   />
-          <field field_ref="hflx_rnf_cea"  name="hflx_rnf_cea"    level="2"   />
-	  <field field_ref="qhcisf_par"     name="hflx_isf_cea"     level="1"  />
-
-          <!-- For freshwater conservation checking -->
-          <field field_ref="empmr"         name="wfo"      long_name="water_flux_into_sea_water"        level="1"              />
-          <field field_ref="emp_oce"       name="emp_oce"       level="2"                />
-          <field field_ref="emp_ice"       name="emp_ice"       level="2"                />
-          <field field_ref="runoffs"       name="runoffs"        level="2"               />
-          <field field_ref="runoffs"       name="friver"   long_name="water_flux_into_sea_water_from_rivers"     level="1" > runoffs - iceberg_cea </field>
-          <field field_ref="calving_cea"   name="calving" level="2" />
-          <field field_ref="iceberg_cea"   name="iceberg" level="2" />
-          <field field_ref="fwfisf_par"     name="iceshelf" level="2" />
-         <field field_ref="vfxice"           name="vfxice" level="2" />
-         <field field_ref="vfxsnw"           name="vfxsnw" level="2" />
-         <field field_ref="vfxsub"           name="vfxsub" level="2" />
-         <field field_ref="vfxsub_err"       name="vfxsub_err" level="2" />
-         <field field_ref="vfxsnw_pre"       name="vfxsnw_pre" level="2" />
-         <field field_ref="vfxsnw_sub"       name="vfxsnw_sub" level="2" />
-         <field field_ref="vfxpnd"           name="vfxpnd" level="2" />
-          <field field_ref="rain"          name="rain"   level="2"    />
-          <field field_ref="snow_ao_cea"   name="snow_ao_cea"    level="2"   />
-          <field field_ref="snow_ai_cea"   name="snow_ai_cea"    level="2"   />
-          <field field_ref="evap_ao_cea"   name="evap_ao_cea"    level="2"   />
-          <field field_ref="subl_ai_cea"   name="subl_ai_cea"    level="2"   />
-          <field field_ref="precip"       name="precip" level="2" />
-          <field field_ref="snowpre"      name="snowpre" level="2"  />
-          <!-- For salt conservation checking -->
-          <field field_ref="saltflx"      name="sosflxdo" level="2"  />
-        </file>
-
-	<file id="file10" name_suffix="_grid_U" description="ocean U grid variables" >
-	  <field field_ref="e3u"  level="2" />
-	  <field field_ref="ssu"          name="uos"     long_name="sea_surface_x_velocity"  level="2"   />
-	  <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity" operation="average" freq_op="1mo" level="2" > @uoce_e3u / @e3u </field>
-	  <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" level="2" />
-          <field field_ref="uocetr_eff"   name="uocetr_eff"  level="2" />
-          <field field_ref="ahu_bbl"       />
-	</file>
-	
-	<file id="file11" name_suffix="_grid_V" description="ocean V grid variables" >
-	  <field field_ref="e3v" level="2"  />
-	  <field field_ref="ssv"          name="vos"     long_name="sea_surface_y_velocity"    level="2" />
-	  <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity" operation="average" freq_op="1mo" level="2" > @voce_e3v / @e3v </field>
-	  <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" level="2" />
-          <field field_ref="vocetr_eff"   name="vocetr_eff" level="2"  />
-          <field field_ref="ahv_bbl"       />
-	</file>
-	
-	<file id="file12" name_suffix="_grid_W" description="ocean W grid variables" >
-	  <field field_ref="e3w"  level="2" />
-	  <field field_ref="woce"         name="wo"    level="2"  />
-	  <field field_ref="avt"          name="difvho"  long_name="ocean_vertical_heat_diffusivity" level="2" />
-	  <!-- avs: available with key_zdfddm -->
-	  <field field_ref="avs"          name="avs"     level="2"     /> 
-	  <field field_ref="avm"              name="avm"  level="2"       />
-	  <!-- avt_evd: available with ln_zdfevd -->
-	  <field field_ref="avt_evd"        name="avt_evd" level="2"  /> 
-	  <field field_ref="av_wave"      name="av_wave" level="2" /> 
-	  <field field_ref="bn2"             name="bn2"      level="2"      /> 
-	  <field field_ref="wocetr_eff"   name="wocetr_eff" level="2"  /> 
-	  <field field_ref="bflx_iwm"     name="bflx_iwm"   level="2" /> 
-	  <field field_ref="pcmap_iwm"    name="pcmap_iwm"  level="2" /> 
-	  <field field_ref="emix_iwm"     name="emix_iwm"   level="2" /> 	  
-	  <field field_ref="w_masstr"     name="vovematr"  level="2" />
-          <field field_ref="logavs"       name="difvsolog"  long_name="ocean_vertical_salt_diffusivity" operation="average" freq_op="1mo" level="2" > exp( @logavs ) </field>
-	  <field field_ref="avt_e3w"      name="NEMO_difvho"  long_name="ocean_vertical_heat_diffusivity"  operation="average" freq_op="1mo" level="1" > @avt_e3w / @e3w </field>
-	  <field field_ref="avt_e3w"      name="NEMO_difvho_noevd"  long_name="ocean_vertical_heat_diffusivity without evd contribution"  operation="average" freq_op="1mo" level="1" > (@avt_e3w - @avt_evd_e3w) / @e3w </field>
-	  <field field_ref="avs_e3w"      name="NEMO_difvso"  long_name="ocean_vertical_salt_diffusivity"  operation="average" freq_op="1mo" level="1" > @avs_e3w / @e3w </field>
-	  <field field_ref="avs_e3w"      name="NEMO_difvso_noevd"  long_name="ocean_vertical_salt_diffusivity without evd contribution"  operation="average" freq_op="1mo" level="1" > (@avs_e3w - @avt_evd_e3w) / @e3w </field>
-	</file>
-
-	<file id="file13" name_suffix="_scalar" description="scalar variables"  >
-
-	  <!-- Volume -->
-          <!-- global contents -->
-	  <field field_ref="voltot"          name="scvoltot"  level="1" />
-	  <field field_ref="sshtot"          name="scsshtot"  level="1" />
-	  <field field_ref="sshsteric"       name="scsshste"  level="1" />
-	  <field field_ref="sshthster"       name="scsshtst"  level="1" />
-	  <field field_ref="masstot"         name="scmastot"  level="1" />
-	  <field field_ref="temptot"         name="sctemtot"  level="1" />
-	  <field field_ref="saltot"          name="scsaltot"  level="1" />
-	  
-	  <!-- global drifts (conservation checks) -->
-	  <field field_ref="bgtemper"        name="bgtemper"   level="1"  />
-	  <field field_ref="bgsaline"        name="bgsaline"   level="1"  />
-	  <field field_ref="bgheatco"        name="bgheatco"   level="1"  />
-	  <field field_ref="bgheatfx"        name="bgheatfx"   level="1"  />
-	  <field field_ref="bgsaltco"        name="bgsaltco"   level="1"  />
-	  <field field_ref="bgvolssh"        name="bgvolssh"   level="1"  />
-	  <field field_ref="bgvole3t"        name="bgvole3t"   level="1"  />
-
-	  <!-- global surface forcings  -->
-	  <field field_ref="bgfrcvol"        name="bgfrcvol"   level="1"  />
-	  <field field_ref="bgfrctem"        name="bgfrctem"   level="1"  />
-	  <field field_ref="bgfrchfx"        name="bgfrchfx"   level="1"  />
-	  <field field_ref="bgfrcsal"        name="bgfrcsal"   level="1"  />
-
-	  <!-- Surface -->
-	  <!-- global contents -->
-          <field field_ref="ibgvol_tot"       name="ibgvol_tot"  level="1"  />
-          <field field_ref="sbgvol_tot"       name="sbgvol_tot"  level="1"  />
-          <field field_ref="ibgarea_tot"      name="ibgarea_tot" level="1"  />
-          <field field_ref="ibgsalt_tot"      name="ibgsalt_tot" level="1"  />
-          <field field_ref="ibgheat_tot"      name="ibgheat_tot" level="1"  />
-          <field field_ref="sbgheat_tot"      name="sbgheat_tot" level="1"  />
-	  
-	  <!-- global drifts (conservation checks) -->
-          <field field_ref="ibgvolume"        name="ibgvolume"   level="1"  />
-          <field field_ref="ibgsaltco"        name="ibgsaltco"   level="1"  />
-          <field field_ref="ibgheatco"        name="ibgheatco"   level="1"  />
-          <field field_ref="ibgheatfx"        name="ibgheatfx"   level="1"  />
-	  
-	  <!-- global forcings  -->
-          <field field_ref="ibgfrcvoltop"     name="ibgfrcvoltop" level="1" />
-          <field field_ref="ibgfrcvolbot"     name="ibgfrcvolbot" level="1" />
-          <field field_ref="ibgfrctemtop"     name="ibgfrctemtop" level="1" />
-          <field field_ref="ibgfrctembot"     name="ibgfrctembot" level="1" />
-          <field field_ref="ibgfrcsal"        name="ibgfrcsal"    level="1" />
-          <field field_ref="ibgfrchfxtop"     name="ibgfrchfxtop" level="1" />
-          <field field_ref="ibgfrchfxbot"     name="ibgfrchfxbot" level="1" />
-	  
-        </file>
-
-       <file id="file14" name_suffix="_diaptr_T_2D" description="zonal mean variables" >
-          <field field_ref="sophtove"    name="htovovrt"      grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sopstove"    name="sltovovrt"     grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sophtgyre"   name="htovgyre"      grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sopstgyre"   name="sltogyre"      grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sophtbtr"    name="htbtr"         grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sopstbtr"    name="sltbtr"        grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sophtadv"    name="htadv"         grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sopstadv"    name="sltadv"        grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sophtldf"    name="htldf"         grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sopstldf"    name="sltldf"        grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sophtvtr"    name="hfbasin"       grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sopstvtr"    name="sltbasin"      grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sophteiv"    name="hfbasinpmadv"  grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sopsteiv"    name="sltbasinpmadv" grid_ref="grid_ptr_T_2D"  level="2" />
-        </file>
-
-         <file id="file15" name_suffix="_diaptr_T_3D" description="zonal mean variables" >
-          <field field_ref="zotem"       name="znltem"        grid_ref="grid_ptr_T_3D" level="2" />
-          <field field_ref="zosal"       name="znlsal"        grid_ref="grid_ptr_T_3D" level="2" />
-          <field field_ref="zosrf"       name="znlsrf"        grid_ref="grid_ptr_T_3D" level="2" />
-        </file>
-
-	    <file id="file16" name_suffix="_diaptr_W" description="diaptr variables"  >
-          <field field_ref="zomsf"   name="msftyz_glo"  long_name="Overturning Stream-Function : global"       grid_ref="grid_ptr_W_GLO" level="1" />
-          <field field_ref="zomsf"   name="msftyz_atl"  long_name="Overturning Stream-Function : Atlantic"     grid_ref="grid_ptr_W_ATL" level="1" />
-          <field field_ref="zomsf"   name="msftyz_ind"  long_name="Overturning Stream-Function : Indo-PAcific" grid_ref="grid_ptr_W_IND" level="1" />
-        </file>
-
-         <file id="file17" name_suffix="_strait_oce" description="transport variables through straits" >
-           <field field_ref="masstr_strait"      name="mfo"  level="2"    />
-         </file>
-
-        <file id="file18" name_suffix="_trdtra" description="ocean trends variables" >
-          <field field_ref="ttrd_zdfp_e3t"   name="ttrdtr_zdfp"  long_name="Tendency_of_heat_content_from_parameterized_dianeutral_mixing"  unit="W m-2"      level="2"   > this * $cpocean * $rho0  </field>
-          <field field_ref="ttrd_iso_e3t"    name="ttrdtr_iso"   long_name="Tendency_of_heat_content_from_parameterized_eddy_diffusion"     unit="W m-2"      level="2"   > this * $cpocean * $rho0  </field>
-          <field field_ref="ttrd_totad_e3t"  name="ttrdtr_totad" long_name="Tendency_of_heat_content_from_residual_mean_advection"          unit="W m-2"      level="2"   > this * $cpocean * $rho0  </field>
-          <field field_ref="ttrd_tot_e3t"    name="ttrdtr_tot"   long_name="Tendency_of_heat_content_from_all_processes"                    unit="W m-2"      level="2"   > this * $cpocean * $rho0  </field>
-          <field field_ref="strd_zdfp_e3t"   name="strdtr_zdfp"  long_name="Tendency_of_salt_content_from_parameterized_dianeutral_mixing"  unit="kg m-2 s-1" level="2"   > this * $rho0 </field>
-          <field field_ref="strd_iso_e3t"    name="strdtr_iso"   long_name="Tendency_of_salt_content_from_parameterized_eddy_diffusion"     unit="kg m-2 s-1" level="2"  > this * $rho0 </field>
-          <field field_ref="strd_totad_e3t"  name="strdtr_totad" long_name="Tendency_of_salt_content_from_residual_mean_advection"          unit="kg m-2 s-1" level="2"  > this * $rho0  </field>
-          <field field_ref="strd_tot_e3t"    name="strdtr_tot"   long_name="Tendency_of_salt_content_from_all_processes"                    unit="kg m-2 s-1" level="2"  > this * $rho0  </field>
-        </file>
-
-      </file_group>
-
-
-      <file_group id="2m_opa" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
-      <file_group id="3m_opa" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
-      <file_group id="4m_opa" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
-      <file_group id="6m_opa" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
-
-      <file_group id="1y_opa"  output_freq="1y" output_level="_AUTO_" enabled="_AUTO_"> <!-- real yearly files -->
-
-	<file id="file19" name_suffix="_grid_T" description="ocean T grid variables" >
-	  <field field_ref="e3t"  level="2"  />
-	  <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"          level="2"              />
-	  <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"             level="2"              />
-	  <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"   level="2"              />
-	  <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"      operation="average" freq_op="1y" level="2" > @toce_e3t / @e3t </field>        
-	  <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                   operation="average" freq_op="1y" level="2" > @soce_e3t / @e3t </field>         
-	  <field field_ref="sst2"         name="tossq"    long_name="square_of_sea_surface_temperature"           level="2"   />
-	  <field field_ref="ssh2"         name="zossq"    long_name="square_of_sea_surface_height_above_geoid"    level="2"   />
-	  <field field_ref="mldr10_1"  level="2"    />
-	  <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"    level="2"       />
-	  <field field_ref="taum"         name="taum" level="2" />
-	  <field field_ref="wspd"         name="sowindsp"  level="2" />
-	  <field field_ref="precip"       name="soprecip" level="2" />
-	  <!-- available with ln_blk_clio or ln_blk_core -->
-	  <field field_ref="qns_oce"      name="sonshdoo" level="2"  />
-	  <field field_ref="qlw_oce"      name="solwhdoo" level="2"  />
-	  <field field_ref="qsb_oce"      name="sosehdoo" level="2"  />
-	  <field field_ref="qla_oce"      name="solahdoo" level="2"  />
-	  <field field_ref="taum_oce"     name="sowndsto" level="2"  />
-	  <!-- ice and snow -->
-	  <field field_ref="snowpre"      name="isnowpre" level="2"  />
-	  <!-- For heat conservation checking -->
-	  <field field_ref="qt_oce"        name="qt_oce"   long_name="downward total flux at ocean surface"         level="2"   />
-	  <field field_ref="qemp_oce"      name="qemp_oce" long_name="Downward Heat Flux from E-P over open ocean"   level="2"         />
-	  <field field_ref="qt_ice"        name="qt_ice"   long_name="downward total flux at ice surface"          level="2"  />
-	  <field field_ref="qemp_ice"      name="qemp_ice" long_name="Downward Heat Flux from E-P over ice"        level="2"    />
-	  <field field_ref="hflx_rain_cea" name="hflx_rain_cea"     level="2"  />
-	  <field field_ref="hflx_evap_cea" name="hflx_evap_cea"     level="2"  />
-	  <field field_ref="hflx_snow_cea" name="hflx_snow_cea"    level="2"   />
-	  <field field_ref="hflx_cal_cea"  name="hflx_cal_cea"    level="2"   />
-	  <field field_ref="qhcisf_par"     name="hflx_isf"     level="1"  />
-	  <!-- For freshwater conservation checking -->
-	  <field field_ref="empmr"         name="wfo"      long_name="water_flux_into_sea_water"             level="2"         />
-	  <field field_ref="emp_oce"       name="emp_oce"         level="2"              />
-	  <field field_ref="emp_ice"       name="emp_ice"         level="2"              />
-	  <field field_ref="runoffs"       name="runoffs"         level="2"              />
-      <field field_ref="runoffs"       name="friver"   long_name="water_flux_into_sea_water_from_rivers"     level="1" > runoffs - iceberg_cea </field>
-	  <field field_ref="calving_cea"   name="calving" level="2" />
-          <field field_ref="iceberg_cea"   name="iceberg" level="2" />
-          <field field_ref="fwfisf_par"  name="iceshelf" level="2"  />
-	  <field field_ref="vfxice"        name="vfxice" level="2"  />
-	  <field field_ref="vfxsnw"        name="vfxsnw" level="2" />
-	  <field field_ref="vfxsub"        name="vfxsub" level="2" />
-	  <field field_ref="rain"          name="rain"    level="2"   />
-	  <field field_ref="snow_ao_cea"   name="snow_ao_cea"  level="2"     />
-	  <field field_ref="snow_ai_cea"   name="snow_ai_cea"  level="2"     />
-	  <field field_ref="evap_ao_cea"   name="evap_ao_cea"  level="2"     />
-	  <field field_ref="subl_ai_cea"   name="subl_ai_cea"  level="2"     />
-	  <!-- For salt conservation checking -->
-          <field field_ref="saltflx"      name="sosflxdo" level="2"  />
-	</file>
-	
-	<file id="file20" 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"   level="2"  />
-	  <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity"      operation="average" freq_op="1y" level="2" > @uoce_e3u / @e3u </field> 
-	  <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress"  level="2"  />
-	  <field field_ref="uocetr_eff"   name="uocetr_eff" level="2"  />
-	</file>
-	
-	<file id="file21" 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"  level="2"   />
-	  <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity"     operation="average" freq_op="1y" level="2" > @voce_e3v / @e3v </field>
-	  <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" level="2" />
-	  <field field_ref="vocetr_eff"   name="vocetr_eff" level="2"  />
-	</file>
-	
-	<file id="file22" name_suffix="_grid_W" description="ocean W grid variables" >
-	  <field field_ref="e3w"  />
-	  <field field_ref="woce"         name="wo"      long_name="ocean vertical velocity"         level="2" />
-	  <field field_ref="avt"          name="difvho"  long_name="ocean_vertical_heat_diffusivity" level="2" />
-	  <field field_ref="wocetr_eff"   name="wocetr_eff"  level="2" />
-	  <field field_ref="avt_evd"      name="avt_evd"   level="2"  />
-	  <field field_ref="av_wave"      name="av_wave"    level="2" />
-	  <field field_ref="bn2"          name="bn2"       level="2"  />
-	  <field field_ref="bflx_iwm"     name="bflx_iwm"  level="2"  />
-	  <field field_ref="pcmap_iwm"    name="pcmap_iwm" level="2"  />
-	  <field field_ref="emix_iwm"     name="emix_iwm"  level="2"  />
-	  <field field_ref="av_ratio"     name="av_ratio"  level="2"  />
-	</file>
-	
-
-       <file id="file23" name_suffix="_diaptr_T_2D" description="zonal mean variables" >
-          <field field_ref="sophtove"    name="htovovrt"      grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sopstove"    name="sltovovrt"     grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sophtgyre"   name="htovgyre"      grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sopstgyre"   name="sltogyre"      grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sophtbtr"    name="htbtr"         grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sopstbtr"    name="sltbtr"        grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sophtadv"    name="htadv"         grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sopstadv"    name="sltadv"        grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sophtldf"    name="htldf"         grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sopstldf"    name="sltldf"        grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sophtvtr"    name="hfbasin"       grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sopstvtr"    name="sltbasin"      grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sophteiv"    name="hfbasinpmadv"  grid_ref="grid_ptr_T_2D"  level="2" />
-          <field field_ref="sopsteiv"    name="sltbasinpmadv" grid_ref="grid_ptr_T_2D"  level="2" />
-        </file>
-
-         <file id="file24" name_suffix="_diaptr_T_3D" description="zonal mean variables" >
-          <field field_ref="zotem"       name="znltem"        grid_ref="grid_ptr_T_3D" level="2" />
-          <field field_ref="zosal"       name="znlsal"        grid_ref="grid_ptr_T_3D" level="2" />
-          <field field_ref="zosrf"       name="znlsrf"        grid_ref="grid_ptr_T_3D" level="2" />
-        </file>
-
-	<file id="file25" name_suffix="_diaptr_W" description="diaptr variables"  >
-	  <field field_ref="zomsf"          name="msftyz"  grid_ref="grid_ptr_W_3D" level="1" />
-        </file>
-
-        <file id="file26" name_suffix="_trdtra" description="ocean trends variables" >
-          <field field_ref="ttrd_zdfp_e3t"   name="ttrdtr_zdfp"  long_name="Tendency_of_heat_content_from_parameterized_dianeutral_mixing"  unit="W m-2"      level="2"  > this * $cpocean * $rho0  </field>
-          <field field_ref="ttrd_iso_e3t"    name="ttrdtr_iso"   long_name="Tendency_of_heat_content_from_parameterized_eddy_diffusion"     unit="W m-2"      level="2"  > this * $cpocean * $rho0  </field>
-          <field field_ref="ttrd_totad_e3t"  name="ttrdtr_totad" long_name="Tendency_of_heat_content_from_residual_mean_advection"          unit="W m-2"      level="2"  > this * $cpocean * $rho0  </field>
-          <field field_ref="ttrd_tot_e3t"    name="ttrdtr_tot"   long_name="Tendency_of_heat_content_from_all_processes"                    unit="W m-2"      level="2"  > this * $cpocean * $rho0  </field>
-          <field field_ref="strd_zdfp_e3t"   name="strdtr_zdfp"  long_name="Tendency_of_salt_content_from_parameterized_dianeutral_mixing"  unit="kg m-2 s-1" level="2"  > this * $rho0 </field>
-          <field field_ref="strd_iso_e3t"    name="strdtr_iso"   long_name="Tendency_of_salt_content_from_parameterized_eddy_diffusion"     unit="kg m-2 s-1" level="2"  > this * $rho0 </field>
-          <field field_ref="strd_totad_e3t"  name="strdtr_totad" long_name="Tendency_of_salt_content_from_residual_mean_advection"          unit="kg m-2 s-1" level="2"  > this * $rho0  </field>
-          <field field_ref="strd_tot_e3t"    name="strdtr_tot"   long_name="Tendency_of_salt_content_from_all_processes"                    unit="kg m-2 s-1" level="2"  > this * $rho0  </field>
-        </file>
-
-      </file_group>
-      
-      <!--  To compute transport through straits : need to read mask file ( every month is the best otherwise costly ) -->
-      <file id="maskMFO"  name="maskMFO" enabled="true" mode="read" output_freq="1mo" cyclic="true"  >
-        <field id="maskMFO_u" operation="instant" freq_offset="1mo" grid_ref="grid_U_4strait" />
-        <field id="maskMFO_v" operation="instant" freq_offset="1mo" grid_ref="grid_V_4strait" />
-      </file>
-
-      <file_group id="2y_opa"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
-      <file_group id="5y_opa"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
-      <file_group id="10y_opa" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
-
-    </file_definition>
Index: CONFIG/UNIFORM/v7/IPSLCM7/SOURCES/NEMO/file_def_nemo-pisces.xml
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/SOURCES/NEMO/file_def_nemo-pisces.xml	(revision 6656)
+++ 	(revision )
@@ -1,238 +1,0 @@
-    <!-- $id$ -->
-    
-    <!-- 
-
-============================================================================================================
-=                                           output files definition                                        =
-=                                            Define your own files ocean biogeochemistry                                         =
-=                                         put the variables you want...                                    =
-============================================================================================================
-    -->
-    
-    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="4" >
-    
-      <file_group id="1ts_pis" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
-
-      <file_group id="1h_pis" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
-
-      <file_group id="2h_pis" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
-
-      <file_group id="3h_pis" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
-
-      <file_group id="4h_pis" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
-
-      <file_group id="6h_pis" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->     
-    
-      <file_group id="1d_pis" output_freq="1d"  output_level="_AUTO_" enabled="_AUTO_" >  <!-- 1d files -->   
-
-        <file id="file31" name_suffix="_bioscalar" description="pisces sms variables" >
-          <field field_ref="tdenit"   name="tdenit"    unit="TgN/yr" operation="instant" level="2" > tdenit * 14. * 86400. * 365. / 1e12 </field>
-          <field field_ref="tnfix"    name="tnfix"     unit="TgN/yr" operation="instant" level="2" > tnfix * 14. * 86400. * 365. / 1e12 </field>
-          <field field_ref="tcflx"    name="tcflx"     unit="PgC/yr" operation="instant" level="2" > tcflx * -1. * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="tcflxcum" name="tcflxcum"  unit="PgC"    operation="instant" level="2" > tcflxcum * -1. * 12. / 1e15 </field>
-          <field field_ref="tcexp"    name="tcexp"     unit="PgC/yr" operation="instant" level="2" > tcexp * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="tintpp"   name="tintpp"    unit="PgC/yr" operation="instant" level="2" > tintpp * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="pno3tot"  name="pno3tot"   unit="umolN"  operation="instant" level="2" > pno3tot * 16. / 117. * 1e6 </field>
-          <field field_ref="ppo4tot"  name="ppo4tot"   unit="umolP"  operation="instant" level="2" > ppo4tot * 1. / 117. * 1e6 </field>
-          <field field_ref="psiltot"  name="psiltot"   unit="umolC"  operation="instant" level="2" > psiltot * 1e6  </field>
-          <field field_ref="palktot"  name="palktot"   unit="umolC"  operation="instant" level="2" > palktot * 1e6  </field>
-          <field field_ref="pfertot"  name="pfertot"   unit="nmolFe" operation="instant" level="2" > pfertot * 1e9  </field>
-        </file>
-
-      </file_group> 
-
-      <file_group id="5d_pis" output_freq="5d"  output_level="_AUTO_" enabled="_AUTO_" >  <!-- 5d files -->   
-
-       <file id="file32" name_suffix="_bioscalar" description="pisces sms variables" >
-          <field field_ref="tdenit"   name="tdenit"    unit="TgN/yr" operation="instant" level="2" > tdenit * 14. * 86400. * 365. / 1e12 </field>
-          <field field_ref="tnfix"    name="tnfix"     unit="TgN/yr" operation="instant" level="2" > tnfix * 14. * 86400. * 365. / 1e12 </field>
-          <field field_ref="tcflx"    name="tcflx"     unit="PgC/yr" operation="instant" level="2" > tcflx * -1. * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="tcflxcum" name="tcflxcum"  unit="PgC"    operation="instant" level="2" > tcflxcum * -1. * 12. / 1e15 </field>
-          <field field_ref="tcexp"    name="tcexp"     unit="PgC/yr" operation="instant" level="2" > tcexp * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="tintpp"   name="tintpp"    unit="PgC/yr" operation="instant" level="2" > tintpp * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="pno3tot"  name="pno3tot"   unit="umolN"  operation="instant" level="2" > pno3tot * 16. / 117. * 1e6 </field>
-          <field field_ref="ppo4tot"  name="ppo4tot"   unit="umolP"  operation="instant" level="2" > ppo4tot * 1. / 117. * 1e6 </field>
-          <field field_ref="psiltot"  name="psiltot"   unit="umolC"  operation="instant" level="2" > psiltot * 1e6  </field>
-          <field field_ref="palktot"  name="palktot"   unit="umolC"  operation="instant" level="2" > palktot * 1e6  </field>
-          <field field_ref="pfertot"  name="pfertot"   unit="nmolFe" operation="instant" level="2" > pfertot * 1e9  </field>
-        </file>
-
-      </file_group> 
-
-	
-      <file_group id="1m_pis" output_freq="1mo" output_level="_AUTO_" enabled="_AUTO_" > <!-- real monthly files -->
-
-
-        <file id="file33" name_suffix="_ptrc_T" description="pisces sms variables" >
-          <field field_ref="DIC"       name="DIC"      operation="average" freq_op="1mo" level="2" > @DIC_e3t / @e3t </field>
-          <field field_ref="Alkalini"  name="Alkalini" operation="average" freq_op="1mo" level="2" > @Alkalini_e3t / @e3t </field>
-          <field field_ref="O2"        name="O2"       operation="average" freq_op="1mo" level="2" > @O2_e3t / @e3t </field>
-          <field field_ref="CaCO3"     name="CaCO3"    operation="average" freq_op="1mo" level="2" > @CaCO3_e3t / @e3t </field>
-          <field field_ref="PO4"       name="PO4"      operation="average" freq_op="1mo" level="2" > @PO4_e3t / @e3t </field>
-          <field field_ref="POC"       name="POC"      operation="average" freq_op="1mo" level="2" > @POC_e3t / @e3t </field>
-          <field field_ref="Si"        name="Si"       operation="average" freq_op="1mo" level="2" > @Si_e3t / @e3t </field>
-          <field field_ref="PHY"       name="PHY"      operation="average" freq_op="1mo" level="2" > @PHY_e3t / @e3t </field>
-          <field field_ref="ZOO"       name="ZOO"      operation="average" freq_op="1mo" level="2" > @ZOO_e3t / @e3t </field>
-          <field field_ref="DOC"       name="DOC"      operation="average" freq_op="1mo" level="2" > @DOC_e3t / @e3t </field>
-          <field field_ref="PHY2"      name="PHY2"     operation="average" freq_op="1mo" level="2" > @PHY2_e3t / @e3t </field>
-          <field field_ref="ZOO2"      name="ZOO2"     operation="average" freq_op="1mo" level="2" > @ZOO2_e3t / @e3t </field>
-          <field field_ref="DSi"       name="DSi"      operation="average" freq_op="1mo" level="2" > @DSi_e3t / @e3t </field>
-          <field field_ref="Fer"       name="Fer"      operation="average" freq_op="1mo" level="2" > @Fer_e3t / @e3t </field>
-          <field field_ref="BFe"       name="BFe"      operation="average" freq_op="1mo" level="2" > @BFe_e3t / @e3t </field>
-          <field field_ref="GOC"       name="GOC"      operation="average" freq_op="1mo" level="2" > @GOC_e3t / @e3t </field>
-          <field field_ref="SFe"       name="SFe"      operation="average" freq_op="1mo" level="2" > @SFe_e3t / @e3t </field>
-          <field field_ref="DFe"       name="DFe"      operation="average" freq_op="1mo" level="2" > @DFe_e3t / @e3t </field>
-          <field field_ref="GSi"       name="GSi"      operation="average" freq_op="1mo" level="2" > @GSi_e3t / @e3t </field>
-          <field field_ref="NFe"       name="NFe"      operation="average" freq_op="1mo" level="2" > @NFe_e3t / @e3t </field>
-          <field field_ref="NCHL"      name="NCHL"     operation="average" freq_op="1mo" level="2" > @NCHL_e3t / @e3t </field>
-          <field field_ref="DCHL"      name="DCHL"     operation="average" freq_op="1mo" level="2" > @DCHL_e3t / @e3t </field>
-          <field field_ref="NO3"       name="NO3"      operation="average" freq_op="1mo" level="2" > @NO3_e3t / @e3t </field>
-          <field field_ref="NH4"       name="NH4"      operation="average" freq_op="1mo" level="2" > @NH4_e3t / @e3t </field>
-       </file>
-
-
-
-       <file id="file34" name_suffix="_diad_T" description="additional pisces diagnostics" >
-
-        <field field_ref="PH"         name="PH"       level="2" />
-        <field field_ref="CO3"        name="CO3"      level="2" />
-        <field field_ref="CO3sat"     name="CO3sat"   level="2" />
-        <field field_ref="PAR"        name="PAR"      level="2" />
-        <field field_ref="PCAL"       name="PCAL"     level="2"  />
-        <field field_ref="Cflx"       name="Cflx"     level="2"  />
-        <field field_ref="Oflx"       name="Oflx"     level="2"  />
-        <field field_ref="Dpco2"      name="Dpco2"    level="2"   />
-        <field field_ref="Dpo2"       name="Dpo2"     level="2"  />
-        <field field_ref="Heup"       name="Heup"     level="2" />
-        <field field_ref="Irondep"    name="Irondep"  level="2" />
-        <field field_ref="Ironsed"    name="Ironsed"  level="2" />
-        <field field_ref="Nfix"       name="Nfix"     level="2" />
-        <field field_ref="LNnut"      name="LNnut"    level="2" />
-        <field field_ref="LDnut"      name="LDnut"    level="2" />
-        <field field_ref="LNFe"       name="LNFe"     level="2" />
-        <field field_ref="LDFe"       name="LDFe"     level="2" />
-        <field field_ref="LNlight"    name="LNlight"  level="2"  />
-        <field field_ref="LDlight"    name="LDlight"  level="2"  />
-        <field field_ref="TPP"        name="TPP"      level="2" />
-        <field field_ref="INTPP"      name="INTPP"    level="2" />
-        <field field_ref="INTPNEW"    name="INTPNEW"  level="2"  />
-        <field field_ref="TPNEW"      name="TPNEW"    level="2" />
-        <field field_ref="EPC100"     name="EPC100"   level="2" />
-        <field field_ref="EPFE100"    name="EPFE100"  level="2"  />
-        <field field_ref="EPSI100"    name="EPSI100"  level="2"  />
-        <field field_ref="EPCAL100"   name="EPCAL100" level="2"  />
-        <field field_ref="xfracal"    name="xfracal"  level="2" />
-        <field field_ref="GRAZ1"      name="GRAZ"     level="2" > this + GRAZ2 </field>
-
-       </file>
-       
-       <file id="file35" name_suffix="_bioscalar" description="pisces sms variables" >
-          <field field_ref="tdenit"   name="tdenit"    unit="TgN/yr" operation="instant" level="1" > tdenit * 14. * 86400. * 365. / 1e12 </field>
-          <field field_ref="tnfix"    name="tnfix"     unit="TgN/yr" operation="instant" level="1" > tnfix * 14. * 86400. * 365. / 1e12 </field>
-          <field field_ref="tcflx"    name="tcflx"     unit="PgC/yr" operation="instant" level="1" > tcflx * -1. * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="tcflxcum" name="tcflxcum"  unit="PgC"    operation="instant" level="1" > tcflxcum * -1. * 12. / 1e15 </field>
-          <field field_ref="tcexp"    name="tcexp"     unit="PgC/yr" operation="instant" level="1" > tcexp * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="tintpp"   name="tintpp"    unit="PgC/yr" operation="instant" level="1" > tintpp * 12. * 86400. * 365. / 1e15 </field>
-          <field field_ref="pno3tot"  name="pno3tot"   unit="umolN"  operation="instant" level="1" > pno3tot * 16. / 117. * 1e6 </field>
-          <field field_ref="ppo4tot"  name="ppo4tot"   unit="umolP"  operation="instant" level="1" > ppo4tot * 1. / 117. * 1e6 </field>
-          <field field_ref="psiltot"  name="psiltot"   unit="umolC"  operation="instant" level="1" > psiltot * 1e6  </field>
-          <field field_ref="palktot"  name="palktot"   unit="umolC"  operation="instant" level="1" > palktot * 1e6  </field>
-          <field field_ref="pfertot"  name="pfertot"   unit="nmolFe" operation="instant" level="1" > pfertot * 1e9  </field>
-        </file>
-
-      </file_group>
-
-
-      <file_group id="2m_pis" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
-      <file_group id="3m_pis" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
-      <file_group id="4m_pis" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
-      <file_group id="6m_pis" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
-
-      <file_group id="1y_pis"  output_freq="1y" output_level="_AUTO_" enabled="_AUTO_"> <!-- real yearly files -->
-
- 
-       <file id="file36" name_suffix="_ptrc_T" description="pisces sms variables" >
-          <field field_ref="DIC"       name="DIC"      operation="average" freq_op="1y" level="1"  > @DIC_e3t / @e3t </field>
-          <field field_ref="Alkalini"  name="Alkalini" operation="average" freq_op="1y" level="1"  > @Alkalini_e3t / @e3t </field>
-          <field field_ref="O2"        name="O2"       operation="average" freq_op="1y" level="1"  > @O2_e3t / @e3t </field>
-          <field field_ref="CaCO3"     name="CaCO3"    operation="average" freq_op="1y" level="2" > @CaCO3_e3t / @e3t </field>
-          <field field_ref="PO4"       name="PO4"      operation="average" freq_op="1y" level="1"  > @PO4_e3t / @e3t </field>
-          <field field_ref="POC"       name="POC"      operation="average" freq_op="1y" level="1"  > @POC_e3t / @e3t </field>
-          <field field_ref="Si"        name="Si"       operation="average" freq_op="1y" level="1"  > @Si_e3t / @e3t </field>
-          <field field_ref="PHY"       name="PHY"      operation="average" freq_op="1y" level="2" > @PHY_e3t / @e3t </field>
-          <field field_ref="ZOO"       name="ZOO"      operation="average" freq_op="1y" level="2" > @ZOO_e3t / @e3t </field>
-          <field field_ref="DOC"       name="DOC"      operation="average" freq_op="1y" level="2" > @DOC_e3t / @e3t </field>
-          <field field_ref="PHY2"      name="PHY2"     operation="average" freq_op="1y" level="2" > @PHY2_e3t / @e3t </field>
-          <field field_ref="ZOO2"      name="ZOO2"     operation="average" freq_op="1y" level="2" > @ZOO2_e3t / @e3t </field>
-          <field field_ref="DSi"       name="DSi"      operation="average" freq_op="1y" level="2" > @DSi_e3t / @e3t </field>
-          <field field_ref="Fer"       name="Fer"      operation="average" freq_op="1y" level="1"  > @Fer_e3t / @e3t </field>
-          <field field_ref="BFe"       name="BFe"      operation="average" freq_op="1y" level="2" > @BFe_e3t / @e3t </field>
-          <field field_ref="GOC"       name="GOC"      operation="average" freq_op="1y" level="1"  > @GOC_e3t / @e3t </field>
-          <field field_ref="SFe"       name="SFe"      operation="average" freq_op="1y" level="2" > @SFe_e3t / @e3t </field>
-          <field field_ref="DFe"       name="DFe"      operation="average" freq_op="1y" level="2" > @DFe_e3t / @e3t </field>
-          <field field_ref="GSi"       name="GSi"      operation="average" freq_op="1y" level="2" > @GSi_e3t / @e3t </field>
-          <field field_ref="NFe"       name="NFe"      operation="average" freq_op="1y" level="2" > @NFe_e3t / @e3t </field>
-          <field field_ref="NCHL"      name="NCHL"     operation="average" freq_op="1y" level="1"  > @NCHL_e3t / @e3t </field>
-          <field field_ref="DCHL"      name="DCHL"     operation="average" freq_op="1y" level="1"  > @DCHL_e3t / @e3t </field>
-          <field field_ref="NO3"       name="NO3"      operation="average" freq_op="1y" level="1"  > @NO3_e3t / @e3t </field>
-          <field field_ref="NH4"       name="NH4"      operation="average" freq_op="1y" level="2" > @NH4_e3t / @e3t </field>
-       </file>
-
-      <file id="file37" name_suffix="_diad_T" description="additional pisces diagnostics"  >
-
-        <field field_ref="PH"         name="PH"       level="2" />
-        <field field_ref="CO3"        name="CO3"      level="2" />
-        <field field_ref="CO3sat"     name="CO3sat"   level="2" />
-        <field field_ref="PAR"        name="PAR"      level="2" />
-        <field field_ref="PCAL"       name="PCAL"     level="2"  />
-        <field field_ref="Cflx"       name="Cflx"     level="1"  />
-        <field field_ref="Oflx"       name="Oflx"     level="2"  />
-        <field field_ref="Dpco2"      name="Dpco2"    level="1"   />
-        <field field_ref="Dpo2"       name="Dpo2"     level="2"  />
-        <field field_ref="Heup"       name="Heup"     level="1" />
-        <field field_ref="Irondep"    name="Irondep"  level="2" />
-        <field field_ref="Ironsed"    name="Ironsed"  level="2" />
-        <field field_ref="Nfix"       name="Nfix"     level="1" />
-        <field field_ref="LNnut"      name="LNnut"    level="2" />
-        <field field_ref="LDnut"      name="LDnut"    level="2" />
-        <field field_ref="LNFe"       name="LNFe"     level="2" />
-        <field field_ref="LDFe"       name="LDFe"     level="2" />
-        <field field_ref="LNlight"    name="LNlight"  level="2"  />
-        <field field_ref="LDlight"    name="LDlight"  level="2"  />
-        <field field_ref="TPP"        name="TPP"      level="1" />
-        <field field_ref="INTPP"      name="INTPP"    level="1" />
-        <field field_ref="INTPNEW"    name="INTPNEW"  level="2"  />
-        <field field_ref="TPNEW"      name="TPNEW"    level="2" />
-        <field field_ref="EPC100"     name="EPC100"   level="1" />
-        <field field_ref="EPFE100"    name="EPFE100"  level="1"  />
-        <field field_ref="EPSI100"    name="EPSI100"  level="1"  />
-        <field field_ref="EPCAL100"   name="EPCAL100" level="1"  />
-        <field field_ref="xfracal"    name="xfracal"  level="2" />
-        <field field_ref="GRAZ1"      name="GRAZ"     level="2" > this + GRAZ2 </field>
-
-        </file>
-
-       <file id="file38" name_suffix="_Age" description="Age tracer" enabled=".FALSE." >
-          <field field_ref="Age"         name="Age"      operation="average" freq_op="1y" level="1"  > @Age_e3t / @e3t </field>
-      </file>
-
-       <file id="file39" name_suffix="_CFC11" description="CFC11 tracer" enabled=".FALSE." >
-          <field field_ref="CFC11"       name="CFC11"    operation="average" freq_op="1y" level="1"  > @CFC11_e3t / @e3t </field>
-          <field field_ref="qtr_CFC11"   name="qtrCFC11"  level="1"   />
-          <field field_ref="qint_CFC11"  name="qintCFC11" level="1"   />
-      </file>
-
-       <file id="file40" name_suffix="_CFC12" description="CFC12 tracer" enabled=".FALSE." >
-          <field field_ref="CFC12"       name="CFC12"    operation="average" freq_op="1y" level="1"  > @CFC12_e3t / @e3t </field>
-          <field field_ref="qtr_CFC12"   name="qtrCFC12"  level="1"   />
-          <field field_ref="qint_CFC12"  name="qintCFC12" level="1"   />
-      </file>
-
-      </file_group>
-
-      <file_group id="2y_pis"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
-      <file_group id="5y_pis"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
-      <file_group id="10y_pis" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
-
-   </file_definition>
-
Index: CONFIG/UNIFORM/v7/IPSLCM7/SOURCES/NEMO/ldftra.F90
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/SOURCES/NEMO/ldftra.F90	(revision 6658)
+++ CONFIG/UNIFORM/v7/IPSLCM7/SOURCES/NEMO/ldftra.F90	(revision 6658)
@@ -0,0 +1,900 @@
+MODULE ldftra
+   !!======================================================================
+   !!                       ***  MODULE  ldftra  ***
+   !! Ocean physics:  lateral diffusivity coefficients
+   !!=====================================================================
+   !! History :       ! 1997-07  (G. Madec)  from inimix.F split in 2 routines
+   !!   NEMO     1.0  ! 2002-09  (G. Madec)  F90: Free form and module
+   !!            2.0  ! 2005-11  (G. Madec)
+   !!            3.7  ! 2013-12  (F. Lemarie, G. Madec)  restructuration/simplification of aht/aeiv specification,
+   !!                 !                                  add velocity dependent coefficient and optional read in file
+   !!----------------------------------------------------------------------
+
+   !!----------------------------------------------------------------------
+   !!   ldf_tra_init : initialization, namelist read, and parameters control
+   !!   ldf_tra      : update lateral eddy diffusivity coefficients at each time step
+   !!   ldf_eiv_init : initialization of the eiv coeff. from namelist choices
+   !!   ldf_eiv      : time evolution of the eiv coefficients (function of the growth rate of baroclinic instability)
+   !!   ldf_eiv_trp  : add to the input ocean transport the contribution of the EIV parametrization
+   !!   ldf_eiv_dia  : diagnose the eddy induced velocity from the eiv streamfunction
+   !!----------------------------------------------------------------------
+   USE oce             ! ocean dynamics and tracers
+   USE dom_oce         ! ocean space and time domain
+   USE phycst          ! physical constants
+   USE ldfslp          ! lateral diffusion: slope of iso-neutral surfaces
+   USE ldfc1d_c2d      ! lateral diffusion: 1D & 2D cases
+   USE diaptr
+   !
+   USE in_out_manager  ! I/O manager
+   USE iom             ! I/O module for ehanced bottom friction file
+   USE lib_mpp         ! distribued memory computing library
+   USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
+
+   IMPLICIT NONE
+   PRIVATE
+
+   PUBLIC   ldf_tra_init   ! called by nemogcm.F90
+   PUBLIC   ldf_tra        ! called by step.F90
+   PUBLIC   ldf_eiv_init   ! called by nemogcm.F90
+   PUBLIC   ldf_eiv        ! called by step.F90
+   PUBLIC   ldf_eiv_trp    ! called by traadv.F90
+   PUBLIC   ldf_eiv_dia    ! called by traldf_iso and traldf_iso_triad.F90
+
+   !                                   !!* Namelist namtra_ldf : lateral mixing on tracers *
+   !                                    != Operator type =!
+   LOGICAL , PUBLIC ::   ln_traldf_OFF       !: no operator: No explicit diffusion
+   LOGICAL , PUBLIC ::   ln_traldf_lap       !: laplacian operator
+   LOGICAL , PUBLIC ::   ln_traldf_blp       !: bilaplacian operator
+   !                                    != Direction of action =!
+   LOGICAL , PUBLIC ::   ln_traldf_lev       !: iso-level direction
+   LOGICAL , PUBLIC ::   ln_traldf_hor       !: horizontal (geopotential) direction
+!  LOGICAL , PUBLIC ::   ln_traldf_iso       !: iso-neutral direction                    (see ldfslp)
+   !		       	                      != iso-neutral options =!
+!  LOGICAL , PUBLIC ::   ln_traldf_triad     !: griffies triad scheme                    (see ldfslp)
+   LOGICAL , PUBLIC ::   ln_traldf_msc       !: Method of Stabilizing Correction
+!  LOGICAL , PUBLIC ::   ln_triad_iso        !: pure horizontal mixing in ML             (see ldfslp)
+!  LOGICAL , PUBLIC ::   ln_botmix_triad     !: mixing on bottom                         (see ldfslp)
+!  REAL(wp), PUBLIC ::   rn_sw_triad         !: =1/0 switching triad / all 4 triads used (see ldfslp)
+!  REAL(wp), PUBLIC ::   rn_slpmax           !: slope limit                              (see ldfslp)
+   !                                    !=  Coefficients =!
+   INTEGER , PUBLIC ::   nn_aht_ijk_t        !: choice of time & space variations of the lateral eddy diffusivity coef.
+   !                                            !  time invariant coefficients:  aht_0 = 1/2  Ud*Ld   (lap case)
+   !                                            !                                bht_0 = 1/12 Ud*Ld^3 (blp case)
+   REAL(wp), PUBLIC ::      rn_Ud               !: lateral diffusive velocity  [m/s]
+   REAL(wp), PUBLIC ::      rn_Ld               !: lateral diffusive length    [m]
+
+   !                                   !!* Namelist namtra_eiv : eddy induced velocity param. *
+   !                                    != Use/diagnose eiv =!
+   LOGICAL , PUBLIC ::   ln_ldfeiv           !: eddy induced velocity flag
+   LOGICAL , PUBLIC ::   ln_ldfeiv_dia       !: diagnose & output eiv streamfunction and velocity (IOM)
+   !                                    != Coefficients =!
+   INTEGER , PUBLIC ::   nn_aei_ijk_t        !: choice of time/space variation of the eiv coeff.
+   REAL(wp), PUBLIC ::      rn_Ue               !: lateral diffusive velocity  [m/s]
+   REAL(wp), PUBLIC ::      rn_Le               !: lateral diffusive length    [m]
+
+   !                                  ! Flag to control the type of lateral diffusive operator
+   INTEGER, PARAMETER, PUBLIC ::   np_ERROR  =-10   ! error in specification of lateral diffusion
+   INTEGER, PARAMETER, PUBLIC ::   np_no_ldf = 00   ! without operator (i.e. no lateral diffusive trend)
+   !                          !!      laplacian     !    bilaplacian    !
+   INTEGER, PARAMETER, PUBLIC ::   np_lap    = 10   ,   np_blp    = 20  ! iso-level operator
+   INTEGER, PARAMETER, PUBLIC ::   np_lap_i  = 11   ,   np_blp_i  = 21  ! standard iso-neutral or geopotential operator
+   INTEGER, PARAMETER, PUBLIC ::   np_lap_it = 12   ,   np_blp_it = 22  ! triad    iso-neutral or geopotential operator
+
+   INTEGER , PUBLIC ::   nldf_tra      = 0         !: type of lateral diffusion used defined from ln_traldf_... (namlist logicals)
+   LOGICAL , PUBLIC ::   l_ldftra_time = .FALSE.   !: flag for time variation of the lateral eddy diffusivity coef.
+   LOGICAL , PUBLIC ::   l_ldfeiv_time = .FALSE.   !: flag for time variation of the eiv coef.
+
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   ahtu, ahtv   !: eddy diffusivity coef. at U- and V-points   [m2/s]
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   aeiu, aeiv   !: eddy induced velocity coeff.                [m2/s]
+
+   REAL(wp) ::   aht0, aei0               ! constant eddy coefficients (deduced from namelist values)                     [m2/s]
+   REAL(wp) ::   r1_2  = 0.5_wp           ! =1/2
+   REAL(wp) ::   r1_4  = 0.25_wp          ! =1/4
+   REAL(wp) ::   r1_12 = 1._wp / 12._wp   ! =1/12
+
+   !! * Substitutions
+#  include "do_loop_substitute.h90"
+#  include "domzgr_substitute.h90"
+   !!----------------------------------------------------------------------
+   !! NEMO/OCE 4.0 , NEMO Consortium (2018)
+   !! $Id: ldftra.F90 15093 2021-07-06 16:20:39Z clem $
+   !! Software governed by the CeCILL license (see ./LICENSE)
+   !!----------------------------------------------------------------------
+CONTAINS
+
+   SUBROUTINE ldf_tra_init
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE ldf_tra_init  ***
+      !!
+      !! ** Purpose :   initializations of the tracer lateral mixing coeff.
+      !!
+      !! ** Method  : * the eddy diffusivity coef. specification depends on:
+      !!
+      !!    ln_traldf_lap = T     laplacian operator
+      !!    ln_traldf_blp = T   bilaplacian operator
+      !!
+      !!    nn_aht_ijk_t  =  0 => = constant
+      !!                  !
+      !!                  = 10 => = F(z) : constant with a reduction of 1/4 with depth
+      !!                  !
+      !!                  =-20 => = F(i,j)   = shape read in 'eddy_diffusivity_2D.nc' file
+      !!                  = 20    = F(i,j)   = F(e1,e2) or F(e1^3,e2^3) (lap or bilap case)
+      !!                  = 21    = F(i,j,t) = F(growth rate of baroclinic instability)
+      !!                  !
+      !!                  =-30 => = F(i,j,k)   = shape read in 'eddy_diffusivity_3D.nc' file
+      !!                  = 30    = F(i,j,k)   = 2D (case 20) + decrease with depth (case 10)
+      !!                  = 31    = F(i,j,k,t) = F(local velocity) (  1/2  |u|e     laplacian operator
+      !!                                                           or 1/12 |u|e^3 bilaplacian operator )
+      !!              * initialisation of the eddy induced velocity coefficient by a call to ldf_eiv_init
+      !!
+      !! ** action  : ahtu, ahtv initialized one for all or l_ldftra_time set to true
+      !!              aeiu, aeiv initialized one for all or l_ldfeiv_time set to true
+      !!----------------------------------------------------------------------
+      INTEGER  ::   jk                             ! dummy loop indices
+      INTEGER  ::   ioptio, ierr, inum, ios, inn   ! local integer
+      REAL(wp) ::   zah_max, zUfac                 !   -      -
+      CHARACTER(len=5) ::   cl_Units               ! units (m2/s or m4/s)
+      !!
+      NAMELIST/namtra_ldf/ ln_traldf_OFF, ln_traldf_lap  , ln_traldf_blp  ,   &   ! type of operator
+         &                 ln_traldf_lev, ln_traldf_hor  , ln_traldf_triad,   &   ! acting direction of the operator
+         &                 ln_traldf_iso, ln_traldf_msc  ,  rn_slpmax     ,   &   ! option for iso-neutral operator
+         &                 ln_triad_iso , ln_botmix_triad, rn_sw_triad    ,   &   ! option for triad operator
+         &                 nn_aht_ijk_t , rn_Ud          , rn_Ld                  ! lateral eddy coefficient
+      !!----------------------------------------------------------------------
+      !
+      IF(lwp) THEN                      ! control print
+         WRITE(numout,*)
+         WRITE(numout,*) 'ldf_tra_init : lateral tracer diffusion'
+         WRITE(numout,*) '~~~~~~~~~~~~ '
+      ENDIF
+
+      !
+      !  Choice of lateral tracer physics
+      ! =================================
+      !
+      READ  ( numnam_ref, namtra_ldf, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namtra_ldf in reference namelist' )
+      READ  ( numnam_cfg, namtra_ldf, IOSTAT = ios, ERR = 902 )
+902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namtra_ldf in configuration namelist' )
+      IF(lwm) WRITE( numond, namtra_ldf )
+      !
+      IF(lwp) THEN                      ! control print
+         WRITE(numout,*) '   Namelist : namtra_ldf --- lateral mixing parameters (type, direction, coefficients)'
+         WRITE(numout,*) '      type :'
+         WRITE(numout,*) '         no explicit diffusion                   ln_traldf_OFF   = ', ln_traldf_OFF
+         WRITE(numout,*) '         laplacian operator                      ln_traldf_lap   = ', ln_traldf_lap
+         WRITE(numout,*) '         bilaplacian operator                    ln_traldf_blp   = ', ln_traldf_blp
+         WRITE(numout,*) '      direction of action :'
+         WRITE(numout,*) '         iso-level                               ln_traldf_lev   = ', ln_traldf_lev
+         WRITE(numout,*) '         horizontal (geopotential)               ln_traldf_hor   = ', ln_traldf_hor
+         WRITE(numout,*) '         iso-neutral Madec operator              ln_traldf_iso   = ', ln_traldf_iso
+         WRITE(numout,*) '         iso-neutral triad operator              ln_traldf_triad = ', ln_traldf_triad
+         WRITE(numout,*) '            use the Method of Stab. Correction   ln_traldf_msc   = ', ln_traldf_msc
+         WRITE(numout,*) '            maximum isoppycnal slope             rn_slpmax       = ', rn_slpmax
+         WRITE(numout,*) '            pure lateral mixing in ML            ln_triad_iso    = ', ln_triad_iso
+         WRITE(numout,*) '            switching triad or not               rn_sw_triad     = ', rn_sw_triad
+         WRITE(numout,*) '            lateral mixing on bottom             ln_botmix_triad = ', ln_botmix_triad
+         WRITE(numout,*) '      coefficients :'
+         WRITE(numout,*) '         type of time-space variation            nn_aht_ijk_t    = ', nn_aht_ijk_t
+         WRITE(numout,*) '            lateral diffusive velocity (if cst)  rn_Ud           = ', rn_Ud, ' m/s'
+         WRITE(numout,*) '            lateral diffusive length   (if cst)  rn_Ld           = ', rn_Ld, ' m'
+      ENDIF
+      !
+      !
+      ! Operator and its acting direction   (set nldf_tra)
+      ! =================================
+      !
+      nldf_tra = np_ERROR
+      ioptio   = 0
+      IF( ln_traldf_OFF ) THEN   ;   nldf_tra = np_no_ldf   ;   ioptio = ioptio + 1   ;   ENDIF
+      IF( ln_traldf_lap ) THEN   ;                              ioptio = ioptio + 1   ;   ENDIF
+      IF( ln_traldf_blp ) THEN   ;                              ioptio = ioptio + 1   ;   ENDIF
+      IF( ioptio /=  1  )   CALL ctl_stop( 'tra_ldf_init: use ONE of the 3 operator options (NONE/lap/blp)' )
+      !
+      IF( .NOT.ln_traldf_OFF ) THEN    !==  direction ==>> type of operator  ==!
+         ioptio = 0
+         IF( ln_traldf_lev   )   ioptio = ioptio + 1
+         IF( ln_traldf_hor   )   ioptio = ioptio + 1
+         IF( ln_traldf_iso   )   ioptio = ioptio + 1
+         IF( ln_traldf_triad )   ioptio = ioptio + 1
+         IF( ioptio /=  1  )   CALL ctl_stop( 'tra_ldf_init: use ONE direction (level/hor/iso/triad)' )
+         !
+         !                                ! defined the type of lateral diffusion from ln_traldf_... logicals
+         ierr = 0
+         IF ( ln_traldf_lap ) THEN        ! laplacian operator
+            IF ( ln_zco ) THEN                  ! z-coordinate
+               IF ( ln_traldf_lev   )   nldf_tra = np_lap     ! iso-level = horizontal (no rotation)
+               IF ( ln_traldf_hor   )   nldf_tra = np_lap     ! iso-level = horizontal (no rotation)
+               IF ( ln_traldf_iso   )   nldf_tra = np_lap_i   ! iso-neutral: standard  (   rotation)
+               IF ( ln_traldf_triad )   nldf_tra = np_lap_it  ! iso-neutral: triad     (   rotation)
+            ENDIF
+            IF ( ln_zps ) THEN                  ! z-coordinate with partial step
+               IF ( ln_traldf_lev   )   ierr     = 1          ! iso-level not allowed
+               IF ( ln_traldf_hor   )   nldf_tra = np_lap     ! horizontal             (no rotation)
+               IF ( ln_traldf_iso   )   nldf_tra = np_lap_i   ! iso-neutral: standard     (rotation)
+               IF ( ln_traldf_triad )   nldf_tra = np_lap_it  ! iso-neutral: triad        (rotation)
+            ENDIF
+            IF ( ln_sco ) THEN                  ! s-coordinate
+               IF ( ln_traldf_lev   )   nldf_tra = np_lap     ! iso-level              (no rotation)
+               IF ( ln_traldf_hor   )   nldf_tra = np_lap_i   ! horizontal             (   rotation)
+               IF ( ln_traldf_iso   )   nldf_tra = np_lap_i   ! iso-neutral: standard  (   rotation)
+               IF ( ln_traldf_triad )   nldf_tra = np_lap_it  ! iso-neutral: triad     (   rotation)
+            ENDIF
+         ENDIF
+         !
+         IF( ln_traldf_blp ) THEN         ! bilaplacian operator
+            IF ( ln_zco ) THEN                  ! z-coordinate
+               IF ( ln_traldf_lev   )   nldf_tra = np_blp     ! iso-level = horizontal (no rotation)
+               IF ( ln_traldf_hor   )   nldf_tra = np_blp     ! iso-level = horizontal (no rotation)
+               IF ( ln_traldf_iso   )   nldf_tra = np_blp_i   ! iso-neutral: standard  (   rotation)
+               IF ( ln_traldf_triad )   nldf_tra = np_blp_it  ! iso-neutral: triad     (   rotation)
+            ENDIF
+            IF ( ln_zps ) THEN                  ! z-coordinate with partial step
+               IF ( ln_traldf_lev   )   ierr     = 1          ! iso-level not allowed
+               IF ( ln_traldf_hor   )   nldf_tra = np_blp     ! horizontal             (no rotation)
+               IF ( ln_traldf_iso   )   nldf_tra = np_blp_i   ! iso-neutral: standard  (   rotation)
+               IF ( ln_traldf_triad )   nldf_tra = np_blp_it  ! iso-neutral: triad     (   rotation)
+            ENDIF
+            IF ( ln_sco ) THEN                  ! s-coordinate
+               IF ( ln_traldf_lev   )   nldf_tra = np_blp     ! iso-level              (no rotation)
+               IF ( ln_traldf_hor   )   nldf_tra = np_blp_it  ! horizontal             (   rotation)
+               IF ( ln_traldf_iso   )   nldf_tra = np_blp_i   ! iso-neutral: standard  (   rotation)
+               IF ( ln_traldf_triad )   nldf_tra = np_blp_it  ! iso-neutral: triad     (   rotation)
+            ENDIF
+         ENDIF
+         IF ( ierr == 1 )   CALL ctl_stop( 'iso-level in z-partial step, not allowed' )
+      ENDIF
+      !
+      IF( ln_isfcav .AND. ln_traldf_triad )   CALL ctl_stop( ' ice shelf cavity and traldf_triad not tested' )
+           !
+      IF(  nldf_tra == np_lap_i .OR. nldf_tra == np_lap_it .OR. &
+         & nldf_tra == np_blp_i .OR. nldf_tra == np_blp_it  )   l_ldfslp = .TRUE.    ! slope of neutral surfaces required
+      !
+      IF( ln_traldf_blp .AND. ( ln_traldf_iso .OR. ln_traldf_triad) ) THEN     ! iso-neutral bilaplacian need MSC
+         IF( .NOT.ln_traldf_msc )   CALL ctl_stop( 'tra_ldf_init: iso-neutral bilaplacian requires ln_traldf_msc=.true.' )
+      ENDIF
+      !
+      IF(lwp) THEN
+         WRITE(numout,*)
+         SELECT CASE( nldf_tra )
+         CASE( np_no_ldf )   ;   WRITE(numout,*) '   ==>>>   NO lateral diffusion'
+         CASE( np_lap    )   ;   WRITE(numout,*) '   ==>>>   laplacian iso-level operator'
+         CASE( np_lap_i  )   ;   WRITE(numout,*) '   ==>>>   Rotated laplacian operator (standard)'
+         CASE( np_lap_it )   ;   WRITE(numout,*) '   ==>>>   Rotated laplacian operator (triad)'
+         CASE( np_blp    )   ;   WRITE(numout,*) '   ==>>>   bilaplacian iso-level operator'
+         CASE( np_blp_i  )   ;   WRITE(numout,*) '   ==>>>   Rotated bilaplacian operator (standard)'
+         CASE( np_blp_it )   ;   WRITE(numout,*) '   ==>>>   Rotated bilaplacian operator (triad)'
+         END SELECT
+         WRITE(numout,*)
+      ENDIF
+
+      !
+      !  Space/time variation of eddy coefficients
+      ! ===========================================
+      !
+      l_ldftra_time = .FALSE.                ! no time variation except in case defined below
+      !
+      IF( ln_traldf_OFF ) THEN               !== no explicit diffusive operator  ==!
+         !
+         IF(lwp) WRITE(numout,*) '   ==>>>   No diffusive operator selected. ahtu and ahtv are not allocated'
+         RETURN
+         !
+      ELSE                                   !==  a lateral diffusion operator is used  ==!
+         !
+         !                                         ! allocate the aht arrays
+         ALLOCATE( ahtu(jpi,jpj,jpk) , ahtv(jpi,jpj,jpk) , STAT=ierr )
+         IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'ldf_tra_init: failed to allocate arrays')
+         !
+         ahtu(:,:,jpk) = 0._wp                     ! last level always 0
+         ahtv(:,:,jpk) = 0._wp
+         !.
+         !                                         ! value of lap/blp eddy mixing coef.
+         IF(     ln_traldf_lap ) THEN   ;   zUfac = r1_2 *rn_Ud   ;   inn = 1   ;   cl_Units = ' m2/s'   !   laplacian
+         ELSEIF( ln_traldf_blp ) THEN   ;   zUfac = r1_12*rn_Ud   ;   inn = 3   ;   cl_Units = ' m4/s'   ! bilaplacian
+         ENDIF
+         aht0    = zUfac *    rn_Ld**inn              ! mixing coefficient
+         zah_max = zUfac * (ra*rad)**inn              ! maximum reachable coefficient (value at the Equator for e1=1 degree)
+         !
+         !
+         SELECT CASE(  nn_aht_ijk_t  )             !* Specification of space-time variations of ahtu, ahtv
+         !
+         CASE(   0  )      !==  constant  ==!
+            IF(lwp) WRITE(numout,*) '   ==>>>   eddy diffusivity = constant = ', aht0, cl_Units
+            ahtu(:,:,1:jpkm1) = aht0
+            ahtv(:,:,1:jpkm1) = aht0
+            !
+         CASE(  10  )      !==  fixed profile  ==!
+            IF(lwp) WRITE(numout,*) '   ==>>>   eddy diffusivity = F( depth )'
+            IF(lwp) WRITE(numout,*) '           surface eddy diffusivity = constant = ', aht0, cl_Units
+            ahtu(:,:,1) = aht0                        ! constant surface value
+            ahtv(:,:,1) = aht0
+            CALL ldf_c1d( 'TRA', ahtu(:,:,1), ahtv(:,:,1), ahtu, ahtv )
+            !
+         CASE ( -20 )      !== fixed horizontal shape and magnitude read in file  ==!
+            IF(lwp) WRITE(numout,*) '   ==>>>   eddy diffusivity = F(i,j) read in eddy_diffusivity.nc file'
+            CALL iom_open( 'eddy_diffusivity_2D.nc', inum )
+            CALL iom_get ( inum, jpdom_global, 'ahtu_2D', ahtu(:,:,1), cd_type = 'U', psgn = 1._wp )
+            CALL iom_get ( inum, jpdom_global, 'ahtv_2D', ahtv(:,:,1), cd_type = 'V', psgn = 1._wp )
+            CALL iom_close( inum )
+            DO jk = 2, jpkm1
+               ahtu(:,:,jk) = ahtu(:,:,1)
+               ahtv(:,:,jk) = ahtv(:,:,1)
+            END DO
+            !
+         CASE(  20  )      !== fixed horizontal shape  ==!
+            IF(lwp) WRITE(numout,*) '   ==>>>   eddy diffusivity = F( e1, e2 ) or F( e1^3, e2^3 ) (lap or blp case)'
+            IF(lwp) WRITE(numout,*) '           using a fixed diffusive velocity = ', rn_Ud,' m/s   and   Ld = Max(e1,e2)'
+            IF(lwp) WRITE(numout,*) '           maximum reachable coefficient (at the Equator) = ', zah_max, cl_Units, '  for e1=1Â°)'
+            CALL ldf_c2d( 'TRA', zUfac      , inn        , ahtu, ahtv )    ! value proportional to scale factor^inn
+            !
+         CASE(  21  )      !==  time varying 2D field  ==!
+            IF(lwp) WRITE(numout,*) '   ==>>>   eddy diffusivity = F( latitude, longitude, time )'
+            IF(lwp) WRITE(numout,*) '                            = F( growth rate of baroclinic instability )'
+            IF(lwp) WRITE(numout,*) '            min value = 0.2 * aht0 (with aht0= 1/2 rn_Ud*rn_Ld)'
+            IF(lwp) WRITE(numout,*) '            max value =       aei0 (with aei0=1/2 rn_Ue*Le  increased to aht0 within 20N-20S'
+            !
+            l_ldftra_time = .TRUE.     ! will be calculated by call to ldf_tra routine in step.F90
+            !
+            IF( ln_traldf_blp )   CALL ctl_stop( 'ldf_tra_init: aht=F( growth rate of baroc. insta .)',   &
+               &                                 '              incompatible with bilaplacian operator' )
+            !
+         CASE( -30  )      !== fixed 3D shape read in file  ==!
+            IF(lwp) WRITE(numout,*) '   ==>>>   eddy diffusivity = F(i,j,k) read in eddy_diffusivity.nc file'
+            CALL iom_open( 'eddy_diffusivity_3D.nc', inum )
+            CALL iom_get ( inum, jpdom_global, 'ahtu_3D', ahtu, cd_type = 'U', psgn = 1._wp )
+            CALL iom_get ( inum, jpdom_global, 'ahtv_3D', ahtv, cd_type = 'V', psgn = 1._wp )
+            CALL iom_close( inum )
+            !
+         CASE(  30  )      !==  fixed 3D shape  ==!
+            IF(lwp) WRITE(numout,*) '   ==>>>   eddy diffusivity = F( latitude, longitude, depth )'
+            IF(lwp) WRITE(numout,*) '           using a fixed diffusive velocity = ', rn_Ud,' m/s   and   Ld = Max(e1,e2)'
+            IF(lwp) WRITE(numout,*) '           maximum reachable coefficient (at the Equator) = ', zah_max, cl_Units, '  for e1=1Â°)'
+            CALL ldf_c2d( 'TRA', zUfac      , inn        , ahtu, ahtv )    ! surface value proportional to scale factor^inn
+            CALL ldf_c1d( 'TRA', ahtu(:,:,1), ahtv(:,:,1), ahtu, ahtv )    ! reduction with depth
+            !
+         CASE(  31  )      !==  time varying 3D field  ==!
+            IF(lwp) WRITE(numout,*) '   ==>>>   eddy diffusivity = F( latitude, longitude, depth , time )'
+            IF(lwp) WRITE(numout,*) '           proportional to the velocity : 1/2 |u|e or 1/12 |u|e^3'
+            !
+            l_ldftra_time = .TRUE.     ! will be calculated by call to ldf_tra routine in step.F90
+            !
+         CASE DEFAULT
+            CALL ctl_stop('ldf_tra_init: wrong choice for nn_aht_ijk_t, the type of space-time variation of aht')
+         END SELECT
+         !
+         IF( .NOT.l_ldftra_time ) THEN             !* No time variation
+            IF(     ln_traldf_lap ) THEN                 !   laplacian operator (mask only)
+               ahtu(:,:,1:jpkm1) =       ahtu(:,:,1:jpkm1)   * umask(:,:,1:jpkm1)
+               ahtv(:,:,1:jpkm1) =       ahtv(:,:,1:jpkm1)   * vmask(:,:,1:jpkm1)
+            ELSEIF( ln_traldf_blp ) THEN                 ! bilaplacian operator (square root + mask)
+               ahtu(:,:,1:jpkm1) = SQRT( ahtu(:,:,1:jpkm1) ) * umask(:,:,1:jpkm1)
+               ahtv(:,:,1:jpkm1) = SQRT( ahtv(:,:,1:jpkm1) ) * vmask(:,:,1:jpkm1)
+            ENDIF
+         ENDIF
+         !
+      ENDIF
+      !
+   END SUBROUTINE ldf_tra_init
+
+
+   SUBROUTINE ldf_tra( kt, Kbb, Kmm )
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE ldf_tra  ***
+      !!
+      !! ** Purpose :   update at kt the tracer lateral mixing coeff. (aht and aeiv)
+      !!
+      !! ** Method  : * time varying eddy diffusivity coefficients:
+      !!
+      !!    nn_aei_ijk_t = 21    aeiu, aeiv = F(i,j,  t) = F(growth rate of baroclinic instability)
+      !!                                                   with a reduction to 0 in vicinity of the Equator
+      !!    nn_aht_ijk_t = 21    ahtu, ahtv = F(i,j,  t) = F(growth rate of baroclinic instability)
+      !!
+      !!                 = 31    ahtu, ahtv = F(i,j,k,t) = F(local velocity) (  |u|e  /12   laplacian operator
+      !!                                                                     or |u|e^3/12 bilaplacian operator )
+      !!
+      !!              * time varying EIV coefficients: call to ldf_eiv routine
+      !!
+      !! ** action  :   ahtu, ahtv   update at each time step
+      !!                aeiu, aeiv      -       -     -    -   (if ln_ldfeiv=T)
+      !!----------------------------------------------------------------------
+      INTEGER, INTENT(in) ::   kt   ! time step
+      INTEGER, INTENT(in) ::   Kbb, Kmm   ! ocean time level indices
+      !
+      INTEGER  ::   ji, jj, jk   ! dummy loop indices
+      REAL(wp) ::   zaht, zahf, zaht_min, zDaht, z1_f20   ! local scalar
+      !!----------------------------------------------------------------------
+      !
+      IF( ln_ldfeiv .AND. nn_aei_ijk_t == 21 ) THEN       ! eddy induced velocity coefficients
+         !                                ! =F(growth rate of baroclinic instability)
+         !                                ! max value aeiv_0 ; decreased to 0 within 20N-20S
+         CALL ldf_eiv( kt, aei0, aeiu, aeiv, Kmm )
+      ENDIF
+      !
+      SELECT CASE(  nn_aht_ijk_t  )       ! Eddy diffusivity coefficients
+      !
+      CASE(  21  )       !==  time varying 2D field  ==!   = F( growth rate of baroclinic instability )
+         !                                             !   min value 0.2*aht0
+         !                                             !   max value aht0 (aei0 if nn_aei_ijk_t=21)
+         !                                             !   increase to aht0 within 20N-20S
+         IF( ln_ldfeiv .AND. nn_aei_ijk_t == 21 ) THEN   ! use the already computed aei.
+            ahtu(:,:,1) = 3._wp * aeiu(:,:,1)  ! /!\ Coeffs modified by CdL
+            ahtv(:,:,1) = 3._wp * aeiv(:,:,1)  ! /!\ Coeffs modified by CdL
+         ELSE                                            ! compute aht.
+            CALL ldf_eiv( kt, aht0, ahtu, ahtv, Kmm )
+         ENDIF
+         !
+         z1_f20   = 1._wp / (  2._wp * omega * SIN( rad * 20._wp )  )   ! 1 / ff(20 degrees)
+         zaht_min = 0.2_wp * aht0                                       ! minimum value for aht
+         zDaht    = aht0 - zaht_min
+         DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
+            !!gm CAUTION : here we assume lat/lon grid in 20deg N/S band (like all ORCA cfg)
+            !!     ==>>>   The Coriolis value is identical for t- & u_points, and for v- and f-points
+            zaht = ( 1._wp -  MIN( 1._wp , ABS( ff_t(ji,jj) * z1_f20 ) ) ) * zDaht
+            zahf = ( 1._wp -  MIN( 1._wp , ABS( ff_f(ji,jj) * z1_f20 ) ) ) * zDaht
+            ahtu(ji,jj,1) = (  MAX( zaht_min, ahtu(ji,jj,1) ) + zaht  )     ! min value zaht_min
+            ahtv(ji,jj,1) = (  MAX( zaht_min, ahtv(ji,jj,1) ) + zahf  )     ! increase within 20S-20N
+         END_2D
+         DO jk = 1, jpkm1                             ! deeper value = surface value + mask for all levels
+            ahtu(:,:,jk) = ahtu(:,:,1) * umask(:,:,jk)
+            ahtv(:,:,jk) = ahtv(:,:,1) * vmask(:,:,jk)
+         END DO
+         !
+      CASE(  31  )       !==  time varying 3D field  ==!   = F( local velocity )
+         IF( ln_traldf_lap     ) THEN          !   laplacian operator |u| e /12
+            DO jk = 1, jpkm1
+               ahtu(:,:,jk) = ABS( uu(:,:,jk,Kbb) ) * e1u(:,:) * r1_12   ! n.b. uu,vv are masked
+               ahtv(:,:,jk) = ABS( vv(:,:,jk,Kbb) ) * e2v(:,:) * r1_12
+            END DO
+         ELSEIF( ln_traldf_blp ) THEN      ! bilaplacian operator      sqrt( |u| e^3 /12 ) = sqrt( |u| e /12 ) * e
+            DO jk = 1, jpkm1
+               ahtu(:,:,jk) = SQRT(  ABS( uu(:,:,jk,Kbb) ) * e1u(:,:) * r1_12  ) * e1u(:,:)
+               ahtv(:,:,jk) = SQRT(  ABS( vv(:,:,jk,Kbb) ) * e2v(:,:) * r1_12  ) * e2v(:,:)
+            END DO
+         ENDIF
+         !
+      END SELECT
+      !
+      CALL iom_put( "ahtu_2d", ahtu(:,:,1) )   ! surface u-eddy diffusivity coeff.
+      CALL iom_put( "ahtv_2d", ahtv(:,:,1) )   ! surface v-eddy diffusivity coeff.
+      CALL iom_put( "ahtu_3d", ahtu(:,:,:) )   ! 3D      u-eddy diffusivity coeff.
+      CALL iom_put( "ahtv_3d", ahtv(:,:,:) )   ! 3D      v-eddy diffusivity coeff.
+      !
+      IF( ln_ldfeiv ) THEN
+        CALL iom_put( "aeiu_2d", aeiu(:,:,1) )   ! surface u-EIV coeff.
+        CALL iom_put( "aeiv_2d", aeiv(:,:,1) )   ! surface v-EIV coeff.
+        CALL iom_put( "aeiu_3d", aeiu(:,:,:) )   ! 3D      u-EIV coeff.
+        CALL iom_put( "aeiv_3d", aeiv(:,:,:) )   ! 3D      v-EIV coeff.
+      ENDIF
+      !
+   END SUBROUTINE ldf_tra
+
+
+   SUBROUTINE ldf_eiv_init
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE ldf_eiv_init  ***
+      !!
+      !! ** Purpose :   initialization of the eiv coeff. from namelist choices.
+      !!
+      !! ** Method  :   the eiv diffusivity coef. specification depends on:
+      !!    nn_aei_ijk_t  =  0 => = constant
+      !!                  !
+      !!                  = 10 => = F(z) : constant with a reduction of 1/4 with depth
+      !!                  !
+      !!                  =-20 => = F(i,j)   = shape read in 'eddy_induced_velocity_2D.nc' file
+      !!                  = 20    = F(i,j)   = F(e1,e2) or F(e1^3,e2^3) (lap or bilap case)
+      !!                  = 21    = F(i,j,t) = F(growth rate of baroclinic instability)
+      !!                  !
+      !!                  =-30 => = F(i,j,k)   = shape read in 'eddy_induced_velocity_3D.nc' file
+      !!                  = 30    = F(i,j,k)   = 2D (case 20) + decrease with depth (case 10)
+      !!
+      !! ** Action  :   aeiu , aeiv   :  initialized one for all or l_ldftra_time set to true
+      !!                l_ldfeiv_time : =T if EIV coefficients vary with time
+      !!----------------------------------------------------------------------
+      INTEGER  ::   jk                     ! dummy loop indices
+      INTEGER  ::   ierr, inum, ios, inn   ! local integer
+      REAL(wp) ::   zah_max, zUfac         !   -   scalar
+      !!
+      NAMELIST/namtra_eiv/ ln_ldfeiv   , ln_ldfeiv_dia,   &   ! eddy induced velocity (eiv)
+         &                 nn_aei_ijk_t, rn_Ue, rn_Le         ! eiv  coefficient
+      !!----------------------------------------------------------------------
+      !
+      IF(lwp) THEN                      ! control print
+         WRITE(numout,*)
+         WRITE(numout,*) 'ldf_eiv_init : eddy induced velocity parametrization'
+         WRITE(numout,*) '~~~~~~~~~~~~ '
+      ENDIF
+      !
+      READ  ( numnam_ref, namtra_eiv, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namtra_eiv in reference namelist' )
+      !
+      READ  ( numnam_cfg, namtra_eiv, IOSTAT = ios, ERR = 902 )
+902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namtra_eiv in configuration namelist' )
+      IF(lwm)  WRITE ( numond, namtra_eiv )
+
+      IF(lwp) THEN                      ! control print
+         WRITE(numout,*) '   Namelist namtra_eiv : '
+         WRITE(numout,*) '      Eddy Induced Velocity (eiv) param.         ln_ldfeiv     = ', ln_ldfeiv
+         WRITE(numout,*) '      eiv streamfunction & velocity diag.        ln_ldfeiv_dia = ', ln_ldfeiv_dia
+         WRITE(numout,*) '      coefficients :'
+         WRITE(numout,*) '         type of time-space variation            nn_aei_ijk_t  = ', nn_aht_ijk_t
+         WRITE(numout,*) '         lateral diffusive velocity (if cst)     rn_Ue         = ', rn_Ue, ' m/s'
+         WRITE(numout,*) '         lateral diffusive length   (if cst)     rn_Le         = ', rn_Le, ' m'
+         WRITE(numout,*)
+      ENDIF
+      !
+      l_ldfeiv_time = .FALSE.       ! no time variation except in case defined below
+      !
+      !
+      IF( .NOT.ln_ldfeiv ) THEN     !== Parametrization not used  ==!
+         !
+         IF(lwp) WRITE(numout,*) '   ==>>>   eddy induced velocity param is NOT used'
+         ln_ldfeiv_dia = .FALSE.
+         !
+      ELSE                          !== use the parametrization  ==!
+         !
+         IF(lwp) WRITE(numout,*) '   ==>>>   use eddy induced velocity parametrization'
+         IF(lwp) WRITE(numout,*)
+         !
+         IF( ln_traldf_blp )   CALL ctl_stop( 'ldf_eiv_init: eddy induced velocity ONLY with laplacian diffusivity' )
+         !
+         IF( .NOT.( ln_traldf_iso .OR. ln_traldf_triad ) )   &
+           &                  CALL ctl_stop( 'ln_ldfeiv=T requires iso-neutral laplacian diffusion' )
+         !                                != allocate the aei arrays
+         ALLOCATE( aeiu(jpi,jpj,jpk), aeiv(jpi,jpj,jpk), STAT=ierr )
+         IF( ierr /= 0 )   CALL ctl_stop('STOP', 'ldf_eiv: failed to allocate arrays')
+         !
+         !                                != Specification of space-time variations of eaiu, aeiv
+         !
+         aeiu(:,:,jpk) = 0._wp               ! last level always 0
+         aeiv(:,:,jpk) = 0._wp
+         !                                   ! value of EIV coef. (laplacian operator)
+         zUfac = r1_2 *rn_Ue                    ! velocity factor
+         inn = 1                                ! L-exponent
+         aei0    = zUfac *    rn_Le**inn        ! mixing coefficient
+         zah_max = zUfac * (ra*rad)**inn        ! maximum reachable coefficient (value at the Equator)
+
+         SELECT CASE( nn_aei_ijk_t )         !* Specification of space-time variations
+         !
+         CASE(   0  )                        !--  constant  --!
+            IF(lwp) WRITE(numout,*) '   ==>>>   eddy induced velocity coef. = constant = ', aei0, ' m2/s'
+            aeiu(:,:,1:jpkm1) = aei0
+            aeiv(:,:,1:jpkm1) = aei0
+            !
+         CASE(  10  )                        !--  fixed profile  --!
+            IF(lwp) WRITE(numout,*) '   ==>>>   eddy induced velocity coef. = F( depth )'
+            IF(lwp) WRITE(numout,*) '           surface eddy diffusivity = constant = ', aht0, ' m2/s'
+            aeiu(:,:,1) = aei0                  ! constant surface value
+            aeiv(:,:,1) = aei0
+            CALL ldf_c1d( 'TRA', aeiu(:,:,1), aeiv(:,:,1), aeiu, aeiv )
+            !
+         CASE ( -20 )                        !--  fixed horizontal shape read in file  --!
+            IF(lwp) WRITE(numout,*) '   ==>>>   eddy induced velocity coef. = F(i,j) read in eddy_diffusivity_2D.nc file'
+            CALL iom_open ( 'eddy_induced_velocity_2D.nc', inum )
+            CALL iom_get  ( inum, jpdom_global, 'aeiu', aeiu(:,:,1), cd_type = 'U', psgn = 1._wp )
+            CALL iom_get  ( inum, jpdom_global, 'aeiv', aeiv(:,:,1), cd_type = 'V', psgn = 1._wp )
+            CALL iom_close( inum )
+            DO jk = 2, jpkm1
+               aeiu(:,:,jk) = aeiu(:,:,1)
+               aeiv(:,:,jk) = aeiv(:,:,1)
+            END DO
+            !
+         CASE(  20  )                        !--  fixed horizontal shape  --!
+            IF(lwp) WRITE(numout,*) '   ==>>>   eddy induced velocity coef. = F( e1, e2 )'
+            IF(lwp) WRITE(numout,*) '           using a fixed diffusive velocity = ', rn_Ue, ' m/s   and   Le = Max(e1,e2)'
+            IF(lwp) WRITE(numout,*) '           maximum reachable coefficient (at the Equator) = ', zah_max, ' m2/s   for e1=1Â°)'
+            CALL ldf_c2d( 'TRA', zUfac      , inn        , aeiu, aeiv )    ! value proportional to scale factor^inn
+            !
+         CASE(  21  )                        !--  time varying 2D field  --!
+            IF(lwp) WRITE(numout,*) '   ==>>>   eddy induced velocity coef. = F( latitude, longitude, time )'
+            IF(lwp) WRITE(numout,*) '                                       = F( growth rate of baroclinic instability )'
+            IF(lwp) WRITE(numout,*) '           maximum allowed value: aei0 = ', aei0, ' m2/s'
+            !
+            l_ldfeiv_time = .TRUE.     ! will be calculated by call to ldf_tra routine in step.F90
+            !
+         CASE( -30  )                        !-- fixed 3D shape read in file  --!
+            IF(lwp) WRITE(numout,*) '   ==>>>   eddy induced velocity coef. = F(i,j,k) read in eddy_diffusivity_3D.nc file'
+            CALL iom_open ( 'eddy_induced_velocity_3D.nc', inum )
+            CALL iom_get  ( inum, jpdom_global, 'aeiu', aeiu, cd_type = 'U', psgn = 1._wp )
+            CALL iom_get  ( inum, jpdom_global, 'aeiv', aeiv, cd_type = 'V', psgn = 1._wp )
+            CALL iom_close( inum )
+            !
+         CASE(  30  )                        !--  fixed 3D shape  --!
+            IF(lwp) WRITE(numout,*) '   ==>>>   eddy induced velocity coef. = F( latitude, longitude, depth )'
+            CALL ldf_c2d( 'TRA', zUfac      , inn        , aeiu, aeiv )    ! surface value proportional to scale factor^inn
+            CALL ldf_c1d( 'TRA', aeiu(:,:,1), aeiv(:,:,1), aeiu, aeiv )    ! reduction with depth
+            !
+         CASE DEFAULT
+            CALL ctl_stop('ldf_tra_init: wrong choice for nn_aei_ijk_t, the type of space-time variation of aei')
+         END SELECT
+         !
+         IF( .NOT.l_ldfeiv_time ) THEN             !* mask if No time variation
+            DO jk = 1, jpkm1
+               aeiu(:,:,jk) = aeiu(:,:,jk) * umask(:,:,jk)
+               aeiv(:,:,jk) = aeiv(:,:,jk) * vmask(:,:,jk)
+            END DO
+         ENDIF
+         !
+      ENDIF
+      !
+   END SUBROUTINE ldf_eiv_init
+
+
+   SUBROUTINE ldf_eiv( kt, paei0, paeiu, paeiv, Kmm )
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE ldf_eiv  ***
+      !!
+      !! ** Purpose :   Compute the eddy induced velocity coefficient from the
+      !!              growth rate of baroclinic instability.
+      !!
+      !! ** Method  :   coefficient function of the growth rate of baroclinic instability
+      !!
+      !! Reference : Treguier et al. JPO 1997   ; Held and Larichev JAS 1996
+      !!----------------------------------------------------------------------
+      INTEGER                         , INTENT(in   ) ::   kt             ! ocean time-step index
+      INTEGER                         , INTENT(in   ) ::   Kmm            ! ocean time level indices
+      REAL(wp)                        , INTENT(in   ) ::   paei0          ! max value            [m2/s]
+      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) ::   paeiu, paeiv   ! eiv coefficient      [m2/s]
+      !
+      INTEGER  ::   ji, jj, jk    ! dummy loop indices
+      REAL(wp) ::   zfw, ze3w, zn2, z1_f20, zzaei    ! local scalars
+      REAL(wp), DIMENSION(jpi,jpj) ::   zn, zah, zhw, zRo, zaeiw   ! 2D workspace
+      !!----------------------------------------------------------------------
+      !
+      zn (:,:) = 0._wp        ! Local initialization
+      zhw(:,:) = 5._wp
+      zah(:,:) = 0._wp
+      zRo(:,:) = 0._wp
+      !                       ! Compute lateral diffusive coefficient at T-point
+      IF( ln_traldf_triad ) THEN
+         DO_3D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 1, jpk )
+            ! Take the max of N^2 and zero then take the vertical sum
+            ! of the square root of the resulting N^2 ( required to compute
+            ! internal Rossby radius Ro = .5 * sum_jpk(N) / f
+            zn2 = MAX( rn2b(ji,jj,jk), 0._wp )
+            zn(ji,jj) = zn(ji,jj) + SQRT( zn2 ) * e3w(ji,jj,jk,Kmm)
+            ! Compute elements required for the inverse time scale of baroclinic
+            ! eddies using the isopycnal slopes calculated in ldfslp.F :
+            ! T^-1 = sqrt(m_jpk(N^2*(r1^2+r2^2)*e3w))
+            ze3w = e3w(ji,jj,jk,Kmm) * wmask(ji,jj,jk)
+            zah(ji,jj) = zah(ji,jj) + zn2 * wslp2(ji,jj,jk) * ze3w
+            zhw(ji,jj) = zhw(ji,jj) + ze3w
+         END_3D
+      ELSE
+         DO_3D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 1, jpk )
+            ! Take the max of N^2 and zero then take the vertical sum
+            ! of the square root of the resulting N^2 ( required to compute
+            ! internal Rossby radius Ro = .5 * sum_jpk(N) / f
+            zn2 = MAX( rn2b(ji,jj,jk), 0._wp )
+            zn(ji,jj) = zn(ji,jj) + SQRT( zn2 ) * e3w(ji,jj,jk,Kmm)
+            ! Compute elements required for the inverse time scale of baroclinic
+            ! eddies using the isopycnal slopes calculated in ldfslp.F :
+            ! T^-1 = sqrt(m_jpk(N^2*(r1^2+r2^2)*e3w))
+            ze3w = e3w(ji,jj,jk,Kmm) * wmask(ji,jj,jk)
+            zah(ji,jj) = zah(ji,jj) + zn2 * ( wslpi(ji,jj,jk) * wslpi(ji,jj,jk)   &
+               &                            + wslpj(ji,jj,jk) * wslpj(ji,jj,jk) ) * ze3w
+            zhw(ji,jj) = zhw(ji,jj) + ze3w
+         END_3D
+      ENDIF
+
+      DO_2D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )
+         zfw = MAX( ABS( 2. * omega * SIN( rad * gphit(ji,jj) ) ) , 1.e-10 )
+         ! Rossby radius at w-point taken betwenn 2 km and  40km
+         zRo(ji,jj) = MAX(  2.e3 , MIN( .4 * zn(ji,jj) / zfw, 40.e3 )  )
+         ! Compute aeiw by multiplying Ro^2 and T^-1
+         zaeiw(ji,jj) = zRo(ji,jj) * zRo(ji,jj) * SQRT( zah(ji,jj) / zhw(ji,jj) ) * tmask(ji,jj,1)
+      END_2D
+
+      !                                         !==  Bound on eiv coeff.  ==!
+      z1_f20 = 1._wp / (  2._wp * omega * sin( rad * 20._wp )  )
+      DO_2D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )
+         zzaei = MIN( 1._wp, ABS( ff_t(ji,jj) * z1_f20 ) ) * zaeiw(ji,jj)     ! tropical decrease
+         zaeiw(ji,jj) = MIN( zzaei , paei0 )                                  ! Max value = paei0
+      END_2D
+      IF( nn_hls == 1 )   CALL lbc_lnk( 'ldftra', zaeiw(:,:), 'W', 1.0_wp )   ! lateral boundary condition
+      !
+      DO_2D( 0, 0, 0, 0 )  ! /!\ Coeffs halved by CdL
+         paeiu(ji,jj,1) = r1_4 * ( zaeiw(ji,jj) + zaeiw(ji+1,jj  ) ) * umask(ji,jj,1)
+         paeiv(ji,jj,1) = r1_4 * ( zaeiw(ji,jj) + zaeiw(ji  ,jj+1) ) * vmask(ji,jj,1)
+      END_2D
+      CALL lbc_lnk( 'ldftra', paeiu(:,:,1), 'U', 1.0_wp , paeiv(:,:,1), 'V', 1.0_wp )      ! lateral boundary condition
+
+      DO jk = 2, jpkm1                          !==  deeper values equal the surface one  ==!
+         paeiu(:,:,jk) = paeiu(:,:,1) * umask(:,:,jk)
+         paeiv(:,:,jk) = paeiv(:,:,1) * vmask(:,:,jk)
+      END DO
+      !
+   END SUBROUTINE ldf_eiv
+
+
+   SUBROUTINE ldf_eiv_trp( kt, kit000, pu, pv, pw, cdtype, Kmm, Krhs )
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE ldf_eiv_trp  ***
+      !!
+      !! ** Purpose :   add to the input ocean transport the contribution of
+      !!              the eddy induced velocity parametrization.
+      !!
+      !! ** Method  :   The eddy induced transport is computed from a flux stream-
+      !!              function which depends on the slope of iso-neutral surfaces
+      !!              (see ldf_slp). For example, in the i-k plan :
+      !!                   psi_uw = mk(aeiu) e2u mi(wslpi)   [in m3/s]
+      !!                   Utr_eiv = - dk[psi_uw]
+      !!                   Vtr_eiv = + di[psi_uw]
+      !!                ln_ldfeiv_dia = T : output the associated streamfunction,
+      !!                                    velocity and heat transport (call ldf_eiv_dia)
+      !!
+      !! ** Action  : pu, pv increased by the eiv transport
+      !!----------------------------------------------------------------------
+      INTEGER                     , INTENT(in   ) ::   kt        ! ocean time-step index
+      INTEGER                     , INTENT(in   ) ::   kit000    ! first time step index
+      INTEGER                     , INTENT(in   ) ::   Kmm, Krhs ! ocean time level indices
+      CHARACTER(len=3)            , INTENT(in   ) ::   cdtype    ! =TRA or TRC (tracer indicator)
+      ! TEMP: [tiling] Can be A2D(nn_hls) after all lbc_lnks removed in the nn_hls = 2 case in tra_adv_fct
+      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) ::   pu        ! in : 3 ocean transport components   [m3/s]
+      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) ::   pv        ! out: 3 ocean transport components   [m3/s]
+      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) ::   pw        ! increased by the eiv                [m3/s]
+      !!
+      INTEGER  ::   ji, jj, jk                 ! dummy loop indices
+      REAL(wp) ::   zuwk, zuwk1, zuwi, zuwi1   ! local scalars
+      REAL(wp) ::   zvwk, zvwk1, zvwj, zvwj1   !   -      -
+      REAL(wp), DIMENSION(A2D(nn_hls),jpk) ::   zpsi_uw, zpsi_vw
+      !!----------------------------------------------------------------------
+      !
+      IF( .NOT. l_istiled .OR. ntile == 1 )  THEN                       ! Do only on the first tile
+         IF( kt == kit000 )  THEN
+            IF(lwp) WRITE(numout,*)
+            IF(lwp) WRITE(numout,*) 'ldf_eiv_trp : eddy induced advection on ', cdtype,' :'
+            IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   add to velocity fields the eiv component'
+         ENDIF
+      ENDIF
+
+
+      zpsi_uw(:,:, 1 ) = 0._wp   ;   zpsi_vw(:,:, 1 ) = 0._wp
+      zpsi_uw(:,:,jpk) = 0._wp   ;   zpsi_vw(:,:,jpk) = 0._wp
+      !
+      DO_3D( nn_hls, nn_hls-1, nn_hls, nn_hls-1, 2, jpkm1 )
+         zpsi_uw(ji,jj,jk) = - r1_4 * e2u(ji,jj) * ( wslpi(ji,jj,jk  ) + wslpi(ji+1,jj,jk) )   &
+            &                                    * ( aeiu (ji,jj,jk-1) + aeiu (ji  ,jj,jk) ) * wumask(ji,jj,jk)
+         zpsi_vw(ji,jj,jk) = - r1_4 * e1v(ji,jj) * ( wslpj(ji,jj,jk  ) + wslpj(ji,jj+1,jk) )   &
+            &                                    * ( aeiv (ji,jj,jk-1) + aeiv (ji,jj  ,jk) ) * wvmask(ji,jj,jk)
+      END_3D
+      !
+      DO_3D_OVR( nn_hls, nn_hls-1, nn_hls, nn_hls-1, 1, jpkm1 )
+         pu(ji,jj,jk) = pu(ji,jj,jk) - ( zpsi_uw(ji,jj,jk) - zpsi_uw(ji,jj,jk+1) )
+         pv(ji,jj,jk) = pv(ji,jj,jk) - ( zpsi_vw(ji,jj,jk) - zpsi_vw(ji,jj,jk+1) )
+      END_3D
+      DO_3D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 1, jpkm1 )
+         pw(ji,jj,jk) = pw(ji,jj,jk) + (  zpsi_uw(ji,jj,jk) - zpsi_uw(ji-1,jj  ,jk)   &
+            &                           + zpsi_vw(ji,jj,jk) - zpsi_vw(ji  ,jj-1,jk) )
+      END_3D
+      !
+      !                              ! diagnose the eddy induced velocity and associated heat transport
+      IF( ln_ldfeiv_dia .AND. cdtype == 'TRA' )   CALL ldf_eiv_dia( zpsi_uw, zpsi_vw, Kmm )
+      !
+    END SUBROUTINE ldf_eiv_trp
+
+
+   SUBROUTINE ldf_eiv_dia( psi_uw, psi_vw, Kmm )
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE ldf_eiv_dia  ***
+      !!
+      !! ** Purpose :   diagnose the eddy induced velocity and its associated
+      !!              vertically integrated heat transport.
+      !!
+      !! ** Method :
+      !!
+      !!----------------------------------------------------------------------
+      REAL(wp), DIMENSION(A2D(nn_hls),jpk), INTENT(in) ::   psi_uw, psi_vw   ! streamfunction   [m3/s]
+      INTEGER                             , INTENT(in) ::   Kmm              ! ocean time level indices
+      !
+      INTEGER  ::   ji, jj, jk    ! dummy loop indices
+      REAL(wp) ::   zztmp   ! local scalar
+      REAL(wp), DIMENSION(A2D(nn_hls))     ::   zw2d   ! 2D workspace
+      REAL(wp), DIMENSION(A2D(nn_hls),jpk) ::   zw3d   ! 3D workspace
+      !!----------------------------------------------------------------------
+      !
+!!gm I don't like this routine....   Crazy  way of doing things, not optimal at all...
+!!gm     to be redesigned....
+      !                                                  !==  eiv stream function: output  ==!
+!!gm      CALL iom_put( "psi_eiv_uw", psi_uw )                 ! output
+!!gm      CALL iom_put( "psi_eiv_vw", psi_vw )
+      !
+      !                                                  !==  eiv velocities: calculate and output  ==!
+      !
+      zw3d(:,:,jpk) = 0._wp                                    ! bottom value always 0
+      !
+      DO_3D( 0, 0, 0, 0, 1, jpkm1 )                                  ! e2u e3u u_eiv = -dk[psi_uw]
+         zw3d(ji,jj,jk) = ( psi_uw(ji,jj,jk+1) - psi_uw(ji,jj,jk) ) / ( e2u(ji,jj) * e3u(ji,jj,jk,Kmm) )
+      END_3D
+      CALL iom_put( "uoce_eiv", zw3d )
+      !
+      DO_3D( 0, 0, 0, 0, 1, jpkm1 )                                  ! e1v e3v v_eiv = -dk[psi_vw]
+         zw3d(ji,jj,jk) = ( psi_vw(ji,jj,jk+1) - psi_vw(ji,jj,jk) ) / ( e1v(ji,jj) * e3v(ji,jj,jk,Kmm) )
+      END_3D
+      CALL iom_put( "voce_eiv", zw3d )
+      !
+      DO_3D( 0, 0, 0, 0, 1, jpkm1 )                            ! e1 e2 w_eiv = dk[psix] + dk[psix]
+         zw3d(ji,jj,jk) = (  psi_vw(ji,jj,jk) - psi_vw(ji  ,jj-1,jk)    &
+            &              + psi_uw(ji,jj,jk) - psi_uw(ji-1,jj  ,jk)  ) / e1e2t(ji,jj)
+      END_3D
+      CALL iom_put( "woce_eiv", zw3d )
+      !
+      IF( iom_use('weiv_masstr') ) THEN   ! vertical mass transport & its square value
+         DO_2D( 0, 0, 0, 0 )
+            zw2d(ji,jj) = rho0 * e1e2t(ji,jj)
+         END_2D
+         DO jk = 1, jpk
+            zw3d(:,:,jk) = zw3d(:,:,jk) * zw2d(:,:)
+         END DO
+         CALL iom_put( "weiv_masstr" , zw3d )
+      ENDIF
+      !
+      IF( iom_use('ueiv_masstr') ) THEN
+         zw3d(:,:,:) = 0.e0
+         DO jk = 1, jpkm1
+            zw3d(:,:,jk) = rho0 * ( psi_uw(:,:,jk+1) - psi_uw(:,:,jk) )
+         END DO
+         CALL iom_put( "ueiv_masstr", zw3d )                  ! mass transport in i-direction
+      ENDIF
+      !
+      zztmp = 0.5_wp * rho0 * rcp
+      IF( iom_use('ueiv_heattr') .OR. iom_use('ueiv_heattr3d') ) THEN
+        zw2d(:,:)   = 0._wp
+        zw3d(:,:,:) = 0._wp
+        DO_3D( 0, 0, 0, 0, 1, jpkm1 )
+           zw3d(ji,jj,jk) = zw3d(ji,jj,jk) + ( psi_uw(ji,jj,jk+1)          - psi_uw(ji  ,jj,jk)            )   &
+              &                            * ( ts    (ji,jj,jk,jp_tem,Kmm) + ts    (ji+1,jj,jk,jp_tem,Kmm) )
+           zw2d(ji,jj) = zw2d(ji,jj) + zw3d(ji,jj,jk)
+        END_3D
+        CALL iom_put( "ueiv_heattr"  , zztmp * zw2d )                  ! heat transport in i-direction
+        CALL iom_put( "ueiv_heattr3d", zztmp * zw3d )                  ! heat transport in i-direction
+      ENDIF
+      !
+      IF( iom_use('veiv_masstr') ) THEN
+         zw3d(:,:,:) = 0.e0
+         DO jk = 1, jpkm1
+            zw3d(:,:,jk) = rho0 * ( psi_vw(:,:,jk+1) - psi_vw(:,:,jk) )
+         END DO
+         CALL iom_put( "veiv_masstr", zw3d )                  ! mass transport in i-direction
+      ENDIF
+      !
+      zw2d(:,:)   = 0._wp
+      zw3d(:,:,:) = 0._wp
+      DO_3D( 0, 0, 0, 0, 1, jpkm1 )
+         zw3d(ji,jj,jk) = zw3d(ji,jj,jk) + ( psi_vw(ji,jj,jk+1)          - psi_vw(ji,jj  ,jk)            )   &
+            &                            * ( ts    (ji,jj,jk,jp_tem,Kmm) + ts    (ji,jj+1,jk,jp_tem,Kmm) )
+         zw2d(ji,jj) = zw2d(ji,jj) + zw3d(ji,jj,jk)
+      END_3D
+      CALL iom_put( "veiv_heattr"  , zztmp * zw2d )                  !  heat transport in j-direction
+      CALL iom_put( "veiv_heattr3d", zztmp * zw3d )                  !  heat transport in j-direction
+      !
+      IF( iom_use( 'sophteiv' ) )   CALL dia_ptr_hst( jp_tem, 'eiv', 0.5 * zw3d )
+      !
+      zztmp = 0.5_wp * 0.5
+      IF( iom_use('ueiv_salttr') .OR. iom_use('ueiv_salttr3d')) THEN
+        zw2d(:,:) = 0._wp
+        zw3d(:,:,:) = 0._wp
+        DO_3D( 0, 0, 0, 0, 1, jpkm1 )
+           zw3d(ji,jj,jk) = zw3d(ji,jj,jk) * ( psi_uw(ji,jj,jk+1)          - psi_uw(ji  ,jj,jk)            )   &
+              &                            * ( ts    (ji,jj,jk,jp_sal,Kmm) + ts    (ji+1,jj,jk,jp_sal,Kmm) )
+           zw2d(ji,jj) = zw2d(ji,jj) + zw3d(ji,jj,jk)
+        END_3D
+        CALL iom_put( "ueiv_salttr", zztmp * zw2d )                  ! salt transport in i-direction
+        CALL iom_put( "ueiv_salttr3d", zztmp * zw3d )                ! salt transport in i-direction
+      ENDIF
+      zw2d(:,:) = 0._wp
+      zw3d(:,:,:) = 0._wp
+      DO_3D( 0, 0, 0, 0, 1, jpkm1 )
+         zw3d(ji,jj,jk) = zw3d(ji,jj,jk) + ( psi_vw(ji,jj,jk+1)          - psi_vw(ji,jj  ,jk)            )   &
+            &                            * ( ts    (ji,jj,jk,jp_sal,Kmm) + ts    (ji,jj+1,jk,jp_sal,Kmm) )
+         zw2d(ji,jj) = zw2d(ji,jj) + zw3d(ji,jj,jk)
+      END_3D
+      CALL iom_put( "veiv_salttr"  , zztmp * zw2d )                  !  salt transport in j-direction
+      CALL iom_put( "veiv_salttr3d", zztmp * zw3d )                  !  salt transport in j-direction
+      !
+      IF( iom_use( 'sopsteiv' ) ) CALL dia_ptr_hst( jp_sal, 'eiv', 0.5 * zw3d )
+      !
+      !
+   END SUBROUTINE ldf_eiv_dia
+
+   !!======================================================================
+END MODULE ldftra
