Index: CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/domain_def.xml
===================================================================
--- CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/domain_def.xml	(revision 2719)
+++ CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/domain_def.xml	(revision 2737)
@@ -5,5 +5,5 @@
 	 <!--   My zoom: example of hand defined zoom   -->
          <domain id="myzoom" zoom_ibegin="10" zoom_jbegin="10" zoom_ni="5" zoom_nj="5" />
-         <domain id="1point" zoom_ibegin="150" zoom_jbegin="150" zoom_ni="1" zoom_nj="1" />
+         <domain id="1point" zoom_ibegin="10" zoom_jbegin="10" zoom_ni="1" zoom_nj="1" />
          <!--   Eq section   -->
          <domain id="EqT" zoom_ibegin="1" zoom_jbegin="0000" zoom_ni="0000" zoom_nj="1" />
Index: CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/field_def.xml
===================================================================
--- CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/field_def.xml	(revision 2719)
+++ CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/field_def.xml	(revision 2737)
@@ -23,4 +23,5 @@
       <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="e3t_0"        long_name="Initial T-cell thickness"   standard_name="ref_cell_thickness"   unit="m"   grid_ref="grid_T_3D"/>
 
          <field id="toce"         long_name="temperature"         standard_name="sea_water_potential_temperature"   unit="degC"     grid_ref="grid_T_3D"/>
@@ -59,5 +60,4 @@
          <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="bn2"          long_name="squared Brunt-Vaisala frequency"                                           unit="s-1"    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" />
 
@@ -174,4 +174,6 @@
       <field_group id="SBC" grid_ref="grid_T_2D" > <!-- time step automaticaly defined based on nn_fsbc -->
          <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="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="1e-3/m2/s" />
          <field id="fmmflx"       long_name="Water flux due to freezing/melting"                                                                                        unit="kg/m2/s"   />
@@ -274,4 +276,6 @@
          <field id="micesalt"     long_name="Mean ice salinity"                                                                                                               unit="1e-3"         />
          <field id="miceage"      long_name="Mean ice age"                                                                                                                    unit="years"        />
+         <field id="alb_ice"      long_name="Mean albedo over sea ice"                                                                                                        unit=""             />
+         <field id="albedo"       long_name="Mean albedo over sea ice and ocean"                                                                                              unit=""             />
 
          <field id="iceage_cat"   long_name="Ice age for categories"                                       unit="days"   axis_ref="ncatice" />
@@ -324,4 +328,5 @@
          <field id="vfxsub"       long_name="snw sublimation"                                              unit="m/day"   />
          <field id="vfxspr"       long_name="snw precipitation on ice"                                     unit="m/day"   />
+         <field id="vfxthin"      long_name="daily thermo ice prod. for thin ice(<20cm) + open water"      unit="m/day"   />
 
          <field id="afxtot"       long_name="area tendency (total)"                                        unit="day-1"   />
@@ -365,4 +370,5 @@
       <field_group id="grid_U"   grid_ref="grid_U_2D">
          <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" />
@@ -400,4 +406,5 @@
       <field_group id="grid_V"   grid_ref="grid_V_2D">
          <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="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" />
@@ -454,4 +461,12 @@
         <!-- avt_tide: available with key_zdftmx -->
         <field id="av_tide"      long_name="tidal vertical diffusivity"   standard_name="ocean_vertical_tracer_diffusivity_due_to_tides"   unit="m2/s" />
+
+       <!-- variables available with key_zdftmx_new -->
+        <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="wave-induced vertical diffusivity"     standard_name="ocean_vertical_tracer_diffusivity_due_to_internal_waves"         unit="m2/s" />
+        <field id="bn2"          long_name="squared Brunt-Vaisala frequency"       standard_name="squared_brunt_vaisala_frequency"                                 unit="s-1"  />
+        <field id="bflx_tmx"     long_name="wave-induced buoyancy flux"            standard_name="buoyancy_flux_due_to_internal_waves"                             unit="W/kg" />
+        <field id="pcmap_tmx"    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_tmx"     long_name="power density available for mixing"    standard_name="power_available_for_mixing_from_breaking_internal_waves"         unit="W/kg" />
 
         <!-- variables available with key_diaar5 -->   
@@ -849,5 +864,8 @@
        <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="Sdenit"      long_name="Nitrate reduction in the sediments"      unit="molN/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="Ironice"     long_name="Iron input/uptake due to sea ice"        unit="mol/m2/s"                        />
        <field id="HYDR"        long_name="Iron input from hydrothemal vents"       unit="mol/m2/s"   grid_ref="grid_T_3D" />
Index: CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/iodef_lim2.xml
===================================================================
--- CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/iodef_lim2.xml	(revision 2719)
+++ CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/iodef_lim2.xml	(revision 2737)
@@ -41,6 +41,6 @@
 	  <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="tosstd"   long_name="sea_surface_temperature_standard_deviation"         operation="average" freq_op="1d" > 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" > 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="mldr10_1"     />
@@ -49,12 +49,4 @@
        
         <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"    />
@@ -68,5 +60,58 @@
 	</file>
 
-        <file id="file3" name_suffix="_bioscalar" description="pisces sms variables" >
+        <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="_bioscalar" description="pisces sms variables" >
           <field field_ref="tdenit"   name="tdenit"   unit="TgN/yr" operation="instant" > tdenit * 14. * 86400. * 365. / 1e12 </field>
           <field field_ref="tnfix"    name="tnfix"    unit="TgN/yr" operation="instant" > tnfix * 14. * 86400. * 365. / 1e12 </field>
@@ -86,12 +131,12 @@
       <file_group id="5d" output_freq="5d"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->   
 	
-	<file id="file4" name_suffix="_grid_T" description="ocean T grid variables" >
+	<file id="file5" name_suffix="_grid_T" description="ocean T grid variables" >
 	  <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="toce"         name="thetao"   long_name="sea_water_potential_temperature"      operation="average" freq_op="5d" > @toce_e3t / @e3t </field>
+	  <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                   operation="average" freq_op="5d" > @soce_e3t / @e3t </field>
 	  <field field_ref="mldr10_1"     />
 	</file>
 
-      <file id="file5" name_suffix="_SBC" description="surface fluxes variables" > <!-- time step automaticaly defined based on nn_fsbc -->
+      <file id="file6" name_suffix="_SBC" description="surface fluxes variables" > <!-- time step automaticaly defined based on nn_fsbc -->
           <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"                                         level="1" />
@@ -115,19 +160,19 @@
        </file>
 
-	<file id="file6" name_suffix="_grid_U" description="ocean U grid variables" >
+	<file id="file7" name_suffix="_grid_U" description="ocean U grid variables" >
 	  <field field_ref="e3u"  />
-	  <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity" operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field>
+	  <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity" operation="average" freq_op="5d" > @uoce_e3u / @e3u </field>
 	  <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
 	  <field field_ref="ahu_bbl"       />
 	</file>
 	
-	<file id="file7" name_suffix="_grid_V" description="ocean V grid variables" >
+	<file id="file8" name_suffix="_grid_V" description="ocean V grid variables" >
 	  <field field_ref="e3v"  />
-	  <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity" operation="instant" freq_op="5d" > @voce_e3v / @e3v </field>
+	  <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity" operation="average" freq_op="5d" > @voce_e3v / @e3v </field>
 	  <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />
 	  <field field_ref="ahv_bbl"       />
 	</file>
 	
