Index: NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif2model.F90
===================================================================
--- NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif2model.F90	(revision 9871)
+++ NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif2model.F90	(revision 10288)
@@ -1,18 +1,18 @@
 #if defined key_agrif
-!!----------------------------------------------------------------------
-!! NEMO/NST 3.6 , NEMO Consortium (2018)
-!! $Id$
-!! Software governed by the CeCILL licence (./LICENSE)
-!!----------------------------------------------------------------------
+   !!----------------------------------------------------------------------
+   !! NEMO/NST 4.0 , NEMO Consortium (2018)
+   !! $Id$
+   !! Software governed by the CeCILL license (see ./LICENSE)
+   !!----------------------------------------------------------------------
 SUBROUTINE Agrif2Model
-   !!---------------------------------------------
-   !!   *** ROUTINE Agrif2Model ***
-   !!--------------------------------------------- 
+      !!---------------------------------------------
+      !!   *** ROUTINE Agrif2Model ***
+      !!--------------------------------------------- 
 END SUBROUTINE Agrif2model
 
 SUBROUTINE Agrif_Set_numberofcells(Agrif_Gr)
-   !!---------------------------------------------
-   !!   *** ROUTINE Agrif_Set_numberofcells ***
-   !!--------------------------------------------- 
+      !!---------------------------------------------
+      !!   *** ROUTINE Agrif_Set_numberofcells ***
+      !!--------------------------------------------- 
    USE Agrif_Grids
    IMPLICIT NONE
@@ -27,7 +27,7 @@
 
 SUBROUTINE Agrif_Get_numberofcells(Agrif_Gr)
-   !!---------------------------------------------
-   !!   *** ROUTINE Agrif_Get_numberofcells ***
-   !!--------------------------------------------- 
+      !!---------------------------------------------
+      !!   *** ROUTINE Agrif_Get_numberofcells ***
+      !!--------------------------------------------- 
    USE Agrif_Grids
    IMPLICIT NONE
@@ -42,7 +42,7 @@
 
 SUBROUTINE Agrif_Allocationcalls(Agrif_Gr)
-   !!---------------------------------------------
-   !!   *** ROUTINE Agrif_Allocationscalls ***
-   !!--------------------------------------------- 
+      !!---------------------------------------------
+      !!   *** ROUTINE Agrif_Allocationscalls ***
+      !!--------------------------------------------- 
    USE Agrif_Grids 
 #include "include_use_Alloc_agrif.h"
@@ -56,7 +56,7 @@
 
 SUBROUTINE Agrif_probdim_modtype_def()
-   !!---------------------------------------------
-   !!   *** ROUTINE Agrif_probdim_modtype_def ***
-   !!--------------------------------------------- 
+      !!---------------------------------------------
+      !!   *** ROUTINE Agrif_probdim_modtype_def ***
+      !!--------------------------------------------- 
    USE Agrif_Types
    IMPLICIT NONE
@@ -71,7 +71,7 @@
 
 SUBROUTINE Agrif_clustering_def()
-   !!---------------------------------------------
-   !!   *** ROUTINE Agrif_clustering_def ***
-   !!--------------------------------------------- 
+      !!---------------------------------------------
+      !!   *** ROUTINE Agrif_clustering_def ***
+      !!--------------------------------------------- 
    IMPLICIT NONE
 
@@ -82,7 +82,7 @@
 #else
 SUBROUTINE Agrif2Model
-   !!---------------------------------------------
-   !!   *** ROUTINE Agrif2Model ***
-   !!--------------------------------------------- 
+      !!---------------------------------------------
+      !!   *** ROUTINE Agrif2Model ***
+      !!--------------------------------------------- 
    WRITE(*,*) 'Impossible to bet here'
 END SUBROUTINE Agrif2model
Index: NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_all_update.F90
===================================================================
--- NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_all_update.F90	(revision 9871)
+++ NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_all_update.F90	(revision 10288)
@@ -29,6 +29,6 @@
    !!----------------------------------------------------------------------
    !! NEMO/NST 4.0 , NEMO Consortium (2018)
-   !! $Id: agrif_all_update.F90 9758 2018-06-07 09:18:26Z jchanut $
-   !! Software governed by the CeCILL licence (./LICENSE)
+   !! $Id$
+   !! Software governed by the CeCILL license (see ./LICENSE)
    !!----------------------------------------------------------------------
 CONTAINS
