Index: branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/EXP00/namelist_cfg
===================================================================
--- branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/EXP00/namelist_cfg	(revision 9356)
+++ branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/EXP00/namelist_cfg	(revision 9490)
@@ -4,9 +4,9 @@
 !
 !-----------------------------------------------------------------------
-&namusr_def
-!-----------------------------------------------------------------------
-   rn_dx = 1000.0
-   rn_dz = 1.0
-   nn_wad_test = 1
+&namusr_def    !    Wetting and Drying TEST CASE
+!-----------------------------------------------------------------------
+   rn_dx       = 1000.0    ! horizontal resolution
+   rn_dz       = 1.0       ! vertical   resolution
+   nn_wad_test = 1         ! ???
 /
 !-----------------------------------------------------------------------
@@ -39,39 +39,21 @@
 /
 !-----------------------------------------------------------------------
-&namtsd        !   data : Temperature  & Salinity
-!-----------------------------------------------------------------------
-   cn_dir        = './'      !  root directory for the location of the runoff files
-   ln_tsd_init   = .false.   !  Initialisation of ocean T & S with T &S input data (T) or not (F)
-   ln_tsd_tradmp = .false.   !  damping of ocean T & S toward T &S input data (T) or not (F)
-/
-!-----------------------------------------------------------------------
-&namwad        !   Wetting and drying  default is no WAD
-!-----------------------------------------------------------------------
-   ln_wd_il          = .false   ! T/F activation of iterative limiter for  wetting and drying scheme
-   ln_wd_dl          = .true.   ! T/F activation of directional llimiter for wetting drying scheme
-   ln_wd_dl_bc       = .true.   ! T/F Directional limiteer Baroclinic option
-   ln_wd_dl_rmp      = .true.   ! T/F Turn on directional limiter ramp
-   rn_wdmin0         =  0.30    ! dpoth at which wetting/drying starts
-   rn_wdmin1         =  0.2     ! Minimum wet depth on dried cells
-   rn_wdmin2         =  0.0001  ! Tolerance of min wet depth on dried cells
-   rn_wdld           =  2.5     ! Land elevation below which wetting/drying is allowed
-   nn_wdit           =   20     ! Max iterations for W/D limiter
-/
-!-----------------------------------------------------------------------
-&namcrs        !   coarsened grid (for outputs and/or TOP)              (ln_crs =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namc1d        !   1D configuration options                             ("key_c1d")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namc1d_dyndmp !   U & V newtonian damping                              ("key_c1d")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namc1d_uvd    !   data: U & V currents                                 ("key_c1d")
-!-----------------------------------------------------------------------
-/
+&namwad        !   Wetting and Drying (WaD)                             (default: NO)
+!-----------------------------------------------------------------------
+   ln_wd_il    = .false    ! T/F activation of iterative   limiter
+   ln_wd_dl    = .true.    ! T/F activation of directional limiter
+   ln_wd_dl_bc = .true.    ! T/F Directional limiteer Baroclinic option
+   ln_wd_dl_rmp= .true.    ! T/F Turn on directional limiter ramp
+   rn_wdmin0   =  0.30     ! depth at which WaD starts
+   rn_wdmin1   =  0.2      ! Minimum wet depth on dried cells
+   rn_wdmin2   =  0.0001   ! Tolerance of min wet depth on dried cells
+   rn_wdld     =  2.5      ! Land elevation below which WaD is allowed
+   nn_wdit     =   20      ! Max iterations for WaD limiter
+/
+
+!!======================================================================
+!!            ***  Surface Boundary Condition namelists  ***          !!
+!!======================================================================
+!
 !-----------------------------------------------------------------------
 &namsbc        !   Surface Boundary Condition (surface module)
@@ -80,5 +62,4 @@
    !                       !     (also = the frequency of sea-ice model call)
    ln_usr      = .true.    !  analytical formulation                    (T => check usrdef_sbc)
-   ln_blk      = .false.   !  CORE bulk formulation                     (T => fill namsbc_blk )
    nn_ice      = 0         !  =0 no ice boundary condition   ,
    ln_rnf      = .false.   !  runoffs                                   (T => fill namsbc_rnf )
@@ -281,8 +262,4 @@
 /
 !-----------------------------------------------------------------------
-&namtra_adv_mle !   mixed layer eddy parametrisation (Fox-Kemper param) (default: NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
 &namtra_ldf    !   lateral diffusion scheme for tracers                 (default: NO selection)
 !-----------------------------------------------------------------------
@@ -305,24 +282,15 @@
    !                       !  Coefficients:
    nn_aht_ijk_t    = 0         !  space/time variation of eddy coef
-   !                                !   =-20 (=-30)    read in eddy_induced_velocity_2D.nc (..._3D.nc) file
-   !                                !   =  0           constant 
-   !                                !   = 10 F(k)      =ldf_c1d 
-   !                                !   = 20 F(i,j)    =ldf_c2d 
-   !                                !   = 21 F(i,j,t)  =Treguier et al. JPO 1997 formulation
-   !                                !   = 30 F(i,j,k)  =ldf_c2d + ldf_c1d
-   !                                !   = 31 F(i,j,k,t)=F(local velocity)
-   rn_aht_0        = 1000.     !  lateral eddy diffusivity   (lap. operator) [m2/s]
-   rn_bht_0        = 1.e+12    !  lateral eddy diffusivity (bilap. operator) [m4/s]
-/
-!-----------------------------------------------------------------------
-&namtra_ldfeiv !   eddy induced velocity param.                         (default: NO)
-!-----------------------------------------------------------------------
-   ln_ldfeiv     =.false.   ! use eddy induced velocity parameterization
-/
-!-----------------------------------------------------------------------
-&namtra_dmp    !   tracer: T & S newtonian damping                      (default: NO)
-!-----------------------------------------------------------------------
-   ln_tradmp   =  .false.  !  add a damping termn (T) or not (F)
-/
+      !                             !  =  0  constant 
+      !                        !  time invariant coefficients :  aht = 1/2  Uv*Lv   (lap case) 
+      !                             !                            or  = 1/12 Uv*Lv^3 (blp case)
+      rn_Ud      = 0.2              !  lateral diffusive velocity [m/s] (nn_aht_ijk_t= 0, 10, 20, 30)
+      rn_Ld      = 10.e+3           !  lateral diffusive length   [m]   (nn_aht_ijk_t= 0, 10)
+/
+
+!!======================================================================
+!!                      ***  Dynamics namelists  ***                  !!
+!!======================================================================
+!
 !-----------------------------------------------------------------------
 &nam_vvl       !   vertical coordinate options                          (default: z-star)
@@ -374,15 +342,11 @@
    !                       !  Coefficient
    nn_ahm_ijk_t  = 0           !  space/time variation of eddy coef
-   !                                !  =-30  read in eddy_viscosity_3D.nc file
-   !                                !  =-20  read in eddy_viscosity_2D.nc file
-   !                                !  =  0  constant 
-   !                                !  = 10  F(k)=c1d
-   !                                !  = 20  F(i,j)=F(grid spacing)=c2d
-   !                                !  = 30  F(i,j,k)=c2d*c1d
-   !                                !  = 31  F(i,j,k)=F(grid spacing and local velocity)
-   rn_ahm_0      = 1000.        !  horizontal laplacian eddy viscosity   [m2/s]
-   rn_ahm_b      =      0.     !  background eddy viscosity for ldf_iso [m2/s]
-   rn_bhm_0      =      0.     !  horizontal bilaplacian eddy viscosity [m4/s]
-/
+      !                             !  =  0  constant 
+      !                        !  time invariant coefficients :  ahm = 1/2  Uv*Lv   (lap case) 
+      !                             !                            or  = 1/12 Uv*Lv^3 (blp case)
+      rn_Uv      = 2.0              !  lateral viscous velocity [m/s] (nn_ahm_ijk_t= 0, 10, 20, 30)
+      rn_Lv      = 10.e+3           !  lateral viscous length   [m]   (nn_ahm_ijk_t= 0, 10)
+/
+
 !!======================================================================
 !!                     vertical physics namelists                     !!