-	<file id="file8" name_suffix="_grid_W" description="ocean W grid variables" >
+	<file id="file9" name_suffix="_grid_W" description="ocean W grid variables" >
 	  <field field_ref="e3w"  />
 	  <field field_ref="woce"         name="wo"     />
@@ -136,25 +181,4 @@
 	</file>
 
-        <file id="file22" name_suffix="_ptrc_T" description="pisces sms variables" >
-          <field field_ref="DIC"               operation="instant" freq_op="5d" > @DIC_E3T / @e3t </field>
-          <field field_ref="Alkalini"          operation="instant" freq_op="5d" > @Alkalini_E3T / @e3t </field>
-          <field field_ref="O2"                operation="instant" freq_op="5d" > @O2_E3T / @e3t </field>
-          <field field_ref="PO4"               operation="instant" freq_op="5d" > @PO4_E3T / @e3t </field>
-          <field field_ref="Si"                operation="instant" freq_op="5d" > @Si_E3T / @e3t </field>
-          <field field_ref="Fer"               operation="instant" freq_op="5d" > @Fer_E3T / @e3t </field>
-          <field field_ref="NO3"               operation="instant" freq_op="5d" > @NO3_E3T / @e3t </field>
-	  <field field_ref="NCHL"  name="CHLT" long_name="Total surface Concentration" operation="instant" freq_op="5d"  > ( @NCHL_E3T + @DCHL_E3T ) / @e3t </field>
-       </file>
-
-       <file id="file23" name_suffix="_diad_T" description="additional pisces diagnostics" >
-         <field field_ref="Cflx"       />
-         <field field_ref="Dpco2"       />
-         <field field_ref="PAR"      />
-         <field field_ref="PARDM"      />
-         <field field_ref="TPP"    />
-         <field field_ref="INTPP"   />
-         <field field_ref="EPC100"   />
-       </file>
-
   </file_group> 
 
@@ -162,5 +186,5 @@
       <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."> <!-- real monthly files -->
 
-        <file id="file9" name_suffix="_grid_T" >
+        <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"                                          />
@@ -169,9 +193,8 @@
           <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="toce"         name="thetao"   long_name="sea_water_potential_temperature"   operation="average" 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="soce"         name="so"       long_name="sea_water_salinity"                operation="average" freq_op="1mo" > @soce_e3t / @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" />
@@ -195,19 +218,19 @@
         </file>
 
-	<file id="file10" name_suffix="_grid_U" description="ocean U grid variables" >
+	<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="1mo" > @uoce_e3u / @e3u </field>
+	  <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity" operation="average" freq_op="1mo" > @uoce_e3u / @e3u </field>
 	  <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
 	</file>
 	
-	<file id="file11" name_suffix="_grid_V" description="ocean V grid variables" >
+	<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="1mo" > @voce_e3v / @e3v </field>
+	  <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity" operation="average" freq_op="1mo" > @voce_e3v / @e3v </field>
 	  <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />
 	</file>
 	
-	<file id="file12" name_suffix="_grid_W" description="ocean W grid variables" >
+	<file id="file13" name_suffix="_grid_W" description="ocean W grid variables" >
 	  <field field_ref="e3w"  />
 	  <field field_ref="woce"         name="wo"     />
@@ -215,38 +238,41 @@
 	</file>
 
-	<file id="file13" 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="iiceconc"          name="siconc"  />
-          <field field_ref="iceprod_cea"  name="sip" />
-          <field field_ref="ist_ipa"    />
-          <field field_ref="uice_ipa"   />
-          <field field_ref="vice_ipa"   />
-          <field field_ref="utau_ice"   />
-          <field field_ref="vtau_ice"   />
-          <field field_ref="qsr_io_cea" />
-          <field field_ref="qns_io_cea" />
-          <field field_ref="snowpre"    />
-	</file>
-
-        <file id="file14" name_suffix="_ptrc_T" description="pisces sms variables" >
-          <field field_ref="DIC"               operation="instant" freq_op="1mo" > @DIC_E3T / @e3t </field>
-          <field field_ref="Alkalini"          operation="instant" freq_op="1mo" > @Alkalini_E3T / @e3t </field>
-          <field field_ref="O2"                operation="instant" freq_op="1mo" > @O2_E3T / @e3t </field>
-          <field field_ref="PO4"               operation="instant" freq_op="1mo" > @PO4_E3T / @e3t </field>
-          <field field_ref="Si"                operation="instant" freq_op="1mo" > @Si_E3T / @e3t </field>
-          <field field_ref="Fer"               operation="instant" freq_op="1mo" > @Fer_E3T / @e3t </field>
-          <field field_ref="NO3"               operation="instant" freq_op="1mo" > @NO3_E3T / @e3t </field>
-	  <field field_ref="NCHL"  name="CHLT" long_name="Total surface Concentration" operation="instant" freq_op="1mo"  > ( @NCHL_E3T + @DCHL_E3T ) / @e3t </field>
+
+	<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="iiceconc"      name="siconc"  />
+          <field field_ref="iceprod_cea"   name="sip" />
+          <field field_ref="ist_ipa"       name="ist_ipa"/>
+          <field field_ref="uice_ipa"      name="uice_ipa" />
+          <field field_ref="vice_ipa"      name="vice_ipa"  />
+          <field field_ref="utau_ice"      name="utau_ice"  />
+          <field field_ref="vtau_ice"      name="vtau_ice"  />
+          <field field_ref="qsr_io_cea"    name="qsr_io_cea" />
+          <field field_ref="qns_io_cea"    name="qns_io_cea" />
+          <field field_ref="snowpre"       name="snowpre" />
+	</file>
+
+
+        <file id="file15" name_suffix="_ptrc_T" description="pisces sms variables" >
+          <field field_ref="DIC"       name="DIC"      operation="average" freq_op="1mo" > @DIC_E3T / @e3t </field>
+          <field field_ref="Alkalini"  name="Alkalini" operation="average" freq_op="1mo" > @Alkalini_E3T / @e3t </field>
+          <field field_ref="O2"        name="O2"       operation="average" freq_op="1mo" > @O2_E3T / @e3t </field>
+          <field field_ref="PO4"       name="PO4"      operation="average" freq_op="1mo" > @PO4_E3T / @e3t </field>
+          <field field_ref="Si"        name="Si"       operation="average" freq_op="1mo" > @Si_E3T / @e3t </field>
+          <field field_ref="Fer"       name="Fer"      operation="average" freq_op="1mo" > @Fer_E3T / @e3t </field>
+          <field field_ref="NCHL"      name="NCHL"     operation="average" freq_op="1mo" > @NCHL_E3T / @e3t </field>
+          <field field_ref="DCHL"      name="DCHL"     operation="average" freq_op="1mo" > @DCHL_E3T / @e3t </field>
+          <field field_ref="NO3"       name="NO3"      operation="average" freq_op="1mo" > @NO3_E3T / @e3t </field>
        </file>
 
-       <file id="file15" name_suffix="_diad_T" description="additional pisces diagnostics" >
-         <field field_ref="Cflx"       />
-         <field field_ref="Dpco2"       />
-         <field field_ref="PAR"      />
-         <field field_ref="PARDM"      />
-         <field field_ref="TPP"    />
-         <field field_ref="INTPP"   />
-         <field field_ref="EPC100"   />
+       <file id="file16" name_suffix="_diad_T" description="additional pisces diagnostics" >
+         <field field_ref="Cflx"      name="Cflx"    />
+         <field field_ref="Dpco2"     name="Dpco2"   />
+         <field field_ref="PAR"       name="PAR"   />
+         <field field_ref="PARDM"     name="PARDM"  />
+         <field field_ref="TPP"       name="TPP"  />
+         <field field_ref="INTPP"     name="INTPP"  />
+         <field field_ref="EPC100"    name="EPC100"  />
        </file>
 
