Index: /CONFIG/UNIFORM/v6/NEMO_v7_dev/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/COMP/lim3.card
===================================================================
--- /CONFIG/UNIFORM/v6/NEMO_v7_dev/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/COMP/lim3.card	(revision 3218)
+++ /CONFIG/UNIFORM/v6/NEMO_v7_dev/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/COMP/lim3.card	(revision 3219)
@@ -15,8 +15,8 @@
 
 [ParametersFiles]
-List=	(${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/namelist_ice_lim3_ref , namelist_ice_ref ), \
-        (${SUBMIT_DIR}/PARAM/namelist_lim3_${RESOL_OCE}_cfg             , namelist_ice_cfg ), \
-        (${SUBMIT_DIR}/PARAM/file_def_nemo-lim3.xml                  , file_def_nemo-lim.xml   ), \
-        (${MODIPSL}/modeles/NEMOGCM/CONFIG/ORCA1_LIM3_PISCES/EXP00/field_def_nemo-lim.xml                  , field_def_nemo-lim.xml   )
+List=	(${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/namelist_ice_lim3_ref    , namelist_ice_ref ), \
+        (${SUBMIT_DIR}/PARAM/namelist_lim3_${RESOL_OCE}_cfg                , namelist_ice_cfg ), \
+        (${SUBMIT_DIR}/PARAM/file_def_nemo-lim3.xml                        , file_def_nemo-lim3.xml   ), \
+        (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/field_def_nemo-lim.xml   , field_def_nemo-lim.xml   )
 
 
@@ -28,6 +28,5 @@
 
 [OutputFiles]
-List=   (${config_UserChoices_JobName}_1m_icemod.nc, ${R_OUT_ICE_O_M}/${PREFIX}_1M_icemod.nc, Post_1M_icemod ), \
-        (${config_UserChoices_JobName}_1d_icemod.nc, ${R_OUT_ICE_O_D}/${PREFIX}_1D_icemod.nc, Post_1D_icemod )
+List=   (${config_UserChoices_JobName}_1m_icemod.nc, ${R_OUT_ICE_O_M}/${PREFIX}_1M_icemod.nc, Post_1M_icemod )
 
 [Post_1M_icemod]
Index: /CONFIG/UNIFORM/v6/NEMO_v7_dev/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/COMP/opa9.card
===================================================================
--- /CONFIG/UNIFORM/v6/NEMO_v7_dev/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/COMP/opa9.card	(revision 3218)
+++ /CONFIG/UNIFORM/v6/NEMO_v7_dev/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/COMP/opa9.card	(revision 3219)
@@ -8,7 +8,7 @@
 #-- related to NEMO_tag_revision (nemo_v3, nemo_v3_1, nemo_v3_2_beta)
 #-- NOTE: if you use COMMON ACCOUNT you have to de-comment it
-OPA_version=v4_0_alpha
+#OPA_version=v4_0_alpha
 R_FORCING=${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}
-mesh_mask=y
+mesh_mask= n
 #==============================================================
 
@@ -18,20 +18,18 @@
 
 [BoundaryFiles]
-List=	(${opa9_UserChoices_R_FORCING}/u_10.15JUNE2009_fill.nc            , u_10.nc), \
-        (${opa9_UserChoices_R_FORCING}/v_10.15JUNE2009_fill.nc            , v_10.nc), \
-        (${opa9_UserChoices_R_FORCING}/t_10.15JUNE2009_fill.nc            , t_10.nc), \
-        (${opa9_UserChoices_R_FORCING}/q_10.15JUNE2009_fill.nc            , q_10.nc), \
-        (${opa9_UserChoices_R_FORCING}/ncar_rad.15JUNE2009_fill.nc        , radsw.nc), \
-        (${opa9_UserChoices_R_FORCING}/ncar_rad.15JUNE2009_fill.nc        , radlw.nc), \
-        (${opa9_UserChoices_R_FORCING}/ncar_precip.15JUNE2009_fill.nc     , precip.nc), \
-        (${opa9_UserChoices_R_FORCING}/ncar_precip.15JUNE2009_fill.nc     , snow.nc), \
-        (${opa9_UserChoices_R_FORCING}/slp.15JUNE2009_fill.nc             , slp.15JUNE2009_fill.nc), \
-        (${opa9_UserChoices_R_FORCING}/weights_core_orca2_bilinear_noc.nc , weights_core_orca2_bilinear_noc.nc), \
-        (${opa9_UserChoices_R_FORCING}/weights_core_orca2_bicubic_noc.nc  , weights_core_orca2_bicubic_noc.nc)
+List=	(${opa9_UserChoices_R_FORCING}/u_10.15JUNE2009_fill.nc            ,         .), \
+        (${opa9_UserChoices_R_FORCING}/v_10.15JUNE2009_fill.nc            ,         .), \
+        (${opa9_UserChoices_R_FORCING}/t_10.15JUNE2009_fill.nc            ,         .), \
+        (${opa9_UserChoices_R_FORCING}/q_10.15JUNE2009_fill.nc            ,         .), \
+        (${opa9_UserChoices_R_FORCING}/ncar_rad.15JUNE2009_fill.nc        ,         .), \
+        (${opa9_UserChoices_R_FORCING}/ncar_rad.15JUNE2009_fill.nc        ,         .), \
+        (${opa9_UserChoices_R_FORCING}/ncar_precip.15JUNE2009_fill.nc     ,         .), \
+        (${opa9_UserChoices_R_FORCING}/ncar_precip.15JUNE2009_fill.nc     ,         .), \
+        (${opa9_UserChoices_R_FORCING}/slp.15JUNE2009_fill.nc             ,         .), \
+        (${opa9_UserChoices_R_FORCING}/weights_core_orca2_bilinear_noc.nc ,         .), \
+        (${opa9_UserChoices_R_FORCING}/weights_core_orca2_bicubic_noc.nc  ,         .)
 
 ListNonDel= (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/ahmcoef.nc, .), \
-            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/bathy_level.nc, .), \
-            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/bathy_meter.nc, .), \
-            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/coordinates.nc, .), \
+            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/ORCA_R2_zps_domcfg.nc, .), \
             (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/potT_PHC3WOA_ORCA2_IOVI.nc, data_1m_potential_temperature_nomask.nc), \
             (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/Salt_corr_PHC3WOA09.nc, data_1m_salinity_nomask.nc), \