Index: NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_ice.F90
===================================================================
--- NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_ice.F90	(revision 9871)
+++ NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_ice.F90	(revision 10288)
@@ -16,10 +16,10 @@
 
    INTEGER, PUBLIC ::  u_ice_id, v_ice_id, tra_ice_id
-   INTEGER, PUBLIC ::  lim_nbstep = 0    ! child time position in sea-ice model
+   INTEGER, PUBLIC ::  nbstep_ice = 0    ! child time position in sea-ice model
 
    !!----------------------------------------------------------------------
    !! NEMO/NST 4.0 , NEMO Consortium (2018)
    !! $Id$
-   !! Software governed by the CeCILL licence     (./LICENSE)
+   !! Software governed by the CeCILL license (see ./LICENSE)
    !!----------------------------------------------------------------------
 
Index: NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_ice_interp.F90
===================================================================
--- NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_ice_interp.F90	(revision 9871)
+++ NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_ice_interp.F90	(revision 10288)
@@ -31,7 +31,7 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/NST 3.6 , NEMO Consortium (2018)
-   !! $Id: agrif_ice_interp.F90 6204 2016-01-04 13:47:06Z cetlod $
-   !! Software governed by the CeCILL licence     (./LICENSE)
+   !! NEMO/NST 4.0 , NEMO Consortium (2018)
+   !! $Id$
+   !! Software governed by the CeCILL license (see ./LICENSE)
    !!----------------------------------------------------------------------
 
@@ -57,11 +57,11 @@
       CASE('U','V')
          IF( PRESENT( kiter ) ) THEN  ! interpolation at the child ice sub-time step (only for ice rheology)
-            zbeta = ( REAL(lim_nbstep) - REAL(kitermax - kiter) / REAL(kitermax) ) /  &
+            zbeta = ( REAL(nbstep_ice) - REAL(kitermax - kiter) / REAL(kitermax) ) /  &
                &    ( Agrif_Rhot() * REAL(Agrif_Parent(nn_fsbc)) / REAL(nn_fsbc) )
          ELSE                         ! interpolation at the child ice time step
-            zbeta = REAL(lim_nbstep) / ( Agrif_Rhot() * REAL(Agrif_Parent(nn_fsbc)) / REAL(nn_fsbc) )
+            zbeta = REAL(nbstep_ice) / ( Agrif_Rhot() * REAL(Agrif_Parent(nn_fsbc)) / REAL(nn_fsbc) )
          ENDIF
       CASE('T')
-            zbeta = REAL(lim_nbstep) / ( Agrif_Rhot() * REAL(Agrif_Parent(nn_fsbc)) / REAL(nn_fsbc) )
+            zbeta = REAL(nbstep_ice) / ( Agrif_Rhot() * REAL(Agrif_Parent(nn_fsbc)) / REAL(nn_fsbc) )
       END SELECT
       !
Index: NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_ice_update.F90
===================================================================
--- NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_ice_update.F90	(revision 9871)
+++ NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_ice_update.F90	(revision 10288)
@@ -37,6 +37,6 @@
    !!----------------------------------------------------------------------
    !! NEMO/NST 4.0 , NEMO Consortium (2018)
-   !! $Id: agrif_ice_update.F90 6204 2016-01-04 13:47:06Z cetlod $
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! $Id$
+   !! Software governed by the CeCILL license (see ./LICENSE)
    !!----------------------------------------------------------------------
 CONTAINS
Index: NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_oce.F90
===================================================================
--- NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_oce.F90	(revision 9871)
+++ NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_oce.F90	(revision 10288)
@@ -70,5 +70,5 @@
    !! NEMO/NST 4.0 , NEMO Consortium (2018)
    !! $Id$
-   !! Software governed by the CeCILL licence     (./LICENSE)
+   !! Software governed by the CeCILL license (see ./LICENSE)
    !!----------------------------------------------------------------------
 CONTAINS 
Index: NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_oce_interp.F90
===================================================================
--- NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_oce_interp.F90	(revision 9871)
+++ NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_oce_interp.F90	(revision 10288)
@@ -50,5 +50,5 @@
    !! NEMO/NST 4.0 , NEMO Consortium (2018)
    !! $Id$