@@ -261,11 +287,11 @@
       <file_group id="1y"  output_freq="1y" output_level="10" enabled=".TRUE."> <!-- real yearly files -->
 
-    <file id="file16" name_suffix="_grid_T" description="ocean T grid variables" >
+    <file id="file17" 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="toce"         name="thetao"   long_name="sea_water_potential_temperature"      operation="average" freq_op="1y" > @toce_e3t / @e3t </field>        
+      <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                   operation="average" freq_op="1y" > @soce_e3t / @e3t </field>         
       <field field_ref="sst2"         name="tossq"    long_name="square_of_sea_surface_temperature"             />
       <field field_ref="ssh2"         name="zossq"    long_name="square_of_sea_surface_height_above_geoid"      />
@@ -295,21 +321,21 @@
      </file>
 
-    <file id="file17" name_suffix="_grid_U" description="ocean U grid variables" >
+    <file id="file18" 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="uoce"         name="uo"      long_name="sea_water_x_velocity"      operation="average" freq_op="1y" > @uoce_e3u / @e3u </field> 
       <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
       <field field_ref="uocetr_eff"   name="uocetr_eff"  />
     </file>
 
-    <file id="file18" name_suffix="_grid_V" description="ocean V grid variables" >
+    <file id="file19" 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="voce"         name="vo"      long_name="sea_water_y_velocity"     operation="average" freq_op="1y" > @voce_e3v / @e3v </field>
       <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />
       <field field_ref="vocetr_eff"   name="vocetr_eff"  />
     </file>
 
-     <file id="file19" name_suffix="_grid_W" description="ocean W grid variables" >
+     <file id="file20" name_suffix="_grid_W" description="ocean W grid variables" >
       <field field_ref="e3w"  />
       <field field_ref="woce"         name="wo"      long_name="ocean vertical velocity"         />
@@ -318,58 +344,57 @@
     </file>
 
-       <file id="file20" name_suffix="_ptrc_T" description="pisces sms variables" >
-          <field field_ref="DIC"      operation="instant" freq_op="1y" > @DIC_E3T / @e3t </field>
-          <field field_ref="Alkalini" operation="instant" freq_op="1y" > @Alkalini_E3T / @e3t </field>
-          <field field_ref="O2"       operation="instant" freq_op="1y" > @O2_E3T / @e3t </field>
-          <field field_ref="CaCO3"    operation="instant" freq_op="1y" > @CaCO3_E3T / @e3t </field>
-          <field field_ref="PO4"      operation="instant" freq_op="1y" > @PO4_E3T / @e3t </field>
-          <field field_ref="POC"      operation="instant" freq_op="1y" > @POC_E3T / @e3t </field>
-          <field field_ref="Si"       operation="instant" freq_op="1y" > @Si_E3T / @e3t </field>
-          <field field_ref="PHY"      operation="instant" freq_op="1y" > @PHY_E3T / @e3t </field>
-          <field field_ref="ZOO"      operation="instant" freq_op="1y" > @ZOO_E3T / @e3t </field>
-          <field field_ref="DOC"      operation="instant" freq_op="1y" > @DOC_E3T / @e3t </field>
-          <field field_ref="PHY2"    operation="instant" freq_op="1y" > @PHY2_E3T / @e3t </field>
-          <field field_ref="ZOO2"     operation="instant" freq_op="1y" > @ZOO2_E3T / @e3t </field>
-          <field field_ref="DSi"      operation="instant" freq_op="1y" > @DSi_E3T / @e3t </field>
-          <field field_ref="Fer"     operation="instant" freq_op="1y" > @Fer_E3T / @e3t </field>
-          <field field_ref="BFe"     operation="instant" freq_op="1y" > @BFe_E3T / @e3t </field>
-          <field field_ref="GOC"    operation="instant" freq_op="1y" > @GOC_E3T / @e3t </field>
-          <field field_ref="SFe"    operation="instant" freq_op="1y" > @SFe_E3T / @e3t </field>
-          <field field_ref="DFe"     operation="instant" freq_op="1y" > @DFe_E3T / @e3t </field>
-          <field field_ref="GSi"   operation="instant" freq_op="1y" > @GSi_E3T / @e3t </field>
-          <field field_ref="NFe"    operation="instant" freq_op="1y" > @NFe_E3T / @e3t </field>
-          <field field_ref="NCHL"   operation="instant" freq_op="1y" > @NCHL_E3T / @e3t </field>
-          <field field_ref="DCHL" operation="instant" freq_op="1y" > @DCHL_E3T / @e3t </field>
-          <field field_ref="NO3"  operation="instant" freq_op="1y" > @NO3_E3T / @e3t </field>
-          <field field_ref="NH4"  operation="instant" freq_op="1y" > @NH4_E3T / @e3t </field>
-	  <field field_ref="NCHL"  name="CHLT" long_name="Total surface Concentration" operation="instant" freq_op="1y"  > ( @NCHL_E3T + @DCHL_E3T ) / @e3t </field>
+       <file id="file21" name_suffix="_ptrc_T" description="pisces sms variables" >
+          <field field_ref="DIC"       name="DIC"      operation="average" freq_op="1y" > @DIC_E3T / @e3t </field>
+          <field field_ref="Alkalini"  name="Alkalini" operation="average" freq_op="1y" > @Alkalini_E3T / @e3t </field>
+          <field field_ref="O2"        name="O2"       operation="average" freq_op="1y" > @O2_E3T / @e3t </field>
+          <field field_ref="CaCO3"     name="CaCO3"    operation="average" freq_op="1y" > @CaCO3_E3T / @e3t </field>
+          <field field_ref="PO4"       name="PO4"      operation="average" freq_op="1y" > @PO4_E3T / @e3t </field>
+          <field field_ref="POC"       name="POC"      operation="average" freq_op="1y" > @POC_E3T / @e3t </field>
+          <field field_ref="Si"        name="Si"       operation="average" freq_op="1y" > @Si_E3T / @e3t </field>
+          <field field_ref="PHY"       name="PHY"      operation="average" freq_op="1y" > @PHY_E3T / @e3t </field>
+          <field field_ref="ZOO"       name="ZOO"      operation="average" freq_op="1y" > @ZOO_E3T / @e3t </field>
+          <field field_ref="DOC"       name="DOC"      operation="average" freq_op="1y" > @DOC_E3T / @e3t </field>
+          <field field_ref="PHY2"      name="PHY2"     operation="average" freq_op="1y" > @PHY2_E3T / @e3t </field>
+          <field field_ref="ZOO2"      name="ZOO2"     operation="average" freq_op="1y" > @ZOO2_E3T / @e3t </field>
+          <field field_ref="DSi"       name="DSi"      operation="average" freq_op="1y" > @DSi_E3T / @e3t </field>
+          <field field_ref="Fer"       name="Fer"      operation="average" freq_op="1y" > @Fer_E3T / @e3t </field>
+          <field field_ref="BFe"       name="BFe"      operation="average" freq_op="1y" > @BFe_E3T / @e3t </field>
+          <field field_ref="GOC"       name="GOC"      operation="average" freq_op="1y" > @GOC_E3T / @e3t </field>
+          <field field_ref="SFe"       name="SFe"      operation="average" freq_op="1y" > @SFe_E3T / @e3t </field>
+          <field field_ref="DFe"       name="DFe"      operation="average" freq_op="1y" > @DFe_E3T / @e3t </field>
+          <field field_ref="GSi"       name="GSi"      operation="average" freq_op="1y" > @GSi_E3T / @e3t </field>
+          <field field_ref="NFe"       name="NFe"      operation="average" freq_op="1y" > @NFe_E3T / @e3t </field>
+          <field field_ref="NCHL"      name="NCHL"     operation="average" freq_op="1y" > @NCHL_E3T / @e3t </field>
+          <field field_ref="DCHL"      name="DCHL"     operation="average" freq_op="1y" > @DCHL_E3T / @e3t </field>
+          <field field_ref="NO3"       name="NO3"      operation="average" freq_op="1y" > @NO3_E3T / @e3t </field>
+          <field field_ref="NH4"       name="NH4"      operation="average" freq_op="1y" > @NH4_E3T / @e3t </field>
     </file>
 
