Index: CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/context_nemo.xml
===================================================================
--- CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/context_nemo.xml	(revision 2483)
+++ CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/context_nemo.xml	(revision 2489)
@@ -1,8 +1,7 @@
-  <!-- =========================================================================================================== -->
-  <!-- NEMO context                                                                                                -->
-  <!-- =========================================================================================================== -->
- <context id="nemo" time_origin="1900-01-01 00:00:00" >
-    
-    <!-- $id$ -->
+<!-- =========================================================================================================== -->
+<!-- NEMO context                                                                                                -->
+<!-- =========================================================================================================== -->
+<context id="nemo" time_origin="1900-01-01 00:00:00" >    
+  <!-- $id$ -->
     
     <!-- 
@@ -21,277 +20,645 @@
     -->
     
-    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4">
-    
-      <file_group id="1h" output_freq="1h"  output_level="10" enabled=".FALSE."/> <!-- 1h files -->
-     
-      <file_group id="1d" output_freq="1d"  output_level="10" enabled="_1D_ENABLE_"> <!-- 1d files -->
-
+    <file_definition type="one_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="10d" min_digits="4">
+    
+      <file_group id="1ts" output_freq="1ts" sync_freq="1ts" output_level="10" enabled=".FALSE."> <!-- 1 time step files -->
+	<file id="file51" name_suffix="_grid_T" description="ocean T grid variables" >
+	  <field field_ref="e3t" long_name="T-cell thickness" />
+          <field field_ref="botpres"         name="pbo"      long_name="Pressure_at_sea_floor"                                          />
+          <!-- pso : sea_water_pressure_at_sea_water_surface = 0 -->
+          <field field_ref="ssh"             name="zos"      long_name="sea_surface_height_above_geoid"                                 />
+	  <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="toce_e3t"                        long_name="temperature * e3t"                 operation="instant" freq_op="1ts" > toce * e3t </field >  
+	  <field field_ref="soce_e3t"                        long_name="salinity * e3t"                    operation="instant" freq_op="1ts" > soce * e3t </field >  
+          <field field_ref="toce"            name="thetao"   long_name="sea_water_potential_temperature"   operation="instant" freq_op="1ts" > @toce_e3t / @e3t </field>      
+          <field field_ref="soce"            name="so"       long_name="sea_water_salinity"                operation="instant" freq_op="1ts" > @soce_e3t / @e3t </field>       
+          <field field_ref="rhop"            name="rhopoto"  long_name="sea_water_potential_density"                          level="2" />
+          <field field_ref="mldkz5"          name="mldkz5"   level="2"  />
+          <field field_ref="mldr10_1"        name="mldr10_1" level="2" />
+          <field field_ref="runoffs"         name="friver"   long_name="water_flux_into_sea_water_from_rivers"                   level="1" />
+          <field field_ref="empmr"           name="wfo"      long_name="water_flux_into_sea_water"                               level="1" />
+          <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="qrp"             name="hfcorr"   long_name="heat_flux_correction"                                   level="1" />
+	  <field field_ref="uoce"            name="uo"       long_name="sea_water_x_velocity" operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field>
+	  <field field_ref="utau"            name="tauuo"    long_name="surface_downward_x_stress" />
+	  <field field_ref="voce"            name="vo"       long_name="sea_water_y_velocity" operation="instant" freq_op="5d" > @voce_e3v / @e3v </field>
+	  <field field_ref="vtau"            name="tauvo"    long_name="surface_downward_y_stress" />
+	  <field field_ref="woce"            name="wo"       long_name="ocean vertical velocity" operation="instant" freq_op="5d" > @woce_e3w / @e3w </field>
+	  <field field_ref="avt"             name="difvho"   long_name="ocean_vertical_heat_diffusivity" />
+	  <field field_ref="snowthic_cea"    name="snthic"   long_name="surface_snow_thickness"   />
+	  <field field_ref="icethic_cea"     name="sithic"    long_name="sea_ice_thickness"        />
+          <field field_ref="icevolu"         name="sivolu" />
+          <field field_ref="snowvol"         name="snvolu" />
+          <field field_ref="iceconc"         name="siconc" />
+
+          <field field_ref="vfxbog"          name="vfxbog" />
+          <field field_ref="vfxdyn"          name="vfxdyn" />
+          <field field_ref="vfxopw"          name="vfxopw" />
+          <field field_ref="vfxsni"          name="vfxsni" />
+          <field field_ref="vfxsum"          name="vfxsum" />
+          <field field_ref="vfxbom"          name="vfxbom" />
+          <field field_ref="vfxres"          name="vfxres" />
+          <field field_ref="vfxice"          name="vfxice" />
+          <field field_ref="vfxsnw"          name="vfxsnw" />
+          <field field_ref="vfxsub"          name="vfxsub" />
+          <field field_ref="vfxspr"          name="vfxspr" />
+
+          <field field_ref="icetrp"          name="sivtrp" />
+          <field field_ref="snwtrp"          name="snvtrp" />
+          <field field_ref="saltrp"          name="saltrp" />
+          <field field_ref="deitrp"          name="deitrp" />
+          <field field_ref="destrp"          name="destrp" />
+
+          <field field_ref="sfxbri"          name="sfxbri" />
+          <field field_ref="sfxdyn"          name="sfxdyn" />
+          <field field_ref="sfxres"          name="sfxres" />
+          <field field_ref="sfxbog"          name="sfxbog" />
+          <field field_ref="sfxbom"          name="sfxbom" />
+          <field field_ref="sfxsum"          name="sfxsum" />
+          <field field_ref="sfxsni"          name="sfxsni" />
+          <field field_ref="sfxopw"          name="sfxopw" />
+          <field field_ref="sfx"             name="sfx"    />
+
+          <field field_ref="hfxsum"          name="hfxsum" />
+          <field field_ref="hfxbom"          name="hfxbom" />
+          <field field_ref="hfxbog"          name="hfxbog" />
+          <field field_ref="hfxdif"          name="hfxdif" />
+          <field field_ref="hfxopw"          name="hfxopw" />
+          <field field_ref="hfxout"          name="hfxout" />
+          <field field_ref="hfxin"           name="hfxin"  />
+          <field field_ref="hfxsnw"          name="hfxsnw" />
+          <field field_ref="hfxerr"          name="hfxerr" />
+          <field field_ref="hfxerr_rem"      name="hfxerr_rem"    />
+
+	  <!-- ice-ocean heat flux from mass exchange -->
+          <field field_ref="hfxdyn"          name="hfxdyn"    />
+          <field field_ref="hfxres"          name="hfxres"    />
+          <field field_ref="hfxthd"          name="hfxthd"    />
+	  <!-- ice-atm. heat flux from mass exchange -->
+          <field field_ref="hfxsub"          name="hfxsub"    />
+          <field field_ref="hfxspr"          name="hfxspr"    />
+
+	  <!-- diags -->
+          <field field_ref="hfxdhc"          name="hfxdhc"    />
+          <field field_ref="hfxtur"          name="hfxtur"    />
+
+          <field field_ref="isst"             name="sst"      />
+          <field field_ref="isss"             name="sss"      />
+          <field field_ref="micesalt"         name="sisali"   />
+          <field field_ref="micet"            name="sitemp"   />
+          <field field_ref="icest"            name="sistem"   />
+          <field field_ref="icehc"            name="siheco"   />
+          <field field_ref="isnowhc"          name="snheco"   />
+          <field field_ref="miceage"          name="siages"   />
+
+          <field field_ref="uice_ipa"         name="sivelu"   />
+          <field field_ref="vice_ipa"         name="sivelv"   />
+          <field field_ref="icevel"           name="sivelo"   />
+          <field field_ref="idive"            name="sidive"   />
+          <field field_ref="ishear"           name="sishea"   />
+          <field field_ref="icestr"           name="sistre"   />
+
+          <field field_ref="ibrinv"           name="sibrin"   />
+          <field field_ref="icecolf"          name="sicolf"   />
+
+          <field field_ref="iceage_cat"       name="siagecat" />
+          <field field_ref="iceconc_cat"      name="siconcat" />
+          <field field_ref="icethic_cat"      name="sithicat" />
+          <field field_ref="snowthic_cat"     name="snthicat" />
+          <field field_ref="salinity_cat"     name="salincat" />
+          <field field_ref="brinevol_cat"     name="sibricat" />
+    
+	</file>
+
+      </file_group>
+      
+      <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
+
+      <file_group id="2h" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
+
+      <file_group id="3h" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
+
+      <file_group id="4h" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
+
+      <file_group id="6h" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->     
+    
+      <file_group id="1d" output_freq="1d"  output_level="10" enabled="_1D_ENABLE_">  <!-- 5d files -->   
+	
 	<file id="file1" name_suffix="_grid_T" description="ocean T grid variables" >