-   !! Software governed by the CeCILL licence (./LICENSE)
+   !! Software governed by the CeCILL license (see ./LICENSE)
    !!----------------------------------------------------------------------
 CONTAINS
Index: NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_oce_sponge.F90
===================================================================
--- NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_oce_sponge.F90	(revision 9871)
+++ NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_oce_sponge.F90	(revision 10288)
@@ -32,5 +32,5 @@
    !! NEMO/NST 4.0 , NEMO Consortium (2018)
    !! $Id$
-   !! Software governed by the CeCILL licence (./LICENSE)
+   !! Software governed by the CeCILL license (see ./LICENSE)
    !!----------------------------------------------------------------------
 CONTAINS
Index: NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_oce_update.F90
===================================================================
--- NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_oce_update.F90	(revision 9871)
+++ NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_oce_update.F90	(revision 10288)
@@ -35,5 +35,5 @@
    !! NEMO/NST 4.0 , NEMO Consortium (2018)
    !! $Id$
-   !! Software governed by the CeCILL licence (./LICENSE)
+   !! Software governed by the CeCILL license (see ./LICENSE)
    !!----------------------------------------------------------------------
 CONTAINS
Index: NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_top_interp.F90
===================================================================
--- NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_top_interp.F90	(revision 9871)
+++ NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_top_interp.F90	(revision 10288)
@@ -29,5 +29,5 @@
    !! NEMO/NST 4.0 , NEMO Consortium (2018)
    !! $Id$
-   !! Software governed by the CeCILL licence (./LICENSE)
+   !! Software governed by the CeCILL license (see ./LICENSE)
    !!----------------------------------------------------------------------
 CONTAINS
Index: NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_top_sponge.F90
===================================================================
--- NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_top_sponge.F90	(revision 9871)
+++ NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_top_sponge.F90	(revision 10288)
@@ -32,5 +32,5 @@
    !! NEMO/NST 4.0 , NEMO Consortium (2018)
    !! $Id$
-   !! Software governed by the CeCILL licence (./LICENSE)
+   !! Software governed by the CeCILL license (see ./LICENSE)
    !!----------------------------------------------------------------------
 CONTAINS
Index: NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_top_update.F90
===================================================================
--- NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_top_update.F90	(revision 9871)
+++ NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_top_update.F90	(revision 10288)
@@ -29,5 +29,5 @@
    !! NEMO/NST 4.0 , NEMO Consortium (2018)
    !! $Id$
-   !! Software governed by the CeCILL licence (./LICENSE)
+   !! Software governed by the CeCILL license (see ./LICENSE)
    !!----------------------------------------------------------------------
 CONTAINS
Index: NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_user.F90
===================================================================
--- NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_user.F90	(revision 9871)
+++ NEMO/branches/2018/dev_r9866_HPC_03_globcom/src/NST/agrif_user.F90	(revision 10288)
@@ -1,9 +1,9 @@
 #undef UPD_HIGH   /* MIX HIGH UPDATE */
 #if defined key_agrif
-!!----------------------------------------------------------------------
-!! NEMO/NST 4.0 , NEMO Consortium (2018)
-!! $Id$
-!! Software governed by the CeCILL licence (./LICENSE)
-!!----------------------------------------------------------------------
+   !!----------------------------------------------------------------------
+   !! NEMO/NST 4.0 , NEMO Consortium (2018)
+   !! $Id$
+   !! Software governed by the CeCILL license (see ./LICENSE)
+   !!----------------------------------------------------------------------
 SUBROUTINE agrif_user
 END SUBROUTINE agrif_user
@@ -13,14 +13,14 @@
 
 SUBROUTINE Agrif_InitWorkspace
-   !!----------------------------------------------------------------------
-   !!                 *** ROUTINE Agrif_InitWorkspace ***
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      !!                 *** ROUTINE Agrif_InitWorkspace ***
+      !!----------------------------------------------------------------------
    USE par_oce
    USE dom_oce
    USE nemogcm
    USE mppini
-   !!
-   IMPLICIT NONE
-   !!----------------------------------------------------------------------
+      !!
+   IMPLICIT NONE
+      !!----------------------------------------------------------------------
    !
    IF( .NOT. Agrif_Root() ) THEN