-   <file id="file21" name_suffix="_diad_T" description="additional pisces diagnostics" >
-       <field field_ref="PH"       />
-       <field field_ref="PAR"      />
-       <field field_ref="PARDM"      />
-       <field field_ref="Cflx"     />
-        <field field_ref="Oflx"     />
-       <field field_ref="Dpco2"    />
-       <field field_ref="Dpo2"    />
-        <field field_ref="Heup"     />
-        <field field_ref="Irondep"  />
-        <field field_ref="Ironsed"  />
-        <field field_ref="Nfix"     />
-        <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="TPP"   />
-       <field field_ref="TPNEW"   />
-        <field field_ref="EPC100"   />
-        <field field_ref="EPFE100"  />
-        <field field_ref="EPSI100"  />
-        <field field_ref="EPCAL100" />
-        <field field_ref="xfracal"  />
-        <field field_ref="GRAZ1"  name="GRAZT" operation="instant" freq_op="1y" > @GRAZ1 + @GRAZ2 </field> 
+   <file id="file22" name_suffix="_diad_T" description="additional pisces diagnostics" >
+       <field field_ref="PH"         name="PH" />
+       <field field_ref="PAR"        name="PAR"   />
+       <field field_ref="PARDM"      name="PARDM"   />
+       <field field_ref="Cflx"       name="Cflx"  />
+        <field field_ref="Oflx"      name="Oflx"  />
+       <field field_ref="Dpco2"      name="Dpco2"   />
+       <field field_ref="Dpo2"       name="Dpo2"   />
+        <field field_ref="Heup"      name="Heup"  />
+        <field field_ref="Irondep"   name="Irondep"  />
+        <field field_ref="Ironsed"   name="Ironsed"  />
+        <field field_ref="Nfix"      name="Nfix"  />
+        <field field_ref="LNnut"     name="LNnut"  />
+        <field field_ref="LDnut"     name="PH"  />
+        <field field_ref="LNFe"      name="LNFe"  />
+        <field field_ref="LDFe"      name="LDFe"  />
+        <field field_ref="LNlight"   name="LNlight"  />
+        <field field_ref="LDlight"   name="LDlight"  />
+        <field field_ref="TPP"       name="TPP"  />
+       <field field_ref="TPNEW"      name="TPNEW"  />
+        <field field_ref="EPC100"    name="EPC100"  />
+        <field field_ref="EPFE100"   name="EPFE100"  />
+        <field field_ref="EPSI100"   name="EPSI100"  />
+        <field field_ref="EPCAL100"  name="EPCAL100"  />
+        <field field_ref="xfracal"   name="xfracal"  />
+        <field field_ref="GRAZ1"     name="GRAZT" operation="average" freq_op="1y" > @GRAZ1 + @GRAZ2 </field> 
     </file>
 
Index: CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/iodef_lim3.xml
===================================================================
--- CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/iodef_lim3.xml	(revision 2719)
+++ CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/iodef_lim3.xml	(revision 2737)
@@ -41,6 +41,6 @@
 	  <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="tosstd"   long_name="sea_surface_temperature_standard_deviation"         operation="average" freq_op="1d" > 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" > 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="mldr10_1"     />
@@ -141,6 +141,6 @@
 	<file id="file5" name_suffix="_grid_T" description="ocean T grid variables" >
 	  <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="toce"         name="thetao"   long_name="sea_water_potential_temperature"      operation="average" freq_op="5d" > @toce_e3t / @e3t </field>
+	  <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                   operation="average" freq_op="5d" > @soce_e3t / @e3t </field>
 	  <field field_ref="mldr10_1"     />
 	</file>
@@ -170,5 +170,5 @@
 	<file id="file7" name_suffix="_grid_U" description="ocean U grid variables" >
 	  <field field_ref="e3u"  />
-	  <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity" operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field>
+	  <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity" operation="average" freq_op="5d" > @uoce_e3u / @e3u </field>
 	  <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
 	  <field field_ref="ahu_bbl"       />
@@ -177,5 +177,5 @@
 	<file id="file8" name_suffix="_grid_V" description="ocean V grid variables" >
 	  <field field_ref="e3v"  />
-	  <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity" operation="instant" freq_op="5d" > @voce_e3v / @e3v </field>
+	  <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity" operation="average" freq_op="5d" > @voce_e3v / @e3v </field>
 	  <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />
 	  <field field_ref="ahv_bbl"       />
@@ -201,9 +201,8 @@
           <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="toce"         name="thetao"   long_name="sea_water_potential_temperature"   operation="average" 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="soce"         name="so"       long_name="sea_water_salinity"                operation="average" freq_op="1mo" > @soce_e3t / @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" />
@@ -230,5 +229,5 @@
 	  <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="1mo" > @uoce_e3u / @e3u </field>
+	  <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity" operation="average" freq_op="1mo" > @uoce_e3u / @e3u </field>
 	  <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
 	</file>
@@ -237,5 +236,5 @@
 	  <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="1mo" > @voce_e3v / @e3v </field>
+	  <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity" operation="average" freq_op="1mo" > @voce_e3v / @e3v </field>
 	  <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />
 	</file>
@@ -334,22 +333,23 @@
 
         <file id="file15" name_suffix="_ptrc_T" description="pisces sms variables" >