-	  <field field_ref="sst"          name="sosstsst"  />
-	  <field field_ref="sss"          name="sosaline"  />
-	  <field field_ref="ssh"          name="sossheig"  />
-	  <field field_ref="empmr"        name="sowaflup"  />
-	  <field field_ref="qsr"          name="soshfldo"  />
-          <field field_ref="saltflx"      name="sosfldow"  />
-	  <field field_ref="qt"           name="sohefldo"  />
-	  <field field_ref="mldr10_1"     name="somxl010"  />
-	  <field field_ref="mldkz5"       name="somixhgt"  />
-	  <field field_ref="ice_cover"    name="soicecov"  />
-	  <field field_ref="wspd"         name="sowindsp"  />
-	  <field field_ref="erp"          name="sowafldp"  />
-	  <field field_ref="ist_ipa"      name="soicetem"  />
-	  <field field_ref="icealb_cea"   name="soicealb"  />   
-	</file>
-
-	<file id="file2" name_suffix="_grid_U" description="ocean U grid variables" >
-	  <field field_ref="uoce"         name="vozocrtx"  />
-	  <field field_ref="uoce_eiv"     name="vozoeivu"  />
-	  <field field_ref="utau"         name="sozotaux"  />
+	  <field field_ref="e3t"  />
+	  <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"                    operation="instant" freq_op="1d" > @toce_e3t / @e3t </field>
+	  <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                                 operation="instant" freq_op="1d" > @soce_e3t / @e3t </field>
+	  <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       />
+	  <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                          />
+	  <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                />
+	  <field field_ref="sst"          name="tosstd"   long_name="sea_surface_temperature_standard_deviation"         operation="instant" freq_op="1d" > sqrt( @sst2 - @sst * @sst ) </field>
+	  <field field_ref="ssh"          name="zosstd"   long_name="sea_surface_height_above_geoid_standard_deviation"  operation="instant" freq_op="1d" > sqrt( @ssh2 - @ssh * @ssh ) </field>
+	  <field field_ref="sst"          name="sstdcy"   long_name="amplitude of sst diurnal cycle" operation="average" freq_op="1d" > @sstmax - @sstmin </field>
+	  <field field_ref="mldkz5"       />
+	  <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" > @mldr10_1max - @mldr10_1min </field>
+	  <field field_ref="sbt"                          />
+	  <field field_ref="heatc"        name="heatc"    long_name="Heat content vertically integrated"            />
+	  <field field_ref="saltc"        name="saltc"    long_name="Salt content vertically integrated"            />  
+	</file>
+
+       <file id="file2" name_suffix="_scalar" description="scalar variables" enabled=".true." >
+          <field field_ref="voltot"       name="scvoltot"    />
+          <field field_ref="sshtot"       name="scsshtot"    />
+          <field field_ref="sshsteric"    name="scsshste"    />
+          <field field_ref="sshthster"    name="scsshtst"    />
+          <field field_ref="masstot"      name="scmastot"    />
+          <field field_ref="temptot"      name="sctemtot"    />
+          <field field_ref="saltot"       name="scsaltot"    />
+
+          <field field_ref="bgtemper"     name="bgtemper"    />
+          <field field_ref="bgsaline"     name="bgsaline"    />
+          <field field_ref="bgheatco"     name="bgheatco"    />
+          <field field_ref="bgsaltco"     name="bgsaltco"    />
+          <field field_ref="bgvolssh"     name="bgvolssh"    /> 
+          <field field_ref="bgvole3t"     name="bgvole3t"    />
+          <field field_ref="bgfrcvol"     name="bgfrcvol"    />
+          <field field_ref="bgfrctem"     name="bgfrctem"    />
+          <field field_ref="bgfrcsal"     name="bgfrcsal"    />
+	</file>
+
+        <file id="file3" name_suffix="_SBC_scalar" description="scalar variables" enabled=".true." >
+          <field field_ref="ibgvoltot"    name="ibgvoltot"   />
+          <field field_ref="sbgvoltot"    name="sbgvoltot"   />
+          <field field_ref="ibgarea"      name="ibgarea"     />
+          <field field_ref="ibgsaline"    name="ibgsaline"   />
+          <field field_ref="ibgtemper"    name="ibgtemper"   />
+          <field field_ref="ibgheatco"    name="ibgheatco"   />
+          <field field_ref="sbgheatco"    name="sbgheatco"   />
+          <field field_ref="ibgsaltco"    name="ibgsaltco"   />
+
+          <field field_ref="ibgvfx"       name="ibgvfx"      />
+          <field field_ref="ibgvfxbog"    name="ibgvfxbog"   />
+          <field field_ref="ibgvfxopw"    name="ibgvfxopw"   />
+          <field field_ref="ibgvfxsni"    name="ibgvfxsni"   />
+          <field field_ref="ibgvfxdyn"    name="ibgvfxdyn"   />
+          <field field_ref="ibgvfxbom"    name="ibgvfxbom"   />
+          <field field_ref="ibgvfxsum"    name="ibgvfxsum"   />
+          <field field_ref="ibgvfxres"    name="ibgvfxres"   />
+          <field field_ref="ibgvfxspr"    name="ibgvfxspr"   />
+          <field field_ref="ibgvfxsnw"    name="ibgvfxsnw"   />
+          <field field_ref="ibgvfxsub"    name="ibgvfxsub"   />
+
+          <field field_ref="ibgsfx"       name="ibgsfx"      />
+          <field field_ref="ibgsfxbri"    name="ibgsfxbri"   />
+          <field field_ref="ibgsfxdyn"    name="ibgsfxdyn"   />
+          <field field_ref="ibgsfxres"    name="ibgsfxres"   />
+          <field field_ref="ibgsfxbog"    name="ibgsfxbog"   />
+          <field field_ref="ibgsfxopw"    name="ibgsfxopw"   />
+          <field field_ref="ibgsfxsni"    name="ibgsfxsni"   />
+          <field field_ref="ibgsfxbom"    name="ibgsfxbom"   />
+          <field field_ref="ibgsfxsum"    name="ibgsfxsum"   />
+
+          <field field_ref="ibghfxdhc"    name="ibghfxdhc"   />
+          <field field_ref="ibghfxspr"    name="ibghfxspr"   />
+
+          <field field_ref="ibghfxres"    name="ibghfxres"   />
+          <field field_ref="ibghfxsub"    name="ibghfxsub"   />
+          <field field_ref="ibghfxdyn"    name="ibghfxdyn"   />
+          <field field_ref="ibghfxthd"    name="ibghfxthd"   />
+          <field field_ref="ibghfxsum"    name="ibghfxsum"   />
+          <field field_ref="ibghfxbom"    name="ibghfxbom"   />
+          <field field_ref="ibghfxbog"    name="ibghfxbog"   />
+          <field field_ref="ibghfxdif"    name="ibghfxdif"   />
+          <field field_ref="ibghfxopw"    name="ibghfxopw"   />
+          <field field_ref="ibghfxout"    name="ibghfxout"   />
+          <field field_ref="ibghfxin"     name="ibghfxin"    />
+          <field field_ref="ibghfxsnw"    name="ibghfxsnw"   />
+
+          <field field_ref="ibgfrcvol"    name="ibgfrcvol"   />
+          <field field_ref="ibgfrcsfx"    name="ibgfrcsfx"   />
+          <field field_ref="ibgvolgrm"    name="ibgvolgrm"   />
+
+        </file>
+	<file id="file4" name_suffix="_icemod" description="ice variables" enabled=".false." >
+	  <field field_ref="snowthic_cea"     name="snthic"     long_name="surface_snow_thickness"   />
+	  <field field_ref="icethic_cea"      name="sithic"     long_name="sea_ice_thickness"        />
+          <field field_ref="icevolu"          name="sivolu"  />
+          <field field_ref="snowvol"          name="snvolu"  />
+          <field field_ref="iceconc"          name="siconc"  />
+
+          <field field_ref="vfxbog"           name="vfxbog"  />
+          <field field_ref="vfxdyn"           name="vfxdyn"  />
+          <field field_ref="vfxopw"           name="vfxopw"  />
+          <field field_ref="vfxsni"           name="vfxsni"  />
+          <field field_ref="vfxsum"           name="vfxsum"  />
+          <field field_ref="vfxbom"           name="vfxbom"  />
+          <field field_ref="vfxres"           name="vfxres"  />
+          <field field_ref="vfxice"           name="vfxice"  />
+          <field field_ref="vfxsnw"           name="vfxsnw"  />
+          <field field_ref="vfxsub"           name="vfxsub"  />
+          <field field_ref="vfxspr"           name="vfxspr"  />
+
+          <field field_ref="icetrp"           name="sivtrp"  />
+          <field field_ref="snwtrp"           name="snvtrp"  />
+          <field field_ref="saltrp"           name="saltrp"  />
+          <field field_ref="deitrp"           name="deitrp"  />
+          <field field_ref="destrp"           name="destrp"  />
+
+          <field field_ref="sfxbri"           name="sfxbri"  />
+          <field field_ref="sfxdyn"           name="sfxdyn"  />
+          <field field_ref="sfxres"           name="sfxres"  />
+          <field field_ref="sfxbog"           name="sfxbog"  />
+          <field field_ref="sfxbom"           name="sfxbom"  />
+          <field field_ref="sfxsum"           name="sfxsum"  />
+          <field field_ref="sfxsni"           name="sfxsni"  />
+          <field field_ref="sfxopw"           name="sfxopw"  />
+          <field field_ref="sfx"              name="sfx"     />
+
+          <field field_ref="hfxsum"           name="hfxsum"  />
+          <field field_ref="hfxbom"           name="hfxbom"  />
+          <field field_ref="hfxbog"           name="hfxbog"  />
+          <field field_ref="hfxdif"           name="hfxdif"  />
+          <field field_ref="hfxopw"           name="hfxopw"  />
+          <field field_ref="hfxout"           name="hfxout"  />
+          <field field_ref="hfxin"            name="hfxin"   />
+          <field field_ref="hfxsnw"           name="hfxsnw"  />
+          <field field_ref="hfxerr"           name="hfxerr"  />
+          <field field_ref="hfxerr_rem"       name="hfxerr_rem"    /> 
+
+	  <!-- ice-ocean heat flux from mass exchange -->
+          <field field_ref="hfxdyn"          name="hfxdyn"    />
+          <field field_ref="hfxres"          name="hfxres"    />
+          <field field_ref="hfxthd"          name="hfxthd"    />
+	  <!-- ice-atm. heat flux from mass exchange -->
+          <field field_ref="hfxsub"          name="hfxsub"    />
+          <field field_ref="hfxspr"          name="hfxspr"    />
+
+	  <!-- diags -->
+          <field field_ref="hfxdhc"          name="hfxdhc"    />
+          <field field_ref="hfxtur"          name="hfxtur"    />
+
+          <field field_ref="isst"             name="sst"      />
+          <field field_ref="isss"             name="sss"      />
+          <field field_ref="micesalt"         name="sisali"   />
+          <field field_ref="micet"            name="sitemp"   />
+          <field field_ref="icest"            name="sistem"   />
+          <field field_ref="icehc"            name="siheco"   />
+          <field field_ref="isnowhc"          name="snheco"   />
+          <field field_ref="miceage"          name="siages"   /> 
+
+          <field field_ref="uice_ipa"         name="sivelu"   />
+          <field field_ref="vice_ipa"         name="sivelv"   />
+          <field field_ref="icevel"           name="sivelo"   />
+          <field field_ref="idive"            name="sidive"   />
+          <field field_ref="ishear"           name="sishea"   />
+          <field field_ref="icestr"           name="sistre"   /> 
+
+          <field field_ref="ibrinv"           name="sibrin"   />
+          <field field_ref="icecolf"          name="sicolf"   />
+
+          <field field_ref="iceage_cat"       name="siagecat" />
+          <field field_ref="iceconc_cat"      name="siconcat" />
+          <field field_ref="icethic_cat"      name="sithicat" />
+          <field field_ref="snowthic_cat"     name="snthicat" />
+          <field field_ref="salinity_cat"     name="salincat" />
+          <field field_ref="brinevol_cat"     name="sibricat" />
+
+	</file>
+
+  </file_group> 
+
+
+      <file_group id="1m" output_freq="1mo" output_level="10" enabled="_1M_ENABLE_"> <!-- real monthly files -->
+
+        <file id="file10" name_suffix="_grid_T" >
+	  <field field_ref="e3t" long_name="T-cell thickness" />
+          <field field_ref="botpres"      name="pbo"      long_name="Pressure_at_sea_floor"                                          />
+          <!-- pso : sea_water_pressure_at_sea_water_surface = 0 -->
+          <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                                 />
+          <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="instant" freq_op="1mo" > @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="instant" freq_op="1mo" > @soce_e3t / @e3t </field>       
+          <field field_ref="soce_e3t"                     long_name="salinity * e3t"                    operation="instant" freq_op="1mo" > soce * e3t </field >  
+          <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                                 level="1" />
+          <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="2" />
+          <field field_ref="runoffs"      name="friver"   long_name="water_flux_into_sea_water_from_rivers"                   level="1" />
+          <field field_ref="empmr"        name="wfo"      long_name="water_flux_into_sea_water"                               level="1" />
+          <!-- 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="1" />
+          <field field_ref="qrp"          name="hfcorr"    long_name="heat_flux_correction"                                   level="1" />
+        </file>
+
+	<file id="file11" name_suffix="_grid_U" description="ocean U grid variables" >
+	  <field field_ref="e3u"  />
+	  <field field_ref="ssu"          name="uos"     long_name="sea_surface_x_velocity"    />
+	  <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity" operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field>
+	  <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
+          <!-- available with key_diaar5 -->
+	  <field field_ref="u_masstr"     name="vozomatr"  />
+	  <field field_ref="u_heattr"     name="sozohetr"  />
+          <field field_ref="u_salttr"     name="sozosatr"  />
 	</file>
 	