@@ -37,9 +37,9 @@
 
 SUBROUTINE Agrif_InitValues
-   !!----------------------------------------------------------------------
-   !!                 *** ROUTINE Agrif_InitValues ***
-   !!
-   !! ** Purpose :: Declaration of variables to be interpolated
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      !!                 *** ROUTINE Agrif_InitValues ***
+      !!
+      !! ** Purpose :: Declaration of variables to be interpolated
+      !!----------------------------------------------------------------------
    USE Agrif_Util
    USE oce 
@@ -50,5 +50,5 @@
    !!
    IMPLICIT NONE
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
    !
    CALL nemo_init       !* Initializations of each fine grid
@@ -69,9 +69,9 @@
 
 SUBROUTINE Agrif_InitValues_cont_dom
-   !!----------------------------------------------------------------------
-   !!                 *** ROUTINE Agrif_InitValues_cont ***
-   !!
-   !! ** Purpose ::   Declaration of variables to be interpolated
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      !!                 *** ROUTINE Agrif_InitValues_cont ***
+      !!
+      !! ** Purpose ::   Declaration of variables to be interpolated
+      !!----------------------------------------------------------------------
    USE Agrif_Util
    USE oce 
@@ -84,5 +84,5 @@
    !
    IMPLICIT NONE
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
    !
    ! Declaration of the type of variable which have to be interpolated
@@ -94,9 +94,9 @@
 
 SUBROUTINE agrif_declare_var_dom
-   !!----------------------------------------------------------------------
-   !!                 *** ROUTINE agrif_declare_var ***
-   !!
-   !! ** Purpose :: Declaration of variables to be interpolated
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      !!                 *** ROUTINE agrif_declare_var ***
+      !!
+      !! ** Purpose :: Declaration of variables to be interpolated
+      !!----------------------------------------------------------------------
    USE agrif_util
    USE par_oce       
@@ -106,8 +106,8 @@
    !
    INTEGER :: ind1, ind2, ind3
-   !!----------------------------------------------------------------------
-
-   ! 1. Declaration of the type of variable which have to be interpolated
-   !---------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+
+      ! 1. Declaration of the type of variable which have to be interpolated
+      !---------------------------------------------------------------------
    ind1 =     nbghostcells
    ind2 = 1 + nbghostcells
@@ -116,16 +116,16 @@
    CALL agrif_declare_variable((/2,1/),(/ind3,ind2/),(/'x','y'/),(/1,1/),(/nlci,nlcj/),e2v_id)
 
-   ! 2. Type of interpolation
-   !-------------------------
+      ! 2. Type of interpolation
+      !-------------------------
    CALL Agrif_Set_bcinterp( e1u_id, interp1=Agrif_linear, interp2=AGRIF_ppm    )
    CALL Agrif_Set_bcinterp( e2v_id, interp1=AGRIF_ppm   , interp2=Agrif_linear )
 
-   ! 3. Location of interpolation
-   !-----------------------------
+      ! 3. Location of interpolation
+      !-----------------------------
    CALL Agrif_Set_bc(e1u_id,(/0,ind1-1/))
    CALL Agrif_Set_bc(e2v_id,(/0,ind1-1/))
 
-   ! 4. Update type
-   !--------------- 
+      ! 4. Update type
+      !--------------- 
 # if defined UPD_HIGH
    CALL Agrif_Set_Updatetype(e1u_id,update1 = Agrif_Update_Average, update2=Agrif_Update_Full_Weighting)
@@ -140,9 +140,9 @@
 
 SUBROUTINE Agrif_InitValues_cont
-   !!----------------------------------------------------------------------
-   !!                 *** ROUTINE Agrif_InitValues_cont ***
-   !!
-   !! ** Purpose ::   Declaration of variables to be interpolated
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      !!                 *** ROUTINE Agrif_InitValues_cont ***
+      !!
+      !! ** Purpose ::   Declaration of variables to be interpolated
+      !!----------------------------------------------------------------------
    USE agrif_oce_update
    USE agrif_oce_interp
@@ -161,5 +161,5 @@
    LOGICAL :: check_namelist
    CHARACTER(len=15) :: cl_check1, cl_check2, cl_check3, cl_check4 
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
 
    ! 1. Declaration of the type of variable which have to be interpolated