-          <field field_ref="DIC"               operation="instant" freq_op="1mo" > @DIC_E3T / @e3t </field>
-          <field field_ref="Alkalini"          operation="instant" freq_op="1mo" > @Alkalini_E3T / @e3t </field>
-          <field field_ref="O2"                operation="instant" freq_op="1mo" > @O2_E3T / @e3t </field>
-          <field field_ref="PO4"               operation="instant" freq_op="1mo" > @PO4_E3T / @e3t </field>
-          <field field_ref="Si"                operation="instant" freq_op="1mo" > @Si_E3T / @e3t </field>
-          <field field_ref="Fer"               operation="instant" freq_op="1mo" > @Fer_E3T / @e3t </field>
-          <field field_ref="NO3"               operation="instant" freq_op="1mo" > @NO3_E3T / @e3t </field>
-	  <field field_ref="NCHL"  name="CHLT" operation="instant" freq_op="1mo"  > ( @NCHL_E3T + @DCHL_E3T ) / @e3t </field>
+          <field field_ref="DIC"       name="DIC"      operation="average" freq_op="1mo" > @DIC_E3T / @e3t </field>
+          <field field_ref="Alkalini"  name="Alkalini" operation="average" freq_op="1mo" > @Alkalini_E3T / @e3t </field>
+          <field field_ref="O2"        name="O2"       operation="average" freq_op="1mo" > @O2_E3T / @e3t </field>
+          <field field_ref="PO4"       name="PO4"      operation="average" freq_op="1mo" > @PO4_E3T / @e3t </field>
+          <field field_ref="Si"        name="Si"       operation="average" freq_op="1mo" > @Si_E3T / @e3t </field>
+          <field field_ref="Fer"       name="Fer"      operation="average" freq_op="1mo" > @Fer_E3T / @e3t </field>
+          <field field_ref="NCHL"      name="NCHL"     operation="average" freq_op="1mo" > @NCHL_E3T / @e3t </field>
+          <field field_ref="DCHL"      name="DCHL"     operation="average" freq_op="1mo" > @DCHL_E3T / @e3t </field>
+          <field field_ref="NO3"       name="NO3"      operation="average" freq_op="1mo" > @NO3_E3T / @e3t </field>
        </file>
 
        <file id="file16" name_suffix="_diad_T" description="additional pisces diagnostics" >
-         <field field_ref="Cflx"       />
-         <field field_ref="Dpco2"       />
-         <field field_ref="PAR"      />
-         <field field_ref="PARDM"      />
-         <field field_ref="TPP"    />
-         <field field_ref="INTPP"   />
-         <field field_ref="EPC100"   />
+         <field field_ref="Cflx"      name="Cflx"    />
+         <field field_ref="Dpco2"     name="Dpco2"   />
+         <field field_ref="PAR"       name="PAR"   />
+         <field field_ref="PARDM"     name="PARDM"  />
+         <field field_ref="TPP"       name="TPP"  />
+         <field field_ref="INTPP"     name="INTPP"  />
+         <field field_ref="EPC100"    name="EPC100"  />
        </file>
 
@@ -369,6 +369,6 @@
       <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="toce"         name="thetao"   long_name="sea_water_potential_temperature"      operation="average" freq_op="1y" > @toce_e3t / @e3t </field>        
+      <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                   operation="average" freq_op="1y" > @soce_e3t / @e3t </field>         
       <field field_ref="sst2"         name="tossq"    long_name="square_of_sea_surface_temperature"             />
       <field field_ref="ssh2"         name="zossq"    long_name="square_of_sea_surface_height_above_geoid"      />
@@ -401,5 +401,5 @@
       <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="uoce"         name="uo"      long_name="sea_water_x_velocity"      operation="average" freq_op="1y" > @uoce_e3u / @e3u </field> 
       <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
       <field field_ref="uocetr_eff"   name="uocetr_eff"  />
@@ -409,5 +409,5 @@
       <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="voce"         name="vo"      long_name="sea_water_y_velocity"     operation="average" freq_op="1y" > @voce_e3v / @e3v </field>
       <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />
       <field field_ref="vocetr_eff"   name="vocetr_eff"  />
@@ -422,57 +422,56 @@
 
        <file id="file21" name_suffix="_ptrc_T" description="pisces sms variables" >
-          <field field_ref="DIC"      operation="instant" freq_op="1y" > @DIC_E3T / @e3t </field>
-          <field field_ref="Alkalini" operation="instant" freq_op="1y" > @Alkalini_E3T / @e3t </field>
-          <field field_ref="O2"       operation="instant" freq_op="1y" > @O2_E3T / @e3t </field>
-          <field field_ref="CaCO3"    operation="instant" freq_op="1y" > @CaCO3_E3T / @e3t </field>
-          <field field_ref="PO4"      operation="instant" freq_op="1y" > @PO4_E3T / @e3t </field>
-          <field field_ref="POC"      operation="instant" freq_op="1y" > @POC_E3T / @e3t </field>
-          <field field_ref="Si"       operation="instant" freq_op="1y" > @Si_E3T / @e3t </field>
-          <field field_ref="PHY"      operation="instant" freq_op="1y" > @PHY_E3T / @e3t </field>
-          <field field_ref="ZOO"      operation="instant" freq_op="1y" > @ZOO_E3T / @e3t </field>
-          <field field_ref="DOC"      operation="instant" freq_op="1y" > @DOC_E3T / @e3t </field>
-          <field field_ref="PHY2"    operation="instant" freq_op="1y" > @PHY2_E3T / @e3t </field>
-          <field field_ref="ZOO2"     operation="instant" freq_op="1y" > @ZOO2_E3T / @e3t </field>
-          <field field_ref="DSi"      operation="instant" freq_op="1y" > @DSi_E3T / @e3t </field>
-          <field field_ref="Fer"     operation="instant" freq_op="1y" > @Fer_E3T / @e3t </field>
-          <field field_ref="BFe"     operation="instant" freq_op="1y" > @BFe_E3T / @e3t </field>
-          <field field_ref="GOC"    operation="instant" freq_op="1y" > @GOC_E3T / @e3t </field>
-          <field field_ref="SFe"    operation="instant" freq_op="1y" > @SFe_E3T / @e3t </field>
-          <field field_ref="DFe"     operation="instant" freq_op="1y" > @DFe_E3T / @e3t </field>
-          <field field_ref="GSi"   operation="instant" freq_op="1y" > @GSi_E3T / @e3t </field>
-          <field field_ref="NFe"    operation="instant" freq_op="1y" > @NFe_E3T / @e3t </field>
-          <field field_ref="NCHL"   operation="instant" freq_op="1y" > @NCHL_E3T / @e3t </field>
-          <field field_ref="DCHL" operation="instant" freq_op="1y" > @DCHL_E3T / @e3t </field>
-          <field field_ref="NO3"  operation="instant" freq_op="1y" > @NO3_E3T / @e3t </field>
-          <field field_ref="NH4"  operation="instant" freq_op="1y" > @NH4_E3T / @e3t </field>
-	  <field field_ref="NCHL"  name="CHLT" operation="instant" freq_op="1y"  > ( @NCHL_E3T + @DCHL_E3T ) / @e3t </field>
+          <field field_ref="DIC"       name="DIC"      operation="average" freq_op="1y" > @DIC_E3T / @e3t </field>
+          <field field_ref="Alkalini"  name="Alkalini" operation="average" freq_op="1y" > @Alkalini_E3T / @e3t </field>
+          <field field_ref="O2"        name="O2"       operation="average" freq_op="1y" > @O2_E3T / @e3t </field>
+          <field field_ref="CaCO3"     name="CaCO3"    operation="average" freq_op="1y" > @CaCO3_E3T / @e3t </field>
+          <field field_ref="PO4"       name="PO4"      operation="average" freq_op="1y" > @PO4_E3T / @e3t </field>
+          <field field_ref="POC"       name="POC"      operation="average" freq_op="1y" > @POC_E3T / @e3t </field>
+          <field field_ref="Si"        name="Si"       operation="average" freq_op="1y" > @Si_E3T / @e3t </field>
+          <field field_ref="PHY"       name="PHY"      operation="average" freq_op="1y" > @PHY_E3T / @e3t </field>
+          <field field_ref="ZOO"       name="ZOO"      operation="average" freq_op="1y" > @ZOO_E3T / @e3t </field>
+          <field field_ref="DOC"       name="DOC"      operation="average" freq_op="1y" > @DOC_E3T / @e3t </field>
+          <field field_ref="PHY2"      name="PHY2"     operation="average" freq_op="1y" > @PHY2_E3T / @e3t </field>
+          <field field_ref="ZOO2"      name="ZOO2"     operation="average" freq_op="1y" > @ZOO2_E3T / @e3t </field>
+          <field field_ref="DSi"       name="DSi"      operation="average" freq_op="1y" > @DSi_E3T / @e3t </field>
+          <field field_ref="Fer"       name="Fer"      operation="average" freq_op="1y" > @Fer_E3T / @e3t </field>
+          <field field_ref="BFe"       name="BFe"      operation="average" freq_op="1y" > @BFe_E3T / @e3t </field>
+          <field field_ref="GOC"       name="GOC"      operation="average" freq_op="1y" > @GOC_E3T / @e3t </field>
+          <field field_ref="SFe"       name="SFe"      operation="average" freq_op="1y" > @SFe_E3T / @e3t </field>
+          <field field_ref="DFe"       name="DFe"      operation="average" freq_op="1y" > @DFe_E3T / @e3t </field>
+          <field field_ref="GSi"       name="GSi"      operation="average" freq_op="1y" > @GSi_E3T / @e3t </field>
+          <field field_ref="NFe"       name="NFe"      operation="average" freq_op="1y" > @NFe_E3T / @e3t </field>
+          <field field_ref="NCHL"      name="NCHL"     operation="average" freq_op="1y" > @NCHL_E3T / @e3t </field>
+          <field field_ref="DCHL"      name="DCHL"     operation="average" freq_op="1y" > @DCHL_E3T / @e3t </field>
+          <field field_ref="NO3"       name="NO3"      operation="average" freq_op="1y" > @NO3_E3T / @e3t </field>
+          <field field_ref="NH4"       name="NH4"      operation="average" freq_op="1y" > @NH4_E3T / @e3t </field>
     </file>
 
    <file id="file22" name_suffix="_diad_T" description="additional pisces diagnostics" >
