Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg	(revision 6596)
@@ -22,11 +22,7 @@
    cp_cfg      =  "amm"                !  name of the configuration
    jp_cfg      =     011               !  resolution of the configuration
-   jpidta      =     198               !  1st lateral dimension ( >= jpi )
-   jpjdta      =     224               !  2nd    "         "    ( >= jpj )
-   jpkdta      =      51               !  number of levels      ( >= jpk )
-   jpiglo      =     198               !  1st dimension of global domain --> i =jpidta
-   jpjglo      =     224               !  2nd    -                  -    --> j  =jpjdta
-   jpizoom     =       1               !  left bottom (i,j) indices of the zoom
-   jpjzoom     =       1               !  in data domain indices
+!   jpkdta      =      51               !  number of levels      ( >= jpk )
+!   jpiglo      =     198               !  1st dimension of global domain --> i =jpidta
+!   jpjglo      =     224               !  2nd    -                  -    --> j  =jpjdta
    jperio      =       0               !  lateral cond. type (between 0 and 6)
 /
@@ -49,10 +45,4 @@
 !-----------------------------------------------------------------------
    rn_rdt      =   600.    !  time step for the dynamics (and tracer if nn_acc=0)
-   ppglam0     =  999999.0             !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =  999999.0             ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_deg    =  999999.0             !  meridional grid-spacing (degrees)
-   ppe1_m      =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_m      =  999999.0             !  meridional grid-spacing (degrees)
    ppsur       =  999999.0             !  ORCA r4, r2 and r05 coefficients
    ppa0        =  999999.0             ! (default coefficients)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_cfg
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_cfg	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_cfg	(revision 6596)
@@ -18,11 +18,9 @@
    cp_cfg      =  "papa"                 !  name of the configuration
    jp_cfg      =       1                 !  resolution of the configuration
-   jpidta      =       3                 !  1st lateral dimension ( >= jpi ) = 30*jp_cfg+2
-   jpjdta      =       3                 !  2nd    "         "    ( >= jpj ) = 20*jp_cfg+2 
-   jpkdta      =      75                 !  number of levels      ( >= jpk )
-   jpiglo      =       3                 !  1st dimension of global domain --> i  = jpidta
-   jpjglo      =       3                 !  2nd    -                  -    --> j  = jpjdta
-   jpizoom     =       1                 !  left bottom (i,j) indices of the zoom
-   jpjzoom     =       1                 !  in data domain indices
+!   jpidta      =       3                 !  1st lateral dimension ( >= jpi ) = 30*jp_cfg+2
+!   jpjdta      =       3                 !  2nd    "         "    ( >= jpj ) = 20*jp_cfg+2 
+!   jpkdta      =      75                 !  number of levels      ( >= jpk )
+!   jpiglo      =       3                 !  1st dimension of global domain --> i  = jpidta
+!   jpjglo      =       3                 !  2nd    -                  -    --> j  = jpjdta
    jperio      =       0                 !  lateral cond. type (between 0 and 6)
 /
@@ -43,5 +41,4 @@
    nn_msh      =    0      !  create (=1) a mesh file or not (=0)
    rn_rdt      =  360.     !  time step for the dynamics 
-   jphgr_msh   =       1                 !  type of horizontal mesh
    ppglam0     =    -150.0               !  longitude of first raw and column T-point (jphgr_msh = 1)
    ppgphi0     =      50.0               ! latitude  of first raw and column T-point (jphgr_msh = 1)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/GYRE/EXP00/namelist_cfg
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/GYRE/EXP00/namelist_cfg	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/GYRE/EXP00/namelist_cfg	(revision 6596)
@@ -26,14 +26,7 @@
 &namcfg     !   parameters of the configuration   
 !-----------------------------------------------------------------------
-   ln_read_cfg = .false.  !!gm .false.   !  flag to read (.true.) configuration definition files (coordinates,
+   ln_read_cfg = .true.  !!gm .false.   !  flag to read (.true.) configuration definition files (coordinates,
    cp_cfg      =  "gyre"                 !  name of the configuration
    jp_cfg      =       1                 !  resolution of the configuration
-   jpidta      =      32                 !  1st lateral dimension ( >= jpi ) = 30*jp_cfg+2
-   jpjdta      =      22                 !  2nd    "         "    ( >= jpj ) = 20*jp_cfg+2 
-   jpkdta      =      31                 !  number of levels      ( >= jpk )
-   jpiglo      =      32                 !  1st dimension of global domain --> i  = jpidta
-   jpjglo      =      22                 !  2nd    -                  -    --> j  = jpjdta
-   jpizoom     =       1                 !  left bottom (i,j) indices of the zoom
-   jpjzoom     =       1                 !  in data domain indices
    jperio      =       0                 !  lateral cond. type (between 0 and 6)
 /
@@ -53,12 +46,5 @@
    nn_bathy    =    0      !  compute (=0) or read (=1) the bathymetry file
    rn_rdt      = 7200.     !  time step for the dynamics 
-   jphgr_msh   =       5                 !  type of horizontal mesh
    nn_msh      =    1      !  create (=1) a mesh file or not (=0)
-   ppglam0     =       0.0               !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =      29.0               ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =  999999.0               !  zonal      grid-spacing (degrees)
-   ppe2_deg    =  999999.0               !  meridional grid-spacing (degrees)
-   ppe1_m      =  999999.0               !  zonal      grid-spacing (degrees)
-   ppe2_m      =  999999.0               !  meridional grid-spacing (degrees)
    ppsur       =   -2033.194295283385    !  ORCA r4, r2 and r05 coefficients
    ppa0        =     155.8325369664153   ! (default coefficients)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg	(revision 6596)
@@ -24,11 +24,4 @@
    cp_cfg      =  "gyre"                 !  name of the configuration
    jp_cfg      =       1                 !  resolution of the configuration
-   jpidta      =      32                 !  1st lateral dimension ( >= jpi ) = 30*jp_cfg+2
-   jpjdta      =      22                 !  2nd    "         "    ( >= jpj ) = 20*jp_cfg+2 
-   jpkdta      =      31                 !  number of levels      ( >= jpk )
-   jpiglo      =      32                 !  1st dimension of global domain --> i  = jpidta
-   jpjglo      =      22                 !  2nd    -                  -    --> j  = jpjdta
-   jpizoom     =       1                 !  left bottom (i,j) indices of the zoom
-   jpjzoom     =       1                 !  in data domain indices
    jperio      =       0                 !  lateral cond. type (between 0 and 6)
 /
@@ -47,11 +40,4 @@
    nn_bathy    =    0      !  compute (=0) or read (=1) the bathymetry file
    rn_rdt      = 7200.     !  time step for the dynamics 
-   jphgr_msh   =       5                 !  type of horizontal mesh
-   ppglam0     =       0.0               !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =      29.0               ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =  999999.0               !  zonal      grid-spacing (degrees)
-   ppe2_deg    =  999999.0               !  meridional grid-spacing (degrees)
-   ppe1_m      =  999999.0               !  zonal      grid-spacing (degrees)
-   ppe2_m      =  999999.0               !  meridional grid-spacing (degrees)
    ppsur       =   -2033.194295283385    !  ORCA r4, r2 and r05 coefficients
    ppa0        =     155.8325369664153   ! (default coefficients)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg	(revision 6596)
@@ -17,11 +17,4 @@
    cp_cfg      =  "gyre"                 !  name of the configuration
    jp_cfg      =       1                 !  resolution of the configuration
-   jpidta      =      32                 !  1st lateral dimension ( >= jpi ) = 30*jp_cfg+2
-   jpjdta      =      22                 !  2nd    "         "    ( >= jpj ) = 20*jp_cfg+2 
-   jpkdta      =      31                 !  number of levels      ( >= jpk )
-   jpiglo      =      32                 !  1st dimension of global domain --> i  = jpidta
-   jpjglo      =      22                 !  2nd    -                  -    --> j  = jpjdta
-   jpizoom     =       1                 !  left bottom (i,j) indices of the zoom
-   jpjzoom     =       1                 !  in data domain indices
    jperio      =       0                 !  lateral cond. type (between 0 and 6)
 /
@@ -37,11 +30,4 @@
    nn_bathy    =    0      !  compute (=0) or read (=1) the bathymetry file
    rn_rdt      = 7200.     !  time step for the dynamics 
-   jphgr_msh   =       5                 !  type of horizontal mesh
-   ppglam0     =       0.0               !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =      29.0               ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =  999999.0               !  zonal      grid-spacing (degrees)
-   ppe2_deg    =  999999.0               !  meridional grid-spacing (degrees)
-   ppe1_m      =  999999.0               !  zonal      grid-spacing (degrees)
-   ppe2_m      =  999999.0               !  meridional grid-spacing (degrees)
    ppsur       =   -2033.194295283385    !  ORCA r4, r2 and r05 coefficients
    ppa0        =     155.8325369664153   ! (default coefficients)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/GYRE_XIOS/EXP00/namelist_cfg
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/GYRE_XIOS/EXP00/namelist_cfg	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/GYRE_XIOS/EXP00/namelist_cfg	(revision 6596)
@@ -17,11 +17,4 @@
    cp_cfg      =  "gyre"                 !  name of the configuration
    jp_cfg      =       1                 !  resolution of the configuration
-   jpidta      =      32                 !  1st lateral dimension ( >= jpi ) = 30*jp_cfg+2
-   jpjdta      =      22                 !  2nd    "         "    ( >= jpj ) = 20*jp_cfg+2 
-   jpkdta      =      31                 !  number of levels      ( >= jpk )
-   jpiglo      =      32                 !  1st dimension of global domain --> i  = jpidta
-   jpjglo      =      22                 !  2nd    -                  -    --> j  = jpjdta
-   jpizoom     =       1                 !  left bottom (i,j) indices of the zoom
-   jpjzoom     =       1                 !  in data domain indices
    jperio      =       0                 !  lateral cond. type (between 0 and 6)
 /
@@ -41,12 +34,4 @@
    nn_bathy    =    0      !  compute (=0) or read (=1) the bathymetry file
    rn_rdt      = 7200.     !  time step for the dynamics 
-!   nn_baro     =   60      !  number of barotropic time step            ("key_dynspg_ts")
-   jphgr_msh   =       5                 !  type of horizontal mesh
-   ppglam0     =       0.0               !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =      29.0               ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =  999999.0               !  zonal      grid-spacing (degrees)
-   ppe2_deg    =  999999.0               !  meridional grid-spacing (degrees)
-   ppe1_m      =  999999.0               !  zonal      grid-spacing (degrees)
-   ppe2_m      =  999999.0               !  meridional grid-spacing (degrees)
    ppsur       =   -2033.194295283385    !  ORCA r4, r2 and r05 coefficients
    ppa0        =     155.8325369664153   ! (default coefficients)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg	(revision 6596)
@@ -35,11 +35,4 @@
 &namdom        !   space and time domain (bathymetry, mesh, timestep)
 !-----------------------------------------------------------------------  
-   jphgr_msh   =       0               !  type of horizontal mesh
-   ppglam0     =  999999.0             !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =  999999.0             ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_deg    =  999999.0             !  meridional grid-spacing (degrees)
-   ppe1_m      =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_m      =  999999.0             !  meridional grid-spacing (degrees)
    ppsur       =   -4762.96143546300   !  ORCA r4, r2 and r05 coefficients
    ppa0        =     255.58049070440   ! (default coefficients)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist_cfg
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist_cfg	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist_cfg	(revision 6596)
@@ -34,11 +34,4 @@
 &namdom        !   space and time domain (bathymetry, mesh, timestep)
 !-----------------------------------------------------------------------
-   jphgr_msh   =       0               !  type of horizontal mesh
-   ppglam0     =  999999.0             !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =  999999.0             ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_deg    =  999999.0             !  meridional grid-spacing (degrees)
-   ppe1_m      =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_m      =  999999.0             !  meridional grid-spacing (degrees)
    ppsur       =   -4762.96143546300   !  ORCA r4, r2 and r05 coefficients
    ppa0        =     255.58049070440   ! (default coefficients)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/namelist_cfg
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/namelist_cfg	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/namelist_cfg	(revision 6596)
@@ -33,11 +33,4 @@
 &namdom        !   space and time domain (bathymetry, mesh, timestep)
 !-----------------------------------------------------------------------
-   jphgr_msh   =       0               !  type of horizontal mesh
-   ppglam0     =  999999.0             !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =  999999.0             ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_deg    =  999999.0             !  meridional grid-spacing (degrees)
-   ppe1_m      =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_m      =  999999.0             !  meridional grid-spacing (degrees)
    ppsur       =   -4762.96143546300   !  ORCA r4, r2 and r05 coefficients
    ppa0        =     255.58049070440   ! (default coefficients)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist_cfg
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist_cfg	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist_cfg	(revision 6596)
@@ -49,11 +49,4 @@
 &namdom        !   space and time domain (bathymetry, mesh, timestep)
 !-----------------------------------------------------------------------
-   jphgr_msh   =       0               !  type of horizontal mesh
-   ppglam0     =  999999.0             !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =  999999.0             ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_deg    =  999999.0             !  meridional grid-spacing (degrees)
-   ppe1_m      =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_m      =  999999.0             !  meridional grid-spacing (degrees)
    ppsur       =   -4762.96143546300   !  ORCA r4, r2 and r05 coefficients
    ppa0        =     255.58049070440   ! (default coefficients)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_cfg
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_cfg	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_cfg	(revision 6596)
@@ -30,11 +30,4 @@
 &namdom        !   space and time domain (bathymetry, mesh, timestep)
 !-----------------------------------------------------------------------
-   jphgr_msh   =       0               !  type of horizontal mesh
-   ppglam0     =  999999.0             !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =  999999.0             ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_deg    =  999999.0             !  meridional grid-spacing (degrees)
-   ppe1_m      =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_m      =  999999.0             !  meridional grid-spacing (degrees)
    ppsur       =   -4762.96143546300   !  ORCA r4, r2 and r05 coefficients
    ppa0        =     255.58049070440   ! (default coefficients)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_cfg
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_cfg	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_cfg	(revision 6596)
@@ -35,11 +35,5 @@
    nn_msh      =    1      !  create (=1) a mesh file or not (=0)
    rn_rdt      = 21600.    !  time step for the dynamics 
-   jphgr_msh   =       0               !  type of horizontal mesh
-   ppglam0     =  999999.0             !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =  999999.0             ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_deg    =  999999.0             !  meridional grid-spacing (degrees)
-   ppe1_m      =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_m      =  999999.0             !  meridional grid-spacing (degrees)
+                           !
    ppsur       =   -4762.96143546300   !  ORCA r4, r2 and r05 coefficients
    ppa0        =     255.58049070440   ! (default coefficients)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist_cfg
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist_cfg	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist_cfg	(revision 6596)
@@ -32,11 +32,4 @@
 &namdom        !   space and time domain (bathymetry, mesh, timestep)
 !-----------------------------------------------------------------------
-   jphgr_msh   =       0               !  type of horizontal mesh
-   ppglam0     =  999999.0             !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =  999999.0             ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_deg    =  999999.0             !  meridional grid-spacing (degrees)
-   ppe1_m      =  999999.0             !  zonal      grid-spacing (degrees)
-   ppe2_m      =  999999.0             !  meridional grid-spacing (degrees)
    ppsur       =   -4762.96143546300   !  ORCA r4, r2 and r05 coefficients
    ppa0        =     255.58049070440   ! (default coefficients)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/SHARED/namelist_ref
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/SHARED/namelist_ref	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/SHARED/namelist_ref	(revision 6596)
@@ -77,11 +77,4 @@
    cp_cfz      = "no zoom" !  name of the zoom of configuration
    jp_cfg      =      0    !  resolution of the configuration
-   jpidta      =     10    !  1st lateral dimension ( >= jpi )
-   jpjdta      =     12    !  2nd    "         "    ( >= jpj )
-   jpkdta      =     31    !  number of levels      ( >= jpk )
-   jpiglo      =     10    !  1st dimension of global domain --> i =jpidta
-   jpjglo      =     12    !  2nd    -                  -    --> j =jpjdta
-   jpizoom     =      1    !  left bottom (i,j) indices of the zoom
-   jpjzoom     =      1    !  in data domain indices
    jperio      =      0    !  lateral cond. type (between 0 and 6)
                                  !  = 0 closed                 ;   = 1 cyclic East-West
@@ -141,17 +134,6 @@
    rn_rdt      = 5760.     !  time step for the dynamics (and tracer if nn_acc=0)
    rn_atfp     =    0.1    !  asselin time filter parameter
-   ln_crs      = .false.      !  Logical switch for coarsening module
-   jphgr_msh   =       0               !  type of horizontal mesh
-                                       !  = 0 curvilinear coordinate on the sphere read in coordinate.nc
-                                       !  = 1 geographical mesh on the sphere with regular grid-spacing
-                                       !  = 2 f-plane with regular grid-spacing
-                                       !  = 3 beta-plane with regular grid-spacing
-                                       !  = 4 Mercator grid with T/U point at the equator
-   ppglam0     =       0.0             !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =     -35.0             ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =       1.0             !  zonal      grid-spacing (degrees)
-   ppe2_deg    =       0.5             !  meridional grid-spacing (degrees)
-   ppe1_m      =    5000.0             !  zonal      grid-spacing (degrees)
-   ppe2_m      =    5000.0             !  meridional grid-spacing (degrees)
+   ln_crs      = .false.   !  Logical switch for coarsening module
+                           !   
    ppsur       =    -4762.96143546300  !  ORCA r4, r2 and r05 coefficients
    ppa0        =      255.58049070440  ! (default coefficients)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/dom_ice_2.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/dom_ice_2.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/dom_ice_2.F90	(revision 6596)
@@ -27,5 +27,4 @@
       !                                        !  (otherwise = jpj+10 (SH) or -10 (SH) )
 
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)         ::   fs2cor , fcor     !: coriolis factor and coeficient
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)         ::   covrai            !: sine of geographic latitude
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)         ::   area              !: surface of grid cell 
@@ -48,6 +47,5 @@
       ierr(:) = 0
       !