@@ -293,9 +293,9 @@
 
 SUBROUTINE agrif_declare_var
-   !!----------------------------------------------------------------------
-   !!                 *** ROUTINE agrif_declarE_var ***
-   !!
-   !! ** Purpose :: Declaration of variables to be interpolated
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      !!                 *** ROUTINE agrif_declarE_var ***
+      !!
+      !! ** Purpose :: Declaration of variables to be interpolated
+      !!----------------------------------------------------------------------
    USE agrif_util
    USE agrif_oce
@@ -307,5 +307,5 @@
    !
    INTEGER :: ind1, ind2, ind3
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
 
    ! 1. Declaration of the type of variable which have to be interpolated
@@ -451,9 +451,9 @@
 #if defined key_si3
 SUBROUTINE Agrif_InitValues_cont_ice
-   !!----------------------------------------------------------------------
-   !!                 *** ROUTINE Agrif_InitValues_cont_ice ***
-   !!
-   !! ** Purpose :: Initialisation of variables to be interpolated for ice
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      !!                 *** ROUTINE Agrif_InitValues_cont_ice ***
+      !!
+      !! ** Purpose :: Initialisation of variables to be interpolated for ice
+      !!----------------------------------------------------------------------
    USE Agrif_Util
    USE sbc_oce, ONLY : nn_fsbc  ! clem: necessary otherwise Agrif_Parent(nn_fsbc) = nn_fsbc
@@ -465,5 +465,5 @@
    !
    IMPLICIT NONE
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
    !
    ! Declaration of the type of variable which have to be interpolated (parent=>child)
@@ -483,11 +483,11 @@
       CALL ctl_stop('rhot * nn_fsbc(parent) /= N * nn_fsbc(child), therefore nn_fsbc(child) should be set to 1 or nn_fsbc(parent)')
    ENDIF
-   ! First Interpolations (using "after" ice subtime step => lim_nbstep=1)
+   ! First Interpolations (using "after" ice subtime step => nbstep_ice=1)
    !----------------------------------------------------------------------
-   lim_nbstep = ( Agrif_irhot() * Agrif_Parent(nn_fsbc) / nn_fsbc ) ! clem: to have calledweight=1 in interp (otherwise the western border of the zoom is wrong)
+   nbstep_ice = ( Agrif_irhot() * Agrif_Parent(nn_fsbc) / nn_fsbc ) ! clem: to have calledweight=1 in interp (otherwise the western border of the zoom is wrong)
    CALL agrif_interp_ice('U') ! interpolation of ice velocities
    CALL agrif_interp_ice('V') ! interpolation of ice velocities
    CALL agrif_interp_ice('T') ! interpolation of ice tracers 
-   lim_nbstep = 0
+   nbstep_ice = 0
    
    !
@@ -495,9 +495,9 @@
 
 SUBROUTINE agrif_declare_var_ice
-   !!----------------------------------------------------------------------
-   !!                 *** ROUTINE agrif_declare_var_ice ***
-   !!
-   !! ** Purpose :: Declaration of variables to be interpolated for ice
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      !!                 *** ROUTINE agrif_declare_var_ice ***
+      !!
+      !! ** Purpose :: Declaration of variables to be interpolated for ice
+      !!----------------------------------------------------------------------
    USE Agrif_Util
    USE ice
@@ -507,5 +507,5 @@
    !
    INTEGER :: ind1, ind2, ind3
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
    !
    ! 1. Declaration of the type of variable which have to be interpolated (parent=>child)
@@ -553,9 +553,9 @@
 # if defined key_top
 SUBROUTINE Agrif_InitValues_cont_top
-   !!----------------------------------------------------------------------
-   !!                 *** ROUTINE Agrif_InitValues_cont_top ***
-   !!
-   !! ** Purpose :: Declaration of variables to be interpolated
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      !!                 *** ROUTINE Agrif_InitValues_cont_top ***
+      !!
+      !! ** Purpose :: Declaration of variables to be interpolated
+      !!----------------------------------------------------------------------
    USE Agrif_Util
    USE oce 
@@ -575,5 +575,5 @@
    CHARACTER(len=10) :: cl_check1, cl_check2, cl_check3
    LOGICAL :: check_namelist
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
 
 
@@ -634,9 +634,9 @@
 
 SUBROUTINE agrif_declare_var_top