@@ -50,4 +48,7 @@
             (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/M2rowdrg.nc, .),\
             (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/mask_itf.nc, .),\
+            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/eddy_viscosity_2D.nc, .),\
+            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/eddy_viscosity_3D.nc, .),\
+            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/calving.nc, .)     ,\
             (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/resto.nc, .)
 
@@ -56,8 +57,8 @@
 List=   (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/namelist_ref                            , namelist_ref           ), \
         (${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}${EXPTYPE}_cfg                          , namelist_cfg           ), \
-        (${SUBMIT_DIR}/PARAM/file_def_${RESOL_OCE}${EXPTYPE}_cfg                          , file_def_nemo-opa.xml  ), \
+        (${SUBMIT_DIR}/PARAM/file_def_nemo-opa.xml                                        , file_def_nemo-opa.xml  ), \
         (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/field_def_nemo-opa.xml                  , field_def_nemo-opa.xml ), \
         (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/domain_def_nemo.xml                     , domain_def_nemo.xml    ), \
-        (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/context_nemo.xml                        , context_nemo.xml       ), \
+        (${SUBMIT_DIR}/PARAM/context_nemo.xml                                             , context_nemo.xml       ), \
         (${MODIPSL}/modeles/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/iodef.xml              , iodef.xml              )
 
@@ -75,21 +76,8 @@
         (${config_UserChoices_JobName}_1y_grid_V.nc    , ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_V.nc     , NONE          ),\
         (${config_UserChoices_JobName}_1y_grid_W.nc    , ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_W.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_1y_diaptr.nc    , ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_diaptr.nc     , Post_1Y_diaptr),\
-        (${config_UserChoices_JobName}_1m_scalar.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_scalar.nc     , NONE          ),\
+        (${config_UserChoices_JobName}_1y_SBC.nc       , ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_SBC.nc        , NONE          ),\
         (${config_UserChoices_JobName}_1m_grid_T.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_T.nc     , Post_1M_grid_T),\