-      ALLOCATE( fs2cor(jpi,jpj)     , fcor(jpi,jpj) ,                                   &
-         &      covrai(jpi,jpj)     , area(jpi,jpj) , tms(jpi,jpj) , tmu(jpi,jpj) ,     &
+      ALLOCATE( covrai(jpi,jpj)     , area(jpi,jpj) , tms(jpi,jpj) , tmu(jpi,jpj) ,     &
          &      wght  (jpi,jpj,2,2)                                               , STAT=ierr(1) )
          !
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90	(revision 6596)
@@ -79,5 +79,5 @@
                ENDIF
                !
-               IF( fcor(ji,jj) >= 0.e0 ) THEN     !--  Northern hemisphere.
+               IF( ff_t(ji,jj) >= 0._wp ) THEN     !--  Northern hemisphere.
                   hicif(ji,jj)   = zidto * hginn
                   frld(ji,jj)    = zidto * alinn + ( 1.0 - zidto ) * 1.0
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limmsh_2.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limmsh_2.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limmsh_2.F90	(revision 6596)
@@ -70,7 +70,4 @@
       ENDIF
       
-      IF( jphgr_msh == 2 .OR. jphgr_msh == 3 .OR. jphgr_msh == 5 )   &
-          &      CALL ctl_stop(' Coriolis parameter in LIM not set for f- or beta-plane' )
-
       !----------------------------------------------------------                          
       !    Initialization of local and some global (common) variables 
@@ -79,6 +76,4 @@
       njeq   = INT( jpj / 2 )   !i bug mpp potentiel
       njeqm1 = njeq - 1 
-
-      fcor(:,:) = 2. * omega * SIN( gphit(:,:) * rad )   !  coriolis factor at T-point
  
 !i    DO jj = 1, jpj
@@ -87,12 +82,12 @@
 !i    END DO
 
-      IF( fcor(1,1) * fcor(1,nlcj) < 0.e0 ) THEN   ! local domain include both hemisphere
+      IF( ff_t(1,1) * ff_t(1,nlcj) < 0.e0 ) THEN   ! local domain include both hemisphere
          l_jeq = .TRUE.
          njeq  = 1
-         DO WHILE ( njeq <= jpj .AND. fcor(1,njeq) < 0.e0 )
+         DO WHILE ( njeq <= jpj .AND. ff_t(1,njeq) < 0.e0 )
             njeq = njeq + 1
          END DO
          IF(lwp ) WRITE(numout,*) '          the equator is inside the domain at about njeq = ', njeq
-      ELSEIF( fcor(1,1) < 0.e0 ) THEN
+      ELSEIF( ff_t(1,1) < 0.e0 ) THEN
          l_jeq = .FALSE.
          njeq = jpj
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limrhg_2.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limrhg_2.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limrhg_2.F90	(revision 6596)
@@ -163,5 +163,5 @@
          DO ji = 1 , jpi
             ! only the sinus changes its sign with the hemisphere
-            zsang(ji,jj)  = SIGN( 1._wp, fcor(ji,jj) ) * sangvg   ! only the sinus changes its sign with the hemisphere
+            zsang(ji,jj)  = SIGN( 1._wp, ff_t(ji,jj) ) * sangvg   ! only the sinus changes its sign with the hemisphere
             !
             zmasst(ji,jj) = tms(ji,jj) * ( rhosn * hsnm(ji,jj) + rhoic * hicm(ji,jj) )
@@ -198,6 +198,6 @@
                &           + zmasst(ji,jj-1) * wght(ji,jj,2,1) + zmasst(ji-1,jj-1) * wght(ji,jj,1,1) ) * zusw
             zcorl(ji,jj) = zmass(ji,jj) &
-               &           *( fcor(ji,jj  ) * wght(ji,jj,2,2) + fcor(ji-1,jj  )*wght(ji,jj,1,2)   &
-               &            + fcor(ji,jj-1) * wght(ji,jj,2,1) + fcor(ji-1,jj-1)*wght(ji,jj,1,1) ) * zusw
+               &           *( ff_t(ji,jj  ) * wght(ji,jj,2,2) + ff_t(ji-1,jj  )*wght(ji,jj,1,2)   &
+               &            + ff_t(ji,jj-1) * wght(ji,jj,2,1) + ff_t(ji-1,jj-1)*wght(ji,jj,1,1) ) * zusw
 
             ! Wind stress.
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90	(revision 6596)
@@ -347,5 +347,5 @@
       ! Tricky trick : add 2 to frld in the Southern Hemisphere
       !--------------------------------------------------------
-      IF( fcor(1,1) < 0.e0 ) THEN
+      IF( ff_t(1,1) < 0._wp ) THEN
          DO jj = 1, njeqm1
             DO ji = 1, jpi
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limtrp_2.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limtrp_2.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limtrp_2.F90	(revision 6596)
@@ -234,5 +234,5 @@
          !-------------------------------------------------------------------!
          DO jj = 1, jpj
-            zindhe = MAX( 0.e0, SIGN( 1.e0, fcor(1,jj) ) )              ! = 0 for SH, =1 for NH
+            zindhe = MAX( 0._wp, SIGN( 1._wp, ff_t(1,jj) ) )              ! = 0 for SH, =1 for NH
             DO ji = 1, jpi
                !
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_3/dom_ice.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_3/dom_ice.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_3/dom_ice.F90	(revision 6596)
@@ -20,5 +20,4 @@
    INTEGER, PUBLIC ::   njeq , njeqm1        !: j-index of the equator if it is inside the domain
 
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)     ::   fcor   !: coriolis coefficient
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) ::   wght   !: weight of the 4 neighbours to compute averages
 
@@ -37,5 +36,5 @@
       !!-------------------------------------------------------------------
       !
-      ALLOCATE( fcor(jpi,jpj), wght(jpi,jpj,2,2), STAT = dom_ice_alloc )
+      ALLOCATE( wght(jpi,jpj,2,2), STAT = dom_ice_alloc )
       !
       IF( dom_ice_alloc /= 0 )   CALL ctl_warn( 'dom_ice_alloc: failed to allocate arrays.' )
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90	(revision 6596)
@@ -168,5 +168,5 @@
             DO jj = 1, jpj
                DO ji = 1, jpi
-                  IF( fcor(ji,jj) >= 0._wp ) THEN
+                  IF( ff_t(ji,jj) >= 0._wp ) THEN
                      zht_i_ini(ji,jj) = rn_hti_ini_n
                      zht_s_ini(ji,jj) = rn_hts_ini_n
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_3/limmsh.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_3/limmsh.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_3/limmsh.F90	(revision 6596)
@@ -54,21 +54,16 @@
       ENDIF
 
-      IF( jphgr_msh == 2 .OR. jphgr_msh == 3 .OR. jphgr_msh == 5 )   &
-          &      CALL ctl_stop(' Coriolis parameter in LIM not set for f- or beta-plane')
-
-      !                           !==  coriolis factor & Equator position ==!
+      !                           !==  Equator position  ==!
       njeq   = INT( jpj / 2 ) 
       njeqm1 = njeq - 1 
       !
-      fcor(:,:) = 2. * omega * SIN( gphit(:,:) * rad )   ! coriolis factor
-      !
-      IF( fcor(1,1) * fcor(1,nlcj) < 0.e0 ) THEN   ! local domain include both hemisphere
+      IF( ff_t(1,1) * ff_t(1,nlcj) < 0._wp ) THEN   ! local domain include both hemisphere
          l_jeq = .TRUE.
          njeq  = 1
-         DO WHILE ( njeq <= jpj .AND. fcor(1,njeq) < 0.e0 )
+         DO WHILE ( njeq <= jpj .AND. ff_t(1,njeq) < 0._wp )
             njeq = njeq + 1
          END DO
          IF(lwp ) WRITE(numout,*) '          the equator is inside the domain at about njeq = ', njeq
-      ELSEIF( fcor(1,1) < 0.e0 ) THEN
+      ELSEIF( ff_t(1,1) < 0._wp ) THEN
          l_jeq = .FALSE.
          njeq = jpj
@@ -84,10 +79,10 @@
 
       !                           !==  metric coefficients for sea ice dynamic  ==!
-      wght(:,:,:,:) = 0.e0
+      wght(:,:,:,:) = 0._wp
 !!gm  Optimisation :  wght to be defined at F-point, not I-point  and change in limrhg
       DO jj = 2, jpj
          DO ji = 2, jpi
-            zusden = 1.e0 / (  ( e1t(ji,jj) + e1t(ji-1,jj  ) )   &
-               &             * ( e2t(ji,jj) + e2t(ji  ,jj-1) ) )
+            zusden = 1._wp / (  ( e1t(ji,jj) + e1t(ji-1,jj  ) )   &
+               &              * ( e2t(ji,jj) + e2t(ji  ,jj-1) ) )
             wght(ji,jj,1,1) = zusden * e1t(ji  ,jj) * e2t(ji,jj  )
             wght(ji,jj,1,2) = zusden * e1t(ji  ,jj) * e2t(ji,jj-1)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90	(revision 6596)
@@ -267,7 +267,7 @@
             zmass1(ji,jj) = ( zt12 * zc1 + zt11 * zc2 ) / ( zt11 + zt12 + zepsi )
             zmass2(ji,jj) = ( zt22 * zc1 + zt21 * zc3 ) / ( zt21 + zt22 + zepsi )
-            zcorl1(ji,jj) = zmass1(ji,jj) * ( e1t(ji+1,jj) * fcor(ji,jj) + e1t(ji,jj) * fcor(ji+1,jj) )   &
+            zcorl1(ji,jj) = zmass1(ji,jj) * ( e1t(ji+1,jj) * ff_t(ji,jj) + e1t(ji,jj) * ff_t(ji+1,jj) )   &
                &                          / ( e1t(ji,jj) + e1t(ji+1,jj) + zepsi )
-            zcorl2(ji,jj) = zmass2(ji,jj) * ( e2t(ji,jj+1) * fcor(ji,jj) + e2t(ji,jj) * fcor(ji,jj+1) )   &
+            zcorl2(ji,jj) = zmass2(ji,jj) * ( e2t(ji,jj+1) * ff_t(ji,jj) + e2t(ji,jj) * ff_t(ji,jj+1) )   &
                &                          / ( e2t(ji,jj+1) + e2t(ji,jj) + zepsi )
             !
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/NST_SRC/agrif_user.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/NST_SRC/agrif_user.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/NST_SRC/agrif_user.F90	(revision 6596)
@@ -41,6 +41,4 @@
       jpidta  = jpiglo
       jpjdta  = jpjglo
-      jpizoom = 1
-      jpjzoom = 1
       nperio  = 0
       jperio  = 0
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OFF_SRC/domrea.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OFF_SRC/domrea.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OFF_SRC/domrea.F90	(revision 6596)
@@ -118,6 +118,5 @@
          &             nn_write, ln_iscpl  , ln_mskland  , ln_cfmeta    , ln_clobber, nn_chunksz, nn_euler
       NAMELIST/namdom/ nn_bathy , rn_bathy , rn_e3zps_min, rn_e3zps_rat , nn_msh    , rn_hmin   , rn_isfhmin,&
-         &             rn_atfp  , rn_rdt   , nn_baro     , nn_closea    , ln_crs    , jphgr_msh,             &
-         &             ppglam0, ppgphi0, ppe1_deg, ppe2_deg, ppe1_m, ppe2_m, &
+         &             rn_atfp  , rn_rdt   , nn_baro     , nn_closea    , ln_crs    ,             &
          &             ppsur, ppa0, ppa1, ppkth, ppacr, ppdzmin, pphmax, ldbletanh, &
          &             ppa2, ppkth2, ppacr2
@@ -229,11 +228,5 @@
          WRITE(numout,*) '      time-splitting: nb of sub time-step  nn_baro   = ', nn_baro
          WRITE(numout,*) '      suppression of closed seas (=0)      nn_closea = ', nn_closea
-         WRITE(numout,*) '      type of horizontal mesh jphgr_msh           = ', jphgr_msh
-         WRITE(numout,*) '      longitude of first raw and column T-point ppglam0 = ', ppglam0
-         WRITE(numout,*) '      latitude  of first raw and column T-point ppgphi0 = ', ppgphi0
-         WRITE(numout,*) '      zonal      grid-spacing (degrees) ppe1_deg        = ', ppe1_deg
-         WRITE(numout,*) '      meridional grid-spacing (degrees) ppe2_deg        = ', ppe2_deg
-         WRITE(numout,*) '      zonal      grid-spacing (degrees) ppe1_m          = ', ppe1_m
-         WRITE(numout,*) '      meridional grid-spacing (degrees) ppe2_m          = ', ppe2_m
+
          WRITE(numout,*) '      ORCA r4, r2 and r05 coefficients  ppsur           = ', ppsur
          WRITE(numout,*) '                                        ppa0            = ', ppa0
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90	(revision 6596)
@@ -155,5 +155,5 @@
          &             nn_bench, nn_timing, nn_diacfl
       NAMELIST/namcfg/ cp_cfg, cp_cfz, jp_cfg, jpidta, jpjdta, jpkdta, jpiglo, jpjglo, &
-         &             jpizoom, jpjzoom, jperio, ln_use_jattr
+         &             jperio, ln_use_jattr
       !!----------------------------------------------------------------------
       cltxt = ''
@@ -351,11 +351,4 @@
          WRITE(numout,*) '      configuration name              cp_cfg      = ', TRIM(cp_cfg)
          WRITE(numout,*) '      configuration resolution        jp_cfg      = ', jp_cfg
-         WRITE(numout,*) '      1st lateral dimension ( >= jpi ) jpidta     = ', jpidta
-         WRITE(numout,*) '      2nd    "         "    ( >= jpj ) jpjdta     = ', jpjdta
-         WRITE(numout,*) '      3nd    "         "               jpkdta     = ', jpkdta
-         WRITE(numout,*) '      1st dimension of global domain in i jpiglo  = ', jpiglo
-         WRITE(numout,*) '      2nd    -                  -    in j jpjglo  = ', jpjglo
-         WRITE(numout,*) '      left bottom i index of the zoom (in data domain) jpizoom = ', jpizoom
-         WRITE(numout,*) '      left bottom j index of the zoom (in data domain) jpizoom = ', jpjzoom
          WRITE(numout,*) '      lateral cond. type (between 0 and 6) jperio = ', jperio   
          WRITE(numout,*) '      use file attribute if exists as i/p j-start ln_use_jattr = ', ln_use_jattr
@@ -400,12 +393,4 @@
       ENDIF
       !