-	<file id="file3" name_suffix="_grid_V" description="ocean V grid variables" >
-	  <field field_ref="voce"         name="vomecrty"  />
-	  <field field_ref="voce_eiv"     name="vomeeivv"  />
-	  <field field_ref="vtau"         name="sometauy"  />
+	<file id="file12" name_suffix="_grid_V" description="ocean V grid variables" >
+	  <field field_ref="e3v"  />
+	  <field field_ref="ssv"          name="vos"     long_name="sea_surface_y_velocity"    />
+	  <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity" operation="instant" freq_op="5d" > @voce_e3v / @e3v </field>
+	  <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />
+          <!-- available with key_diaar5 -->
+	  <field field_ref="v_masstr"     name="vomematr"  />
+	  <field field_ref="v_heattr"     name="somehetr"  />
+          <field field_ref="v_salttr"     name="somesatr"  />
 	</file>
 	
+	<file id="file13" name_suffix="_grid_W" description="ocean W grid variables" >
+	  <field field_ref="e3w"  />
+	  <field field_ref="woce"         name="wo"      long_name="ocean vertical velocity" operation="instant" freq_op="5d" > @woce_e3w / @e3w </field>
+	  <field field_ref="avt"          name="difvho"  long_name="ocean_vertical_heat_diffusivity" />
+	  <field field_ref="w_masstr"     name="vovematr"  />
+	</file>
+
+	<file id="file14" name_suffix="_icemod" description="ice variables" enabled=".true." >
+	  <field field_ref="snowthic_cea"    name="snthic"     long_name="surface_snow_thickness"   />
+	  <field field_ref="icethic_cea"     name="sithic"     long_name="sea_ice_thickness"        />
+          <field field_ref="icevolu"         name="sivolu" />
+          <field field_ref="snowvol"         name="snvolu" />
+          <field field_ref="iceconc"         name="siconc" />
+
+          <field field_ref="vfxbog"          name="vfxbog" />
+          <field field_ref="vfxdyn"          name="vfxdyn" />
+          <field field_ref="vfxopw"          name="vfxopw" />
+          <field field_ref="vfxsni"          name="vfxsni" />
+          <field field_ref="vfxsum"          name="vfxsum" />
+          <field field_ref="vfxbom"          name="vfxbom" />
+          <field field_ref="vfxres"          name="vfxres" />
+          <field field_ref="vfxice"          name="vfxice" />
+          <field field_ref="vfxsnw"          name="vfxsnw" />
+          <field field_ref="vfxsub"          name="vfxsub" />
+          <field field_ref="vfxspr"          name="vfxspr" />
+
+          <field field_ref="icetrp"          name="sivtrp" />
+          <field field_ref="snwtrp"          name="snvtrp" />
+          <field field_ref="saltrp"          name="saltrp" />
+          <field field_ref="deitrp"          name="deitrp" />
+          <field field_ref="destrp"          name="destrp" />
+
+          <field field_ref="sfxbri"          name="sfxbri" />
+          <field field_ref="sfxdyn"          name="sfxdyn" />
+          <field field_ref="sfxres"          name="sfxres" />
+          <field field_ref="sfxbog"          name="sfxbog" />
+          <field field_ref="sfxbom"          name="sfxbom" />
+          <field field_ref="sfxsum"          name="sfxsum" />
+          <field field_ref="sfxsni"          name="sfxsni" />
+          <field field_ref="sfxopw"          name="sfxopw" />
+          <field field_ref="sfx"             name="sfx"    />
+
+          <field field_ref="hfxsum"          name="hfxsum" />
+          <field field_ref="hfxbom"          name="hfxbom" />
+          <field field_ref="hfxbog"          name="hfxbog" />
+          <field field_ref="hfxdif"          name="hfxdif" />
+          <field field_ref="hfxopw"          name="hfxopw" />
+          <field field_ref="hfxout"          name="hfxout" />
+          <field field_ref="hfxin"           name="hfxin"  />
+          <field field_ref="hfxsnw"          name="hfxsnw" />
+          <field field_ref="hfxerr"          name="hfxerr" />
+          <field field_ref="hfxerr_rem"      name="hfxerr_rem"    />
+
+	  <!-- ice-ocean heat flux from mass exchange -->
+          <field field_ref="hfxdyn"          name="hfxdyn"    />
+          <field field_ref="hfxres"          name="hfxres"    />
+          <field field_ref="hfxthd"          name="hfxthd"    />
+	  <!-- ice-atm. heat flux from mass exchange -->
+          <field field_ref="hfxsub"          name="hfxsub"    />
+          <field field_ref="hfxspr"          name="hfxspr"    />
+
+	  <!-- diags -->
+          <field field_ref="hfxdhc"          name="hfxdhc"    />
+          <field field_ref="hfxtur"          name="hfxtur"    />
+
+          <field field_ref="isst"             name="sst"      />
+          <field field_ref="isss"             name="sss"      />
+          <field field_ref="micesalt"         name="sisali"   />
+          <field field_ref="micet"            name="sitemp"   />
+          <field field_ref="icest"            name="sistem"   />
+          <field field_ref="icehc"            name="siheco"   />
+          <field field_ref="isnowhc"          name="snheco"   />
+          <field field_ref="miceage"          name="siages"   />
+
+          <field field_ref="uice_ipa"         name="sivelu"   />
+          <field field_ref="vice_ipa"         name="sivelv"   />
+          <field field_ref="icevel"           name="sivelo"   />
+          <field field_ref="idive"            name="sidive"   />
+          <field field_ref="ishear"           name="sishea"   />
+          <field field_ref="icestr"           name="sistre"   />
+
+          <field field_ref="ibrinv"           name="sibrin"   />
+          <field field_ref="icecolf"          name="sicolf"   />
+
+          <field field_ref="iceage_cat"       name="siagecat" />
+          <field field_ref="iceconc_cat"      name="siconcat" />
+          <field field_ref="icethic_cat"      name="sithicat" />
+          <field field_ref="snowthic_cat"     name="snthicat" />
+          <field field_ref="salinity_cat"     name="salincat" />
+          <field field_ref="brinevol_cat"     name="sibricat" />
+
+	</file>
+
+        <file id="file15" name_suffix="_scalar" description="scalar variables" enabled=".true." >
+          <field field_ref="voltot"       name="scvoltot"    />
+          <field field_ref="sshtot"       name="scsshtot"    />
+          <field field_ref="sshsteric"    name="scsshste"    />
+          <field field_ref="sshthster"    name="scsshtst"    />
+          <field field_ref="masstot"      name="scmastot"    />
+          <field field_ref="temptot"      name="sctemtot"    />
+          <field field_ref="saltot"       name="scsaltot"    />
+
+          <field field_ref="bgtemper"     name="bgtemper"    />
+          <field field_ref="bgsaline"     name="bgsaline"    />
+          <field field_ref="bgheatco"     name="bgheatco"    />
+          <field field_ref="bgsaltco"     name="bgsaltco"    />
+          <field field_ref="bgvolssh"     name="bgvolssh"    /> 
+          <field field_ref="bgvole3t"     name="bgvole3t"    />
+          <field field_ref="bgfrcvol"     name="bgfrcvol"    />
+          <field field_ref="bgfrctem"     name="bgfrctem"    />
+          <field field_ref="bgfrcsal"     name="bgfrcsal"    />
+
+          <field field_ref="ibgvoltot"    name="ibgvoltot"   />
+          <field field_ref="sbgvoltot"    name="sbgvoltot"   />
+          <field field_ref="ibgarea"      name="ibgarea"     />
+          <field field_ref="ibgsaline"    name="ibgsaline"   />
+          <field field_ref="ibgtemper"    name="ibgtemper"   />
+          <field field_ref="ibgheatco"    name="ibgheatco"   />
+          <field field_ref="sbgheatco"    name="sbgheatco"   />
+          <field field_ref="ibgsaltco"    name="ibgsaltco"   />
+
+          <field field_ref="ibgvfx"       name="ibgvfx"      />
+          <field field_ref="ibgvfxbog"    name="ibgvfxbog"   />
+          <field field_ref="ibgvfxopw"    name="ibgvfxopw"   />
+          <field field_ref="ibgvfxsni"    name="ibgvfxsni"   />
+          <field field_ref="ibgvfxdyn"    name="ibgvfxdyn"   />
+          <field field_ref="ibgvfxbom"    name="ibgvfxbom"   />
+          <field field_ref="ibgvfxsum"    name="ibgvfxsum"   />
+          <field field_ref="ibgvfxres"    name="ibgvfxres"   />
+          <field field_ref="ibgvfxspr"    name="ibgvfxspr"   />
+          <field field_ref="ibgvfxsnw"    name="ibgvfxsnw"   />
+          <field field_ref="ibgvfxsub"    name="ibgvfxsub"   />
+
+          <field field_ref="ibgsfx"       name="ibgsfx"      />
+          <field field_ref="ibgsfxbri"    name="ibgsfxbri"   />
+          <field field_ref="ibgsfxdyn"    name="ibgsfxdyn"   />
+          <field field_ref="ibgsfxres"    name="ibgsfxres"   />
+          <field field_ref="ibgsfxbog"    name="ibgsfxbog"   />
+          <field field_ref="ibgsfxopw"    name="ibgsfxopw"   />
+          <field field_ref="ibgsfxsni"    name="ibgsfxsni"   />
+          <field field_ref="ibgsfxbom"    name="ibgsfxbom"   />
+          <field field_ref="ibgsfxsum"    name="ibgsfxsum"   />
+
+          <field field_ref="ibghfxdhc"    name="ibghfxdhc"   />
+          <field field_ref="ibghfxspr"    name="ibghfxspr"   />
+
+          <field field_ref="ibghfxres"    name="ibghfxres"   />
+          <field field_ref="ibghfxsub"    name="ibghfxsub"   />
+          <field field_ref="ibghfxdyn"    name="ibghfxdyn"   />
+          <field field_ref="ibghfxthd"    name="ibghfxthd"   />
+          <field field_ref="ibghfxsum"    name="ibghfxsum"   />
+          <field field_ref="ibghfxbom"    name="ibghfxbom"   />
+          <field field_ref="ibghfxbog"    name="ibghfxbog"   />
+          <field field_ref="ibghfxdif"    name="ibghfxdif"   />
+          <field field_ref="ibghfxopw"    name="ibghfxopw"   />
+          <field field_ref="ibghfxout"    name="ibghfxout"   />
+          <field field_ref="ibghfxin"    name="ibghfxin"     />
+          <field field_ref="ibghfxsnw"    name="ibghfxsnw"   />
+
+          <field field_ref="ibgfrcvol"    name="ibgfrcvol"   />
+          <field field_ref="ibgfrcsfx"    name="ibgfrcsfx"   />
+          <field field_ref="ibgvolgrm"    name="ibgvolgrm"   />
+
+        </file>
+
+	<file id="file16" name_suffix="_diaptr" description="diaptr variables" >
+           <field field_ref="zomsfglo"   />
+           <field field_ref="zomsfatl"   />
+           <field field_ref="zomsfpac"   />
+           <field field_ref="zomsfind"   />
+           <field field_ref="zomsfipc"   />
+           <field field_ref="zotemglo"   />
+           <field field_ref="zotematl"   />
+           <field field_ref="zotempac"   />
+           <field field_ref="zotemind"   />
+           <field field_ref="zotemipc"   />
+           <field field_ref="zosalglo"   />
+           <field field_ref="zosalatl"   />
+           <field field_ref="zosalpac"   />
+           <field field_ref="zosalind"   />
+           <field field_ref="zosalipc"   />
+           <field field_ref="zosrfglo"   />
+           <field field_ref="zosrfatl"   />
+           <field field_ref="zosrfpac"   />
+           <field field_ref="zosrfind"   />
+           <field field_ref="zosrfipc"   />
+           <field field_ref="sophtadv"   />
+           <field field_ref="sophtldf"   />
+           <field field_ref="sopstadv"   />
+           <field field_ref="sopstldf"   />
+	</file>
+	
+	<!--
+	<file id="file8" name_suffix="_Tides" description="tidal harmonics" >
+	  <field field_ref="M2x"          name="M2x"      long_name="M2 Elevation harmonic real part"                       />
+	  <field field_ref="M2y"          name="M2y"      long_name="M2 Elevation harmonic imaginary part"                  />
+	  <field field_ref="M2x_u"        name="M2x_u"    long_name="M2 current barotrope along i-axis harmonic real part "       />
+	  <field field_ref="M2y_u"        name="M2y_u"    long_name="M2 current barotrope along i-axis harmonic imaginary part "  />
+	  <field field_ref="M2x_v"        name="M2x_v"    long_name="M2 current barotrope along j-axis harmonic real part "       />
+	  <field field_ref="M2y_v"        name="M2y_v"    long_name="M2 current barotrope along j-axis harmonic imaginary part "  />
+	</file>
+	-->
+
       </file_group>
 