-        (${config_UserChoices_JobName}_1m_grid_U.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_U.nc     , Post_1M_grid_U),\
-        (${config_UserChoices_JobName}_1m_grid_V.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_V.nc     , Post_1M_grid_V),\
-        (${config_UserChoices_JobName}_1m_grid_W.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_W.nc     , Post_1M_grid_W),\
-        (${config_UserChoices_JobName}_1m_diaptr.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_diaptr.nc     , Post_1M_diaptr),\
         (${config_UserChoices_JobName}_5d_grid_T.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_5D_grid_T.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_5d_grid_U.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_5D_grid_U.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_5d_grid_V.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_5D_grid_V.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_5d_grid_W.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_5D_grid_W.nc     , NONE          ),\
         (${config_UserChoices_JobName}_1d_grid_T.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_T.nc     , Post_1D_grid_T),\
-        (${config_UserChoices_JobName}_1d_grid_U.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_U.nc     , Post_1D_grid_U),\
-        (${config_UserChoices_JobName}_1d_grid_W.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_W.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_1d_SBC.nc       , ${R_OUT_OCE_O_D}/${PREFIX}_1D_SBC.nc        , NONE          ),\
-        (${config_UserChoices_JobName}_1d_diaptr.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_1D_diaptr.nc     , NONE          ),\
-        (${config_UserChoices_JobName}_1d_scalar.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_1D_scalar.nc     , NONE          ),\
         (mesh_mask.nc     , ${R_OUT_OCE_O}/${config_UserChoices_JobName}_mesh_mask.nc                       , NONE),\
         (runoffs.nc       , ${R_OUT_OCE_O}/${config_UserChoices_JobName}_runoffs.nc                         , NONE),\
Index: /CONFIG/UNIFORM/v6/NEMO_v7_dev/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/COMP/pisces.card
===================================================================
--- /CONFIG/UNIFORM/v6/NEMO_v7_dev/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/COMP/pisces.card	(revision 3218)
+++ /CONFIG/UNIFORM/v6/NEMO_v7_dev/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/COMP/pisces.card	(revision 3219)
@@ -27,10 +27,10 @@
 
 [ParametersFiles]
-List=   (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/namelist_top_ref                          , namelist_top_ref), \
-        (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/namelist_pisces_ref                       , namelist_pisces_ref), \
-        (${SUBMIT_DIR}/PARAM/namelist_top_cfg                                               , namelist_top_cfg), \
-        (${SUBMIT_DIR}/PARAM/namelist_pisces_${RESOL_OCE}$_cfg                              , namelist_pisces_cfg), \
-        (${SUBMIT_DIR}/PARAM/file_def_nemo-pisces.xml                                       , file_def_nemo-pisces.xml   ), \
-        (${MODIPSL}/modeles/NEMOGCM/CONFIG/ORCA1_LIM3_PISCES/EXP00/field_def_nemo-pisces.xml, field_def_nemo-pisces.xml   )
+List=   (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/namelist_top_ref                          , namelist_top_ref          ), \
+        (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/namelist_pisces_ref                       , namelist_pisces_ref       ), \
+        (${SUBMIT_DIR}/PARAM/namelist_top_cfg                                               , namelist_top_cfg          ), \
+        (${SUBMIT_DIR}/PARAM/namelist_pisces_${RESOL_OCE}_cfg                               , namelist_pisces_cfg       ), \
+        (${SUBMIT_DIR}/PARAM/file_def_nemo-pisces.xml                                       , file_def_nemo-pisces.xml  ), \
+        (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/field_def_nemo-pisces.xml                 , field_def_nemo-pisces.xml )
 
 
@@ -44,9 +44,6 @@
 List=   (${config_UserChoices_JobName}_1y_ptrc_T.nc        , ${R_OUT_MBG_O_Y}/${PREFIX}_1Y_ptrc_T.nc    , Post_1Y_ptrc_T   ) , \
         (${config_UserChoices_JobName}_1y_diad_T.nc        , ${R_OUT_MBG_O_Y}/${PREFIX}_1Y_diad_T.nc    , Post_1Y_diad_T   ) , \