-      IF( nbench == 1 )   THEN            ! Benchmark 
-         SELECT CASE ( cp_cfg )
-         CASE ( 'gyre' )   ;   CALL ctl_warn( ' The Benchmark is activated ' )
-         CASE DEFAULT      ;   CALL ctl_stop( ' The Benchmark is based on the GYRE configuration:',   &
-            &                                 ' cp_cfg="gyre" in namelsit &namcfg or set nbench = 0' )
-         END SELECT
-      ENDIF
-      !
       IF( lk_c1d .AND. .NOT.lk_iomput )   CALL ctl_stop( 'nemo_ctl: The 1D configuration must be used ',   &
          &                                               'with the IOM Input/Output manager. '        ,   &
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90	(revision 6596)
@@ -769,8 +769,8 @@
 !      is = mjg(1) + 1            ! if monotasking and no zoom, is=2
 !      in = mjg(1) + nlcj-1 - 1   ! if monotasking and no zoom, in=jpjm1      
-      iwe = mig(1) - jpizoom + 2         ! if monotasking and no zoom, iw=2
-      ies = mig(1) + nlci - jpizoom - 1  ! if monotasking and no zoom, ie=jpim1
-      iso = mjg(1) - jpjzoom + 2         ! if monotasking and no zoom, is=2
-      ino = mjg(1) + nlcj - jpjzoom - 1  ! if monotasking and no zoom, in=jpjm1
+      iwe = mig(1) - 1 + 2         ! if monotasking and no zoom, iw=2
+      ies = mig(1) + nlci-1 - 1  ! if monotasking and no zoom, ie=jpim1
+      iso = mjg(1) - 1 + 2         ! if monotasking and no zoom, is=2
+      ino = mjg(1) + nlcj-1 - 1  ! if monotasking and no zoom, in=jpjm1
 
       ALLOCATE( nbondi_bdy(nb_bdy))
@@ -785,45 +785,45 @@
       ! Work out dimensions of boundary data on each neighbour process
       IF(nbondi == 0) THEN
-         iw_b(1) = jpizoom + nimppt(nowe+1)
-         ie_b(1) = jpizoom + nimppt(nowe+1)+nlcit(nowe+1)-3
-         is_b(1) = jpjzoom + njmppt(nowe+1)
-         in_b(1) = jpjzoom + njmppt(nowe+1)+nlcjt(nowe+1)-3
-
-         iw_b(2) = jpizoom + nimppt(noea+1)
-         ie_b(2) = jpizoom + nimppt(noea+1)+nlcit(noea+1)-3
-         is_b(2) = jpjzoom + njmppt(noea+1)
-         in_b(2) = jpjzoom + njmppt(noea+1)+nlcjt(noea+1)-3
+         iw_b(1) = 1 + nimppt(nowe+1)
+         ie_b(1) = 1 + nimppt(nowe+1)+nlcit(nowe+1)-3
+         is_b(1) = 1 + njmppt(nowe+1)
+         in_b(1) = 1 + njmppt(nowe+1)+nlcjt(nowe+1)-3
+
+         iw_b(2) = 1 + nimppt(noea+1)
+         ie_b(2) = 1 + nimppt(noea+1)+nlcit(noea+1)-3
+         is_b(2) = 1 + njmppt(noea+1)
+         in_b(2) = 1 + njmppt(noea+1)+nlcjt(noea+1)-3
       ELSEIF(nbondi == 1) THEN
-         iw_b(1) = jpizoom + nimppt(nowe+1)
-         ie_b(1) = jpizoom + nimppt(nowe+1)+nlcit(nowe+1)-3
-         is_b(1) = jpjzoom + njmppt(nowe+1)
-         in_b(1) = jpjzoom + njmppt(nowe+1)+nlcjt(nowe+1)-3
+         iw_b(1) = 1 + nimppt(nowe+1)
+         ie_b(1) = 1 + nimppt(nowe+1)+nlcit(nowe+1)-3
+         is_b(1) = 1 + njmppt(nowe+1)
+         in_b(1) = 1 + njmppt(nowe+1)+nlcjt(nowe+1)-3
       ELSEIF(nbondi == -1) THEN
-         iw_b(2) = jpizoom + nimppt(noea+1)
-         ie_b(2) = jpizoom + nimppt(noea+1)+nlcit(noea+1)-3
-         is_b(2) = jpjzoom + njmppt(noea+1)
-         in_b(2) = jpjzoom + njmppt(noea+1)+nlcjt(noea+1)-3
+         iw_b(2) = 1 + nimppt(noea+1)
+         ie_b(2) = 1 + nimppt(noea+1)+nlcit(noea+1)-3
+         is_b(2) = 1 + njmppt(noea+1)
+         in_b(2) = 1 + njmppt(noea+1)+nlcjt(noea+1)-3
       ENDIF
 
       IF(nbondj == 0) THEN
-         iw_b(3) = jpizoom + nimppt(noso+1)
-         ie_b(3) = jpizoom + nimppt(noso+1)+nlcit(noso+1)-3
-         is_b(3) = jpjzoom + njmppt(noso+1)
-         in_b(3) = jpjzoom + njmppt(noso+1)+nlcjt(noso+1)-3
-
-         iw_b(4) = jpizoom + nimppt(nono+1)
-         ie_b(4) = jpizoom + nimppt(nono+1)+nlcit(nono+1)-3
-         is_b(4) = jpjzoom + njmppt(nono+1)
-         in_b(4) = jpjzoom + njmppt(nono+1)+nlcjt(nono+1)-3
+         iw_b(3) = 1 + nimppt(noso+1)
+         ie_b(3) = 1 + nimppt(noso+1)+nlcit(noso+1)-3
+         is_b(3) = 1 + njmppt(noso+1)
+         in_b(3) = 1 + njmppt(noso+1)+nlcjt(noso+1)-3
+
+         iw_b(4) = 1 + nimppt(nono+1)
+         ie_b(4) = 1 + nimppt(nono+1)+nlcit(nono+1)-3
+         is_b(4) = 1 + njmppt(nono+1)
+         in_b(4) = 1 + njmppt(nono+1)+nlcjt(nono+1)-3
       ELSEIF(nbondj == 1) THEN
-         iw_b(3) = jpizoom + nimppt(noso+1)
-         ie_b(3) = jpizoom + nimppt(noso+1)+nlcit(noso+1)-3
-         is_b(3) = jpjzoom + njmppt(noso+1)
-         in_b(3) = jpjzoom + njmppt(noso+1)+nlcjt(noso+1)-3
+         iw_b(3) = 1 + nimppt(noso+1)
+         ie_b(3) = 1 + nimppt(noso+1)+nlcit(noso+1)-3
+         is_b(3) = 1 + njmppt(noso+1)
+         in_b(3) = 1 + njmppt(noso+1)+nlcjt(noso+1)-3
       ELSEIF(nbondj == -1) THEN
-         iw_b(4) = jpizoom + nimppt(nono+1)
-         ie_b(4) = jpizoom + nimppt(nono+1)+nlcit(nono+1)-3
-         is_b(4) = jpjzoom + njmppt(nono+1)
-         in_b(4) = jpjzoom + njmppt(nono+1)+nlcjt(nono+1)-3
+         iw_b(4) = 1 + nimppt(nono+1)
+         ie_b(4) = 1 + nimppt(nono+1)+nlcit(nono+1)-3
+         is_b(4) = 1 + njmppt(nono+1)
+         in_b(4) = 1 + njmppt(nono+1)+nlcjt(nono+1)-3
       ENDIF
 
@@ -899,6 +899,6 @@
 !                     idx_bdy(ib_bdy)%nbi(icount,igrd)   = nbidta(ib,igrd,ib_bdy)- mig(1)+1
 !                     idx_bdy(ib_bdy)%nbj(icount,igrd)   = nbjdta(ib,igrd,ib_bdy)- mjg(1)+1
-                     idx_bdy(ib_bdy)%nbi(icount,igrd)   = nbidta(ib,igrd,ib_bdy)- mig(1)+jpizoom
-                     idx_bdy(ib_bdy)%nbj(icount,igrd)   = nbjdta(ib,igrd,ib_bdy)- mjg(1)+jpjzoom
+                     idx_bdy(ib_bdy)%nbi(icount,igrd)   = nbidta(ib,igrd,ib_bdy)- mig(1)+1
+                     idx_bdy(ib_bdy)%nbj(icount,igrd)   = nbjdta(ib,igrd,ib_bdy)- mjg(1)+1
                      ! check if point has to be sent
                      ii = idx_bdy(ib_bdy)%nbi(icount,igrd)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90	(revision 6596)
@@ -24,4 +24,7 @@
 
    PUBLIC   dom_c1d   ! called in domcfg.F90
+
+   INTEGER ::   jpizoom = 1      !: left bottom (i,j) indices of the zoom
+   INTEGER ::   jpjzoom = 1      !: in data domain indices
 
    !!----------------------------------------------------------------------
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/C1D/dyncor_c1d.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/C1D/dyncor_c1d.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/C1D/dyncor_c1d.F90	(revision 6596)
@@ -49,30 +49,4 @@
       IF(lwp) WRITE(numout,*) '~~~~~~~'
 
-      SELECT CASE( jphgr_msh )   ! type of horizontal mesh
-      !
-      CASE ( 0, 1, 4 )               ! mesh on the sphere
-         ff(:,:) = 2. * omega * SIN( rad * gphit(:,:) ) 
-         !
-      CASE ( 2 )                     ! f-plane at ppgphi0 
-         ff(:,:) = 2. * omega * SIN( rad * ppgphi0 )
-         IF(lwp) WRITE(numout,*) '          f-plane: Coriolis parameter = constant = ', ff(1,1)
-         !
-      CASE ( 3 )                     ! beta-plane
-         zbeta   = 2. * omega * COS( rad * ppgphi0 ) / ra                     ! beta at latitude ppgphi0
-         zphi0   = ppgphi0 - FLOAT( jpjglo/2) * ppe2_m *1.e-3  / ( ra * rad ) ! latitude of the first row F-points
-         zf0     = 2. * omega * SIN( rad * zphi0 )                            ! compute f0 1st point south
-         ff(:,:) = ( zf0  + zbeta * gphit(:,:) * 1.e+3 )                      ! f = f0 +beta* y ( y=0 at south)
-         IF(lwp) WRITE(numout,*) '          Beta-plane: Beta parameter = constant = ', ff(1,1)
-         IF(lwp) WRITE(numout,*) '                      Coriolis parameter varies from ', ff(1,1),' to ', ff(1,jpj)
-         !
-      CASE ( 5 )                     ! beta-plane and rotated domain
-         zbeta = 2. * omega * COS( rad * ppgphi0 ) / ra                     ! beta at latitude ppgphi0
-         zphi0 = 15.e0                                                      ! latitude of the first row F-points
-         zf0   = 2. * omega * SIN( rad * zphi0 )                            ! compute f0 1st point south
-         ff(:,:) = ( zf0 + zbeta * ABS( gphit(:,:) - zphi0 ) * rad * ra )   ! f = f0 +beta* y ( y=0 at south)
-         IF(lwp) WRITE(numout,*) '          Beta-plane: Beta parameter = constant = ', ff(1,1)
-         IF(lwp) WRITE(numout,*) '                      Coriolis parameter varies from ', ff(1,1),' to ', ff(1,jpj)
-         !
-      END SELECT
       !
    END SUBROUTINE cor_c1d
@@ -100,6 +74,6 @@
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1   ! vector opt.
-               ua(ji,jj,jk) = ua(ji,jj,jk) + ff(ji,jj) * vn(ji,jj,jk)
-               va(ji,jj,jk) = va(ji,jj,jk) - ff(ji,jj) * un(ji,jj,jk)
+               ua(ji,jj,jk) = ua(ji,jj,jk) + ff_t(ji,jj) * vn(ji,jj,jk)
+               va(ji,jj,jk) = va(ji,jj,jk) - ff_t(ji,jj) * un(ji,jj,jk)
             END DO
          END DO
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/CRS/crsdom.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/CRS/crsdom.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/CRS/crsdom.F90	(revision 6596)
@@ -2023,7 +2023,4 @@
          nimpp_crs = nimppt_crs(nproc + 1)
 
-         ! No coarsening with zoom
-         IF( jpizoom /= 1 .OR. jpjzoom /= 1)    STOP 
-
          DO ji = 1, jpi_crs
             mig_crs(ji) = ji + nimpp_crs - 1
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90	(revision 6596)
@@ -11,5 +11,5 @@
    !!----------------------------------------------------------------------
    USE par_kind, ONLY: wp
-   USE par_oce                  ! For parameter jpi,jpj,jphgr_msh
+   USE par_oce                  ! For parameter jpi,jpj
    USE dom_oce                  ! For parameters in par_oce
    USE crs                      ! Coarse grid domain
@@ -170,15 +170,11 @@
      !      3.c.2 Coriolis factor  
 
-      SELECT CASE( jphgr_msh )   ! type of horizontal mesh
-
-      CASE ( 0, 1, 4 )           ! mesh on the sphere
-
-         ff_crs(:,:) = 2. * omega * SIN( rad * gphif_crs(:,:) )
-
-      CASE DEFAULT 
-
-       IF(lwp)    WRITE(numout,*) 'crsini.F90. crs_init. Only jphgr_msh = 0, 1 or 4 supported' 
+!!gm  Not sure CRS needs Coriolis parameter....
+!!gm  If needed, then update this to have Coriolis at both f- and t-points
+
+      ff_crs(:,:) = 2. * omega * SIN( rad * gphif_crs(:,:) )
+
+      CALL ctl_warn( 'crsini: CAUTION, CRS only designed for Coriolis defined on the sphere' ) 
  
-      END SELECT 
 
      !    3.d.1 mbathy ( vertical k-levels of bathymetry )     
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90	(revision 6596)
@@ -424,6 +424,6 @@
               IF( iiglo==jpidta .AND. nimpp==1 ) iiglo = 2
 
-              iiloc=iiglo-jpizoom+1-nimpp+1   ! local coordinates of the point
-              ijloc=ijglo-jpjzoom+1-njmpp+1   !  "
+              iiloc=iiglo-nimpp+1   ! local coordinates of the point
+              ijloc=ijglo-njmpp+1   !  "
 
               !verify if the point is on the local domain:(1,nlei)*(1,nlej)
@@ -444,6 +444,6 @@
               WRITE(numout,*)"      List of points selected by the proc:"
               DO jpt = 1,iptloc
-                 iiglo = secs(jsec)%listPoint(jpt)%I + jpizoom - 1 + nimpp - 1
-                 ijglo = secs(jsec)%listPoint(jpt)%J + jpjzoom - 1 + njmpp - 1
+                 iiglo = secs(jsec)%listPoint(jpt)%I + nimpp - 1
+                 ijglo = secs(jsec)%listPoint(jpt)%J + njmpp - 1
                  WRITE(numout,*)'         # I J : ',iiglo,ijglo
               ENDDO
@@ -452,6 +452,6 @@
               IF(jsec==nn_secdebug .AND. secs(jsec)%nb_point .NE. 0)THEN
               DO jpt = 1,iptloc
-                 iiglo = secs(jsec)%listPoint(jpt)%I + jpizoom - 1 + nimpp - 1
-                 ijglo = secs(jsec)%listPoint(jpt)%J + jpjzoom - 1 + njmpp - 1
+                 iiglo = secs(jsec)%listPoint(jpt)%I + nimpp - 1
+                 ijglo = secs(jsec)%listPoint(jpt)%J + njmpp - 1
               ENDDO
               ENDIF
@@ -468,6 +468,6 @@
            IF(jsec==nn_secdebug .AND. secs(jsec)%nb_point .NE. 0)THEN
               DO jpt = 1,secs(jsec)%nb_point
-                 iiglo = secs(jsec)%listPoint(jpt)%I + jpizoom - 1 + nimpp - 1
-                 ijglo = secs(jsec)%listPoint(jpt)%J + jpjzoom - 1 + njmpp - 1
+                 iiglo = secs(jsec)%listPoint(jpt)%I + nimpp - 1
+                 ijglo = secs(jsec)%listPoint(jpt)%J + njmpp - 1
               ENDDO
            ENDIF
@@ -479,6 +479,6 @@
               iptloc = secs(jsec)%nb_point
               DO jpt = 1,iptloc
-                 iiglo = secs(jsec)%listPoint(jpt)%I + jpizoom - 1 + nimpp - 1
-                 ijglo = secs(jsec)%listPoint(jpt)%J + jpjzoom - 1 + njmpp - 1
+                 iiglo = secs(jsec)%listPoint(jpt)%I + nimpp - 1
+                 ijglo = secs(jsec)%listPoint(jpt)%J + njmpp - 1
                  WRITE(numout,*)'         # I J : ',iiglo,ijglo
                  CALL FLUSH(numout)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90	(revision 6596)
@@ -57,21 +57,4 @@
    INTEGER,  PUBLIC :: nn_baro           !: Number of barotropic iterations during one baroclinic step (rdt)
    REAL(wp), PUBLIC :: rn_bt_cmax        !: Maximum allowed courant number (used if ln_bt_auto=T)
-
-   !! Horizontal grid parameters for domhgr
-   !! =====================================
-   INTEGER       ::   jphgr_msh          !: type of horizontal mesh
-   !                                       !  = 0 curvilinear coordinate on the sphere read in coordinate.nc
-   !                                       !  = 1 geographical mesh on the sphere with regular grid-spacing
-   !                                       !  = 2 f-plane with regular grid-spacing
-   !                                       !  = 3 beta-plane with regular grid-spacing
-   !                                       !  = 4 Mercator grid with T/U point at the equator
-
-   REAL(wp)      ::   ppglam0            !: longitude of first raw and column T-point (jphgr_msh = 1)
-   REAL(wp)      ::   ppgphi0            !: latitude  of first raw and column T-point (jphgr_msh = 1)
-   !                                                        !  used for Coriolis & Beta parameters (jphgr_msh = 2 or 3)
-   REAL(wp)      ::   ppe1_deg           !: zonal      grid-spacing (degrees)
-   REAL(wp)      ::   ppe2_deg           !: meridional grid-spacing (degrees)
-   REAL(wp)      ::   ppe1_m             !: zonal      grid-spacing (degrees)
-   REAL(wp)      ::   ppe2_m             !: meridional grid-spacing (degrees)
 
    !! Vertical grid parameter for domzgr
@@ -102,17 +85,11 @@
 
    !                                                  !!! associated variables
-   INTEGER , PUBLIC                 ::   neuler        !: restart euler forward option (0=Euler)
-   REAL(wp), PUBLIC                 ::   atfp1         !: asselin time filter coeff. (atfp1= 1-2*atfp)
-   REAL(wp), PUBLIC                 ::   r2dt          !: = 2*rdt except at nit000 (=rdt) if neuler=0
+   INTEGER , PUBLIC ::   neuler        !: restart euler forward option (0=Euler)
+   REAL(wp), PUBLIC ::   atfp1         !: asselin time filter coeff. (atfp1= 1-2*atfp)
+   REAL(wp), PUBLIC ::   r2dt          !: = 2*rdt except at nit000 (=rdt) if neuler=0
 
    !!----------------------------------------------------------------------
    !! space domain parameters
    !!----------------------------------------------------------------------
-   LOGICAL, PUBLIC ::   lzoom      =  .FALSE.   !: zoom flag
-   LOGICAL, PUBLIC ::   lzoom_e    =  .FALSE.   !: East  zoom type flag
-   LOGICAL, PUBLIC ::   lzoom_w    =  .FALSE.   !: West  zoom type flag
-   LOGICAL, PUBLIC ::   lzoom_s    =  .FALSE.   !: South zoom type flag
-   LOGICAL, PUBLIC ::   lzoom_n    =  .FALSE.   !: North zoom type flag
-
    !                                     !!! domain parameters linked to mpp
    INTEGER, PUBLIC ::   nperio            !: type of lateral boundary condition
@@ -166,5 +143,5 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   e1e2f , r1_e1e2f                !: associated metrics at f-point
    !
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   ff                              !: coriolis factor                   [1/s]
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   ff_f, ff_t                      !: coriolis factor at f- and t-point         [1/s]
 
    !!----------------------------------------------------------------------
@@ -229,13 +206,12 @@
    !! ---------------------------------------------------------------------
    INTEGER , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   mbathy             !: number of ocean level (=0, 1, ... , jpk-1)
-   INTEGER , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   mbkt               !: vertical index of the bottom last T- ocean level
-   INTEGER , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   mbku, mbkv         !: vertical index of the bottom last U- and W- ocean level
+   INTEGER , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   mbkt, mbku, mbkv   !: bottom last wet T-, U- and W-level
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   bathy              !: ocean depth (meters)
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   tmask_i            !: interior domain T-point mask
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   tmask_h            !: internal domain T-point mask (Figure 8.5 NEMO book)
 
-   INTEGER , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   misfdep                 !: top first ocean level                (ISF)
-   INTEGER , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   mikt, miku, mikv, mikf  !: first wet T-, U-, V-, F- ocean level (ISF)
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   risfdep                 !: Iceshelf draft                       (ISF)
+   INTEGER , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   misfdep                 !: top first ocean level             (ISF)
+   INTEGER , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   mikt, miku, mikv, mikf  !: top first wet T-, U-, V-, F-level (ISF)
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   risfdep                 !: Iceshelf draft                    (ISF)
 
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   ssmask, ssumask, ssvmask, ssfmask    !: surface mask at T-,U-, V- and F-pts
@@ -319,6 +295,6 @@
          &      njmppt(jpnij) , ibonjt(jpnij) , nldit(jpnij) , nldjt(jpnij) ,     &
          &                                      nleit(jpnij) , nlejt(jpnij) ,     &
-         &      mi0(jpidta)   , mi1 (jpidta),  mj0(jpjdta)   , mj1 (jpjdta),      &
-         &      tpol(jpiglo)  , fpol(jpiglo)                               , STAT=ierr(2) )
+         &      mi0(jpidta)   , mi1 (jpidta),  mj0(jpjdta)   , mj1 (jpjdta) ,     &
+         &      tpol(jpiglo)  , fpol(jpiglo)                                , STAT=ierr(2) )
          !
       ALLOCATE( glamt(jpi,jpj) ,    glamu(jpi,jpj) ,  glamv(jpi,jpj) ,  glamf(jpi,jpj) ,     &
@@ -332,7 +308,7 @@
          &      e1e2v(jpi,jpj) , r1_e1e2v(jpi,jpj) , e1_e2v(jpi,jpj)                   ,     &
          &      e1e2f(jpi,jpj) , r1_e1e2f(jpi,jpj)                                     ,     &
-         &        ff (jpi,jpj)                                                         , STAT=ierr(3) )
-         !
-      ALLOCATE( gdept_0(jpi,jpj,jpk) , gdepw_0(jpi,jpj,jpk) , gde3w_0(jpi,jpj,jpk) ,     &
+         &      ff_f (jpi,jpj) ,    ff_t (jpi,jpj)                                     , STAT=ierr(3) )
+         !
+      ALLOCATE( gdept_0(jpi,jpj,jpk) , gdepw_0(jpi,jpj,jpk) , gde3w_0(jpi,jpj,jpk) ,      &
          &      gdept_b(jpi,jpj,jpk) , gdepw_b(jpi,jpj,jpk) ,                             &
          &      gdept_n(jpi,jpj,jpk) , gdepw_n(jpi,jpj,jpk) , gde3w_n(jpi,jpj,jpk) , STAT=ierr(4) )