-      <file_group id="1m" output_freq="1mo" output_level="10" enabled="_1M_ENABLE_"> <!-- real monthly files -->
-
-	<file id="file4" name_suffix="_grid_T" description="ocean T grid variables" >
-	  <field field_ref="sst"          name="sosstsst"  />
-	  <field field_ref="sss"          name="sosaline"  />
-	  <field field_ref="ssh"          name="sossheig"  />
-	  <field field_ref="toce"         name="votemper"  />
-	  <field field_ref="soce"         name="vosaline"  />
-	  <field field_ref="empmr"        name="sowaflup"  />
-	  <field field_ref="qsr"          name="soshfldo"  />
-          <field field_ref="saltflx"      name="sosfldow"  />
-	  <field field_ref="qt"           name="sohefldo"  />
-	  <field field_ref="mldr10_1"     name="somxl010"  />
-	  <field field_ref="mldkz5"       name="somixhgt"  />
-	  <field field_ref="ice_cover"    name="soicecov"  />
-	  <field field_ref="wspd"         name="sowindsp"  />
-	  <field field_ref="erp"          name="sowafldp"  />
-	  <field field_ref="ist_ipa"      name="soicetem"  />
-	  <field field_ref="icealb_cea"   name="soicealb"  />   
-	</file>
-
-	<file id="file5" name_suffix="_grid_U" description="ocean U grid variables" >
-	  <field field_ref="uoce"         name="vozocrtx"  />
-	  <field field_ref="uoce_eiv"     name="vozoeivu"  />
-	  <field field_ref="utau"         name="sozotaux"  />
-	</file>
-	
-	<file id="file6" name_suffix="_grid_V" description="ocean V grid variables" >
-	  <field field_ref="voce"         name="vomecrty"  />
-	  <field field_ref="voce_eiv"     name="vomeeivv"  />
-	  <field field_ref="vtau"         name="sometauy"  />
-	</file>
-
-	<file id="file7" name_suffix="_grid_W" description="ocean W grid variables" >
-	  <field field_ref="woce"         name="vovecrtz" />
-	  <field field_ref="avt"          name="votkeavt" />
-	  <field field_ref="avs"          name="voddmavs" />
-	</file>
-
-	<file id="file8" name_suffix="_icemod" description="ice variables" >
-	  <field field_ref="ice_pres"                     />
-	  <field field_ref="snowthic_cea" name="isnowthi" />
-	  <field field_ref="icethic_cea"  name="iicethic" />
-	  <field field_ref="iceprod_cea"  name="iiceprod" />
-	  <field field_ref="ist_ipa"      name="iicetemp" />
-	  <field field_ref="uice_ipa"     name="iicevelu" />
-	  <field field_ref="vice_ipa"     name="iicevelv" />
-	  <field field_ref="utau_ice"     name="iicestru" />
-	  <field field_ref="vtau_ice"     name="iicestrv" />
-	  <field field_ref="qsr_io_cea"   name="iicesflx" />
-	  <field field_ref="qns_io_cea"   name="iicenflx" />
-	  <field field_ref="snowpre"      name="isnowpre" />
-	</file>
-
-    <file id="file9" name_suffix="_diaptr" description="diaptr variables" >
-       <field field_ref="zotemglo"   />
-       <field field_ref="zosalglo"     />
-       <field field_ref="zosrfglo"    />
-       <field field_ref="zomsfglo"    />
-       <field field_ref="zotematl"   />
-       <field field_ref="zosalatl"     />
-       <field field_ref="zosrfatl"    />
-       <field field_ref="zomsfatl"    />
-       <field field_ref="zotempac"   />
-       <field field_ref="zosalpac"     />
-       <field field_ref="zosrfpac"    />
-       <field field_ref="zomsfpac"    />
-       <field field_ref="zotemind"   />
-       <field field_ref="zosalind"     />
-       <field field_ref="zosrfind"    />
-       <field field_ref="zomsfind"    />
-       <field field_ref="zotemipc"   />
-       <field field_ref="zosalipc"     />
-       <field field_ref="zosrfipc"    />
-       <field field_ref="zomsfipc"     />
-       <field field_ref="sophtadv"      />
-       <field field_ref="sophtldf"      />
-       <field field_ref="sopstadv"      />
-       <field field_ref="sopstldf"      />
+
+      <file_group id="2m" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
+      <file_group id="3m" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
+      <file_group id="4m" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
+      <file_group id="6m" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
+
+      <file_group id="1y"  output_freq="1y" output_level="10" enabled=".TRUE."> <!-- real yearly files -->
+
+    <file id="file20" name_suffix="_grid_T" description="ocean T grid variables" >
+      <field field_ref="e3t"  />
+      <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       />
+      <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                          />
+      <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                />
+      <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"      operation="instant" freq_op="1y" > @toce_e3t / @e3t </field>        
+      <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                   operation="instant" freq_op="1y" > @soce_e3t / @e3t </field>         
+      <field field_ref="sst2"         name="tossq"    long_name="square_of_sea_surface_temperature"             />
+      <field field_ref="ssh2"         name="zossq"    long_name="square_of_sea_surface_height_above_geoid"      />
+      <field field_ref="mldr10_1"     />
+      <field field_ref="mldkz5"       name="omlmax"   long_name="ocean_mixed_layer_thickness_defined_by_mixing_scheme" level="2" operation="maximum" />
+      <field field_ref="runoffs"      name="friver"   long_name="water_flux_into_sea_water_from_rivers"                   level="1" />
+      <field field_ref="empmr"        name="wfo"      long_name="water_flux_into_sea_water"                               level="1" />
+      <field field_ref="erp"          name="wfcorr"   long_name="water_flux_correction"                                   level="1" /> <!-- usually = 0 -->
+      <field field_ref="qns"          name="nshfls"   long_name="surface_net_downward_non_solar_flux"                     level="1" />
+      <field field_ref="qsr"          name="rsntds"   long_name="surface_net_downward_shortwave_flux"                     level="1" />
+      <field field_ref="qsr3d"        name="rsds"     long_name="downwelling_shortwave_flux_in_sea_water"                 level="1" />
+      <field field_ref="qt"           name="tohfls"   long_name="surface_net_downward_total_heat_flux"          />
+      <field field_ref="saltflx"      name="sosflxdo"   />
+      <field field_ref="taum"         name="taum" />
+      <field field_ref="wspd"         name="sowindsp"   />
+       <field field_ref="precip"       name="soprecip"  />
+       <!-- available with ln_blk_clio or ln_blk_core -->
+       <!-- <field field_ref="qns_oce"      name="sonshdoo"  /> -->
+       <!-- <field field_ref="qlw_oce"      name="solwhdoo"  /> -->
+       <!-- <field field_ref="qsb_oce"      name="sosehdoo"  /> -->
+       <!-- <field field_ref="qla_oce"      name="solahdoo"  /> -->
+       <!-- <field field_ref="taum_oce"     name="sowndsto"  /> -->
+        <!-- ice and snow -->
+       <field field_ref="snowpre"      name="isnowpre"  />
+       <field field_ref="utau_ice"     name="iicestru"  />
+       <field field_ref="vtau_ice"     name="iicestrv"  />
+     </file>
+
+    <file id="file21" name_suffix="_grid_U" description="ocean U grid variables" >
+      <field field_ref="e3u"  />
+      <field field_ref="ssu"          name="uos"     long_name="sea_surface_x_velocity"    />
+      <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity"      operation="instant" freq_op="1y" > @uoce_e3u / @e3u </field> 
+      <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
+      <field field_ref="uocetr_eff"   name="uocetr_eff"  />
     </file>
 