-       <field field_ref="PH"       />
-       <field field_ref="PAR"      />
-       <field field_ref="PARDM"      />
-       <field field_ref="Cflx"     />
-        <field field_ref="Oflx"     />
-       <field field_ref="Dpco2"    />
-       <field field_ref="Dpo2"    />
-        <field field_ref="Heup"     />
-        <field field_ref="Irondep"  />
-        <field field_ref="Ironsed"  />
-        <field field_ref="Nfix"     />
-        <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="TPP"   />
-       <field field_ref="TPNEW"   />
-        <field field_ref="EPC100"   />
-        <field field_ref="EPFE100"  />
-        <field field_ref="EPSI100"  />
-        <field field_ref="EPCAL100" />
-        <field field_ref="xfracal"  />
-        <field field_ref="GRAZ1"  name="GRAZT" operation="instant" freq_op="1y" > @GRAZ1 + @GRAZ2 </field> 
+       <field field_ref="PH"         name="PH" />
+       <field field_ref="PAR"        name="PAR"   />
+       <field field_ref="PARDM"      name="PARDM"   />
+       <field field_ref="Cflx"       name="Cflx"  />
+        <field field_ref="Oflx"      name="Oflx"  />
+       <field field_ref="Dpco2"      name="Dpco2"   />
+       <field field_ref="Dpo2"       name="Dpo2"   />
+        <field field_ref="Heup"      name="Heup"  />
+        <field field_ref="Irondep"   name="Irondep"  />
+        <field field_ref="Ironsed"   name="Ironsed"  />
+        <field field_ref="Nfix"      name="Nfix"  />
+        <field field_ref="LNnut"     name="LNnut"  />
+        <field field_ref="LDnut"     name="PH"  />
+        <field field_ref="LNFe"      name="LNFe"  />
+        <field field_ref="LDFe"      name="LDFe"  />
+        <field field_ref="LNlight"   name="LNlight"  />
+        <field field_ref="LDlight"   name="LDlight"  />
+        <field field_ref="TPP"       name="TPP"  />
+       <field field_ref="TPNEW"      name="TPNEW"  />
+        <field field_ref="EPC100"    name="EPC100"  />
+        <field field_ref="EPFE100"   name="EPFE100"  />
+        <field field_ref="EPSI100"   name="EPSI100"  />
+        <field field_ref="EPCAL100"  name="EPCAL100"  />
+        <field field_ref="xfracal"   name="xfracal"  />
+        <field field_ref="GRAZ1"     name="GRAZT" operation="average" freq_op="1y" > @GRAZ1 + @GRAZ2 </field> 
     </file>
 
Index: CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_ORCA1ia_cfg
===================================================================
--- CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_ORCA1ia_cfg	(revision 2719)
+++ CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_ORCA1ia_cfg	(revision 2737)
@@ -94,4 +94,6 @@
 !-----------------------------------------------------------------------
    nn_fsbc     = 3         !  frequency of surface boundary condition computation
+   nn_isf      = 3         !  ice shelf melting/freezing                (/=0 => fill namsbc_isf)
+                           !  3 = rnf file for isf
    nn_ice_embd = 1         ! embedded sea-ice (full salt and mass exchanges and pressure)
    ln_dm2dc    = .true.    !  Daily mean to diurnal cycle on short wave
@@ -123,6 +125,6 @@
 !              !  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_R1_runoff_clim_v1.0_nomask',        -1         , 'sorunoff',   .true.     , .true. , 'yearly'  , ''       , ''       , ''
-   sn_cnf      = 'eORCA_R1_runoff_clim_v1.0_nomask',         0         , 'socoeff' ,   .false.    , .true. , 'yearly'  , ''       , ''       , ''
+   sn_rnf      = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc',        -1         , 'sorunoff',   .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'  , ''       , ''       , ''
@@ -137,4 +139,14 @@
    rn_dep_max = 150.         !  depth over which runoffs is spread ( ln_rnf_depth_ini = .true )
    nn_rnf_depth_file = 1     ! 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'  ,  ''      ,   ''
 /
 !-----------------------------------------------------------------------
Index: CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_lim3_ref
===================================================================
--- CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_lim3_ref	(revision 2719)
+++ CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_lim3_ref	(revision 2737)
@@ -21,5 +21,6 @@
    cn_icerst_outdir = "."          !  directory in which to write output ice restarts
    ln_limdyn     = .true.          !  ice dynamics (T) or thermodynamics only (F)
-   rn_amax       = 0.999           !  maximum tolerated ice concentration 
+   rn_amax_n     = 0.999           !  maximum tolerated ice concentration NH
+   rn_amax_s     = 0.999           !  maximum tolerated ice concentration SH
    ln_limdiahsb  = .false.         !  check the heat and salt budgets (T) or not (F)
    ln_limdiaout  = .true.          !  output the heat and salt budgets (T) or not (F)
@@ -85,5 +86,5 @@
    rn_hnewice  = 0.1               !  thickness for new ice formation in open water (m)
    ln_frazil   = .false.           !  use frazil ice collection thickness as a function of wind (T) or not (F)
-   rn_maxfrazb = 0.0               !  maximum fraction of frazil ice collecting at the ice base
+   rn_maxfrazb = 1.0               !  maximum fraction of frazil ice collecting at the ice base
    rn_vfrazb   = 0.417             !  thresold drift speed for frazil ice collecting at the ice bottom (m/s)
    rn_Cfrazb   = 5.0               !  squeezing coefficient for frazil ice collecting at the ice bottom