-	(${config_UserChoices_JobName}_1m_bioscalar.nc     , ${R_OUT_MBG_O_M}/${PREFIX}_1M_bioscalar.nc , Post_1M_bioscalar) , \
         (${config_UserChoices_JobName}_1m_ptrc_T.nc        , ${R_OUT_MBG_O_M}/${PREFIX}_1M_ptrc_T.nc    , Post_1M_ptrc_T   ) , \
-        (${config_UserChoices_JobName}_1m_diad_T.nc        , ${R_OUT_MBG_O_M}/${PREFIX}_1M_diad_T.nc    , Post_1M_diad_T   ) , \
-	(${config_UserChoices_JobName}_1d_bioscalar.nc     , ${R_OUT_MBG_O_D}/${PREFIX}_1D_bioscalar.nc , Post_1D_bioscalar)
-
+        (${config_UserChoices_JobName}_1m_diad_T.nc        , ${R_OUT_MBG_O_M}/${PREFIX}_1M_diad_T.nc    , Post_1M_diad_T   ) 
 
 
Index: /CONFIG/UNIFORM/v6/NEMO_v7_dev/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/config.card
===================================================================
--- /CONFIG/UNIFORM/v6/NEMO_v7_dev/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/config.card	(revision 3218)
+++ /CONFIG/UNIFORM/v6/NEMO_v7_dev/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/config.card	(revision 3219)
@@ -31,5 +31,5 @@
 # config.card configuration options :
 #R_BC=$WORKDIR/../../gzi/rgzi002/IGCM/BC
-R_BC=/workgpfs/rech/gzi/rgzi011
+R_BC=/workgpfs/rech/gzi/rgzi011/IGCM/BC
 #R_INIT=$WORKDIR/../../gzi/rgzi002/IGCM/BC
 #========================================================================
Index: /CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/context_nemo.xml
===================================================================
--- /CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/context_nemo.xml	(revision 3219)
+++ /CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/context_nemo.xml	(revision 3219)
@@ -0,0 +1,124 @@
+<!--
+ ============================================================================================== 
+    NEMO context
+============================================================================================== 
+-->
+<context id="nemo">
+<!-- $id$ -->
+<!-- Fields definition -->
+    <field_definition src="./field_def_nemo-opa.xml"/>   <!--  NEMO ocean dynamics                     -->
+    <field_definition src="./field_def_nemo-lim.xml"/>   <!--  LIM ice model                     -->
+    <field_definition src="./field_def_nemo-pisces.xml"/>   <!--  Ocean biology                     -->
+
+<!-- Files definition -->
+    <file_definition src="./file_def_nemo-opa.xml"/>     <!--  NEMO ocean dynamics                     -->
+    <file_definition src="./file_def_nemo-lim3.xml"/>     <!--  NEMO ocean sea ice                      -->
+    <file_definition src="./file_def_nemo-pisces.xml"/>     <!--  NEMO ocean biogeochemistry with PISCES  -->
+    <!-- 
+============================================================================================================
+= grid definition = = DO NOT CHANGE =
+============================================================================================================
+    -->
+    
+    <axis_definition>
+      <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" />
+      <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
+      <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" />
+      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
+      <axis id="nfloat" long_name="Float number"      unit="-"                 />
+      <axis id="icbcla"  long_name="Iceberg class"      unit="1"               />
+      <axis id="ncatice" long_name="Ice category"       unit="1"               />
+      <axis id="iax_20C" long_name="20 degC isotherm"   unit="degC"            />
+      <axis id="iax_28C" long_name="28 degC isotherm"   unit="degC"            />
+    </axis_definition>
+ 
+    <domain_definition src="./domain_def_nemo.xml"/>
+  
+    <grid_definition>    
+
+        <!--  -->
+       <grid id="grid_T_2D" >
+         <domain id="grid_T" />
+       </grid>
+        <!--  -->
+       <grid id="grid_T_3D_ncatice" >
+         <domain id="grid_T" />
+         <axis id="ncatice" />
+       </grid>
+        <!--  -->
+       <grid id="grid_T_3D" >
+         <domain id="grid_T" />
+         <axis id="deptht" />
+       </grid>
+        <!--  -->
+       <grid id="grid_U_2D" >
+         <domain id="grid_U" />
+       </grid>
+        <!--  -->
+       <grid id="grid_U_3D" >
+         <domain id="grid_U" />
+         <axis id="depthu" />
+       </grid>
+        <!--  -->
+       <grid id="grid_V_2D" >
+         <domain id="grid_V" />
+       </grid>
+        <!--  -->
+       <grid id="grid_V_3D" >
+         <domain id="grid_V" />
+         <axis id="depthv" />
+       </grid>
+        <!--  -->
+       <grid id="grid_W_2D" >
+         <domain id="grid_W" />
+       </grid>
+        <!--  -->
+       <grid id="grid_W_3D" >
+         <domain id="grid_W" />
+         <axis id="depthw" />
+       </grid>
+        <!--  -->
+       <grid id="grid_1point" >
+         <domain domain_ref="1point"/>
+       </grid>
+        <!--  -->
+       <grid id="grid_T_nfloat" >
+         <domain id="grid_T" />
+         <axis id="nfloat" />
+       </grid>
+        <!--  -->
+       <grid id="grid_EqT" >
+         <domain domain_ref="EqT" />
+       </grid>
+        <!--  -->
+       <grid id="grid_znl_T_2D">
+         <domain id="gznl" />
+       </grid>
+        <!--  -->
+       <grid id="grid_znl_T_3D">
+         <domain id="gznl" />
+         <axis id="deptht" />
+       </grid>
+        <!--  -->
+       <grid id="grid_znl_W_3D">
+         <domain id="gznl" />
+         <axis id="depthw" />
+       </grid>
+
+      <grid id="grid_ptr_T_2D">
+       <domain id="ptr" />
+      </grid>
+
+      <grid id="grid_ptr_T_3D">
+       <domain id="ptr" />
+         <axis id="deptht" />
+       </grid>
+
+      <grid id="grid_ptr_W_3D">
+       <domain id="ptr" />
+         <axis id="depthw" />
+      </grid>
+
+    </grid_definition>   
+
+</context>
Index: /CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/file_def_nemo-lim3.xml
===================================================================
--- /CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/file_def_nemo-lim3.xml	(revision 3218)
+++ /CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/file_def_nemo-lim3.xml	(revision 3219)
@@ -28,10 +28,5 @@
       <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."> <!-- real monthly files -->
 
