Index: branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/SHARED/namelist_ice_lim3_ref
===================================================================
--- branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/SHARED/namelist_ice_lim3_ref	(revision 8516)
+++ branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/SHARED/namelist_ice_lim3_ref	(revision 8517)
@@ -18,11 +18,13 @@
 &namice_run     !   Generic parameters
 !------------------------------------------------------------------------------
-   jpl              =    5            !  number of ice  categories
-   nlay_i           =    2            !  number of ice  layers
-   nlay_s           =    1            !  number of snow layers (only 1 is working)
-   nn_monocat       =    0            !  virtual ITD mono-category parameterizations (1-4 => jpl = 1 only) or not (0)
+   jpl              =   5             !  number of ice  categories
+   nlay_i           =   2             !  number of ice  layers
+   nlay_s           =   1             !  number of snow layers (only 1 is working)
+   nn_monocat       =   0             !  virtual ITD mono-category parameterizations (1-4 => jpl = 1 only) or not (0)
                                       !     2: simple piling instead of ridging    --- temporary option
                                       !     3: activate G(he) only                 --- temporary option
                                       !     4: activate extra lateral melting only --- temporary option
+   ln_icedyn        = .true.          !  ice dynamics (T) or not (F)
+   ln_icethd        = .true.          !  ice thermo   (T) or not (F)
    rn_amax_n        =   0.997         !  maximum tolerated ice concentration NH
    rn_amax_s        =   0.997         !  maximum tolerated ice concentration SH
@@ -41,11 +43,9 @@
 &namice_dyn     !   Ice dynamics
 !------------------------------------------------------------------------------
-   ln_icedyn        = .true.          !  ice dynamics (T) or not (F) => DO NOT TOUCH UNLESS U KNOW WHAT U DO
-      nn_icedyn     =   2             !     switch for ice dynamics   
-                                      !        2: total
-                                      !        1: advection only (no diffusion, no ridging/rafting)
-                                      !        0: advection only (as 1 but with prescribed velocity, bypass rheology)
-         rn_uice    =   0.00001       !           prescribed ice u-velocity
-         rn_vice    =  -0.00001       !           prescribed ice v-velocity
+   ln_dynFULL       = .true.          !  dyn.: full ice dynamics               (rheology + advection + ridging/rafting + correction)
+   ln_dynRHGADV     = .false.         !  dyn.: no ridge/raft & no corrections  (rheology + advection)
+   ln_dynADV        = .false.         !  dyn.: only advection w prescribed vel.(rn_uvice + advection)
+      rn_uice       =   0.00001       !        prescribed ice u-velocity
+      rn_vice       =   0.            !        prescribed ice v-velocity
    rn_ishlat        =   2.            !  free slip (0) ; partial slip (0-2) ; no slip (2) ; strong slip (>2)
    rn_cio           =   5.0e-03       !  ice-ocean drag coefficient (-)
@@ -53,8 +53,8 @@
       rn_gamma      =   0.15          !     fraction of ocean depth that ice must reach to initiate landfast
                                       !        recommended range: [0.1 ; 0.25]
-      rn_icebfr     =  10.            !     maximum bottom stress per unit area of contact (N/m2)                 
+      rn_icebfr     =  10.            !     maximum bottom stress per unit area of contact [N/m2]                 
                                       !        a very large value ensures ice velocity=0 even with a small contact area
                                       !        recommended range: ?? (should be greater than atm-ice stress => >0.1 N/m2)
-      rn_lfrelax    =   1.e-5         !     relaxation time scale to reach static friction (s-1)                 
+      rn_lfrelax    =   1.e-5         !     relaxation time scale to reach static friction [s-1]
 /
 !------------------------------------------------------------------------------
@@ -63,5 +63,5 @@
           ! -- ice_rdgrft_strength -- !
    ln_str_H79       = .true.          !  ice strength param.: Hibler_79   => P = pstar*<h>*exp(-c_rhg*A)                      
-      rn_pstar      =   2.0e+04       !     ice strength thickness parameter (N/m2) 
+      rn_pstar      =   2.0e+04       !     ice strength thickness parameter [N/m2]
       rn_crhg       =   20.0          !     ice strength conc. parameter (-)
    ln_str_R75       = .false.         !  ice strength param.: Rothrock_75 => P = Cf*coeff*integral(wr.h^2)    
@@ -74,11 +74,11 @@
    ln_partf_exp     = .true.          !  Exponential ridging participation function (Lipscomb, 2007)
       rn_astar      =   0.03          !     exponential measure of ridging ice fraction [set to 0.05 if hstar=100]
-   ln_ridging       = .true.          !  ridging activated (T) or not (F) => DO NOT TOUCH UNLESS U KNOW WHAT U DO
-      rn_hstar      =  25.0           !     determines the maximum thickness of ridged ice (m) (Hibler, 1980)
+   ln_ridging       = .true.          !  ridging activated (T) or not (F)
+      rn_hstar      =  25.0           !     determines the maximum thickness of ridged ice [m] (Hibler, 1980)
       rn_porordg    =   0.3           !     porosity of newly ridged ice (Lepparanta et al., 1995)
       rn_fsnwrdg    =   0.5           !     snow volume fraction that survives in ridging
       rn_fpndrdg    =   1.0           !     pond fraction that survives in ridging (small a priori)