Index: CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_ref
===================================================================
--- CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_ref	(revision 2719)
+++ CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_ref	(revision 2737)
@@ -5,9 +5,9 @@
 !!                                    namsbc_cpl, namtra_qsr, namsbc_rnf,
 !!                                    namsbc_apr, namsbc_ssr, namsbc_alb)
-!!              4 - lateral boundary (namlbc, namcla, namobc, namagrif, nambdy, nambdy_tide)
+!!              4 - lateral boundary (namlbc, namcla, namagrif, nambdy, nambdy_tide)
 !!              5 - bottom  boundary (nambfr, nambbc, nambbl)
 !!              6 - Tracer           (nameos, namtra_adv, namtra_ldf, namtra_dmp)
 !!              7 - dynamics         (namdyn_adv, namdyn_vor, namdyn_hpg, namdyn_spg, namdyn_ldf)
-!!              8 - Verical physics  (namzdf, namzdf_ric, namzdf_tke, namzdf_kpp, namzdf_ddm, namzdf_tmx)
+!!              8 - Verical physics  (namzdf, namzdf_ric, namzdf_tke, namzdf_kpp, namzdf_ddm, namzdf_tmx, namzdf_tmx_new)
 !!              9 - diagnostics      (namnc4, namtrd, namspr, namflo, namhsb, namsto)
 !!             10 - miscellaneous    (namsol, nammpp, namctl)
@@ -408,5 +408,5 @@
    ln_qsr_2bd  = .false.   !  2 bands              light penetration
    ln_qsr_bio  = .false.   !  bio-model light penetration
-   nn_chldta   =      1    !  RGB : Chl data (=1) or cst value (=0)
+   nn_chldta   =      1    !  RGB : 2D Chl data (=1), 3D Chl data (=2) or cst value (=0)
    rn_abs      =   0.58    !  RGB & 2 bands: fraction of light (rn_si1)
    rn_si0      =   0.35    !  RGB & 2 bands: shortess depth of extinction
@@ -476,5 +476,5 @@
 
    cn_dir      = './'       !  root directory for the location of the bulk files
-   rn_pref     = 101000._wp !  reference atmospheric pressure   [N/m2]/
+   rn_pref     = 101000.    !  reference atmospheric pressure   [N/m2]/
    ln_ref_apr  = .false.    !  ref. pressure: global mean Patm (T) or a constant (F)
    ln_apr_obc  = .false.    !  inverse barometer added to OBC ssh data
@@ -500,9 +500,11 @@
 &namsbc_alb    !   albedo parameters
 !-----------------------------------------------------------------------
-   rn_cloud    =    0.06   !  cloud correction to snow and ice albedo
-   rn_albice   =    0.53   !  albedo of melting ice in the arctic and antarctic
-   rn_alphd    =    0.80   !  coefficients for linear interpolation used to
-   rn_alphc    =    0.65   !  compute albedo between two extremes values
-   rn_alphdi   =    0.72   !  (Pyane, 1972)
+   nn_ice_alb  =    0   !  parameterization of ice/snow albedo
+                        !     0: Shine & Henderson-Sellers (JGR 1985)
+                        !     1: "home made" based on Brandt et al. (J. Climate 2005)
+                        !                         and Grenfell & Perovich (JGR 2004)
+   rn_albice   =  0.53  !  albedo of bare puddled ice (values from 0.49 to 0.58)
+                        !     0.53 (default) => if nn_ice_alb=0
+                        !     0.50 (default) => if nn_ice_alb=1
 /
 !-----------------------------------------------------------------------
@@ -546,5 +548,4 @@
 !!   namlbc        lateral momentum boundary condition
 !!   namcla        cross land advection
-!!   namobc        open boundaries parameters                           ("key_obc")
 !!   namagrif      agrif nested grid ( read by child model only )       ("key_agrif")
 !!   nambdy        Unstructured open boundaries                         ("key_bdy")
@@ -563,25 +564,4 @@
 !-----------------------------------------------------------------------
    nn_cla      =    0      !  advection between 2 ocean pts separates by land
-/
-!-----------------------------------------------------------------------
-&namobc        !   open boundaries parameters                           ("key_obc")
-!-----------------------------------------------------------------------
-   ln_obc_clim = .false.   !  climatological obc data files (T) or not (F)
-   ln_vol_cst  = .true.    !  impose the total volume conservation (T) or not (F)
-   ln_obc_fla  = .false.   !  Flather open boundary condition
-   nn_obcdta   =    1      !  = 0 the obc data are equal to the initial state
-                           !  = 1 the obc data are read in 'obc.dta' files
-   cn_obcdta   = 'annual'  !  set to annual if obc datafile hold 1 year of data
-                           !  set to monthly if obc datafile hold 1 month of data
-   rn_dpein    =    1.     !  damping time scale for inflow at east  open boundary
-   rn_dpwin    =    1.     !     -           -         -       west    -      -
-   rn_dpnin    =    1.     !     -           -         -       north   -      -
-   rn_dpsin    =    1.     !     -           -         -       south   -      -
-   rn_dpeob    = 3000.     !  time relaxation (days) for the east  open boundary
-   rn_dpwob    =   15.     !     -           -         -     west    -      -
-   rn_dpnob    = 3000.     !     -           -         -     north   -      -
-   rn_dpsob    =   15.     !     -           -         -     south   -      -
-   rn_volemp   =    1.     !  = 0 the total volume change with the surface flux (E-P-R)
-                           !  = 1 the total volume remains constant
 /
 !-----------------------------------------------------------------------
@@ -898,10 +878,11 @@
 !!             Tracers & Dynamics vertical physics namelists
 !!======================================================================
-!!    namzdf        vertical physics
-!!    namzdf_ric    richardson number dependent vertical mixing         ("key_zdfric")
-!!    namzdf_tke    TKE dependent vertical mixing                       ("key_zdftke")
-!!    namzdf_kpp    KPP dependent vertical mixing                       ("key_zdfkpp")
-!!    namzdf_ddm    double diffusive mixing parameterization            ("key_zdfddm")
-!!    namzdf_tmx    tidal mixing parameterization                       ("key_zdftmx")
+!!    namzdf            vertical physics
+!!    namzdf_ric        richardson number dependent vertical mixing     ("key_zdfric")
+!!    namzdf_tke        TKE dependent vertical mixing                   ("key_zdftke")
+!!    namzdf_kpp        KPP dependent vertical mixing                   ("key_zdfkpp")
+!!    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")
 !!======================================================================
 !
@@ -1010,5 +991,11 @@
    rn_tfe_itf  = 1.        !  ITF tidal dissipation efficiency
 /
-
+!-----------------------------------------------------------------------
+&namzdf_tmx_new    !   new tidal mixing parameterization                ("key_zdftmx_new")
+!-----------------------------------------------------------------------
+   nn_zpyc     = 1         !  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)
+/
 !!======================================================================
 !!                  ***  Miscellaneous namelists  ***
@@ -1196,59 +1183,52 @@
    ln_s3d     = .false.    ! Logical switch for S profile observations
    ln_ena     = .false.    ! Logical switch for ENACT insitu data set
-   !                       !     ln_cor                  Logical switch for Coriolis insitu data set
+   ln_cor     = .false.    ! Logical switch for Coriolis insitu data set
    ln_profb   = .false.    ! Logical switch for feedback insitu data set
    ln_sla     = .false.    ! Logical switch for SLA observations