-	<file id="file10" name_suffix="_ptrc_T" description="pisces sms variables" >
-       <field field_ref="DIC"      />
-       <field field_ref="Alkalini" />
-       <field field_ref="O2"       />
-       <field field_ref="CaCO3"    />
-       <field field_ref="PO4"      />
-       <field field_ref="POC"      />
-       <field field_ref="Si"       />
-       <field field_ref="PHY"      />
-       <field field_ref="ZOO"      />
-       <field field_ref="DOC"      />
-       <field field_ref="PHY2"     />
-       <field field_ref="ZOO2"     />
-       <field field_ref="DSi"      />
-       <field field_ref="Fer"      />
-       <field field_ref="BFe"      />
-       <field field_ref="GOC"      />
-       <field field_ref="SFe"      />
-       <field field_ref="DFe"      />
-       <field field_ref="GSi"      />
-       <field field_ref="NFe"      />
-       <field field_ref="NCHL"     />
-       <field field_ref="DCHL"     />
-       <field field_ref="NO3"      />
-       <field field_ref="NH4"      />
-	</file>
-	
-	<file id="file11" name_suffix="_diad_T" description="additional pisces diagnostics" >
-       <field field_ref="PH"       />
-       <field field_ref="CO3"      />
-       <field field_ref="CO3sat"   />
-       <field field_ref="PAR"      />
-       <field field_ref="PPPHY"    />
-       <field field_ref="PPPHY2"   />
-       <field field_ref="PPNEWN"   />
-       <field field_ref="PPNEWD"   />
-       <field field_ref="PBSi"     />
-       <field field_ref="PFeN"     />
-       <field field_ref="PFeD"     />
-       <field field_ref="xfracal"  />
-       <field field_ref="PCAL"     />
-       <field field_ref="DCAL"     />
-       <field field_ref="GRAZ1"    />
-       <field field_ref="GRAZ2"    />
-       <field field_ref="EPC100"   />
-       <field field_ref="EPFE100"  />
-       <field field_ref="EPSI100"  />
-       <field field_ref="EPCAL100" />
-       <field field_ref="Cflx"     />
-       <field field_ref="Oflx"     />
-       <field field_ref="Kg"       />
-       <field field_ref="Dpco2"    />
-       <field field_ref="Dpo2"     />
-       <field field_ref="Heup"     />
-       <field field_ref="Irondep"  />
-       <field field_ref="Ironsed"  />
-       <field field_ref="Ironice"  />
-       <field field_ref="Nfix"     />
-       <field field_ref="MuN"      />
-       <field field_ref="MuD"      />
-       <field field_ref="LNnut"    />
-       <field field_ref="LDnut"    />
-       <field field_ref="LNFe"     />
-       <field field_ref="LDFe"     />
-       <field field_ref="LNlight"  />
-       <field field_ref="LDlight"  />
-       <field field_ref="pdust"    />
-       <field field_ref="Fe3"     />
-       <field field_ref="FeL1"     />
-       <field field_ref="TL1"      />
-       <field field_ref="Sdenit"   />
-       <field field_ref="Totlig"   />
-	</file>
-
-    </file_group>
-
-      <file_group id="1y"  output_freq="1y" output_level="10" enabled="_1Y_ENABLE_"> <!-- real yearly files -->
-
-	<file id="file12" name_suffix="_ptrc_T" description="pisces sms variables" >
-       <field field_ref="DIC"      />
-       <field field_ref="Alkalini" />
-       <field field_ref="O2"       />
-       <field field_ref="CaCO3"    />
-       <field field_ref="PO4"      />
-       <field field_ref="POC"      />
-       <field field_ref="Si"       />
-       <field field_ref="PHY"      />
-       <field field_ref="ZOO"      />
-       <field field_ref="DOC"      />
-       <field field_ref="PHY2"     />
-       <field field_ref="ZOO2"     />
-       <field field_ref="DSi"      />
-       <field field_ref="Fer"      />
-       <field field_ref="BFe"      />
-       <field field_ref="GOC"      />
-       <field field_ref="SFe"      />
-       <field field_ref="DFe"      />
-       <field field_ref="GSi"      />
-       <field field_ref="NFe"      />
-       <field field_ref="NCHL"     />
-       <field field_ref="DCHL"     />
-       <field field_ref="NO3"      />
-       <field field_ref="NH4"      />
-	</file>
-
-	<file id="file13" name_suffix="_diad_T" description="additional pisces diagnostics" >
-       <field field_ref="PH"       />
-       <field field_ref="CO3"      />
-       <field field_ref="CO3sat"   />
-       <field field_ref="PAR"      />
-       <field field_ref="PPPHY"    />
-       <field field_ref="PPPHY2"   />
-       <field field_ref="PPNEWN"   />
-       <field field_ref="PPNEWD"   />
-       <field field_ref="PBSi"     />
-       <field field_ref="PFeN"     />
-       <field field_ref="PFeD"     />
-       <field field_ref="xfracal"  />
-       <field field_ref="PCAL"     />
-       <field field_ref="DCAL"     />
-       <field field_ref="GRAZ1"    />
-       <field field_ref="GRAZ2"    />
-       <field field_ref="EPC100"   />
-       <field field_ref="EPFE100"  />
-       <field field_ref="EPSI100"  />
-       <field field_ref="EPCAL100" />
-       <field field_ref="Cflx"     />
-       <field field_ref="Oflx"     />
-       <field field_ref="Kg"       />
-       <field field_ref="Dpco2"    />
-       <field field_ref="Dpo2"     />
-       <field field_ref="Heup"     />
-       <field field_ref="Irondep"  />
-       <field field_ref="Ironsed"  />
-       <field field_ref="Ironice"  />
-       <field field_ref="Nfix"     />
-       <field field_ref="MuN"      />
-       <field field_ref="MuD"      />
-       <field field_ref="LNnut"    />
-       <field field_ref="LDnut"    />
-       <field field_ref="LNFe"     />
-       <field field_ref="LDFe"     />
-       <field field_ref="LNlight"  />
-       <field field_ref="LDlight"  />
-       <field field_ref="pdust"    />
-       <field field_ref="Fe3"     />
-       <field field_ref="FeL1"     />
-       <field field_ref="TL1"      />
-       <field field_ref="Sdenit"   />
-       <field field_ref="Totlig"   />
-	</file>
+    <file id="file22" name_suffix="_grid_V" description="ocean V grid variables" >
+      <field field_ref="e3v"  />
+      <field field_ref="ssv"          name="vos"     long_name="sea_surface_y_velocity"    />
+      <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity"     operation="instant" freq_op="1y" > @voce_e3v / @e3v </field>
+      <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />
+      <field field_ref="uocetr_eff"   name="uocetr_eff"  />
+    </file>
+
+     <file id="file23" name_suffix="_grid_W" description="ocean W grid variables" >
+      <field field_ref="e3w"  />
+      <field field_ref="woce"         name="wo"      long_name="ocean vertical velocity"         />
+      <field field_ref="avt"          name="difvho"  long_name="ocean_vertical_heat_diffusivity" />
+      <field field_ref="wocetr_eff"   name="wocetr_eff"  />
+    </file>
+
 
       </file_group>
 