-      </file_group>
-
-      <file_group id="1y" output_freq="1y"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->   
-	
-
-	<file id="file6" name_suffix="_icemod" description="ice variables" enabled=".true." >
+	<file id="file36" name_suffix="_icemod" description="ice variables" enabled=".true." >
           <field field_ref="snowthic_cea"    name="snthic" />
           <field field_ref="icethic_cea"     name="sithic" />
@@ -121,5 +116,5 @@
 	</file>
 
-        <file id="file7" name_suffix="_scalar" description="scalar variables" enabled=".true." >
+        <file id="file37" name_suffix="_scalar" description="scalar variables" enabled=".true." >
           <field field_ref="voltot"       name="scvoltot"   />
           <field field_ref="sshtot"       name="scsshtot"   />
@@ -141,5 +136,5 @@
         </file>
 
-        <file id="file8" name_suffix="_SBC_scalar" description="scalar variables" enabled=".true." >
+        <file id="file38" name_suffix="_SBC_scalar" description="scalar variables" enabled=".true." >
           <!-- global contents -->
 	  <field field_ref="ibgvol_tot"    name="ibgvol_tot"   />
Index: /CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/file_def_nemo-opa.xml
===================================================================
--- /CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/file_def_nemo-opa.xml	(revision 3218)
+++ /CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/file_def_nemo-opa.xml	(revision 3219)
@@ -23,10 +23,58 @@
       <file_group id="6h" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->     
 