-   ln_rafting       = .true.          !  rafting activated (T) or not (F) => DO NOT TOUCH UNLESS U KNOW WHAT U DO
-      rn_hraft      =   0.75          !     threshold thickness for rafting (m)
+   ln_rafting       = .true.          !  rafting activated (T) or not (F)
+      rn_hraft      =   0.75          !     threshold thickness for rafting [m]
       rn_craft      =   5.0           !     squeezing coefficient used in the rafting function
       rn_fsnwrft    =   0.5           !     snow volume fraction that survives in rafting
@@ -89,5 +89,5 @@
 !------------------------------------------------------------------------------
    ln_rhg_EVP       = .true.          !  EVP rheology
-      rn_creepl     =   1.0e-12       !     creep limit (s-1)
+      rn_creepl     =   1.0e-12       !     creep limit [1/s]
       rn_ecc        =   2.0           !     eccentricity of the elliptical yield curve          
       nn_nevp       = 120             !     number of EVP subcycles                             
@@ -105,7 +105,6 @@
 &namice_thd     !   Ice thermodynamics
 !------------------------------------------------------------------------------
-   ln_icethd        = .true.            !  ice thermo   (T) or not (F) => DO NOT TOUCH UNLESS U KNOW WHAT U DO
                      ! -- icethd_dif -- !
-   rn_kappa_i       =   1.0             !  radiation attenuation coefficient in sea ice (m-1)
+   rn_kappa_i       =   1.0             !  radiation attenuation coefficient in sea ice [1/m]
    ln_cndi_U64      = .false.           !  sea ice thermal conductivity: k = k0 + beta.S/T            (Untersteiner, 1964)
    ln_cndi_P07      = .true.            !  sea ice thermal conductivity: k = k0 + beta1.S/T - beta2.T (Pringle et al., 2007)
@@ -114,9 +113,9 @@
                                         !     Obs: 0.1-0.5 (Lecomte et al, JAMES 2013)
                       ! -- icethd_dh -- !
-   ln_icedH         = .true.            !  activate ice thickness change from growing/melting (T) or not (F) => DO NOT TOUCH UNLESS U KNOW WHAT U DO
+   ln_icedH         = .true.            !  activate ice thickness change from growing/melting (T) or not (F)
    rn_blow_s        =   0.66            !     mesure of snow blowing into the leads
                                         !     = 1 => no snow blowing, < 1 => some snow blowing
                       ! -- icethd_da -- !
-   ln_icedA         = .true.            !  activate lateral melting param. (T) or not (F) => DO NOT TOUCH UNLESS U KNOW WHAT U DO
+   ln_icedA         = .true.            !  activate lateral melting param. (T) or not (F)
       rn_beta       =   1.0             !     coef. beta for lateral melting param. Recommended range=[0.8-1.2]
                                         !      => decrease = more melt and melt peaks toward higher concentration (A~0.5 for beta=1 ; A~0.8 for beta=0.2)
@@ -127,5 +126,5 @@
                                         !         10 vs 8m = -20% melting
                      ! -- icethd_lac -- !
-   ln_icedO         = .true.            !  activate ice growth in open-water (T) or not (F) => DO NOT TOUCH UNLESS U KNOW WHAT U DO
+   ln_icedO         = .true.            !  activate ice growth in open-water (T) or not (F)
       rn_hinew      =   0.1             !     thickness for new ice formation in open water (m), must be larger than rn_hnewice
       ln_frazil     = .false.           !     Frazil ice parameterization (ice collection as a function of wind)
@@ -148,5 +147,5 @@
 !------------------------------------------------------------------------------
                     ! -- icethd_sal -- !
-   ln_icedS       = .true.             !  activate gravity drainage and flushing (T) or not (F) => DO NOT TOUCH UNLESS U KNOW WHAT U DO
+   ln_icedS       = .true.             !  activate gravity drainage and flushing (T) or not (F)
    nn_icesal      =   2                !  ice salinity option
                                        !     1: constant ice salinity (S=rn_icesal)
Index: branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/SHARED/namelist_ref
===================================================================
--- branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/SHARED/namelist_ref	(revision 8516)
+++ branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/SHARED/namelist_ref	(revision 8517)
@@ -429,17 +429,4 @@
 /
 !-----------------------------------------------------------------------
-&namsbc_alb    !   albedo parameters
-!-----------------------------------------------------------------------
-   nn_ice_alb   =    1   !  parameterization of ice/snow albedo
-                         !     0: Shine & Henderson-Sellers (JGR 1985), giving clear-sky albedo
-                         !     1: "home made" based on Brandt et al. (JClim 2005) and Grenfell & Perovich (JGR 2004),
-                         !        giving cloud-sky albedo
-   rn_alb_sdry  =  0.85  !  dry snow albedo         : 0.80 (nn_ice_alb = 0); 0.85 (nn_ice_alb = 1); obs 0.85-0.87 (cloud-sky)
-   rn_alb_smlt  =  0.75  !  melting snow albedo     : 0.65 ( '' )          ; 0.75 ( '' )          ; obs 0.72-0.82 ( '' )
-   rn_alb_idry  =  0.60  !  dry ice albedo          : 0.72 ( '' )          ; 0.60 ( '' )          ; obs 0.54-0.65 ( '' )
-   rn_alb_imlt  =  0.50  !  bare puddled ice albedo : 0.53 ( '' )          ; 0.50 ( '' )          ; obs 0.49-0.58 ( '' )
-   rn_alb_dpnd  =  0.27  !  ponded ice albedo       : 0.25 ( '' )          ; 0.27 ( '' )          ; obs 0.10-0.30 ( '' )
-/
-!-----------------------------------------------------------------------
 &namsbc_wave   ! External fields from wave model                        (ln_wave=T)
 !-----------------------------------------------------------------------