-      <file_group id="10y" output_freq="10y" output_level="10" enabled=".FALSE."/> <!-- real 10y files -->
+      <file_group id="2y"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
+      <file_group id="5y"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
+      <file_group id="10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
 
    </file_definition>
@@ -309,4 +676,6 @@
       <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
       <axis id="nfloat" long_name="Float number"      unit="-"  />
+      <axis id="icbcla" long_name="Iceberg class"     unit="-"  />
+      <axis id="ncatice" long_name="Ice categories"   unit="-"  />
    </axis_definition> 
     
@@ -322,5 +691,6 @@
      <grid id="grid_W_2D" domain_ref="grid_W"/>
      <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/>
-    </grid_definition>  
+    </grid_definition>   
+  </context>
   
-  </context>
+  
Index: CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namcouple_ORCA1xLMD9695
===================================================================
--- CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namcouple_ORCA1xLMD9695	(revision 2483)
+++ CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namcouple_ORCA1xLMD9695	(revision 2489)
@@ -413,5 +413,5 @@
 rmp_tlmd_to_torc_MOSAIC_calvin.nc src
 # Set to ZERO \!/
-0.0 0
+1.0 0
 # CHECKOUT: indicate computation of global, land and sea field integrals.
  INT=1
@@ -433,5 +433,5 @@
 GLOBAL bfb
 # change units from m/s to kg/s