@@ -364,16 +340,14 @@
          &      hift  (jpi,jpj) , hifu  (jpi,jpj) , rx1(jpi,jpj) , STAT=ierr(8) )
 
-      ALLOCATE( mbathy(jpi,jpj) , bathy  (jpi,jpj) ,                                       &
-         &     tmask_i(jpi,jpj) , tmask_h(jpi,jpj) ,                                       & 
-         &     ssmask (jpi,jpj) , ssumask(jpi,jpj) , ssvmask(jpi,jpj) , ssfmask(jpi,jpj) , &
-         &     mbkt   (jpi,jpj) , mbku   (jpi,jpj) , mbkv   (jpi,jpj) , STAT=ierr(9) )
-
-! (ISF) Allocation of basic array   
-      ALLOCATE( misfdep(jpi,jpj) , risfdep(jpi,jpj),     &
-         &     mikt(jpi,jpj), miku(jpi,jpj), mikv(jpi,jpj) ,           &
-         &     mikf(jpi,jpj), STAT=ierr(10) )
-
-      ALLOCATE( tmask(jpi,jpj,jpk) , umask(jpi,jpj,jpk),     & 
-         &      vmask(jpi,jpj,jpk) , fmask(jpi,jpj,jpk), STAT=ierr(11) )
+      ALLOCATE( mbathy (jpi,jpj) , bathy  (jpi,jpj) ,                                       &
+         &      tmask_i(jpi,jpj) , tmask_h(jpi,jpj) ,                                       & 
+         &      ssmask (jpi,jpj) , ssumask(jpi,jpj) , ssvmask(jpi,jpj) , ssfmask(jpi,jpj) , &
+         &      mbkt   (jpi,jpj) , mbku   (jpi,jpj) , mbkv   (jpi,jpj) , STAT=ierr(9) )
+
+      ALLOCATE( misfdep(jpi,jpj) , mikt(jpi,jpj) , miku(jpi,jpj) ,     &
+         &      risfdep(jpi,jpj) , mikv(jpi,jpj) , mikf(jpi,jpj) , STAT=ierr(10) )
+
+      ALLOCATE( tmask(jpi,jpj,jpk) , umask(jpi,jpj,jpk) ,     & 
+         &      vmask(jpi,jpj,jpk) , fmask(jpi,jpj,jpk) , STAT=ierr(11) )
 
       ALLOCATE( wmask(jpi,jpj,jpk) , wumask(jpi,jpj,jpk), wvmask(jpi,jpj,jpk) , STAT=ierr(12) )
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90	(revision 6596)
@@ -166,6 +166,5 @@
          &             ln_cfmeta, ln_iscpl
       NAMELIST/namdom/ nn_bathy, rn_bathy , rn_e3zps_min, rn_e3zps_rat, nn_msh, rn_hmin, rn_isfhmin, &
-         &             rn_atfp , rn_rdt   , nn_closea   , ln_crs      , jphgr_msh ,                  &
-         &             ppglam0, ppgphi0, ppe1_deg, ppe2_deg, ppe1_m, ppe2_m,                         &
+         &             rn_atfp , rn_rdt   , nn_closea   , ln_crs      ,                              &
          &             ppsur, ppa0, ppa1, ppkth, ppacr, ppdzmin, pphmax, ldbletanh,                  &
          &             ppa2, ppkth2, ppacr2
@@ -295,11 +294,5 @@
          WRITE(numout,*) '      suppression of closed seas (=0)       nn_closea = ', nn_closea
          WRITE(numout,*) '      online coarsening of dynamical fields ln_crs    = ', ln_crs
-         WRITE(numout,*) '      type of horizontal mesh jphgr_msh           = ', jphgr_msh
-         WRITE(numout,*) '      longitude of first raw and column T-point ppglam0 = ', ppglam0
-         WRITE(numout,*) '      latitude  of first raw and column T-point ppgphi0 = ', ppgphi0
-         WRITE(numout,*) '      zonal      grid-spacing (degrees) ppe1_deg        = ', ppe1_deg
-         WRITE(numout,*) '      meridional grid-spacing (degrees) ppe2_deg        = ', ppe2_deg
-         WRITE(numout,*) '      zonal      grid-spacing (degrees) ppe1_m          = ', ppe1_m
-         WRITE(numout,*) '      meridional grid-spacing (degrees) ppe2_m          = ', ppe2_m
+
          WRITE(numout,*) '      ORCA r4, r2 and r05 coefficients  ppsur           = ', ppsur
          WRITE(numout,*) '                                        ppa0            = ', ppa0
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domcfg.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domcfg.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domcfg.F90	(revision 6596)
@@ -9,13 +9,14 @@
 
    !!----------------------------------------------------------------------
-   !!   dom_cfg        : initialize the domain configuration
+   !!   dom_cfg       : initialize the domain configuration
    !!----------------------------------------------------------------------
-   USE dom_oce         ! ocean space and time domain
-   USE phycst          ! physical constants
-   USE in_out_manager  ! I/O manager
-   USE lib_mpp         ! distributed memory computing library
-   USE timing          ! Timing
-   USE c1d             ! 1D configuration
-   USE domc1d          ! 1D configuration: column location
+   USE dom_oce        ! ocean space and time domain
+   USE phycst         ! physical constants
+   !
+   USE in_out_manager ! I/O manager
+   USE lib_mpp        ! distributed memory computing library
+   USE timing         ! Timing
+   USE c1d            ! 1D configuration
+   USE domc1d         ! 1D configuration: column location
 
    IMPLICIT NONE
@@ -71,51 +72,47 @@
       !!                     ***  ROUTINE dom_glo  ***
       !!
-      !! ** Purpose :   initialization for global domain, zoom and local domain
+      !! ** Purpose :   initialization for global and local domain
       !!
       !! ** Method  :   
       !!
-      !! ** Action  : - mig  , mjg : 
-      !!              - mi0  , mi1   :
-      !!              - mj0, , mj1   :
+      !! ** Action  : - mig , mjg : local  domain indices ==> global domain indices
+      !!              - mi0 , mi1 : global domain indices ==> local  domain indices
+      !!              - mj0,, mj1   (global point not in the local domain ==> mi0>mi1 and/or mj0>mj1)
       !!----------------------------------------------------------------------
       INTEGER ::   ji, jj   ! dummy loop argument
       !!----------------------------------------------------------------------
-      !                              ! recalculate jpizoom/jpjzoom given lat/lon
+!!gm  This should be removed with the new configuration interface
+      !                              ! recalculate jp_izoom/jp_jzoom given lat/lon
       IF( lk_c1d .AND. ln_c1d_locpt )  CALL dom_c1d( rn_lat1d, rn_lon1d )
+!!gm end
       !
       !                        ! ============== !
       !                        !  Local domain  ! 
       !                        ! ============== !
-      DO ji = 1, jpi                 ! local domain indices ==> data domain indices
-        mig(ji) = ji + jpizoom - 1 + nimpp - 1
+      DO ji = 1, jpi                 ! local domain indices ==> global domain indices
+        mig(ji) = ji + nimpp - 1
       END DO
       DO jj = 1, jpj
-        mjg(jj) = jj + jpjzoom - 1 + njmpp - 1
+        mjg(jj) = jj + njmpp - 1
       END DO
       !