-   !!----------------------------------------------------------------------
-   !!                 *** ROUTINE agrif_declare_var_top ***
-   !!
-   !! ** Purpose :: Declaration of TOP variables to be interpolated
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      !!                 *** ROUTINE agrif_declare_var_top ***
+      !!
+      !! ** Purpose :: Declaration of TOP variables to be interpolated
+      !!----------------------------------------------------------------------
    USE agrif_util
    USE agrif_oce
@@ -647,5 +647,5 @@
    !
    INTEGER :: ind1, ind2, ind3
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
 
    ! 1. Declaration of the type of variable which have to be interpolated
@@ -684,10 +684,10 @@
 
 SUBROUTINE Agrif_detect( kg, ksizex )
-   !!----------------------------------------------------------------------
-   !!                      *** ROUTINE Agrif_detect ***
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      !!                      *** ROUTINE Agrif_detect ***
+      !!----------------------------------------------------------------------
    INTEGER, DIMENSION(2) :: ksizex
    INTEGER, DIMENSION(ksizex(1),ksizex(2)) :: kg 
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
    !
    RETURN
@@ -697,7 +697,7 @@
 
 SUBROUTINE agrif_nemo_init
-   !!----------------------------------------------------------------------
-   !!                     *** ROUTINE agrif_init ***
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      !!                     *** ROUTINE agrif_init ***
+      !!----------------------------------------------------------------------
    USE agrif_oce 
    USE agrif_ice
@@ -710,5 +710,5 @@
    INTEGER  ::   iminspon
    NAMELIST/namagrif/ rn_sponge_tra, rn_sponge_dyn, ln_spc_dyn, ln_chk_bathy
-   !!--------------------------------------------------------------------------------------
+      !!--------------------------------------------------------------------------------------
    !
    REWIND( numnam_ref )              ! Namelist namagrif in reference namelist : AGRIF zoom
@@ -747,7 +747,7 @@
 
 SUBROUTINE Agrif_InvLoc( indloc, nprocloc, i, indglob )
-   !!----------------------------------------------------------------------
-   !!                     *** ROUTINE Agrif_InvLoc ***
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      !!                     *** ROUTINE Agrif_InvLoc ***
+      !!----------------------------------------------------------------------
    USE dom_oce
    !!
@@ -755,5 +755,5 @@
    !
    INTEGER :: indglob, indloc, nprocloc, i
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
    !
    SELECT CASE( i )
@@ -768,7 +768,7 @@
 
 SUBROUTINE Agrif_get_proc_info( imin, imax, jmin, jmax )
-   !!----------------------------------------------------------------------
-   !!                 *** ROUTINE Agrif_get_proc_info ***
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      !!                 *** ROUTINE Agrif_get_proc_info ***
+      !!----------------------------------------------------------------------
    USE par_oce
    !!
@@ -777,5 +777,5 @@
    INTEGER, INTENT(out) :: imin, imax
    INTEGER, INTENT(out) :: jmin, jmax
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
    !
    imin = nimppt(Agrif_Procrank+1)  ! ?????
@@ -788,7 +788,7 @@
 
 SUBROUTINE Agrif_estimate_parallel_cost(imin, imax,jmin, jmax, nbprocs, grid_cost)
-   !!----------------------------------------------------------------------
-   !!                 *** ROUTINE Agrif_estimate_parallel_cost ***
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      !!                 *** ROUTINE Agrif_estimate_parallel_cost ***
+      !!----------------------------------------------------------------------
    USE par_oce
    !!
@@ -799,5 +799,5 @@
    INTEGER,  INTENT(in)  :: nbprocs
    REAL(wp), INTENT(out) :: grid_cost
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
    !
    grid_cost = REAL(imax-imin+1,wp)*REAL(jmax-jmin+1,wp) / REAL(nbprocs,wp)
@@ -809,7 +809,7 @@
 #else
 SUBROUTINE Subcalledbyagrif
-   !!----------------------------------------------------------------------
-   !!                   *** ROUTINE Subcalledbyagrif ***
-   !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+      !!                   *** ROUTINE Subcalledbyagrif ***
+      !!----------------------------------------------------------------------
    WRITE(*,*) 'Impossible to be here'
 END SUBROUTINE Subcalledbyagrif