-0.0 0
+1000.0 0
 # CHECKOUT: indicate computation of global, land and sea field integrals.
  INT=1
Index: CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_ORCA1_cfg
===================================================================
--- CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_ORCA1_cfg	(revision 2483)
+++ CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_ORCA1_cfg	(revision 2489)
@@ -33,7 +33,6 @@
    jpiglo      =     362               !  1st dimension of global domain --> i =jpidta
    jpjglo      =     292               !  2nd    -                  -    --> j  =jpjdta
-   jpizoom     =       1               !  left bottom (i,j) indices of the zoom
-   jpjzoom     =       1               !  in data domain indices
    jperio      =       6               !  lateral cond. type (between 0 and 6)
+   ln_use_jattr = .true.               !  use (T) the file attribute: open_ocean_jstart if present
 /
 !-----------------------------------------------------------------------
@@ -44,11 +43,4 @@
 &namzgr_sco    !   s-coordinate or hybrid z-s-coordinate
 !-----------------------------------------------------------------------
-   rn_sbot_min =  300.     !  minimum depth of s-bottom surface (>0) (m)
-   rn_sbot_max = 5250.     !  maximum depth of s-bottom surface (= ocean depth) (>0) (m)
-   rn_theta    =    6.0    !  surface control parameter (0<=rn_theta<=20)
-   rn_thetb    =    0.75   !  bottom control parameter  (0<=rn_thetb<= 1)
-   rn_rmax     =    0.15   !  maximum cut-off r-value allowed (0<rn_max<1)
-   rn_bb       =    0.8    !  stretching with s-sigma
-   rn_hc       =  150.0    !  critical depth with s-sigma 
 /
 !-----------------------------------------------------------------------