-      <file_group id="1d" output_freq="1d"  output_level="10" enabled=".TRUE."/> <!-- 1d files -->
-      
+      <file_group id="1d" output_freq="1d"  output_level="10" enabled=".TRUE.">  <!-- 1d files -->
+        <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" >
+          <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       />
+          <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="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"     />
+          <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>
+        </file>
+   </file_group>
+
+       <file_group id="5d" output_freq="5d"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->
+         <file id="file2" 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="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="hdiv"         name="hdivtr"   long_name="horizontal divergence transport"      operation="average" freq_op="5d" > @hdiv * @e3t </field>
+          <field field_ref="mldr10_1"     name="mldr10_1"/>
+          <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                />
+          <field field_ref="qsr"          name="rsntds"      long_name="surface_net_downward_shortwave_flux" />
+          <field field_ref="wspd"         name="windsp"  />
+          <field field_ref="empmr"        name="wfo"      long_name="water_flux_into_sea_water"                     />
+          <field field_ref="empbmr"       name="wfob"     long_name="water_flux_into_sea_water at prev time-step"    />
+          <field field_ref="runoffs"      name="runoffs"  />
+          <field field_ref="fmmflx"       name="fmmflx"  />
+        </file>
+   </file_group>
+
       <file_group id="3d" output_freq="3d"  output_level="10" enabled=".TRUE."/> <!-- 3d files -->
+
       <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."> <!-- real monthly files -->
-
-        <file id="file20" name_suffix="_ptrc_T" description="pisces sms variables" >
+ 
+       <file id="file3" name_suffix="_grid_T" description="ocean T grid variables" >
+          <field field_ref="e3t"      />
+          <field field_ref="toce"         name="thetao"                                                                      operation="instant" freq_op="5d" > @toce_e3t / @e3t </field>
+          <field field_ref="soce"         name="so"                                                                          operation="instant" freq_op="5d" > @soce_e3t / @e3t </field>
+          <field field_ref="sst"          name="tos"   />
+          <field field_ref="sss"          name="sos"   />
+          <field field_ref="ssh"          name="zos"   />
+          <field field_ref="sst"          name="tosstd"       long_name="sea surface temperature standard deviation"         operation="instant" freq_op="5d" > sqrt( @sst2 - @sst * @sst ) </field>
+          <field field_ref="ssh"          name="zosstd"       long_name="sea surface height above geoid standard deviation"  operation="instant" freq_op="5d" > 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" />
+          <field field_ref="saltc"        name="saltc" />
+        </file>
+
+
+        <file id="file4" name_suffix="_ptrc_T" description="pisces sms variables" >
           <field field_ref="DIC"      />
           <field field_ref="Alkalini" />
@@ -40,5 +88,5 @@
         </file>
 
-        <file id="file21" name_suffix="_diad_T" description="additional pisces diagnostics" >
+        <file id="file5" name_suffix="_diad_T" description="additional pisces diagnostics" >
           <field field_ref="Cflx"     />
           <field field_ref="Dpco2"    />
@@ -49,5 +97,5 @@
       <file_group id="1y" output_freq="1y"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->   
 	
-	<file id="file1" name_suffix="_grid_T" description="ocean T grid variables" >
+	<file id="file10" name_suffix="_grid_T" description="ocean T grid variables" >
 	  <field field_ref="e3t"      />
 	  <field field_ref="toce"         name="thetao"                                                                      operation="instant" freq_op="5d" > @toce_e3t / @e3t </field>
@@ -67,5 +115,5 @@
 	</file>
 
-	<file id="file2" name_suffix="_SBC" description="surface fluxes variables" > <!-- time step automaticaly defined based on nn_fsbc -->
+	<file id="file11" name_suffix="_SBC" description="surface fluxes variables" > <!-- time step automaticaly defined based on nn_fsbc -->
 	  <field field_ref="empmr"        name="wfo"      />
 	  <field field_ref="qsr_oce"      name="qsr_oce"  />
@@ -86,5 +134,5 @@
 	</file>
 
-	<file id="file3" name_suffix="_grid_U" description="ocean U grid variables" >
+	<file id="file12" name_suffix="_grid_U" description="ocean U grid variables" >
 	  <field field_ref="e3u" />
 	  <field field_ref="ssu"          name="uos"      />
@@ -98,5 +146,5 @@
 	</file>
 	
-	<file id="file4" name_suffix="_grid_V" description="ocean V grid variables" >
+	<file id="file13" name_suffix="_grid_V" description="ocean V grid variables" >
 	  <field field_ref="e3v" />
 	  <field field_ref="ssv"          name="vos"      />
@@ -110,5 +158,5 @@
 	</file>
 	
-	<file id="file5" name_suffix="_grid_W" description="ocean W grid variables" >
+	<file id="file14" name_suffix="_grid_W" description="ocean W grid variables" >
 	  <field field_ref="e3w" />
 	  <field field_ref="woce"         name="wo"       />