-      !                              ! data domain indices ==> local domain indices
+      !                              ! global domain indices ==> local domain indices
       !                                   ! (return (m.0,m.1)=(1,0) if data domain gridpoint is to the west/south of the 
       !                                   !local domain, or (m.0,m.1)=(jp.+1,jp.) to the east/north of local domain. 
-      DO ji = 1, jpidta
-        mi0(ji) = MAX( 1, MIN( ji - jpizoom + 1 - nimpp + 1, jpi+1 ) )
-        mi1(ji) = MAX( 0, MIN( ji - jpizoom + 1 - nimpp + 1, jpi   ) )
+      DO ji = 1, jpiglo
+        mi0(ji) = MAX( 1 , MIN( ji - nimpp + 1, jpi+1 ) )
+        mi1(ji) = MAX( 0 , MIN( ji - nimpp + 1, jpi   ) )
       END DO
-      DO jj = 1, jpjdta
-        mj0(jj) = MAX( 1, MIN( jj - jpjzoom + 1 - njmpp + 1, jpj+1 ) )
-        mj1(jj) = MAX( 0, MIN( jj - jpjzoom + 1 - njmpp + 1, jpj   ) )
+      DO jj = 1, jpjglo
+        mj0(jj) = MAX( 1 , MIN( jj - njmpp + 1, jpj+1 ) )
+        mj1(jj) = MAX( 0 , MIN( jj - njmpp + 1, jpj   ) )
       END DO
       IF(lwp) THEN                   ! control print
          WRITE(numout,*)
-         WRITE(numout,*) 'dom_glo : domain: data / local '
+         WRITE(numout,*) 'dom_glo : domain: global <<==>> local '
          WRITE(numout,*) '~~~~~~~ '
-         WRITE(numout,*) '          data input domain    : jpidta = ', jpidta,   &
-            &                                            ' jpjdta = ', jpjdta, ' jpkdta = ', jpkdta
-         WRITE(numout,*) '          global or zoom domain: jpiglo = ', jpiglo,   &
-            &                                            ' jpjglo = ', jpjglo, ' jpk    = ', jpk
-         WRITE(numout,*) '          local domain         : jpi    = ', jpi   ,   &
-            &                                            ' jpj    = ', jpj   , ' jpk    = ', jpk
+         WRITE(numout,*) '          global domain:   jpiglo = ', jpiglo, ' jpjglo = ', jpjglo, ' jpkglo = ', jpkglo
+         WRITE(numout,*) '          local  domain:   jpi    = ', jpi   , ' jpj    = ', jpj   , ' jpk    = ', jpk
          WRITE(numout,*)
-         WRITE(numout,*) '          south-west indices    jpizoom = ', jpizoom,   &
-            &                                           ' jpjzoom = ', jpjzoom
          IF( nn_print >= 1 ) THEN
             WRITE(numout,*)
@@ -125,7 +122,7 @@
             WRITE(numout,*) '          conversion data   ==> local  i-index domain'
             WRITE(numout,*) '             starting index'
-            WRITE(numout,25)              (mi0(ji),ji = 1,jpidta)
+            WRITE(numout,25)              (mi0(ji),ji = 1,jpiglo)
             WRITE(numout,*) '             ending index'
-            WRITE(numout,25)              (mi1(ji),ji = 1,jpidta)
+            WRITE(numout,25)              (mi1(ji),ji = 1,jpiglo)
             WRITE(numout,*)
             WRITE(numout,*) '          conversion local  ==> data j-index domain'
@@ -134,66 +131,11 @@
             WRITE(numout,*) '          conversion data  ==> local j-index domain'
             WRITE(numout,*) '             starting index'
-            WRITE(numout,25)              (mj0(jj),jj = 1,jpjdta)
+            WRITE(numout,25)              (mj0(jj),jj = 1,jpjglo)
             WRITE(numout,*) '             ending index'
-            WRITE(numout,25)              (mj1(jj),jj = 1,jpjdta)
+            WRITE(numout,25)              (mj1(jj),jj = 1,jpjglo)
          ENDIF
       ENDIF
  25   FORMAT( 100(10x,19i4,/) )
 
-      !                        ! ============== !
-      !                        !  Zoom domain   !
-      !                        ! ============== !
-      !                              ! zoom control
-      IF( jpiglo + jpizoom - 1  >  jpidta .OR.   &
-          jpjglo + jpjzoom - 1  >  jpjdta      ) &
-          &   CALL ctl_stop( ' global or zoom domain exceed the data domain ! ' )
-
-      !                              ! set zoom flag
-      IF( jpiglo < jpidta .OR. jpjglo < jpjdta )   lzoom = .TRUE.
-
-      !                              ! set zoom type flags
-      IF( lzoom .AND. jpizoom /= 1 )   lzoom_w = .TRUE.                     ! 
-      IF( lzoom .AND. jpjzoom /= 1 )   lzoom_s = .TRUE.
-      IF( lzoom .AND. jpiglo + jpizoom -1 /= jpidta )   lzoom_e = .TRUE.
-      IF( lzoom .AND. jpjglo + jpjzoom -1 /= jpjdta )   lzoom_n = .TRUE.
-      IF(lwp) THEN
-         WRITE(numout,*)
-         WRITE(numout,*) '          zoom flags : '
-         WRITE(numout,*) '             lzoom   = ', lzoom  , ' (T = zoom, F = global )'
-         WRITE(numout,*) '             lzoom_e = ', lzoom_e, ' (T = forced closed east  boundary)'
-         WRITE(numout,*) '             lzoom_w = ', lzoom_w, ' (T = forced closed west  boundary)'
-         WRITE(numout,*) '             lzoom_s = ', lzoom_s, ' (T = forced closed South boundary)'
-         WRITE(numout,*) '             lzoom_n = ', lzoom_n, ' (T = forced closed North boundary)'
-      ENDIF
-      IF(  ( lzoom_e .OR. lzoom_w )  .AND.  ( jperio == 1 .OR. jperio == 4 .OR. jperio == 6 )  )   &
-           &   CALL ctl_stop( ' Your zoom choice is inconsistent with east-west cyclic boundary condition' )
-      IF(  lzoom_n  .AND.  ( 3 <= jperio .AND. jperio <= 6 )  )   &
-           &   CALL ctl_stop( ' Your zoom choice is inconsistent with North fold boundary condition' )
-
-      !                              ! Pre-defined arctic/antarctic zoom of ORCA configuration flag
-      IF( cp_cfg == "orca" ) THEN
-         SELECT CASE ( jp_cfg )
-         CASE ( 2 )                               !  ORCA_R2 configuration
-            IF(  cp_cfz == "arctic"    .AND. jpiglo  == 142    .AND. jpjglo  ==  53 .AND.   &
-               & jpizoom ==  21    .AND. jpjzoom ==  97         )   THEN
-              IF(lwp) WRITE(numout,*) '          ORCA configuration: arctic zoom '
-            ENDIF
-            IF(  cp_cfz == "antarctic" .AND. jpiglo  == jpidta .AND. jpjglo  ==  50 .AND.   &
-               & jpizoom ==   1    .AND. jpjzoom ==   1         )   THEN
-              IF(lwp) WRITE(numout,*) '          ORCA configuration: antarctic zoom '
-            ENDIF
-            !                             
-         CASE ( 05 )                              !  ORCA_R05 configuration
-            IF(    cp_cfz == "arctic"    .AND. jpiglo  == 562    .AND. jpjglo  == 202 .AND.   &
-               & jpizoom ==  81    .AND. jpjzoom == 301         )   THEN
-              IF(lwp) WRITE(numout,*) '          ORCA configuration: arctic zoom '
-            ENDIF
-            IF(    cp_cfz == "antarctic" .AND. jpiglo  == jpidta .AND. jpjglo  == 187 .AND.   &
-               & jpizoom ==   1    .AND. jpjzoom ==   1         )   THEN
-              IF(lwp) WRITE(numout,*) '          ORCA configuration: antarctic zoom '
-            ENDIF
-         END SELECT
-         !
-      ENDIF
       !
    END SUBROUTINE dom_glo
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90	(revision 6596)
@@ -95,5 +95,5 @@
          CALL hgr_read   ( glamt , glamu , glamv , glamf ,   &    ! geographic position (required)
             &              gphit , gphiu , gphiv , gphif ,   &    !     -        -
-            &              iff   , ff    ,                   &    ! Coriolis parameter (if not on the sphere)
+            &              iff   , ff_f  , ff_t  ,           &    ! Coriolis parameter (if not on the sphere)
             &              e1t   , e1u   , e1v   , e1f   ,   &    ! scale factors (required)
             &              e2t   , e2u   , e2v   , e2f   ,   &    !    -     -        -
@@ -106,5 +106,5 @@
          CALL usr_def_hgr( glamt , glamu , glamv , glamf ,   &    ! geographic position (required)
             &              gphit , gphiu , gphiv , gphif ,   &    !
-            &              iff   , ff    ,                   &    ! Coriolis parameter  (if domain not on the sphere)
+            &              iff   , ff_f  , ff_t  ,           &    ! Coriolis parameter  (if domain not on the sphere)
             &              e1t   , e1u   , e1v   , e1f   ,   &    ! scale factors       (required)
             &              e2t   , e2u   , e2v   , e2f   ,   &    !
@@ -116,6 +116,7 @@
       !
       IF( iff == 0 ) THEN                 ! Coriolis parameter has not been defined 
-         IF(lwp) WRITE(numout,*) '          Coriolis parameter calculated on the sphere from gphif'
-         ff(:,:) = 2. * omega * SIN( rad * gphif(:,:) )     ! compute it on the sphere
+         IF(lwp) WRITE(numout,*) '          Coriolis parameter calculated on the sphere from gphif & gphit'
+         ff_f(:,:) = 2. * omega * SIN( rad * gphif(:,:) )     ! compute it on the sphere at f-point
+         ff_t(:,:) = 2. * omega * SIN( rad * gphit(:,:) )     !    -        -       -    at t-point
       ELSE
          IF(lwp) WRITE(numout,*) '          Coriolis parameter have been read in "mesh_mask" file'
@@ -153,5 +154,5 @@
    SUBROUTINE hgr_read( plamt , plamu , plamv  , plamf  ,     &    ! gridpoints position (required)
       &                 pphit , pphiu , pphiv  , pphif  ,     &     
-      &                 kff   , pff   ,                       &    ! Coriolis parameter  (if not on the sphere)
+      &                 kff   , pff_f , pff_t  ,              &    ! Coriolis parameter  (if not on the sphere)
       &                 pe1t  , pe1u  , pe1v   , pe1f   ,     &    ! scale factors       (required)
       &                 pe2t  , pe2u  , pe2v   , pe2f   ,     &
@@ -166,5 +167,5 @@
       REAL(wp), DIMENSION(:,:), INTENT(out) ::   pphit, pphiu, pphiv, pphif   ! latitude outputs
       INTEGER                 , INTENT(out) ::   kff                          ! =1 Coriolis parameter read here, =0 otherwise
-      REAL(wp), DIMENSION(:,:), INTENT(out) ::   pff                          ! Coriolis factor at f-point (if found in file)
+      REAL(wp), DIMENSION(:,:), INTENT(out) ::   pff_f, pff_t                 ! Coriolis factor at f-point (if found in file)
       REAL(wp), DIMENSION(:,:), INTENT(out) ::   pe1t, pe1u, pe1v, pe1f       ! i-scale factors 
       REAL(wp), DIMENSION(:,:), INTENT(out) ::   pe2t, pe2u, pe2v, pe2f       ! j-scale factors
@@ -210,7 +211,9 @@
       CALL iom_get( inum, jpdom_data, 'e2f'  , pe2f  , lrowattr=ln_use_jattr )
       !
-      IF( iom_varid( inum, 'ff', ldstop = .FALSE. ) > 0 ) THEN
-         IF(lwp) WRITE(numout,*) '           ff read in mesh_mask file'
-         CALL iom_get( inum, jpdom_data, 'ff'  , ff  , lrowattr=ln_use_jattr )
+      IF(  iom_varid( inum, 'ff_f', ldstop = .FALSE. ) > 0  .AND.  &
+         & iom_varid( inum, 'ff_t', ldstop = .FALSE. ) > 0    ) THEN
+         IF(lwp) WRITE(numout,*) '           Coriolis factor at f- and t-points read in mesh_mask file'
+         CALL iom_get( inum, jpdom_data, 'ff_f'  , ff_f  , lrowattr=ln_use_jattr )
+         CALL iom_get( inum, jpdom_data, 'ff_t'  , ff_t  , lrowattr=ln_use_jattr )
          kff = 1
       ELSE
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domngb.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domngb.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domngb.F90	(revision 6596)
@@ -62,13 +62,9 @@
       END SELECT
 
-      IF (jphgr_msh /= 2 .AND. jphgr_msh /= 3) THEN
-         zlon       = MOD( plon       + 720., 360. )                                     ! plon between    0 and 360
-         zglam(:,:) = MOD( zglam(:,:) + 720., 360. )                                     ! glam between    0 and 360
-         IF( zlon > 270. )   zlon = zlon - 360.                                          ! zlon between  -90 and 270
-         IF( zlon <  90. )   WHERE( zglam(:,:) > 180. ) zglam(:,:) = zglam(:,:) - 360.   ! glam between -180 and 180
-         zglam(:,:) = zglam(:,:) - zlon
-      ELSE
-         zglam(:,:) = zglam(:,:) - plon
-      END IF
+      zlon       = MOD( plon       + 720., 360. )                                     ! plon between    0 and 360
+      zglam(:,:) = MOD( zglam(:,:) + 720., 360. )                                     ! glam between    0 and 360
+      IF( zlon > 270. )   zlon = zlon - 360.                                          ! zlon between  -90 and 270
+      IF( zlon <  90. )   WHERE( zglam(:,:) > 180. ) zglam(:,:) = zglam(:,:) - 360.   ! glam between -180 and 180
+      zglam(:,:) = zglam(:,:) - zlon
 
       zgphi(:,:) = zgphi(:,:) - plat
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90	(revision 6596)
@@ -256,5 +256,6 @@
       CALL iom_rstput( 0, 0, inum3, 'e2f', e2f, ktype = jp_r8 )
       
-      CALL iom_rstput( 0, 0, inum3, 'ff', ff, ktype = jp_r8 )           !    ! coriolis factor
+      CALL iom_rstput( 0, 0, inum3, 'ff_f', ff_f, ktype = jp_r8 )           !    ! coriolis factor
+      CALL iom_rstput( 0, 0, inum3, 'ff_t', ff_t, ktype = jp_r8 )
       
       ! note that mbkt is set to 1 over land ==> use surface tmask
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90	(revision 6596)
@@ -24,5 +24,4 @@
    !!   dom_zgr          : defined the ocean vertical coordinate system
    !!       zgr_bat      : bathymetry fields (levels and meters)
-   !!       zgr_bat_zoom : modify the bathymetry field if zoom domain
    !!       zgr_bat_ctl  : check the bathymetry files
    !!       zgr_bot_level: deepest ocean level for t-, u, and v-points
@@ -149,5 +148,4 @@
       ! final adjustment of mbathy & check 
       ! -----------------------------------
-      IF( lzoom       )   CALL zgr_bat_zoom     ! correct mbathy in case of zoom subdomain
       IF( .NOT.lk_c1d )   CALL zgr_bat_ctl      ! check bathymetry (mbathy) and suppress isolated ocean points
                           CALL zgr_bot_level    ! deepest ocean level for t-, u- and v-points
@@ -225,7 +223,7 @@
          !
 #if defined key_agrif
-         za1  = (  ppdzmin - pphmax / FLOAT(jpkdta-1)  )                                                   &
-            & / ( TANH((1-ppkth)/ppacr) - ppacr/FLOAT(jpkdta-1) * (  LOG( COSH( (jpkdta - ppkth) / ppacr) )&
-            &                                                      - LOG( COSH( ( 1  - ppkth) / ppacr) )  )  )
+         za1  = (  ppdzmin - pphmax / REAL( jpkdta-1 , wp )  )                                                   &
+            & / ( TANH((1-ppkth)/ppacr) - ppacr/REAL( jpkdta-1 , wp ) * (  LOG( COSH( (jpkdta - ppkth) / ppacr) )&
+            &                                                            - LOG( COSH( ( 1     - ppkth) / ppacr) )  )  )
 #else
          za1  = (  ppdzmin - pphmax / FLOAT(jpkm1)  )                                                      &
@@ -429,34 +427,4 @@
                zdta(:,:) = gdepw_1d(jpk)                     ! last w-point depth
                h_oce     = gdepw_1d(jpk)
-            ENDIF
-         ELSE                                         ! bump centered in the basin
-            IF(lwp) WRITE(numout,*)
-            IF(lwp) WRITE(numout,*) '         bathymetry field: flat basin with a bump'
-            ii_bump = jpidta / 2                           ! i-index of the bump center
-            ij_bump = jpjdta / 2                           ! j-index of the bump center
-            r_bump  = 50000._wp                            ! bump radius (meters)       
-            h_bump  =  2700._wp                            ! bump height (meters)
-            h_oce   = gdepw_1d(jpk)                        ! background ocean depth (meters)
-            IF(lwp) WRITE(numout,*) '            bump characteristics: '
-            IF(lwp) WRITE(numout,*) '               bump center (i,j)   = ', ii_bump, ii_bump
-            IF(lwp) WRITE(numout,*) '               bump height         = ', h_bump , ' meters'
-            IF(lwp) WRITE(numout,*) '               bump radius         = ', r_bump , ' index'
-            IF(lwp) WRITE(numout,*) '            background ocean depth = ', h_oce  , ' meters'
-            !                                        
-            DO jj = 1, jpjdta                              ! zdta :
-               DO ji = 1, jpidta
-                  zi = FLOAT( ji - ii_bump ) * ppe1_m / r_bump
-                  zj = FLOAT( jj - ij_bump ) * ppe2_m / r_bump
-                  zdta(ji,jj) = h_oce - h_bump * EXP( -( zi*zi + zj*zj ) )
-               END DO
-            END DO
-            !                                              ! idta :
-            IF( ln_sco ) THEN                                   ! s-coordinate (zsc       ): idta()=jpk
-               idta(:,:) = jpkm1
-            ELSE                                                ! z-coordinate (zco or zps): step-like topography
-               idta(:,:) = jpkm1
-               DO jk = 1, jpkm1
-                  WHERE( gdept_1d(jk) < zdta(:,:) .AND. zdta(:,:) <= gdept_1d(jk+1) )   idta(:,:) = jk
-               END DO
             ENDIF
          ENDIF
@@ -605,54 +573,4 @@
 
 
-   SUBROUTINE zgr_bat_zoom
-      !!----------------------------------------------------------------------
-      !!                    ***  ROUTINE zgr_bat_zoom  ***
-      !!
-      !! ** Purpose : - Close zoom domain boundary if necessary
-      !!              - Suppress Med Sea from ORCA R2 and R05 arctic zoom
-      !!
-      !! ** Method  : 
-      !!
-      !! ** Action  : - update mbathy: level bathymetry (in level index)
-      !!----------------------------------------------------------------------
-      INTEGER ::   ii0, ii1, ij0, ij1   ! temporary integers
-      !!----------------------------------------------------------------------
-      !
-      IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) '    zgr_bat_zoom : modify the level bathymetry for zoom domain'
-      IF(lwp) WRITE(numout,*) '    ~~~~~~~~~~~~'
-      !
-      ! Zoom domain
-      ! ===========
-      !
-      ! Forced closed boundary if required
-      IF( lzoom_s )   mbathy(  : , mj0(jpjzoom):mj1(jpjzoom) )      = 0
-      IF( lzoom_w )   mbathy(      mi0(jpizoom):mi1(jpizoom) , :  ) = 0
-      IF( lzoom_e )   mbathy(      mi0(jpiglo+jpizoom-1):mi1(jpiglo+jpizoom-1) , :  ) = 0
-      IF( lzoom_n )   mbathy(  : , mj0(jpjglo+jpjzoom-1):mj1(jpjglo+jpjzoom-1) )      = 0
-      !
-      ! Configuration specific domain modifications
-      ! (here, ORCA arctic configuration: suppress Med Sea)
-      IF( cp_cfg == "orca" .AND. cp_cfz == "arctic" ) THEN
-         SELECT CASE ( jp_cfg )
-         !                                        ! =======================
-         CASE ( 2 )                               !  ORCA_R2 configuration
-            !                                     ! =======================
-            IF(lwp) WRITE(numout,*) '                   ORCA R2 arctic zoom: suppress the Med Sea'
-            ii0 = 141   ;   ii1 = 162      ! Sea box i,j indices
-            ij0 =  98   ;   ij1 = 110
-            !                                     ! =======================
-         CASE ( 05 )                              !  ORCA_R05 configuration
-            !                                     ! =======================
-            IF(lwp) WRITE(numout,*) '                   ORCA R05 arctic zoom: suppress the Med Sea'
-            ii0 = 563   ;   ii1 = 642      ! zero over the Med Sea boxe
-            ij0 = 314   ;   ij1 = 370 
-         END SELECT
-         !
-         mbathy( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 0   ! zero over the Med Sea boxe
-         !
-      ENDIF
-      !
-   END SUBROUTINE zgr_bat_zoom
 
 
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90	(revision 6596)
@@ -34,4 +34,5 @@
    USE domvvl          ! varying vertical mesh
    USE iscplrst        ! ice sheet coupling
+   USE usrdef          ! User defined routine
    !
    USE in_out_manager  ! I/O manager
@@ -41,7 +42,4 @@
    USE wrk_nemo        ! Memory allocation
    USE timing          ! Timing
-   USE usrdef          ! User defined routine
-
-
 
    IMPLICIT NONE
@@ -136,5 +134,5 @@
       ub_b(:,:) = 0._wp   ;   vb_b(:,:) = 0._wp
       !
-!!gm  the use of umsak & vmask is not necessary belox as un, vn, ub, vb are always masked
+!!gm  the use of umsak & vmask is not necessary below as un, vn, ub, vb are always masked
       DO jk = 1, jpkm1
          DO jj = 1, jpj
@@ -159,3 +157,4 @@
    END SUBROUTINE istate_init
 
+   !!======================================================================
 END MODULE istate
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90	(revision 6596)
@@ -69,5 +69,5 @@
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:) ::   wgtbtp1, wgtbtp2   !: 1st & 2nd weights used in time filtering of barotropic fields
 
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::  zwz          !: ff/h at F points
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::  zwz          !: ff_f/h at F points
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::  ftnw, ftne   !: triad of coriolis parameter
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::  ftsw, ftse   !: (only used with een vorticity scheme)
@@ -220,5 +220,5 @@
       IF( kt == nit000 .OR. .NOT.ln_linssh ) THEN
          IF( ln_dynvor_een ) THEN               !==  EEN scheme  ==!
-            SELECT CASE( nn_een_e3f )              !* ff/e3 at F-point
+            SELECT CASE( nn_een_e3f )              !* ff_f/e3 at F-point
             CASE ( 0 )                                   ! original formulation  (masked averaging of e3t divided by 4)
                DO jj = 1, jpjm1
@@ -226,5 +226,5 @@
                      zwz(ji,jj) =   ( ht_n(ji  ,jj+1) + ht_n(ji+1,jj+1) +                    &
                         &             ht_n(ji  ,jj  ) + ht_n(ji+1,jj  )   ) * 0.25_wp  
-                     IF( zwz(ji,jj) /= 0._wp )   zwz(ji,jj) = ff(ji,jj) / zwz(ji,jj)
+                     IF( zwz(ji,jj) /= 0._wp )   zwz(ji,jj) = ff_f(ji,jj) / zwz(ji,jj)
                   END DO
                END DO
@@ -236,5 +236,5 @@
                         &       / ( MAX( 1._wp, tmask(ji  ,jj+1, 1) + tmask(ji+1,jj+1, 1) +    &
                         &                       tmask(ji  ,jj  , 1) + tmask(ji+1,jj  , 1) ) )
-                     IF( zwz(ji,jj) /= 0._wp )   zwz(ji,jj) = ff(ji,jj) / zwz(ji,jj)
+                     IF( zwz(ji,jj) /= 0._wp )   zwz(ji,jj) = ff_f(ji,jj) / zwz(ji,jj)
                   END DO
                END DO
@@ -285,5 +285,5 @@
                END DO
             END DO
-            zwz(:,:) = ff(:,:) * zwz(:,:)
+            zwz(:,:) = ff_f(:,:) * zwz(:,:)
          ENDIF
       ENDIF
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90	(revision 6596)
@@ -237,5 +237,5 @@
          SELECT CASE( kvor )                 !==  vorticity considered  ==!
          CASE ( np_COR )                           !* Coriolis (planetary vorticity)
-            zwz(:,:) = ff(:,:) 
+            zwz(:,:) = ff_f(:,:) 
          CASE ( np_RVO )                           !* relative vorticity
             DO jj = 1, jpjm1
@@ -256,7 +256,7 @@
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
-                  zwz(ji,jj) = ff(ji,jj) + (  e2v(ji+1,jj  ) * vn(ji+1,jj  ,jk) - e2v(ji,jj) * vn(ji,jj,jk)    &
-                     &                      - e1u(ji  ,jj+1) * un(ji  ,jj+1,jk) + e1u(ji,jj) * un(ji,jj,jk)  ) &
-                     &                   * r1_e1e2f(ji,jj)
+                  zwz(ji,jj) = ff_f(ji,jj) + (  e2v(ji+1,jj  ) * vn(ji+1,jj  ,jk) - e2v(ji,jj) * vn(ji,jj,jk)    &
+                     &                        - e1u(ji  ,jj+1) * un(ji  ,jj+1,jk) + e1u(ji,jj) * un(ji,jj,jk)  ) &
+                     &                     * r1_e1e2f(ji,jj)
                END DO
             END DO
@@ -264,5 +264,5 @@
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
-                  zwz(ji,jj) = ff(ji,jj)                                                                        &
+                  zwz(ji,jj) = ff_f(ji,jj)                                                                      &
                        &     + (   ( vn(ji+1,jj  ,jk) + vn (ji,jj,jk) ) * ( e2v(ji+1,jj  ) - e2v(ji,jj) )       &
                        &         - ( un(ji  ,jj+1,jk) + un (ji,jj,jk) ) * ( e1u(ji  ,jj+1) - e1u(ji,jj) )   )   &
@@ -357,5 +357,5 @@
          SELECT CASE( kvor )                 !==  vorticity considered  ==!
          CASE ( np_COR )                           !* Coriolis (planetary vorticity)
-            zwz(:,:) = ff(:,:) 
+            zwz(:,:) = ff_f(:,:) 
          CASE ( np_RVO )                           !* relative vorticity
             DO jj = 1, jpjm1
@@ -376,7 +376,7 @@
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
-                  zwz(ji,jj) = ff(ji,jj) + (  e2v(ji+1,jj  ) * vn(ji+1,jj  ,jk) - e2v(ji,jj) * vn(ji,jj,jk)    &
-                     &                      - e1u(ji  ,jj+1) * un(ji  ,jj+1,jk) + e1u(ji,jj) * un(ji,jj,jk)  ) &
-                     &                   * r1_e1e2f(ji,jj)
+                  zwz(ji,jj) = ff_f(ji,jj) + (  e2v(ji+1,jj  ) * vn(ji+1,jj  ,jk) - e2v(ji,jj) * vn(ji,jj,jk)    &
+                     &                        - e1u(ji  ,jj+1) * un(ji  ,jj+1,jk) + e1u(ji,jj) * un(ji,jj,jk)  ) &
+                     &                     * r1_e1e2f(ji,jj)
                END DO
             END DO
@@ -384,5 +384,5 @@
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
-                  zwz(ji,jj) = ff(ji,jj)                                                                       &
+                  zwz(ji,jj) = ff_f(ji,jj)                                                                      &
                        &     + (   ( vn(ji+1,jj  ,jk) + vn (ji,jj,jk) ) * ( e2v(ji+1,jj  ) - e2v(ji,jj) )       &
                        &         - ( un(ji  ,jj+1,jk) + un (ji,jj,jk) ) * ( e1u(ji  ,jj+1) - e1u(ji,jj) )   )   &
@@ -506,5 +506,5 @@
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
-                  zwz(ji,jj) = ff(ji,jj) * z1_e3f(ji,jj)
+                  zwz(ji,jj) = ff_f(ji,jj) * z1_e3f(ji,jj)
                END DO
             END DO
@@ -528,7 +528,7 @@
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
-                  zwz(ji,jj) = (  ff(ji,jj) + (  e2v(ji+1,jj  ) * vn(ji+1,jj  ,jk) - e2v(ji,jj) * vn(ji,jj,jk)    &
-                     &                         - e1u(ji  ,jj+1) * un(ji  ,jj+1,jk) + e1u(ji,jj) * un(ji,jj,jk)  ) &
-                     &                      * r1_e1e2f(ji,jj)    ) * z1_e3f(ji,jj)
+                  zwz(ji,jj) = (  ff_f(ji,jj) + (  e2v(ji+1,jj  ) * vn(ji+1,jj  ,jk) - e2v(ji,jj) * vn(ji,jj,jk)    &
+                     &                           - e1u(ji  ,jj+1) * un(ji  ,jj+1,jk) + e1u(ji,jj) * un(ji,jj,jk)  ) &
+                     &                        * r1_e1e2f(ji,jj)    ) * z1_e3f(ji,jj)
                END DO
             END DO
@@ -536,5 +536,5 @@
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
-                  zwz(ji,jj) = (  ff(ji,jj)                                                                        &
+                  zwz(ji,jj) = (  ff_f(ji,jj)                                                                      &
                        &        + (   ( vn(ji+1,jj  ,jk) + vn (ji,jj,jk) ) * ( e2v(ji+1,jj  ) - e2v(ji,jj) )       &
                        &            - ( un(ji  ,jj+1,jk) + un (ji,jj,jk) ) * ( e1u(ji  ,jj+1) - e1u(ji,jj) )   )   &
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90	(revision 6596)
@@ -106,8 +106,8 @@
 222   DO jfl = 1, jpnfl
 # if   defined key_mpp_mpi
-         IF( (iil(jfl) >= (mig(nldi)-jpizoom+1)) .AND. (iil(jfl) <= (mig(nlei)-jpizoom+1)) .AND.   &
-             (ijl(jfl) >= (mjg(nldj)-jpjzoom+1)) .AND. (ijl(jfl) <= (mjg(nlej)-jpjzoom+1)) ) THEN
-            iiloc(jfl) = iil(jfl) - (mig(1)-jpizoom+1) + 1
-            ijloc(jfl) = ijl(jfl) - (mjg(1)-jpjzoom+1) + 1
+         IF( iil(jfl) >= mig(nldi) .AND. iil(jfl) <= mig(nlei) .AND.   &
+             ijl(jfl) >= mjg(nldj) .AND. ijl(jfl) <= mjg(nlej)   ) THEN
+            iiloc(jfl) = iil(jfl) - mig(1) + 1
+            ijloc(jfl) = ijl(jfl) - mjg(1) + 1
 # else 
             iiloc(jfl) = iil(jfl)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90	(revision 6596)
@@ -234,6 +234,6 @@
 
             ! Translation of this distances (in meter) in indexes
-            zgifl(jfl)= (iimfl(jfl)-0.5) + zdxab/e1u(iimfl(jfl)-1,ijmfl(jfl)) + (mig(1)-jpizoom)
-            zgjfl(jfl)= (ijmfl(jfl)-0.5) + zdyad/e2v(iimfl(jfl),ijmfl(jfl)-1) + (mjg(1)-jpjzoom)
+            zgifl(jfl)= (iimfl(jfl)-0.5) + zdxab/e1u(iimfl(jfl)-1,ijmfl(jfl)) + (mig(1)-1)
+            zgjfl(jfl)= (ijmfl(jfl)-0.5) + zdyad/e2v(iimfl(jfl),ijmfl(jfl)-1) + (mjg(1)-1)
             zgkfl(jfl) = (( gdepw_n(iimfl(jfl),ijmfl(jfl),ikmfl(jfl)+1) - flzz(jfl) )* ikmfl(jfl))   &
                &                 / (  gdepw_n(iimfl(jfl),ijmfl(jfl),ikmfl(jfl)+1)                              &
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90	(revision 6596)
@@ -102,8 +102,8 @@
          IF( lk_mpp ) THEN
             DO jfl = 1, jpnfl
-               IF( (INT(tpifl(jfl)) >= (mig(nldi)-jpizoom+1)) .AND.   &
-                  &(INT(tpifl(jfl)) <= (mig(nlei)-jpizoom+1)) .AND.   &
-                  &(INT(tpjfl(jfl)) >= (mjg(nldj)-jpjzoom+1)) .AND.   &
-                  &(INT(tpjfl(jfl)) <= (mjg(nlej)-jpjzoom+1)) ) THEN
+               IF( (INT(tpifl(jfl)) >= mig(nldi)) .AND.   &
+                  &(INT(tpifl(jfl)) <= mig(nlei)) .AND.   &
+                  &(INT(tpjfl(jfl)) >= mjg(nldj)) .AND.   &
+                  &(INT(tpjfl(jfl)) <= mjg(nlej)) ) THEN
                   iperproc(narea) = iperproc(narea)+1
                ENDIF
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90	(revision 6596)
@@ -72,5 +72,5 @@
       uo_e(:,:) = 0._wp ;   uo_e(1:jpi, 1:jpj) = ssu_m(:,:) * umask(:,:,1)
       vo_e(:,:) = 0._wp ;   vo_e(1:jpi, 1:jpj) = ssv_m(:,:) * vmask(:,:,1)
-      ff_e(:,:) = 0._wp ;   ff_e(1:jpi, 1:jpj) = ff   (:,:) 
+      ff_e(:,:) = 0._wp ;   ff_e(1:jpi, 1:jpj) = ff_f (:,:) 
       tt_e(:,:) = 0._wp ;   tt_e(1:jpi, 1:jpj) = sst_m(:,:)
       fr_e(:,:) = 0._wp ;   fr_e(1:jpi, 1:jpj) = fr_i (:,:)
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90	(revision 6596)
@@ -109,9 +109,9 @@
          CALL iom_getatt(inum, 'open_ocean_jstart', jstartrow ) ! -999 is returned if the attribute is not found
          jstartrow = MAX(1,jstartrow)
-         CALL iom_get ( inum, jpdom_unknown, 'Bathy_level', zdta, kstart=(/jpizoom,jpjzoom+jstartrow-1/), kcount=(/jpiglo,jpjglo/) )
+         CALL iom_get( inum, jpdom_unknown, 'Bathy_level', zdta, kstart=(/1,1+jstartrow-1/), kcount=(/jpiglo,jpjglo/) )
       ELSE
          CALL iom_open ( 'bathy_meter.nc', inum )   ! Meter bathy in case of partial steps
          IF ( ln_isfcav ) THEN
-             CALL iom_get ( inum, jpdom_unknown, 'Bathymetry_isf' , zdta, kstart=(/jpizoom,jpjzoom/), kcount=(/jpiglo,jpjglo/) )
+             CALL iom_get( inum, jpdom_unknown, 'Bathymetry_isf' , zdta, kstart=(/1,1/), kcount=(/jpiglo,jpjglo/) )
          ELSE
              ! Optionally use a file attribute (open_ocean_jstart) to set a start row for reading from the global file
@@ -119,6 +119,5 @@
              CALL iom_getatt(inum, 'open_ocean_jstart', jstartrow ) ! -999 is returned if the attribute is not found
              jstartrow = MAX(1,jstartrow)
-             CALL iom_get ( inum, jpdom_unknown, 'Bathymetry' , zdta, kstart=(/jpizoom,jpjzoom+jstartrow-1/)   &
-                &                                                   , kcount=(/jpiglo,jpjglo/) )
+             CALL iom_get( inum, jpdom_unknown, 'Bathymetry' , zdta, kstart=(/1,1+jstartrow-1/), kcount=(/jpiglo,jpjglo/) )
          ENDIF
       ENDIF
@@ -129,9 +128,9 @@
       IF ( ln_isfcav ) THEN
          CALL iom_open ( 'bathy_meter.nc', inum )   ! Meter bathy in case of partial steps
-         CALL iom_get ( inum, jpdom_unknown, 'isf_draft' , zdtaisf, kstart=(/jpizoom,jpjzoom/), kcount=(/jpiglo,jpjglo/) )
+         CALL iom_get ( inum, jpdom_unknown, 'isf_draft' , zdtaisf, kstart=(/1,1/), kcount=(/jpiglo,jpjglo/) )
       END IF
       CALL iom_close (inum)
 
-      ! land/sea mask over the global/zoom domain
+      ! land/sea mask over the global domain
 
       imask(:,:)=1
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90	(revision 6596)
@@ -298,5 +298,5 @@
       !
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
-      REAL(wp) ::   zaht, zaht_min, z1_f20       ! local scalar
+      REAL(wp) ::   zaht, zahf, zaht_min, z1_f20       ! local scalar
       !!----------------------------------------------------------------------
       !
@@ -327,7 +327,10 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               zaht = ( 1._wp -  MIN( 1._wp , ABS( ff(ji,jj) * z1_f20 ) ) ) * ( rn_aht_0 - zaht_min )
+               !!gm CAUTION : here we assume lat/lon grid in 20deg N/S band (like all ORCA cfg)
+               !!     ==>>>   The Coriolis value is identical for t- & u_points, and for v- and f-points
+               zaht = ( 1._wp -  MIN( 1._wp , ABS( ff_t(ji,jj) * z1_f20 ) ) ) * ( rn_aht_0 - zaht_min )
+               zahf = ( 1._wp -  MIN( 1._wp , ABS( ff_f(ji,jj) * z1_f20 ) ) ) * ( rn_aht_0 - zaht_min )
                ahtu(ji,jj,1) = (  MAX( zaht_min, ahtu(ji,jj,1) ) + zaht  ) * umask(ji,jj,1)     ! min value zaht_min
-               ahtv(ji,jj,1) = (  MAX( zaht_min, ahtv(ji,jj,1) ) + zaht  ) * vmask(ji,jj,1)     ! increase within 20S-20N
+               ahtv(ji,jj,1) = (  MAX( zaht_min, ahtv(ji,jj,1) ) + zahf  ) * vmask(ji,jj,1)     ! increase within 20S-20N
             END DO
          END DO
@@ -568,5 +571,5 @@
       DO jj = 2, jpjm1
          DO ji = fs_2, fs_jpim1   ! vector opt.
-            zzaei = MIN( 1._wp, ABS( ff(ji,jj) * z1_f20 ) ) * zaeiw(ji,jj)       ! tropical decrease
+            zzaei = MIN( 1._wp, ABS( ff_t(ji,jj) * z1_f20 ) ) * zaeiw(ji,jj)       ! tropical decrease
             zaeiw(ji,jj) = MIN( zzaei , paei0 )                                  ! Max value = paei0
          END DO
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90	(revision 6596)
@@ -134,5 +134,5 @@
                !      # qns = zqrp -2(-4) watt/m2  if climatological ice and opa ice     (zfr_obs=1, fr_i=1)
                !                                   (-2=arctic, -4=antarctic)   
-               zqi = -3. + SIGN( 1.e0, ff(ji,jj) )
+               zqi = -3. + SIGN( 1._wp, ff_f(ji,jj) )
                qns(ji,jj) = ( ( 1.- zfr_obs ) * qns(ji,jj)                             &
                   &          +      zfr_obs   * fr_i(ji,jj) * zqi ) * tmask(ji,jj,1)   &
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90	(revision 6596)
@@ -536,4 +536,5 @@
    END SUBROUTINE sbc_isf_cav
 
+
    SUBROUTINE sbc_isf_gammats(pgt, pgs, pqhisf, pqwisf )
       !!----------------------------------------------------------------------
@@ -635,5 +636,5 @@
 
                   !! compute eta* (stability parameter)
-                  zetastar = 1._wp / ( SQRT(1._wp + MAX(zxsiN * zustar(ji,jj) / ( ABS(ff(ji,jj)) * zmols * zRc ), 0.0_wp)))
+                  zetastar = 1._wp / ( SQRT(1._wp + MAX(zxsiN * zustar(ji,jj) / ( ABS(ff_f(ji,jj)) * zmols * zRc ), 0._wp)))
 
                   !! compute the sublayer thickness
@@ -641,5 +642,5 @@
 
                   !! compute gamma turb
-                  zgturb = 1._wp / vkarmn * LOG(zustar(ji,jj) * zxsiN * zetastar * zetastar / ( ABS(ff(ji,jj)) * zhnu )) &
+                  zgturb = 1._wp / vkarmn * LOG(zustar(ji,jj) * zxsiN * zetastar * zetastar / ( ABS(ff_f(ji,jj)) * zhnu )) &
                   &      + 1._wp / ( 2 * zxsiN * zetastar ) - 1._wp / vkarmn
 
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90	(revision 6596)
@@ -329,6 +329,6 @@
             DO jj = 2, jpj                           ! "coriolis+ time^-1" at u- & v-points
                DO ji = fs_2, jpi   ! vector opt.
-                  zfu = ( ff(ji,jj) + ff(ji,jj-1) ) * 0.5_wp
-                  zfv = ( ff(ji,jj) + ff(ji-1,jj) ) * 0.5_wp
+                  zfu = ( ff_f(ji,jj) + ff_f(ji,jj-1) ) * 0.5_wp
+                  zfv = ( ff_f(ji,jj) + ff_f(ji-1,jj) ) * 0.5_wp
                   rfu(ji,jj) = SQRT(  zfu * zfu + z1_t2 )
                   rfv(ji,jj) = SQRT(  zfv * zfv + z1_t2 )
@@ -347,6 +347,5 @@
          !
          z1_t2 = 1._wp / ( rn_time * rn_time )
-         r1_ft(:,:) = 2._wp * omega * SIN( rad * gphit(:,:) )
-         r1_ft(:,:) = 1._wp / SQRT(  r1_ft(:,:) * r1_ft(:,:) + z1_t2 )
+         r1_ft(:,:) = 1._wp / SQRT(  ff_t(:,:) * ff_t(:,:) + z1_t2  )
          !
       ENDIF
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90	(revision 6596)
@@ -239,16 +239,17 @@
       INTEGER  ::   ios, inum     !   -      -
       REAL(wp) ::   ziglo, zjglo, zkglo   ! local scalars
-      CHARACTER(len=120), DIMENSION(16) ::   cltxt, cltxt2, clnam
+      CHARACTER(len=120), DIMENSION(16) ::   cltxt, cltxt2, clnam, clbug
       !
       NAMELIST/namctl/ ln_ctl  , nn_print, nn_ictls, nn_ictle,   &
          &             nn_isplt, nn_jsplt, nn_jctls, nn_jctle,   &
          &             nn_timing, nn_diacfl
-      NAMELIST/namcfg/ ln_read_cfg, cp_cfg, cp_cfz, jp_cfg, jpidta, jpjdta, jpkdta, jpiglo, jpjglo, &
-         &             jpizoom, jpjzoom, jperio, ln_use_jattr
+      NAMELIST/namcfg/ ln_read_cfg, cp_cfg, cp_cfz, jp_cfg,   &
+         &             jperio, ln_use_jattr
       !!----------------------------------------------------------------------
       !
       cltxt  = ''
       cltxt2 = ''
-      clnam  = ''
+      clnam  = ''  
+      clbug  = ''
       cxios_context = 'nemo'
       !
@@ -257,4 +258,7 @@
       CALL ctl_opn( numnam_cfg, 'namelist_cfg', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. )
       !
+
+!!gm      WRITE(clbug(1),*) ' before namelist / namctl read    nstop', nstop      
+
       REWIND( numnam_ref )              ! Namelist namctl in reference namelist : Control prints
       READ  ( numnam_ref, namctl, IOSTAT = ios, ERR = 901 )
@@ -265,4 +269,7 @@
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namctl in configuration namelist', .TRUE. )
 
+
+!!gm      WRITE(clbug(2),*) ' before namelist namcfg read    nstop', nstop      
+
       !
       REWIND( numnam_ref )              ! Namelist namcfg in reference namelist
@@ -273,4 +280,6 @@
       READ  ( numnam_cfg, namcfg, IOSTAT = ios, ERR = 904 )
 904   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfg in configuration namelist', .TRUE. )   
+
+!!gm      WRITE(clbug(3),*) ' after namelist namcfg read    nstop', nstop
 
       !                             !--------------------------!
@@ -291,5 +300,6 @@
       jpk    = jpkglo
       jpidta = jpiglo         !!gm  jpidta, jpjdta : to be suppressed
-      jpjdta = jpjglo         !!gm  together with jpizoom, jpjzoom and all associated variables... 
+      jpjdta = jpjglo         !!gm   
+      jpkdta = jpkglo
       !
 #if defined key_agrif
@@ -301,6 +311,4 @@
          jpidta  = jpiglo
          jpjdta  = jpjglo
-         jpizoom = 1
-         jpjzoom = 1
          nperio  = 0
          jperio  = 0
@@ -338,4 +346,5 @@
       ENDIF
 #endif
+
       narea = narea + 1                                     ! mynode return the rank of proc (0 --> jpnij -1 )
 
@@ -376,16 +385,18 @@
          jpj = ( jpjglo     -2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj    ! second dim.
 #endif
-      ENDIF         
-         jpk = jpkdta                                             ! third dim
+      ENDIF
+               
+      jpk = jpkdta                                             ! third dim
+      
 #if defined key_agrif
-         ! simple trick to use same vertical grid as parent but different number of levels: 
-         ! Save maximum number of levels in jpkdta, then define all vertical grids with this number.
-         ! Suppress once vertical online interpolation is ok
-         IF(.NOT.Agrif_Root())   jpkdta = Agrif_Parent( jpkdta )
-#endif
-         jpim1 = jpi-1                                            ! inner domain indices
-         jpjm1 = jpj-1                                            !   "           "
-         jpkm1 = jpk-1                                            !   "           "
-         jpij  = jpi*jpj                                          !  jpi x j
+      ! simple trick to use same vertical grid as parent but different number of levels: 
+      ! Save maximum number of levels in jpkdta, then define all vertical grids with this number.
+      ! Suppress once vertical online interpolation is ok
+      IF(.NOT.Agrif_Root())   jpkdta = Agrif_Parent( jpkdta )
+#endif
+      jpim1 = jpi-1                                            ! inner domain indices
+      jpjm1 = jpj-1                                            !   "           "
+      jpkm1 = jpk-1                                            !   "           "
+      jpij  = jpi*jpj                                          !  jpi x j
 
       IF(lwp) THEN                            ! open listing units
@@ -393,4 +404,13 @@
          CALL ctl_opn( numout, 'ocean.output', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE., narea )
          !
+
+         DO ji = 1, SIZE(clbug)
+            IF( TRIM(clbug (ji)) /= '' )   WRITE(numout,*) clbug(ji)      ! bug print 
+         END DO
+         WRITE(numout,*)
+
+
+
+
          WRITE(numout,*)
          WRITE(numout,*) '   CNRS - NERC - Met OFFICE - MERCATOR-ocean - INGV - CMCC'
@@ -416,4 +436,6 @@
       ! allocate arrays
       CALL nemo_alloc()
+
+      WRITE(numout,*) ' -after alloc--    nstop', nstop
 
       !                             !-------------------------------!
@@ -581,11 +603,4 @@
          WRITE(numout,*) '      configuration zoom name                          cp_cfz  = ', TRIM(cp_cfz)
          WRITE(numout,*) '      configuration resolution                         jp_cfg  = ', jp_cfg
-         WRITE(numout,*) '      1st lateral dimension ( >= jpiglo )              jpidta  = ', jpidta
-         WRITE(numout,*) '      2nd    "         "    ( >= jpjglo )              jpjdta  = ', jpjdta
-         WRITE(numout,*) '      3nd    "         "                               jpkdta  = ', jpkdta
-         WRITE(numout,*) '      1st dimension of global domain in i              jpiglo  = ', jpiglo
-         WRITE(numout,*) '      2nd    -                  -    in j              jpjglo  = ', jpjglo
-         WRITE(numout,*) '      left bottom i index of the zoom (in data domain) jpizoom = ', jpizoom
-         WRITE(numout,*) '      left bottom j index of the zoom (in data domain) jpizoom = ', jpjzoom
          WRITE(numout,*) '      lateral cond. type (between 0 and 6)             jperio  = ', jperio   
          WRITE(numout,*) '      use file attribute if exists as i/p j-start ln_use_jattr = ', ln_use_jattr
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/par_oce.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/par_oce.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/par_oce.F90	(revision 6596)
@@ -33,32 +33,56 @@
    INTEGER       ::   jp_cfg           !: resolution of the configuration
 
-   ! data size                                       !!! * size of all input files *
-   INTEGER       ::   jpidta           !: 1st lateral dimension ( >= jpi )
-   INTEGER       ::   jpjdta           !: 2nd    "         "    ( >= jpj )
-   INTEGER       ::   jpkdta           !: number of levels      ( >= jpk )
+   !!---------------------------------------------------------------------
+   !! Domain Matrix size 
+   !!---------------------------------------------------------------------
 
-   ! global or zoom domain size                      !!! * computational domain *
+!!gm  TO BE SUPRESSED
+   ! data size                        !!! * size of all input files *
+   INTEGER       ::   jpidta           !: 1st lateral dimension 
+   INTEGER       ::   jpjdta           !: 2nd    "         "   
+   INTEGER       ::   jpkdta           !: number of levels     
+!!gm  END
+
+   ! global domain size               !!! * total computational domain *
    INTEGER       ::   jpiglo           !: 1st dimension of global domain --> i-direction
    INTEGER       ::   jpjglo           !: 2nd    -                  -    --> j-direction
    INTEGER       ::   jpkglo           !: 3nd    -                  -    --> k levels
 
-   ! zoom starting position 
-   INTEGER       ::   jpizoom          !: left bottom (i,j) indices of the zoom
-   INTEGER       ::   jpjzoom          !: in data domain indices
+#if defined key_agrif
+
+!!gm  BUG ?   I'm surprised by the calculation below of nbcellsx and nbcellsy before jpiglo,jpjglo 
+!!gm                           has been assigned to a value....
+!!gm
+
+   ! global domain size for AGRIF     !!! * total AGRIF computational domain *
+   INTEGER, PUBLIC, PARAMETER ::   nbghostcells = 1                             !: number of ghost cells
+   INTEGER, PUBLIC            ::   nbcellsx     = jpiglo - 2 - 2*nbghostcells   !: number of cells in i-direction
+   INTEGER, PUBLIC            ::   nbcellsy     = jpjglo - 2 - 2*nbghostcells   !: number of cells in j-direction
+#endif
+
+   ! local domain size                !!! * local computational domain *
+   INTEGER, PUBLIC ::   jpi   ! = ( jpiglo-2*jpreci + (jpni-1) ) / jpni + 2*jpreci   !: first  dimension
+   INTEGER, PUBLIC ::   jpj   ! = ( jpjglo-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj   !: second dimension
+   INTEGER, PUBLIC ::   jpk   ! = jpkdta
+   INTEGER, PUBLIC ::   jpim1 ! = jpi-1                                            !: inner domain indices
+   INTEGER, PUBLIC ::   jpjm1 ! = jpj-1                                            !:   -     -      -
+   INTEGER, PUBLIC ::   jpkm1 ! = jpk-1                                            !:   -     -      -
+   INTEGER, PUBLIC ::   jpij  ! = jpi*jpj                                          !:  jpi x jpj
+
 
    ! Domain characteristics
-   INTEGER       ::   jperio           !: lateral cond. type (between 0 and 6)
-   !                                       !  = 0 closed                 ;   = 1 cyclic East-West
-   !                                       !  = 2 equatorial symmetric   ;   = 3 North fold T-point pivot
-   !                                       !  = 4 cyclic East-West AND North fold T-point pivot
-   !                                       !  = 5 North fold F-point pivot
-   !                                       !  = 6 cyclic East-West AND North fold F-point pivot
+   INTEGER       ::   jperio         !: lateral cond. type (between 0 and 6)
+   !                                      !  = 0 closed                 ;   = 1 cyclic East-West
+   !                                      !  = 2 equatorial symmetric   ;   = 3 North fold T-point pivot
+   !                                      !  = 4 cyclic East-West AND North fold T-point pivot
+   !                                      !  = 5 North fold F-point pivot
+   !                                      !  = 6 cyclic East-West AND North fold F-point pivot
 
    ! Input file read offset
-   LOGICAL       ::   ln_use_jattr     !: Use file global attribute: open_ocean_jstart to determine start j-row 
-                                           ! when reading input from those netcdf files that have the 
-                                           ! attribute defined. This is designed to enable input files associated 
-                                           ! with the extended grids used in the under ice shelf configurations to 
-                                           ! be used without redundant rows when the ice shelves are not in use.
+   LOGICAL       ::   ln_use_jattr   !: Use file global attribute: open_ocean_jstart to determine start j-row 
+                                          ! when reading input from those netcdf files that have the 
+                                          ! attribute defined. This is designed to enable input files associated 
+                                          ! with the extended grids used in the under ice shelf configurations to 
+                                          ! be used without redundant rows when the ice shelves are not in use.
 
    !!  Values set to pp_not_used indicates that this parameter is not used in THIS config.
@@ -66,6 +90,4 @@
    REAL(wp)      ::   pp_not_used       = 999999._wp   !: vertical grid parameter
    REAL(wp)      ::   pp_to_be_computed = 999999._wp   !:    -      -       -
-
-
 
 
@@ -77,20 +99,4 @@
    INTEGER, PUBLIC, PARAMETER ::   jp_sal = 2    !: indice for salinity
 
-   !!---------------------------------------------------------------------
-   !! Domain Matrix size  (if AGRIF, they are not all parameters)
-   !!---------------------------------------------------------------------
-#if defined key_agrif
-   INTEGER, PUBLIC, PARAMETER ::   nbghostcells = 1                             !: number of ghost cells
-   INTEGER, PUBLIC            ::   nbcellsx     = jpiglo - 2 - 2*nbghostcells   !: number of cells in i-direction
-   INTEGER, PUBLIC            ::   nbcellsy     = jpjglo - 2 - 2*nbghostcells   !: number of cells in j-direction
-   !
-#endif
-   INTEGER, PUBLIC  ::   jpi   ! = ( jpiglo-2*jpreci + (jpni-1) ) / jpni + 2*jpreci   !: first  dimension
-   INTEGER, PUBLIC  ::   jpj   ! = ( jpjglo-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj   !: second dimension
-   INTEGER, PUBLIC  ::   jpk   ! = jpkdta
-   INTEGER, PUBLIC  ::   jpim1 ! = jpi-1                                            !: inner domain indices
-   INTEGER, PUBLIC  ::   jpjm1 ! = jpj-1                                            !:   -     -      -
-   INTEGER, PUBLIC  ::   jpkm1 ! = jpk-1                                            !:   -     -      -
-   INTEGER, PUBLIC  ::   jpij  ! = jpi*jpj                                          !:  jpi x jpj
 
    !!----------------------------------------------------------------------
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/usrdef.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/usrdef.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/usrdef.F90	(revision 6596)
@@ -87,5 +87,5 @@
    SUBROUTINE usr_def_hgr( plamt , plamu , plamv  , plamf  ,   &   ! geographic position (required)
       &                    pphit , pphiu , pphiv  , pphif  ,   &   !
-      &                    kff   , pff   ,                     &   ! Coriolis parameter  (if domain not on the sphere)
+      &                    kff   , pff_f , pff_t  ,            &   ! Coriolis parameter  (if domain not on the sphere)
       &                    pe1t  , pe1u  , pe1v   , pe1f   ,   &   ! scale factors       (required)
       &                    pe2t  , pe2u  , pe2v   , pe2f   ,   &   !
@@ -112,5 +112,5 @@
       REAL(wp), DIMENSION(:,:), INTENT(out) ::   pphit, pphiu, pphiv, pphif   ! latitude outputs                      [degrees]
       INTEGER                 , INTENT(out) ::   kff                          ! =1 Coriolis parameter computed here, =0 otherwise
-      REAL(wp), DIMENSION(:,:), INTENT(out) ::   pff                          ! Coriolis factor at f-point                [1/s]
+      REAL(wp), DIMENSION(:,:), INTENT(out) ::   pff_f, pff_t                 ! Coriolis factor at f-point                [1/s]
       REAL(wp), DIMENSION(:,:), INTENT(out) ::   pe1t, pe1u, pe1v, pe1f       ! i-scale factors                             [m]
       REAL(wp), DIMENSION(:,:), INTENT(out) ::   pe2t, pe2u, pe2v, pe2f       ! j-scale factors                             [m]
@@ -130,12 +130,12 @@
       IF(lwp) WRITE(numout,*) '          beta-plane with regular grid-spacing and rotated domain (GYRE configuration)'
       !
-      !           !==  grid point position  ==!
-      !
-      zlam1 = -85._wp                        ! position of gridpoint (i,j) = (1,jpjglo)
+      !                       !==  grid point position  ==!
+      !
+      zlam1 = -85._wp                           ! position of gridpoint (i,j) = (1,jpjglo)
       zphi1 =  29._wp
       !
-      ze1 = 106000. / REAL( nn_GYRE , wp )   ! gridspacing in meters
-      !
-      zsin_alpha = - SQRT( 2._wp ) * 0.5_wp  ! angle: 45 degrees
+      ze1 = 106000._wp / REAL( nn_GYRE , wp )   ! gridspacing in meters
+      !
+      zsin_alpha = - SQRT( 2._wp ) * 0.5_wp     ! angle: 45 degrees
       zcos_alpha =   SQRT( 2._wp ) * 0.5_wp
       ze1deg = ze1 / (ra * rad)
@@ -179,7 +179,7 @@
       END DO
       !
-      !           !== Horizontal scale factors ==! (in meters)
+      !                       !== Horizontal scale factors ==! (in meters)
       !                     
-      !                             ! constant grid spacing
+      !                                         ! constant grid spacing
       pe1t(:,:) =  ze1     ;      pe2t(:,:) = ze1
       pe1u(:,:) =  ze1     ;      pe2u(:,:) = ze1
@@ -187,9 +187,9 @@
       pe1f(:,:) =  ze1     ;      pe2f(:,:) = ze1
       !
-      !                             ! NO reduction of grid size in some straits 
-      ke1e2u_v = 0                  !    ==>> u_ & v_surfaces will be computed in dom_ghr routine
-      !
-      !
-      !           !==  Coriolis parameter  ==!
+      !                                         ! NO reduction of grid size in some straits 
+      ke1e2u_v = 0                              !    ==>> u_ & v_surfaces will be computed in dom_ghr routine
+      !
+      !
+      !                       !==  Coriolis parameter  ==!
       kff = 1                                            !  indicate not to compute ff afterward
       !
@@ -200,5 +200,6 @@
       zf0   = 2. * omega * SIN( rad * zphi0 )            !  compute f0 1st point south
       !
-      pff(:,:) = ( zf0 + zbeta * ABS( pphif(:,:) - zphi0 ) * rad * ra ) ! f = f0 +beta* y ( y=0 at south)
+      pff_f(:,:) = ( zf0 + zbeta * ABS( pphif(:,:) - zphi0 ) * rad * ra ) ! f = f0 +beta* y ( y=0 at south)
+      pff_t(:,:) = ( zf0 + zbeta * ABS( pphit(:,:) - zphi0 ) * rad * ra ) ! f = f0 +beta* y ( y=0 at south)
       !
       IF(lwp) WRITE(numout,*) '                           beta-plane used. beta = ', zbeta, ' 1/(s.m)'
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/SAO_SRC/nemogcm.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/SAO_SRC/nemogcm.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/SAO_SRC/nemogcm.F90	(revision 6596)
@@ -119,11 +119,12 @@
       INTEGER ::   ilocal_comm   ! local integer
       INTEGER ::   ios
-      CHARACTER(len=80), DIMENSION(16) ::   cltxt
+!!gm      CHARACTER(len=80), DIMENSION(16) ::   cltxt
+      CHARACTER(len=80), DIMENSION(-10:16) ::   cltxt
       !
       NAMELIST/namctl/ ln_ctl, nn_print, nn_ictls, nn_ictle,   &
          &             nn_isplt, nn_jsplt, nn_jctls, nn_jctle,   &
          &             nn_bench, nn_timing
-      NAMELIST/namcfg/ cp_cfg, cp_cfz, jp_cfg, jpidta, jpjdta, jpkdta, jpiglo, jpjglo, &
-         &             jpizoom, jpjzoom, jperio, ln_use_jattr
+      NAMELIST/namcfg/ cp_cfg, cp_cfz, jp_cfg,   &
+         &             jperio, ln_use_jattr
       !!----------------------------------------------------------------------
       !
@@ -161,6 +162,4 @@
       jpidta  = jpiglo
       jpjdta  = jpjglo
-      jpizoom = 1
-      jpjzoom = 1
       nperio  = 0
       jperio  = 0
@@ -333,11 +332,4 @@
          WRITE(numout,*) '      configuration zoom name         cp_cfz      = ', TRIM(cp_cfz)
          WRITE(numout,*) '      configuration resolution        jp_cfg      = ', jp_cfg
-         WRITE(numout,*) '      1st lateral dimension ( >= jpi ) jpidta     = ', jpidta
-         WRITE(numout,*) '      2nd    "         "    ( >= jpj ) jpjdta     = ', jpjdta
-         WRITE(numout,*) '      3nd    "         "               jpkdta     = ', jpkdta
-         WRITE(numout,*) '      1st dimension of global domain in i jpiglo  = ', jpiglo
-         WRITE(numout,*) '      2nd    -                  -    in j jpjglo  = ', jpjglo
-         WRITE(numout,*) '      left bottom i index of the zoom (in data domain) jpizoom = ', jpizoom
-         WRITE(numout,*) '      left bottom j index of the zoom (in data domain) jpizoom = ', jpjzoom
          WRITE(numout,*) '      lateral cond. type (between 0 and 6) jperio = ', jperio   
          WRITE(numout,*) '      use file attribute if exists as i/p j-start ln_use_jattr = ', ln_use_jattr
@@ -382,12 +374,4 @@
       ENDIF
       !
-      IF( nbench == 1 ) THEN              ! Benchmark
-         SELECT CASE ( cp_cfg )
-         CASE ( 'gyre' )   ;   CALL ctl_warn( ' The Benchmark is activated ' )
-         CASE DEFAULT      ;   CALL ctl_stop( ' The Benchmark is based on the GYRE configuration:',   &
-            &                                 ' cp_cfg = "gyre" in namelist &namcfg or set nbench = 0' )
-         END SELECT
-      ENDIF
-      !
       IF( 1_wp /= SIGN(1._wp,-0._wp)  )   CALL ctl_stop( 'nemo_ctl: The intrinsec SIGN function follows ',  &
          &                                               'f2003 standard. '                              ,  &
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90	(revision 6596)
@@ -185,6 +185,6 @@
          &             nn_isplt, nn_jsplt, nn_jctls, nn_jctle,   &
          &             nn_bench, nn_timing, nn_diacfl
-      NAMELIST/namcfg/ cp_cfg, cp_cfz, jp_cfg, jpidta, jpjdta, jpkdta, jpiglo, jpjglo, &
-         &             jpizoom, jpjzoom, jperio, ln_use_jattr
+      NAMELIST/namcfg/ cp_cfg, cp_cfz, jp_cfg,   &
+         &             jperio, ln_use_jattr
       !!----------------------------------------------------------------------
       !
@@ -230,6 +230,4 @@
       jpidta  = jpiglo
       jpjdta  = jpjglo
-      jpizoom = 1
-      jpjzoom = 1
       nperio  = 0
       jperio  = 0
@@ -414,11 +412,4 @@
          WRITE(numout,*) '      configuration zoom name         cp_cfz      = ', TRIM(cp_cfz)
          WRITE(numout,*) '      configuration resolution        jp_cfg      = ', jp_cfg
-         WRITE(numout,*) '      1st lateral dimension ( >= jpi ) jpidta     = ', jpidta
-         WRITE(numout,*) '      2nd    "         "    ( >= jpj ) jpjdta     = ', jpjdta
-         WRITE(numout,*) '      3nd    "         "               jpkdta     = ', jpkdta
-         WRITE(numout,*) '      1st dimension of global domain in i jpiglo  = ', jpiglo
-         WRITE(numout,*) '      2nd    -                  -    in j jpjglo  = ', jpjglo
-         WRITE(numout,*) '      left bottom i index of the zoom (in data domain) jpizoom = ', jpizoom
-         WRITE(numout,*) '      left bottom j index of the zoom (in data domain) jpizoom = ', jpjzoom
          WRITE(numout,*) '      lateral cond. type (between 0 and 6) jperio = ', jperio   
          WRITE(numout,*) '      use file attribute if exists as i/p j-start ln_use_jattr = ', ln_use_jattr
@@ -463,12 +454,4 @@
       ENDIF
       !
-      IF( nbench == 1 ) THEN              ! Benchmark 
-         SELECT CASE ( cp_cfg )
-         CASE ( 'gyre' )   ;   CALL ctl_warn( ' The Benchmark is activated ' )
-         CASE DEFAULT      ;   CALL ctl_stop( ' The Benchmark is based on the GYRE configuration:',   &
-            &                                 ' cp_cfg="gyre" in namelist &namcfg or set nbench = 0' )
-         END SELECT
-      ENDIF
-      !
       IF( 1_wp /= SIGN(1._wp,-0._wp)  )   CALL ctl_stop( 'nemo_ctl: The intrinsec SIGN function follows ',  &
          &                                               'f2003 standard. '                              ,  &
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90	(revision 6596)
@@ -201,5 +201,4 @@
       ENDIF
       !
-      IF( lzoom .AND. .NOT.lk_c1d )   nn_zdmp_tr = 0           ! restoring to climatology at closed north or south boundaries
       SELECT CASE ( nn_zdmp_tr )
       CASE ( 0 )   ;   IF(lwp) WRITE(numout,*) '   tracer damping throughout the water column'
Index: branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc.F90
===================================================================
--- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc.F90	(revision 6595)
+++ branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc.F90	(revision 6596)
@@ -428,7 +428,8 @@
       ENDIF
 
-      IF ( cp_cfg .NE. 'gyre' ) THEN            ! other than GYRE configuration
-      ! GYRE : for diagnostic fields, are needed if cyclic B.C. are present, but not for purely MPI comm. 
-      ! therefore we do not call lbc_lnk in GYRE config. (closed basin, no cyclic B.C.)
+!!gm Test removed, nothing specific to a configuration should survive out of usrdef modules
+!!gm      IF ( cp_cfg .NE. 'gyre' ) THEN            ! other than GYRE configuration
+!!gm      ! GYRE : for diagnostic fields, are needed if cyclic B.C. are present, but not for purely MPI comm. 
+!!gm      ! therefore we do not call lbc_lnk in GYRE config. (closed basin, no cyclic B.C.)
          DO jn = 1, jptra
             IF( ln_trdtrc(jn) ) THEN
@@ -438,5 +439,6 @@
             ENDIF
          END DO
-      ENDIF
+!!gm      ENDIF
+      
       ! ======================================================================
       ! II. Cumulate the trends over the analysis window