@@ -73,5 +65,4 @@
    ppdzmin     =  999999.0             !  Minimum vertical spacing
    pphmax      =  999999.0             !  Maximum depth
-   ldbletanh   =   .TRUE.              !  Use/do not use double tanf function for vertical coordinates
    ppa2        =     100.7609285000000 !  Double tanh function parameters
    ppkth2      =      48.02989372000000    !
@@ -80,4 +71,19 @@
 /
 !-----------------------------------------------------------------------
+&namsplit       
+!----------------------------------------------------------------------- 
+   ln_bt_fw      =    .TRUE.           !  Forward 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
@@ -93,16 +99,17 @@
 &namsbc        !   Surface Boundary Condition (surface module)
 !-----------------------------------------------------------------------
-   nn_fsbc     = 6         !  frequency of surface boundary condition computation
+   nn_fsbc     =  1        !  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.    !  Coupled formulation                       (T => fill namsbc_cpl )
    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")
-   cn_iceflx   = 'linear'  !  AUTO - 
-                           !  ="ave"    - Average flux over all ice categories ("key_lim3")
-                           !  ="linear" - Linear repartition of fluxes over ice categories ("key_lim3")
-   nn_ice_embd = 0         !  AUTO - 
+   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
@@ -167,4 +174,35 @@
 &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 = './' 
 /
 !-----------------------------------------------------------------------
@@ -185,5 +223,4 @@
 &nambbc        !   bottom temperature boundary condition
 !-----------------------------------------------------------------------
-   ln_trabbc   = .false.   !  Apply a geothermal heating at the ocean bottom
 /
 !-----------------------------------------------------------------------
@@ -198,4 +235,6 @@
 &namtra_adv    !   advection scheme for tracer
 !-----------------------------------------------------------------------
+   ln_traadv_tvd    =  .true.   !  TVD scheme
+   ln_traadv_ubs    =  .false.  !  UBS scheme
 /
 !-----------------------------------------------------------------------
@@ -210,7 +249,7 @@
 &namtra_ldf    !   lateral diffusion scheme for tracers
 !----------------------------------------------------------------------------------
-   ln_traldf_grif   =  .true.   !  griffies skew flux formulation       (require "key_ldfslp")
-   ln_traldf_gdia   =  .true.   !  griffies operator strfn diagnostics  (require "key_ldfslp")
-   ln_botmix_grif   =  .true.   !  griffies operator with lateral mixing on bottom (require "key_ldfslp")
+   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")
@@ -220,10 +259,15 @@
 !-----------------------------------------------------------------------
    ln_tradmp   =  .false.  !  add a damping termn (T) or not (F)
-   nn_zdmp     =    1      !  vertical   shape =0    damping throughout the water column
-
 /
 !-----------------------------------------------------------------------
 &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
+/
+!-----------------------------------------------------------------------
+&nam_vvl    !   vertical coordinate options
+!-----------------------------------------------------------------------
 /
 !-----------------------------------------------------------------------
@@ -234,7 +278,9 @@
 &namdyn_hpg    !   Hydrostatic pressure gradient option
 !-----------------------------------------------------------------------
-   ln_dynhpg_imp = .true.  !  time stepping: semi-implicit time scheme  (T)
-   ln_hpg_zps    = .false. !  z-coordinate - partial steps (interpolation)
-   ln_hpg_prj    = .true.  !  s-coordinate (Pressure Jacobian scheme)
+   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)
 /
 !-----------------------------------------------------------------------
@@ -266,30 +312,20 @@
 &nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi)
 !-----------------------------------------------------------------------
-   jpni        =   1       !  jpni   number of processors following i (set automatically if < 1)
-   jpnj        =  29       !  jpnj   number of processors following j (set automatically if < 1)
-   jpnij       =  29       !  jpnij  number of local domains (set automatically if < 1)
+   ln_nnogather=  .false.  !
+   jpni        =   8       !  jpni   number of processors following i (set automatically if < 1)
+   jpnj        =   18      !  jpnj   number of processors following j (set automatically if < 1)
+   jpnij       =  144      !  jpnij  number of local domains (set automatically if < 1)
 /
 !-----------------------------------------------------------------------
 &namctl        !   Control prints & Benchmark
 !----------------------------------------------------------------------- 
+!   ln_ctl      = .true. 
 /
 !-----------------------------------------------------------------------
 &namptr       !   Poleward Transport Diagnostic
 !-----------------------------------------------------------------------
-   ln_diaptr  = .false.     !  Poleward heat and salt transport (T) or not (F)
-   ln_diaznl  = .false.     !  Add zonal means and meridional stream functions
-   ln_subbas  = .false.     !  Atlantic/Pacific/Indian basins computation (T) or not
+   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"
-   ln_ptrcomp = .false.     !  Add decomposition : overturning
-   nn_fptr    =  1          !  Frequency of ptr computation [time step]
-   nn_fwri    =  15         !  AUTO - Frequency of ptr outputs [time step]
-/
-!-----------------------------------------------------------------------
-&nam_asminc   !   assimilation increments                               ('key_asminc')
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_wave   ! External fields from wave model
-!-----------------------------------------------------------------------
 /
 !-----------------------------------------------------------------------
@@ -301,2 +337,15 @@
 !-----------------------------------------------------------------------
 /
+!-----------------------------------------------------------------------
+&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
+!-----------------------------------------------------------------------
+/
Index: CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_lim3_ORCA1_cfg
===================================================================
--- CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_lim3_ORCA1_cfg	(revision 2483)
+++ CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_lim3_ORCA1_cfg	(revision 2489)
@@ -22,15 +22,8 @@
 &namicedyn     !   ice dynamic
 !-----------------------------------------------------------------------
-   ahi0        = 175.e0     !  horizontal eddy diffusivity coefficient for sea-ice [m2/s]
-   telast      = 3600.0     !  timescale for EVP elastic waves
-/
-!-----------------------------------------------------------------------
-&namicetrp     !   ice transport
-!-----------------------------------------------------------------------
 /
 !-----------------------------------------------------------------------
 &namicethd     !   ice thermodynamic
 !-----------------------------------------------------------------------
-   parsub      = 0.0       !  switch for snow sublimation or not - O.M. attention : 0 en couple
 /
 !-----------------------------------------------------------------------