@@ -124,5 +172,5 @@
 	</file>
 
-        <file id="file7" name_suffix="_scalar" description="scalar variables" enabled=".true." >
+        <file id="file15" name_suffix="_scalar" description="scalar variables" enabled=".true." >
           <field field_ref="voltot"       name="scvoltot"   />
           <field field_ref="sshtot"       name="scsshtot"   />
@@ -144,5 +192,5 @@
         </file>
 
-	<file id="file12" name_suffix="_ptrc_T" description="pisces sms variables" >
+	<file id="file16" name_suffix="_ptrc_T" description="pisces sms variables" >
           <field field_ref="DIC"      />
           <field field_ref="Alkalini" />
@@ -171,5 +219,5 @@
 	</file>
 
-	<file id="file13" name_suffix="_diad_T" description="additional pisces diagnostics" >
+	<file id="file17" name_suffix="_diad_T" description="additional pisces diagnostics" >
           <field field_ref="PH"       />
           <field field_ref="PAR"      />
Index: /CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/file_def_nemo-pisces.xml
===================================================================
--- /CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/file_def_nemo-pisces.xml	(revision 3218)
+++ /CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/file_def_nemo-pisces.xml	(revision 3219)
@@ -49,5 +49,5 @@
       <file_group id="1y" output_freq="1y"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->   
 	
-	<file id="file1" name_suffix="_grid_T" description="ocean T grid variables" >
+	<file id="file22" name_suffix="_grid_T" description="ocean T grid variables" >
 	  <field field_ref="e3t"      />
 	  <field field_ref="toce"         name="thetao"                                                                      operation="instant" freq_op="5d" > @toce_e3t / @e3t </field>
@@ -67,5 +67,5 @@
 	</file>
 
-        <file id="file9" name_suffix="_bioscalar" description="pisces sms variables" >
+        <file id="file23" 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>
@@ -91,5 +91,5 @@
 	-->
 
-	<file id="file12" name_suffix="_ptrc_T" description="pisces sms variables" >
+	<file id="file24" name_suffix="_ptrc_T" description="pisces sms variables" >
           <field field_ref="DIC"      />
           <field field_ref="Alkalini" />
@@ -118,5 +118,5 @@
 	</file>
 
-	<file id="file13" name_suffix="_diad_T" description="additional pisces diagnostics" >
+	<file id="file25" name_suffix="_diad_T" description="additional pisces diagnostics" >
           <field field_ref="PH"       />
           <field field_ref="PAR"      />
Index: /CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/namelist_top_cfg
===================================================================
--- /CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/namelist_top_cfg	(revision 3218)
+++ /CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/namelist_top_cfg	(revision 3219)
@@ -56,10 +56,10 @@
 !          !             !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      !
    sn_trcdta(1)  = 'data_DIC_nomask'        ,        -12        ,  'DIC'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(2)  = 'data_Alkalini_nomask'   ,        -12        ,  'Alkalini',    .false.   , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(3)  = 'data_O2_nomask'         ,        -1         ,  'O2'      ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
+   sn_trcdta(2)  = 'data_ALK_nomask'   ,        -12        ,  'Alkalini',    .false.   , .true. , 'yearly'  , ''       , ''   , ''
+   sn_trcdta(3)  = 'data_OXY_nomask'         ,        -1         ,  'O2'      ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
    sn_trcdta(5)  = 'data_PO4_nomask'        ,        -1         ,  'PO4'     ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(7)  = 'data_Si_nomask'         ,        -1         ,  'Si'      ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
+   sn_trcdta(7)  = 'data_SIL_nomask'         ,        -1         ,  'Si'      ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
    sn_trcdta(10) = 'data_DOC_nomask'        ,        -12        ,  'DOC'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(14) = 'data_Fer_nomask'        ,        -12        ,  'Fer'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , ''
+   sn_trcdta(14) = 'data_FER_nomask'        ,        -12        ,  'Fer'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , ''
    sn_trcdta(23) = 'data_NO3_nomask'        ,        -1         ,  'NO3'     ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
    rn_trfac(1)   =   1.0e-06  !  multiplicative factor