-
    ln_sladt   = .false.    ! Logical switch for AVISO SLA data
-
    ln_slafb   = .false.    ! Logical switch for feedback SLA data
-                           !     ln_ssh                  Logical switch for SSH observations
-
-   ln_sst     = .false.     ! Logical switch for SST observations
-   ln_reysst  = .false.     !     ln_reysst               Logical switch for Reynolds observations
-   ln_ghrsst  = .false.    !     ln_ghrsst               Logical switch for GHRSST observations
-
+   ln_ssh     = .false.    ! Logical switch for SSH observations
+   ln_sst     = .false.    ! Logical switch for SST observations
+   ln_reysst  = .false.    ! Logical switch for Reynolds observations
+   ln_ghrsst  = .false.    ! Logical switch for GHRSST observations
    ln_sstfb   = .false.    ! Logical switch for feedback SST data
-                           !     ln_sss                  Logical switch for SSS observations
+   ln_sss     = .false.    ! Logical switch for SSS observations
    ln_seaice  = .false.    ! Logical switch for Sea Ice observations
-                           !     ln_vel3d                Logical switch for velocity observations
-                           !     ln_velavcur             Logical switch for velocity daily av. cur.
-                           !     ln_velhrcur             Logical switch for velocity high freq. cur.
-                           !     ln_velavadcp            Logical switch for velocity daily av. ADCP
-                           !     ln_velhradcp            Logical switch for velocity high freq. ADCP
-                           !     ln_velfb                Logical switch for feedback velocity data
-                           !     ln_grid_global          Global distribtion of observations
-                           !     ln_grid_search_lookup   Logical switch for obs grid search w/lookup table
-                           !     grid_search_file        Grid search lookup file header
-                           !     enactfiles              ENACT input observation file names
-                           !     coriofiles              Coriolis input observation file name
-   !                       ! profbfiles: Profile feedback input observation file name
-   profbfiles = 'profiles_01.nc'
-                           !     ln_profb_enatim         Enact feedback input time setting switch
-                           !     slafilesact             Active SLA input observation file name
-                           !     slafilespas             Passive SLA input observation file name
-   !                       ! slafbfiles: Feedback SLA input observation file name
-   slafbfiles = 'sla_01.nc'
-                           !     sstfiles                GHRSST input observation file name
-   !                       ! sstfbfiles: Feedback SST input observation file name
-   sstfbfiles = 'sst_01.nc'
-                           !     seaicefiles             Sea Ice input observation file names
-   seaicefiles = 'seaice_01.nc'
-                           !     velavcurfiles           Vel. cur. daily av. input file name
-                           !     velhvcurfiles           Vel. cur. high freq. input file name
-                           !     velavadcpfiles          Vel. ADCP daily av. input file name
-                           !     velhvadcpfiles          Vel. ADCP high freq. input file name
-                           !     velfbfiles              Vel. feedback input observation file name
-                           !     dobsini                 Initial date in window YYYYMMDD.HHMMSS
-                           !     dobsend                 Final date in window YYYYMMDD.HHMMSS
-                           !     n1dint                  Type of vertical interpolation method
-                           !     n2dint                  Type of horizontal interpolation method
-                           !     ln_nea                  Rejection of observations near land switch
-   nmsshc     = 0          ! MSSH correction scheme
-                           !     mdtcorr                 MDT  correction
-                           !     mdtcutoff               MDT cutoff for computed correction
+   ln_vel3d   = .false.    ! Logical switch for velocity observations
+   ln_velavcur= .false     ! Logical switch for velocity daily av. cur.
+   ln_velhrcur= .false     ! Logical switch for velocity high freq. cur.
+   ln_velavadcp = .false.  ! Logical switch for velocity daily av. ADCP
+   ln_velhradcp = .false.  ! Logical switch for velocity high freq. ADCP
+   ln_velfb   = .false.    ! Logical switch for feedback velocity data
+   ln_grid_global = .false. ! Global distribtion of observations
+   ln_grid_search_lookup = .false. !  Logical switch for obs grid search w/lookup table
+   grid_search_file = 'grid_search'  !  Grid search lookup file header
+! All of the *files* variables below are arrays. Use namelist_cfg to add more files
+   enactfiles = 'enact.nc' !  ENACT input observation file names (specify full array in namelist_cfg)
+   coriofiles = 'corio.nc' !  Coriolis input observation file name
+   profbfiles = 'profiles_01.nc' ! Profile feedback input observation file name
+   ln_profb_enatim = .false !        Enact feedback input time setting switch
+   slafilesact = 'sla_act.nc' !  Active SLA input observation file names
+   slafilespas = 'sla_pass.nc' ! Passive SLA input observation file names
+   slafbfiles = 'sla_01.nc' ! slafbfiles: Feedback SLA input observation file names
+   sstfiles = 'ghrsst.nc'   ! GHRSST input observation file names
+   sstfbfiles = 'sst_01.nc' ! Feedback SST input observation file names
+   seaicefiles = 'seaice_01.nc' ! Sea Ice input observation file names
+   velavcurfiles = 'velavcurfile.nc'  ! Vel. cur. daily av. input file name
+   velhrcurfiles = 'velhrcurfile.nc'  ! Vel. cur. high freq. input file name
+   velavadcpfiles = 'velavadcpfile.nc' ! Vel. ADCP daily av. input file name
+   velhradcpfiles = 'velhradcpfile.nc' ! Vel. ADCP high freq. input file name
+   velfbfiles = 'velfbfile.nc' ! Vel. feedback input observation file name
+   dobsini = 20000101.000000  !  Initial date in window YYYYMMDD.HHMMSS
+   dobsend = 20010101.000000  !  Final date in window YYYYMMDD.HHMMSS
+   n1dint = 0  !               Type of vertical interpolation method
+   n2dint = 0  !               Type of horizontal interpolation method
+   ln_nea = .false.   !        Rejection of observations near land switch
+   nmsshc     = 0     !        MSSH correction scheme
+   mdtcorr = 1.61     !        MDT  correction
+   mdtcutoff = 65.0   !        MDT cutoff for computed correction
    ln_altbias = .false.    ! Logical switch for alt bias
    ln_ignmis  = .true.     ! Logical switch for ignoring missing files
-                           !     endailyavtypes   ENACT daily average types
+   endailyavtypes = 820    ! ENACT daily average types - array (use namelist_cfg to set more values)
    ln_grid_global = .true.
    ln_grid_search_lookup = .false.
Index: CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_top_ORCA1_cfg
===================================================================
--- CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_top_ORCA1_cfg	(revision 2719)
+++ CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_top_ORCA1_cfg	(revision 2737)
@@ -71,4 +71,5 @@
 &namtrc_ldf    !   lateral diffusion scheme for passive tracer 
 !-----------------------------------------------------------------------
+   rn_fact_lap      =     15.    !     enhanced zonal eddy diffusivity
 /
 !-----------------------------------------------------------------------
Index: CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_top_ref
===================================================================
--- CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_top_ref	(revision 2719)
+++ CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_top_ref	(revision 2737)
@@ -62,4 +62,5 @@
    rn_ahtrc_0       =  2000.    !  horizontal eddy diffusivity for tracers [m2/s]
    rn_ahtrb_0       =     0.    !     background eddy diffusivity for ldf_iso [m2/s]
+   rn_fact_lap      =     1.    !     enhanced zonal eddy diffusivity
 /
 !-----------------------------------------------------------------------
