Index: trunk/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist
===================================================================
--- trunk/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist	(revision 1108)
+++ trunk/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist	(revision 1113)
@@ -1,8 +1,8 @@
 !!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-!! NEMO/OPA  :  1 - run manager      (namrun, nam_ctl, nam_mpp, nam_mpp_dyndist, nam_ctl)
+!! NEMO/OPA  :  1 - run manager      (namrun)
 !! namelists    2 - Domain           (nam_zgr, nam_zgr_sco, namdom)
 !!              3 - Surface boundary (namsbc, namsbc_ana, namsbc_flx, namsbc_clio, namsbc_core
 !!                                    namsbc_cpl, namqsr, namsbc_rnf, namsbc_ssr, namalb)
-!!              4 - lateral boundary (namlbc, namcla, namobc, nambdy, namtide)
+!!              4 - lateral boundary (namlbc, namcla, namobc, namagrif, nambdy, namtide)
 !!              5 - bottom  boundary (nambfr, nambbc, nambbl)
 !!              6 - Tracer           (nameos, nam_traadv, nam_traldf, namtdp)
@@ -10,8 +10,7 @@
 !!              8 - Verical physics  (namzdf, namnpc, namric, namtke, namkpp, namddm)
 !!              9 - diagnostics      (namtrd, namgap, namspr, namflo, namptr)
-!!              9 - miscellaneous    (namsol)
+!!              9 - miscellaneous    (namsol, nam_mpp, nam_mpp_dyndist, namctl)
 !!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-!  CAUTION: some scripts does not support CAPITALs for logical definition 
-!  *******       use .true. or .false. and NOT .TRUE. or .FALSE.
+!  CAUTION: some scripts does not support CAPITALs for logical use .true./.false., not .TRUE./.FALSE.
 
 !!======================================================================
@@ -19,91 +18,24 @@
 !!======================================================================
 !!   namrun            parameters of the run
-!!   nam_mpp           Massively Parallel Processing
-!!   nam_mpp_dyndist   
-!!   nam_ctl           Control prints & Benchmark
-!!======================================================================
-
-!-----------------------------------------------------------------------
-!       namrun   parameters of the run
-!-----------------------------------------------------------------------
-!  no         job number
-!  cexper     experience name for vairmer format
-!  ln_rstart  boolean term for restart (true or false)
-!  nrstdt     restart control = 0 restart, do not control nit000 in the restart file.
-!             !               = 1 restart, control nit000 in the restart file. Do not
-!             !                   use the date in the restart file (use ndate0 in namelist)
-!             !               = 2 restart, control nit000 in the restart file, use the date
-!             !                   in the restart file. ndate0 in the namelist is ignored.
-!  nit000     number of the first time step
-!  nitend     number of the last time step
-!  ndate0     initial calendar date aammjj
-!  nleapy     Leap year calendar (0/1)
-!  ninist     initial state output flag (0/1)
-!  nstock     frequency of restart file
-!  nwrite     frequency of OUTPUT file
-!  ln_dimgnnn (F/T) 1 DIMG file - (for all proc/per proc)
-&namrun
-   no         =       0
-   cexper     =  "ORCA2"
-   ln_rstart  = .false.
-   nrstdt     =       0
-   nit000     =       1
-   nitend     =    5475
-   ndate0     =  010101
-   nleapy     =       0
-   ninist     =       0
-   nstock     =    5475
-   nwrite     =    5475
-   ln_dimgnnn = .false.
-/
-!-----------------------------------------------------------------------
-!       nam_mpp      Massively Parallel Processing
-!-----------------------------------------------------------------------
-!  c_mpi_send         mpi send/recieve type
-!                      = 'S'  : standard blocking send
-!                      = 'B'  : buffer blocking send
-!                      = 'I'  : immediate non-blocking send
-&nam_mpp
-   c_mpi_send =  'S'
-/
-!-----------------------------------------------------------------------
-!       nam_mpp_dyndist      Massively Parallel Distribution            ("key_agrif" && "key_mpp_dyndist")
-!-----------------------------------------------------------------------
-!  jpni   number of processors following i
-!  jpnj   number of processors following j
-!  jpnij  number of local domains
-&nam_mpp_dyndist
-   jpni  = 1
-   jpnj  = 1
-   jpnij = 1
-/
-!-----------------------------------------------------------------------
-!       nam_ctl      Control prints & Benchmark
-!-----------------------------------------------------------------------
-!  ln_ctl     trends control print (expensive!)
-!  nprint     level of print (0 no print)
-!  nictls     start i indice to make the control SUM (very usefull to compare mono-
-!  nictle     end   i indice to make the control SUM (-versus multi processor runs)
-!  njctls     start j indice to make the control SUM (very usefull to compare mono-
-!  njctle     end   j indice to make the control SUM (-versus multi processor runs)
-!  nisplt     number of processors following i
-!  njsplt     number of processors following j
-!  nbench     Bench parameter (0/1): CAUTION it must be zero except for bench
-!             for which we don't care about physical meaning of the results
-!  nbit_cmp   bit comparison mode parameter (0/1): enables bit comparison between 
-!             single and multiple processor runs.
-&namctl
-   ln_ctl =  .false.
-   nprint =       0
-   nictls =       0
-   nictle =       0
-   njctls =       0
-   njctle =       0
-   isplt  =       1
-   jsplt  =       1
-   nbench =       0
-   nbit_cmp =     0
-/
-
+!!======================================================================
+
+!-----------------------------------------------------------------------
+&namrun        !   parameters of the run
+!-----------------------------------------------------------------------
+   no          =       0   !  job number
+   cexper      =  "ORCA2"  !  experience name 
+   ln_rstart   = .false.   !  start from rest (F) or from a restart file (T)
+   nrstdt      =       0   !  restart control = 0 nit000 is not compared to the restart file value
+                           !                  = 1 use ndate0 in namelist (not the value in the restart file)
+                           !                  = 2 calendar parameters read in the restart file
+   nit000      =       1   !  first time step
+   nitend      =    5475   !  last  time step
+   ndate0      =  010101   !  initial calendar date yymmdd (used if nrstdt=1)
+   nleapy      =       0   !  Leap year calendar (1) or not (0)
+   ninist      =       0   !  output the initial state (1) or not (0)
+   nstock      =    5475   !  frequency of creation of a restart file
+   nwrite      =    5475   !  frequency of write in the output file 
+   ln_dimgnnn  = .false.   !  DIMG file format: 1 file for all processors (F) or by processor (T)
+/
 !!======================================================================
 !!                      ***  Domain namelists  ***
@@ -115,61 +47,37 @@
 
 !-----------------------------------------------------------------------
-!       nam_zgr       vertical coordinate
-!-----------------------------------------------------------------------
-!  ln_zco     z-coordinate - full steps      (T/F)                      ("key_zco" may also be defined)
-!  ln_zps     z-coordinate - partial steps   (T/F)
-!  ln_sco     s- or hybrid z-s-coordinate    (T/F)
-&nam_zgr
-   ln_zco   =  .false.
-   ln_zps   =  .true.
-   ln_sco   =  .false.
-/
-!-----------------------------------------------------------------------
-!       nam_zgr_sco   s-coordinate or hybrid z-s-coordinate
-!-----------------------------------------------------------------------
-!  sbot_min   minimum depth of s-bottom surface (>0) (m)
-!  sbot_max   maximum depth of s-bottom surface (= ocean depth) (>0) (m)
-!  theta      surface control parameter (0<=theta<=20)
-!  thetb      bottom control parameter  (0<=thetb<= 1)
-!  r_max      maximum cut-off r-value allowed (0<r_max<1)
-&nam_zgr_sco
-   sbot_min =  300.
-   sbot_max = 5250.
-   theta    =    6.0
-   thetb    =    0.75
-   r_max    =    0.15
-/
-!-----------------------------------------------------------------------
-!       namdom   space and time domain (bathymetry, mesh, timestep)
-!-----------------------------------------------------------------------
-!  ntopo      = 0/1 ,compute/read the bathymetry file (mbathy, nb of T-ocean levels)
-!  e3zps_min  the thickness of the partial step is set larger than the
-!  e3zps_rat     the minimum of e3zps_min and e3zps_rat * e3t (N.B. 0<e3zps_rat<1)
-!  nmsh       =1 create a mesh file (coordinates, scale factors, masks)
-!  nacc       acceleration of convergence method   = 0, not used, rdt = rdttra
-!                                                  = 1,     used, rdt < rdttra(k)
-!  atfp       asselin time filter parameter
-!  rdt        time step for the dynamics (and tracer if nacc=0)
-!  rdtmin     minimum time step on tracers
-!  rdtmax     maximum time step on tracers
-!  rdth       depth variation of tracer time step
-!  rdtbt      barotropic time step (for the time splitting algorithm)
-!  nclosea    =0 remove the closed sea from the global domain (orca configuration)
-!             =1 closed sea (Black Sea, Caspian Sea, Great US Lakes...) 
-&namdom
-   ntopo     =     1
-   e3zps_min =     5.
-   e3zps_rat =     0.1
-   nmsh      =     0
-   nacc      =     0
-   atfp      =     0.1
-   rdt       =  5760.
-   rdtmin    =  5760.
-   rdtmax    =  5760.
-   rdth      =   800.
-   rdtbt     =    90.
-   nclosea   =     0
-/
-
+&nam_zgr       !   vertical coordinate
+!-----------------------------------------------------------------------
+   ln_zco      = .false.   !  z-coordinate - full    steps   (T/F)      ("key_zco" may also be defined)
+   ln_zps      = .true.    !  z-coordinate - partial steps   (T/F)
+   ln_sco      = .false.   !  s- or hybrid z-s-coordinate    (T/F)
+/
+!-----------------------------------------------------------------------
+&nam_zgr_sco   !   s-coordinate or hybrid z-s-coordinate
+!-----------------------------------------------------------------------
+   sbot_min    =  300.     !  minimum depth of s-bottom surface (>0) (m)
+   sbot_max    = 5250.     !  maximum depth of s-bottom surface (= ocean depth) (>0) (m)
+   theta       =    6.0    !  surface control parameter (0<=theta<=20)
+   thetb       =    0.75   !  bottom control parameter  (0<=thetb<= 1)
+   r_max       =    0.15   !  maximum cut-off r-value allowed (0<r_max<1)
+/
+!-----------------------------------------------------------------------
+&namdom        !   space and time domain (bathymetry, mesh, timestep)
+!-----------------------------------------------------------------------
+   ntopo       =    1      !  compute (=0) or read(=1) the bathymetry file
+   e3zps_min   =    5.     !  the thickness of the partial step is set larger than the minimum
+   e3zps_rat   =    0.1    !  of e3zps_min and e3zps_rat * e3t   (N.B. 0<e3zps_rat<1)
+   nmsh        =    0      !  create (=1) a mesh file (coordinates, scale factors, masks) or not (=0)
+   nacc        =    0      !  =1 acceleration of convergence method used, rdt < rdttra(k)
+                           !  =0, no acceleration, rdt = rdttra
+   atfp        =    0.1    !  asselin time filter parameter
+   rdt         = 5760.     !  time step for the dynamics (and tracer if nacc=0)
+   rdtmin      = 5760.     !  minimum time step on tracers (used if nacc=1)
+   rdtmax      = 5760.     !  maximum time step on tracers (used if nacc=1)
+   rdth        =  800.     !  depth variation of tracer time step  (used if nacc=1)
+   rdtbt       =   90.     !  barotropic time step (for the split explicit algorithm) ("key_dynspg_ts")
+   nclosea     =    0      !  = 0 no closed sea in the model domain
+                           !  = 1 closed sea (Black Sea, Caspian Sea, Great US Lakes...) 
+/
 !!======================================================================
 !!            ***  Surface Boundary Condition namelists  ***
@@ -188,154 +96,115 @@
 
 !-----------------------------------------------------------------------
-!       namsbc       Surface Boundary Condition (surface module)
-!-----------------------------------------------------------------------
-!  nn_fsbc       frequency of surface boundary condition computation 
-!                (= the frequency of sea-ice model call)
-!  ln_ana        analytical formulation (fill namsbc_ana ) 
-!  ln_flx        flux formulation       (fill namsbc_flx ) 
-!  ln_blk_clio   CLIO bulk formulation  (fill namsbc_core) 
-!  ln_blk_core   CORE bulk formulation  (fill namsbc_clio) 
-!  ln_cpl        Coupled formulation    (fill namsbc_cpl ) 
-!  nn_ice        =0 no ice boundary condition   ,
-!                =1 observed ice-cover          ,
-!                =2 ice-model used                                      ("key_lim3" or "key_lim2)
-!  nn_ico_cpl    ice-ocean coupling : =0 LIM-3 old case 
-!                                     =1 stresses computed using now ocean velocity
-!                                     =2 combination of 0 and 1 cases
-!  ln_dm2dc     Daily mean to Diurnal Cycle short wave (qsr)
-!  ln_ssr       Sea Surface Restoring on T and/or S (fill namsbc_ssr)
-!  nn_fwb       FreshWater Budget: =0 no control                              , 
-!                                  =1 annual global mean of e-p-r set to zero   ,
-!                                  =2 global mean of e-p-r set to zero at each nn_fsbc time step
-&namsbc
-   nn_fsbc     = 5
-   ln_ana      = .false.
-   ln_flx      = .false.
-   ln_blk_clio = .true.
-   ln_blk_core = .false.
-   ln_cpl      = .false.
-   nn_ice      = 2
-   nn_ico_cpl  = 0
-   ln_dm2dc    = .false.
-   ln_rnf      = .false.
-   ln_ssr      = .false.
-   nn_fwb      = 0
-/
-!-----------------------------------------------------------------------
-!       namsbc_ana   analytical surface boundary condition
-!-----------------------------------------------------------------------
-!  nn_tau000   gently increase the stress over the first ntau_rst time-steps
-!  rn_utau0    uniform value for the i-stress
-!  rn_vtau0    uniform value for the j-stress
-!  rn_q0       uniform value for the total heat flux
-!  rn_qsr0     uniform value for the solar radiation
-!  rn_emp0     uniform value for the freswater budget (E-P)
-&namsbc_ana
-   nn_tau000  =   0
-   rn_utau0   =   0.5
-   rn_vtau0   =   0.e0
-   rn_q0      =   0.e0
-   rn_qsr0    =   0.e0
-   rn_emp0    =   0.e0
-/
-!-----------------------------------------------------------------------
-!       namsbc_flx   surface boundary condition : flux formulation (#ifdef "key_sbc_flux")
-!-----------------------------------------------------------------------
-!  cn_dir   directory in which the model is executed
+&namsbc        !   Surface Boundary Condition (surface module)
+!-----------------------------------------------------------------------
+   nn_fsbc     = 5         !  frequency of surface boundary condition computation 
+                           !               (= the frequency of sea-ice model call)
+   ln_ana      = .false.   !  analytical formulation (T => fill namsbc_ana ) 
+   ln_flx      = .false.   !  flux formulation       (T => fill namsbc_flx )
+   ln_blk_clio = .true.    !  CLIO bulk formulation  (T => fill namsbc_clio) 
+   ln_blk_core = .false.   !  CORE bulk formulation  (T => fill namsbc_core) 
+   ln_cpl      = .false.   !  Coupled formulation    (T => fill namsbc_cpl )
+   nn_ice      = 2         !  =0 no ice boundary condition   ,
+                           !  =1 use observed ice-cover      ,
+                           !  =2 ice-model used                             ("key_lim3" or "key_lim2)
+   nn_ico_cpl  = 0         !  ice-ocean coupling : =0 each nn_fsbc 
+                           !                       =1 stresses recomputed each ocean time step ("key_lim3" only)
+                           !                       =2 combination of 0 and 1 cases             ("key_lim3" only)
+   ln_dm2dc    = .false.   !  daily mean to diurnal cycle short wave (qsr)
+   ln_rnf      = .false.   !  runoffs (T => fill namsbc_ssr)
+   ln_ssr      = .false.   !  Sea Surface Restoring on T and/or S (T => fill namsbc_ssr)
+   nn_fwb      = 0         !  FreshWater Budget: =0 unchecked                              , 
+                           !                     =1 annual global mean of e-p-r set to zero   ,
+                           !                     =2 global mean of e-p-r set to zero at each nn_fsbc time step
+/
+!-----------------------------------------------------------------------
+&namsbc_ana    !   analytical surface boundary condition
+!-----------------------------------------------------------------------
+   nn_tau000   =   0       !  gently increase the stress over the first ntau_rst time-steps
+   rn_utau0    =   0.5     !  uniform value for the i-stress
+   rn_vtau0    =   0.e0    !  uniform value for the j-stress
+   rn_q0       =   0.e0    !  uniform value for the total heat flux
+   rn_qsr0     =   0.e0    !  uniform value for the solar radiation
+   rn_emp0     =   0.e0    !  uniform value for the freswater budget (E-P)
+/
+!-----------------------------------------------------------------------
+&namsbc_flx    !   surface boundary condition : flux formulation
+!-----------------------------------------------------------------------
+!              !      file name     ! frequency (hours) !  variable  ! time interpol. !  clim  ! starting !
+!              !                    !  (if <0  months)  !    name    !    (logical)   !  (0/1) !  record  !
+   sn_utau     =      'utau.nc'     ,        24.        ,    'utau'  ,     .false.    ,    0   ,     0
+   sn_vtau     =      'vtau.nc'     ,        24.        ,    'vtau'  ,     .false.    ,    0   ,     0
+   sn_qtot     =      'qtot.nc'     ,        24.        ,    'qtot'  ,     .false.    ,    0   ,     0
+   sn_qsr      =      'qsr.nc'      ,        24.        ,    'qsr'   ,     .false.    ,    0   ,     0
+   sn_emp      =      'emp.nc'      ,        24.        ,    'emp'   ,     .false.    ,    0   ,     0
 !
-!  THE ORDER OF THE FILES MATTER:
-!               !      file name     ! frequency (hours) ! variable ! time intepolation !  clim  ! starting !
-!               !                    !   (if <0  months) !   name   !    (logical)      !  (0/1) !  record  !
-&namsbc_flx
-   cn_dir       = './'
-   sn_utau      =      'utau.nc'     ,        24.        ,  'utau'  ,     .false.       ,    0   ,     0
-   sn_vtau      =      'vtau.nc'     ,        24.        ,  'vtau'  ,     .false.       ,    0   ,     0
-   sn_qtot      =      'qtot.nc'     ,        24.        ,  'qtot'  ,     .false.       ,    0   ,     0
-   sn_qsr       =      'qsr.nc'      ,        24.        ,  'qsr'   ,     .false.       ,    0   ,     0
-   sn_emp       =      'emp.nc'      ,        24.        ,  'emp'   ,     .false.       ,    0   ,     0
+   cn_dir      = './'      !  root directory for the location of the flux files
 /      
 !-----------------------------------------------------------------------
-!       namsbc_clio  CLIO bulk formulea
-!-----------------------------------------------------------------------
-!  cn_dir   directory in which the model is executed
+&namsbc_clio   !   namsbc_clio  CLIO bulk formulea
+!-----------------------------------------------------------------------
+!              !      file name     ! frequency (hours) !  variable  ! time interpol. !  clim  ! starting !
+!              !                    !  (if <0  months)  !    name    !    (logical)   !  (0/1) !  record  !
+   sn_utau     =    'taux_1m'       ,      -12.         , 'sozotaux' ,    .false.     ,    1   ,    0    
+   sn_vtau     =    'tauy_1m'       ,      -12.         , 'sometauy' ,    .false.     ,    1   ,    0    
+   sn_wndm     =    'flx'           ,      -12.         , 'socliowi' ,    .false.     ,    1   ,    0      
+   sn_tair     =    'flx'           ,      -12.         , 'socliot2' ,    .false.     ,    1   ,    0     
+   sn_humi     =    'flx'           ,      -12.         , 'socliohu' ,    .false.     ,    1   ,    0    
+   sn_ccov     =    'flx'           ,      -12.         , 'socliocl' ,    .false.     ,    1   ,    0      
+   sn_prec     =    'flx'           ,      -12.         , 'socliopl' ,    .false.     ,    1   ,    0       
 !
-!  THE ORDER OF THE FILES MATTER:
-!               !   file name        ! frequency (hours) ! variable   ! time intepolation !  clim  ! starting !
-!               !                    !   (if <0  months) !   name     !    (logical)      !  (0/1) !  record  !
-&namsbc_clio
-   cn_dir       = './'
-   sn_utau      =    'taux_1m'    ,      -12.         ,  'sozotaux',    .false.        ,    1   ,    0    
-   sn_vtau      =    'tauy_1m'    ,      -12.         ,  'sometauy',    .false.        ,    1   ,    0    
-   sn_wndm      =    'flx'        ,      -12.         ,  'socliowi',    .false.        ,    1   ,    0      
-   sn_tair      =    'flx'        ,      -12.         ,  'socliot2',    .false.        ,    1   ,    0     
-   sn_humi      =    'flx'        ,      -12.         ,  'socliohu',    .false.        ,    1   ,    0    
-   sn_ccov      =    'flx'        ,      -12.         ,  'socliocl',    .false.        ,    1   ,    0      
-   sn_prec      =    'flx'        ,      -12.         ,  'socliopl',    .false.        ,    1   ,    0       
-/
-!-----------------------------------------------------------------------
-!       namsbc_core  CORE bulk formulea
-!-----------------------------------------------------------------------
-!  cn_dir         directory in which the model is executed
-!  ln_2m          logical flag to use air temp. and hum referenced at 2m instead 10m
-!  alpha_precip   multiplication factor for precipitation (total & snow)
+   cn_dir      = './'      !  root directory for the location of the bulk files are
+/
+!-----------------------------------------------------------------------
+&namsbc_core   !   namsbc_core  CORE bulk formulea
+!-----------------------------------------------------------------------
+!              !   file name        ! frequency (hours) ! variable   ! time interpol. !  clim  ! starting !
+!              !                    !  (if <0  months)  !   name     !    (logical)   !  (0/1) !  record  !
+   sn_wndi     =    'u10'           ,       24.         , 'U_10_MOD' ,    .false.     ,    1   ,    0    
+   sn_wndj     =    'v10'           ,       24.         , 'V_10_MOD' ,    .false.     ,    1   ,    0    
+   sn_qsr      =    'rad'           ,       24.         , 'SWDN_MOD' ,    .false.     ,    1   ,    0      
+   sn_qlw      =    'rad'           ,       24.         , 'LWDN_MOD' ,    .false.     ,    1   ,    0      
+   sn_tair     =    't10'           ,       24.         , 'T_10_MOD' ,    .false.     ,    1   ,    0     
+   sn_humi     =    'q10'           ,       24.         , 'Q_10_MOD' ,    .false.     ,    1   ,    0    
+   sn_prec     =    'precip'        ,      -12.         , 'RAIN'     ,    .false.     ,    1   ,    0      
+   sn_snow     =    'precip'        ,      -12.         , 'SNOW'     ,    .false.     ,    1   ,    0       
 !
-!  THE ORDER OF THE FILES MATTER:
-!               !   file name        ! frequency (hours) ! variable   ! time intepolation !  clim  ! starting !
-!               !                    !   (if <0  months) !   name     !    (logical)      !  (0/1) !  record  !
-&namsbc_core
-   cn_dir       = './'
-   ln_2m        = .false.
-   alpha_precip = 1.
-   sn_wndi      =    'u10'        ,       24.         ,  'U_10_MOD',    .false.        ,    1   ,    0    
-   sn_wndj      =    'v10'        ,       24.         ,  'V_10_MOD',    .false.        ,    1   ,    0    
-   sn_qsr       =    'rad'        ,       24.         ,  'SWDN_MOD',    .false.        ,    1   ,    0      
-   sn_qlw       =    'rad'        ,       24.         ,  'LWDN_MOD',    .false.        ,    1   ,    0      
-   sn_tair      =    't10'        ,       24.         ,  'T_10_MOD',    .false.        ,    1   ,    0     
-   sn_humi      =    'q10'        ,       24.         ,  'Q_10_MOD',    .false.        ,    1   ,    0    
-   sn_prec      =    'precip'     ,      -12.         ,  'RAIN'    ,    .false.        ,    1   ,    0      
-   sn_snow      =    'precip'     ,      -12.         ,  'SNOW'    ,    .false.        ,    1   ,    0       
-/
-!-----------------------------------------------------------------------
-!       namsbc_cpl    coupled ocean/atmosphere model                    ("key_coupled")
-!-----------------------------------------------------------------------
-&namsbc_cpl
-/
-!-----------------------------------------------------------------------
-!       namqsr   penetrative solar radiation
-!-----------------------------------------------------------------------
-!  ln_traqsr : penetrative solar radiation (T) or not (F)     (Default=T)
-!  rabs       fraction of qsr associated with xsi1
-!  xsi1       first depth of extinction
-!  xsi2       second depth of extinction
-&namqsr
-   ln_traqsr = .true.
-   rabs     =   0.58
-   xsi1     =   0.35
-   xsi2     =   23.0
-/
-!-----------------------------------------------------------------------
-!       namsbc_rnf   runoffs namelist surface boundary condition
-!-----------------------------------------------------------------------
-!cn_dir      Root directory for location of ssr files
-!nn_runoff   =0 no, 1 runoff, 2 runoff+river mouth ups adv
-!rn_hrnf     runoffs, depth over which enhanced vertical mixing is used
-!rn_avt_rnf  runoffs, value of the additional vertical mixing coef. [m2/s]
-!sn_rnf      informations about the runoff file to be read
-!sn_cnf      informations about the runoff mouth file to be read
-!  THE ORDER OF THE FILES MATTER:
-!               !   file name        ! frequency (hours) ! variable   ! time interpolation !
-!               !                    !   (if <0  months) !   name     !     (logical)      !
-&namsbc_rnf
-   cn_dir     = './'
-   nn_runoff  = 2
-   rn_hrnf    = 0.e0
-   rn_avt_rnf = 1.e-3
-   sn_rnf     = 'runoff_1m_nomask.nc' ,      -12.        ,  'sorunoff',    .true.   ,  1  ,  0     
-   sn_cnf     = 'runoff_1m_nomask.nc' ,        0.        ,  'socoefr' ,    .false.  ,  1  ,  0              
-/
-!-----------------------------------------------------------------------
-!       namsbc_ssr   surface boundary condition : sea surface restoring
-!-----------------------------------------------------------------------
-!  cn_dir    directory in which the model is executed
+   cn_dir      = './'      !  root directory for the location of the bulk files
+   ln_2m       = .false.   !  air temperature and humidity referenced at 2m (T) instead 10m (F)
+   alpha_precip= 1.        !  multiplicative factor for precipitation (total & snow)
+/
+!-----------------------------------------------------------------------
+&namsbc_cpl    !   coupled ocean/atmosphere model                        ("key_coupled")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namqsr        !   penetrative solar radiation
+!-----------------------------------------------------------------------
+   ln_traqsr   = .true.    !  penetrative solar radiation (T) or not (F)
+   rabs        =   0.58    !  fraction of qsr associated with xsi1
+   xsi1        =   0.35    !  first depth of extinction
+   xsi2        =   23.0    !  second depth of extinction
+/
+!-----------------------------------------------------------------------
+&namsbc_rnf    !   runoffs namelist surface boundary condition
+!-----------------------------------------------------------------------
+!              !   file name        ! frequency (hours) ! variable   ! time interpol. !  clim  ! starting !
+!              !                    !  (if <0  months)  !   name     !    (logical)   !  (0/1) !  record  !
+   sn_rnf    = 'runoff_1m_nomask.nc',       -12.        , 'sorunoff' ,    .true.      ,    1   ,    0     
+   sn_cnf    = 'runoff_1m_nomask.nc',         0.        , 'socoefr'  ,    .false.     ,    1   ,    0              
+!
+   cn_dir      = './'      !  root directory for the location of the runoff files
+   nn_runoff   =   2       !  no runoff (0), runoff (1), runoff+river mouth ups adv with cen2 (2)
+   rn_hrnf     =   0.e0    !  depth over which enhanced vertical mixing is used
+   rn_avt_rnf  =   1.e-3   !  value of the additional vertical mixing coef. [m2/s]
+/
+!-----------------------------------------------------------------------
+&namsbc_ssr    !   surface boundary condition : sea surface restoring
+!-----------------------------------------------------------------------
+!              !   file name        ! frequency (hours) ! variable   ! time interpol. !  clim  ! starting !
+!              !                    !  (if <0  months)  !   name     !    (logical)   !  (0/1) !  record  !
+   sn_sst      =  'sst_data.nc'     ,        24.        ,  'sst'     ,     .false.    ,    0   ,    0
+   sn_sss      =  'sss_data.nc'     ,       -12.        ,  'sss'     ,     .true.     ,    0   ,    0
+   
 !  nn_sstr   =0/1   add a retroaction term in the surface heat flux
 !  nn_sssr   =O/1/2 add a damping term in the surface freshwater flux
@@ -344,33 +213,20 @@
 !  dqdt       magnitude of the retroaction on temperature [W/m2/K]
 !  deds       magnitude of the damping on salinity [mm/day]
-!  THE ORDER OF THE FILES MATTER:
-!               !   file name     ! frequency (hours) ! variable ! time intepolation !  clim  ! starting !
-!               !                 !   (if <0  months) !   name   !    (logical)      !  (0/1) !  record  !
-&namsbc_ssr
-   cn_dir       = './'
-   nn_sstr      = 0
-   nn_sssr      = 0
-   dqdt         = -40.
-   deds         =  27.7
-   sn_sst       =  'sst_data.nc'  ,         24.       ,  'sst'   ,     .false.       ,    0   ,     0
-   sn_sss       =  'sss_data.nc'  ,        -12.       ,  'sss'   ,     .true.        ,    0   ,     0
+!
+   cn_dir      = './'      !  root directory for the location of the runoff files
+   nn_sstr     =     0     !  add a retroaction term in the surface heat       flux (=1) or not (=0)
+   nn_sssr     =     0     !  add a damping     term in the surface freshwater flux (=1) or not (=0)
+   dqdt        =   -40.    !  magnitude of the retroaction on temperature   [W/m2/K]
+   deds        =    27.7   !  magnitude of the damping on salinity   [mm/day/psu]
 /      
 !-----------------------------------------------------------------------
-!       namalb   albedo parameters
-!-----------------------------------------------------------------------
-!  cgren    correction of the snow or ice albedo to take into account
-!  albice   albedo of melting ice in the arctic and antarctic
-!  alphd    coefficients for linear interpolation used to compute albedo
-!           between two extremes values (Pyane, 1972)
-!  alphc     "                                         "
-!  alphdi    "                                         "
-&namalb
-   cgren    =      0.06
-   albice   =      0.5
-   alphd    =      0.80
-   alphc    =      0.65
-   alphdi   =      0.72
-/
-
+&namalb        !   albedo parameters
+!-----------------------------------------------------------------------
+   cgren       =    0.06   !  correction of the snow or ice albedo to take into account the
+   albice      =    0.5    !  albedo of melting ice in the arctic and antarctic
+   alphd       =    0.80   !  coefficients for linear interpolation used to
+   alphc       =    0.65   !  compute albedo between two extremes values 
+   alphdi      =    0.72   !  (Pyane, 1972)
+/
 !!======================================================================
 !!               ***  Lateral boundary condition  ***
@@ -379,4 +235,5 @@
 !!   namcla        cross land advection
 !!   namobc        open boundaries parameters                           ("key_obc")
+!!   namagrif      agrif nested grid ( read by child model only )       ("key_agrif") 
 !!   nambdy        Unstructured open boundaries                         ("key_bdy")
 !!   namtide       Tidal forcing at open boundaries                     ("key_bdy_tides")
@@ -384,89 +241,67 @@
 
 !-----------------------------------------------------------------------
-!       namlbc   lateral momentum boundary condition
-!-----------------------------------------------------------------------
-!  shlat            shlat = 0 , free slip   ;   0 < shlat < 2 , partial slip
-!                   shlat = 2 , no slip     ;   2 < shlat     , strong slip
-&namlbc
-   shlat  =      2.
-/
-!-----------------------------------------------------------------------
-!       namcla   cross land advection
-!-----------------------------------------------------------------------
-!  n_cla   advection between 2 ocean pts separates by land 
-&namcla
-   n_cla   = 1
-/
-!-----------------------------------------------------------------------
-!       namobc    open boundaries parameters (#ifdef key_obc)
-!-----------------------------------------------------------------------
-!  nobc_dta   = 0 the obc data are equal to the initial state
-!             = 1 the obc data are read in 'obc   .dta' files
-!  rdpeob  time relaxation (days) for the east open boundary
-!  rdpwob  time relaxation (days) for the west open boundary
-!  rdpnob  time relaxation (days) for the north open boundary
-!  rdpsob  time relaxation (days) for the south open boundary
-!  zbsic1  barotropic stream function on isolated coastline 1
-!  zbsic2  barotropic stream function on isolated coastline 2
-!  zbsic3  barotropic stream function on isolated coastline 3
-!  ln_obc_clim  climatological obc data files (default T)
-!  ln_vol_cst   total volume conserved
-&namobc
-    nobc_dta =    0
-    rdpein   =    1.
-    rdpwin   =    1.
-    rdpnin   =   30.
-    rdpsin   =    1.
-    rdpeob   = 1500.
-    rdpwob   =   15.
-    rdpnob   =  150.
-    rdpsob   =   15.
-    zbsic1   =  140.e+6
-    zbsic2   =    1.e+6
-    zbsic3   =    0.
-    ln_obc_clim = .true.
-    ln_vol_cst  = .false.
-/
-!-----------------------------------------------------------------------
-!       nambdy    unstructured open boundaries parameters               ("key_bdy")
-!-----------------------------------------------------------------------
-!  filbdy_mask     Name of mask file (at T-points)
-!  filbdy_data_T   Name of data file (at T-points)
-!  filbdy_data_U   Name of data file (at U-points)
-!  filbdy_data_V   Name of data file (at V-points)
-!  ln_bdy_clim     bdy files must contain 1 or 12 time dumps and be cyclic. 
-!  ln_bdy_vol      Total volume correction (see volbdy parameter)
-!  ln_bdy_fla      Flather boundary conditions                         
-!  nbdy_dta        0 the bdy data are equal to the initial state
-!                  1 the bdy data are read in 'bdydata   .nc' files
-!  nb_rimwidth     width of the relaxation zone
-!  volbdy          0 the total water flux across open boundaries is zero 
-!                  1 the total volume of the system is conserved
-&nambdy
-    filbdy_mask   = 'bdymask_grid_T.nc'
-    filbdy_data_T = 'bdydata_grid_T.nc'
-    filbdy_data_U = 'bdydata_grid_U.nc'
-    filbdy_data_V = 'bdydata_grid_V.nc'
-    ln_bdy_clim = .false.
-    ln_bdy_vol  = .false.
-    ln_bdy_fla  = .true.
-    nbdy_dta    = 1
-    nb_rimwidth = 1
-    volbdy      = 1
-/
-!-----------------------------------------------------------------------
-!       namtide   tidal forcing at unstructured boundaries              ("key_bdy_tides")
-!-----------------------------------------------------------------------
-!  filtide         File name root of tidal forcing files
-!  tide_cpt        Names of tidal components used
-!  tide_speed      Phase speeds of tidal components (deg/hour)
-!  ln_tide_date    If true, adjust tidal harmonics for start date of run.
-&namtide
-    filtide      = 'bdytide_'
-    tide_cpt     = 'M2','S1'
-    tide_speed   = 28.984106, 15.000001
-    ln_tide_date = .true.
-/
-
+&namlbc        !   lateral momentum boundary condition
+!-----------------------------------------------------------------------
+   shlat       =    2.     !      shlat = 0 : free slip
+                           !  0 < shlat < 2 : partial slip
+                           !      shlat = 2 : no slip
+                           !  2 < shlat     : strong slip
+/
+!-----------------------------------------------------------------------
+&namcla        !   cross land advection
+!-----------------------------------------------------------------------
+   n_cla       =    1      !  advection between 2 ocean pts separates by land
+/
+!-----------------------------------------------------------------------
+&namobc        !   open boundaries parameters                           ("key_obc")
+!-----------------------------------------------------------------------
+    nobc_dta   =    0      !  = 0 the obc data are equal to the initial state
+                           !  = 1 the obc data are read in 'obc.dta' files
+    rdpein     =    1.     !  ???
+    rdpwin     =    1.     !  ???
+    rdpnin     =   30.     !  ???
+    rdpsin     =    1.     !  ???
+    rdpeob     = 1500.     !  time relaxation (days) for the east  open boundary
+    rdpwob     =   15.     !    "        "             "     west         "
+    rdpnob     =  150.     !    "        "             "     north        "
+    rdpsob     =   15.     !    "        "             "     south        "
+    zbsic1     =  140.e+6  !   barotropic stream function on first  isolated coastline
+    zbsic2     =    1.e+6  !    "                   "        second       "
+    zbsic3     =    0.     !    "                   "        thrid        "
+    ln_obc_clim= .true.    !  climatological obc data files (T) or not (F)
+    ln_vol_cst = .false.   !  impose the total volume conservation (T) or not (F)
+/
+!-----------------------------------------------------------------------
+&namagrif      !                                                        ("key_agrif")
+!-----------------------------------------------------------------------
+    nbclineupdate = 3      !  baroclinic update frequency
+    ln_spc_dyn    = .true. !  use 0 as special value for dynamics
+    visc_tra      = 2880.  !  viscosity coeeficient for tracers sponge layer
+    visc_dyn      = 2880.  !  viscosity coeeficient for dynamics sponge layer
+/
+!-----------------------------------------------------------------------
+&nambdy        !  unstructured open boundaries parameters               ("key_bdy")
+!-----------------------------------------------------------------------
+    filbdy_mask   = 'bdymask_grid_T.nc'  !  name of mask file (at T-points)
+    filbdy_data_T = 'bdydata_grid_T.nc'  !  name of data file (at T-points)
+    filbdy_data_U = 'bdydata_grid_U.nc'  !  name of data file (at U-points)
+    filbdy_data_V = 'bdydata_grid_V.nc'  !  name of data file (at V-points)
+    ln_bdy_clim = .false.                !  must contain 1 or 12 time dumps and be cyclic
+    ln_bdy_vol  = .false.                !  total volume correction (see volbdy parameter)
+    ln_bdy_fla  = .true.                 !  flather boundary conditions
+    nbdy_dta    = 1                      !  = 0, bdy data are equal to the initial state
+                                         !  = 1, bdy data are read in 'bdydata   .nc' files
+    nb_rimwidth = 1                      !  width of the relaxation zone
+    volbdy      = 1                      !  = 0, the total water flux across open boundaries is zero
+                                         !  = 1, the total volume of the system is conserved
+/
+!-----------------------------------------------------------------------
+&namtide        ! tidal forcing at unstructured boundaries              ("key_bdy_tides")
+!-----------------------------------------------------------------------
+    filtide      = 'bdytide_'           !  file name root of tidal forcing files
+    tide_cpt     = 'M2','S1'            !  names of tidal components used
+    tide_speed   = 28.984106, 15.000001 !  phase speeds of tidal components (deg/hour)
+    ln_tide_date = .true.               !  adjust tidal harmonics for start date of run
+/
 !!======================================================================
 !!                 ***  Bottom boundary condition  ***
@@ -476,39 +311,29 @@
 !!   nambbl        bottom boundary layer scheme                         ("key_trabbl_dif","key_trabbl_adv")
 !!======================================================================
-!-----------------------------------------------------------------------
-!       nambfr   bottom friction
-!-----------------------------------------------------------------------
-!  nbotfr   type of bottom friction : = 0 : no slip    ;  = 1 : linear friction
-!                                     = 3 : free slip  ;  = 2 : non linear friction
-!  bfri1    bottom drag coefficient (linear case)
-!  bfri2    bottom drag coefficient (non linear case)
-!  bfeb2    bottom turbulent kinetic energy  (m2/s2)
-&nambfr
-   nbotfr =       1
-   bfri1  =   4.e-4
-   bfri2  =   1.e-3
-   bfeb2  =  2.5e-3
-/
-!-----------------------------------------------------------------------
-!       nambbc   bottom temperature boundary condition
-!-----------------------------------------------------------------------
-!  ngeo_flux  = 0 no geothermal heat flux
-!             = 1 constant geothermal heat flux
-!             = 2 variable geothermal heat flux (read in geothermal_heating.nc in mW/m2)
-!  ngeo_flux_const   Constant value of geothermal heat flux (W/m2) 
-&nambbc
-   ngeo_flux =  2
-   ngeo_flux_const = 86.4e-3
-/
-!-----------------------------------------------------------------------
-!       nambbl   bottom boundary layer scheme
-!-----------------------------------------------------------------------
-!                                !  diffusive bbl                       ("key_trabbl")
-!                                !  advective bbl                       ("key_trabbl_adv")
-!  atrbbl   mixing coefficient of the bottom boundary layer scheme (m2/s)
-&nambbl
-   atrbbl = 10000.
-/
-
+
+!-----------------------------------------------------------------------
+&nambfr        !   bottom friction
+!-----------------------------------------------------------------------
+   nbotfr      =    1      !  type of bottom friction :   = 0 : no   slip,  = 2 : nonlinear friction
+                           !                              = 3 : free slip,  = 1 :    linear friction
+   bfri1       =    4.e-4  !  bottom drag coefficient (linear case)
+   bfri2       =    1.e-3  !  bottom drag coefficient (non linear case)
+   bfeb2       =    2.5e-3 !  bottom turbulent kinetic energy background  (m^2/s^2)
+/
+!-----------------------------------------------------------------------
+&nambbc        !   bottom temperature boundary condition
+!-----------------------------------------------------------------------
+   ngeo_flux   =    2      !  geothermal heat flux = 0 no flux considered 
+                           !                       = 1 constant flux
+                           !                       = 2 variable flux (read in geothermal_heating.nc in mW/m2) 
+   ngeo_flux_const = 86.4e-3  !  Constant value of geothermal heat flux [W/m2]
+/
+!-----------------------------------------------------------------------
+&nambbl        !   bottom boundary layer scheme
+!-----------------------------------------------------------------------
+!                          !  diffusive bbl                             ("key_trabbl")
+!                          !  advective bbl                             ("key_trabbl_adv")
+   atrbbl      =  10000.   !  lateral mixing coefficient in the bbl  [m2/s]
+/
 !!======================================================================
 !!                        Tracer (T & S ) namelists
@@ -521,82 +346,52 @@
 
 !-----------------------------------------------------------------------
-!       nameos   ocean physical parameters
-!-----------------------------------------------------------------------
-!  neos    type of equation of state and Brunt-Vaisala frequency
-!          !   = 0, UNESCO (formulation of Jackett and McDougall (1994) and of McDougall (1987) )
-!          !   = 1, linear: rho(T)   = rau0 * ( 1.028 - ralpha * T )
-!          !   = 2, linear: rho(T,S) = rau0 * ( rbeta * S - ralpha * T )
-!  ralpha  thermal expension coefficient (neos= 1 or 2)
-!  rbeta   saline  expension coefficient (neos= 2)
-&nameos
-   neos   =      0
-   ralpha =  2.e-4
-   rbeta  =  0.001
-/
-!-----------------------------------------------------------------------
-!       nam_traadv   advection scheme for tracer
-!-----------------------------------------------------------------------
-!  ln_traadv_cen2     2nd order centered scheme          (default T)
-!  ln_traadv_tvd      TVD scheme                         (default F)
-!  ln_traadv_muscl    MUSCL scheme                       (default F)
-!  ln_traadv_muscl2   MUSCL scheme + cen2 at boundaries  (default F)
-!  ln_traadv_ubs      UBS scheme                         (default F)
-!  ln_traadv_qck      QUICKEST scheme                    (default F)
-&nam_traadv
-   ln_traadv_cen2   =  .true.
-   ln_traadv_tvd    =  .false.
-   ln_traadv_muscl  =  .false.
-   ln_traadv_muscl2 =  .false.
-   ln_traadv_ubs    =  .false.
-   ln_traadv_qck    =  .false.
-/
-!-----------------------------------------------------------------------
-!       nam_traldf   lateral diffusion scheme for tracer
-!-----------------------------------------------------------------------
-!  Type of the operator : 
-!     ln_traldf_lap    laplacian operator          (default T)
-!     ln_traldf_bilap  bilaplacian operator        (default F)
-!  Direction of action  : 
-!     ln_traldf_level  iso-level                   (default F)
-!     ln_traldf_hor    horizontal (geopotential)   (default F)   (require "key_ldfslp" when ln_sco=T)
-!     ln_traldf_iso    iso-neutral                 (default T)   (require "key_ldfslp")
-!  Coefficient
-!     aht0    horizontal eddy diffusivity for tracers (m2/s)
-!     ahtb0   background eddy diffusivity for isopycnal diffusion (m2/s)
-!     aeiv0   eddy induced velocity coefficient (m2/s)           (require "key_traldf_eiv")
-&nam_traldf
-   ln_traldf_lap    =  .true.
-   ln_traldf_bilap  =  .false.
-   ln_traldf_level  =  .false.
-   ln_traldf_hor    =  .false.
-   ln_traldf_iso    =  .true.
-   aht0    =  2000.
-   ahtb0   =     0.
-   aeiv0   =  2000.
-/
-!-----------------------------------------------------------------------
-!       namtdp   tracer newtonian damping ('key_tradmp')
-!-----------------------------------------------------------------------
-!  ndmp    type of damping in temperature and salinity 
-!          !   ='latitude', damping poleward of 'ndmp' degrees and function 
-!          !                of the distance-to-coast. Red and Med Seas as ndmp=-1
-!          !   =-1          damping only in Med and Red Seas
-!  ndmpf   =1 create a damping.coeff NetCDF file (the 3D damping array)
-!  nmldmp  type of damping in the mixed layer
-!          !   =0 damping throughout the water column
-!	        !   =1 no damping in the mixed layer defined by avt >5cm2/s 
-!	        !   =2 no damping in the mixed layer defined rho<rho(surf)+.01 
-!  sdmp    surface time scale for internal damping (days)
-!  bdmp    bottom time scale for internal damping (days)
-!  hdmp    depth of transition between sdmp and bdmp (meters)
-&namtdp
-   ndmp   =   -1
-   ndmpf  =    1
-   nmldmp =    1
-   sdmp   =  50.
-   bdmp   = 360.
-   hdmp   = 800.
-/
-
+&nameos        !   ocean physical parameters
+!-----------------------------------------------------------------------
+   neos        =    0      !  type of equation of state and Brunt-Vaisala frequency
+                           !     = 0, UNESCO (formulation of Jackett and McDougall (1994) and of McDougall (1987) )
+                           !     = 1, linear: rho(T)   = rau0 * ( 1.028 - ralpha * T )
+                           !     = 2, linear: rho(T,S) = rau0 * ( rbeta * S - ralpha * T )
+   ralpha      =    2.e-4  !  thermal expension coefficient (neos= 1 or 2)
+   rbeta       =    0.001  !  saline  expension coefficient (neos= 2)
+/
+!-----------------------------------------------------------------------
+&nam_traadv    !   advection scheme for tracer 
+!-----------------------------------------------------------------------
+   ln_traadv_cen2   =  .true.   !  2nd order centered scheme   
+   ln_traadv_tvd    =  .false.  !  TVD scheme                
+   ln_traadv_muscl  =  .false.  !  MUSCL scheme             
+   ln_traadv_muscl2 =  .false.  !  MUSCL2 scheme + cen2 at boundaries  
+   ln_traadv_ubs    =  .false.  !  UBS scheme                 
+/
+!-----------------------------------------------------------------------
+&nam_traldf    !   lateral diffusion scheme for tracer 
+!-----------------------------------------------------------------------
+!                               !  Type of the operator : 
+   ln_traldf_lap    =  .true.   !     laplacian operator       
+   ln_traldf_bilap  =  .false.  !     bilaplacian operator     
+                                !  Direction of action  :
+   ln_traldf_level  =  .false.  !     iso-level                
+   ln_traldf_hor    =  .false.  !     horizontal (geopotential)         (require "key_ldfslp" when ln_sco=T)
+   ln_traldf_iso    =  .true.   !     iso-neutral                       (require "key_ldfslp")
+!                               !  Coefficient
+   aht0        =  2000.         !     horizontal eddy diffusivity for tracers [m2/s]
+   ahtb0       =     0.         !     background eddy diffusivity for ldf_iso [m2/s]
+   aeiv0       =  2000.         !     eddy induced velocity coefficient [m2/s]    (require "key_traldf_eiv")
+/
+!-----------------------------------------------------------------------
+&namtdp        !   tracer newtonian damping                             ('key_tradmp')
+!-----------------------------------------------------------------------
+   ndmp        =   -1      !  type of damping in temperature and salinity 
+                           !     ='latitude', damping poleward of 'ndmp' degrees and function 
+                           !                  of the distance-to-coast. Red and Med Seas as ndmp=-1
+                           !     =-1 damping only in Med and Red Seas
+   ndmpf       =    1      !  create a damping.coeff NetCDF file (=1) or not (=0)
+   nmldmp      =    1      !  type of damping: =0 damping throughout the water column
+                           !                   =1 no damping in the mixed layer defined by avt >5cm2/s )
+                           !                   =2 no damping in the mixed layer defined rho<rho(surf)+.01 )
+   sdmp        =   50.     !  surface time scale for internal damping (days)
+   bdmp        =  360.     !  bottom  time scale for internal damping (days)
+   hdmp        =  800.     !  depth of transition between sdmp and bdmp (meters)
+/
 !!======================================================================
 !!                      ***  Dynamics namelists  ***
@@ -611,91 +406,59 @@
 
 !-----------------------------------------------------------------------
-!       nam_dynadv   formulation of the momentum advection
-!-----------------------------------------------------------------------
-!  ln_dynadv_vec      vector form (T) or flux form (F)         (default T)
-!  ln_dynadv_cen2     flux form - 2nd order centered scheme    (default T)
-!  ln_dynadv_ubs      flux form - 3rd order UBS scheme         (default F)
-&nam_dynadv   
-   ln_dynadv_vec   = .true.
-   ln_dynadv_cen2  = .false.
-   ln_dynadv_ubs   = .false.
+&nam_dynadv    !   formulation of the momentum advection
+!-----------------------------------------------------------------------
+   ln_dynadv_vec = .true.  !  vector form (T) or flux form (F)  
+   ln_dynadv_cen2= .false. !  flux form - 2nd order centered scheme
+   ln_dynadv_ubs = .false. !  flux form - 3rd order UBS      scheme 
 /  
 !-----------------------------------------------------------------------
-!       nam_dynvor   option of physics/algorithm (not control by CPP keys)
-!-----------------------------------------------------------------------
-!  ln_dynvor_ens   vorticity trends: enstrophy conserving scheme (default T)
-!  ln_dynvor_ene      "         "  : energy conserving scheme    (default F)
-!  ln_dynvor_mix      "         "  : mixed scheme                (default F)
-!  ln_dynvor_een      "         "  : energy & enstrophy scheme   (default F)
-&nam_dynvor
-   ln_dynvor_ene = .false.
-   ln_dynvor_ens = .true.
-   ln_dynvor_mix = .false.
-   ln_dynvor_een = .false.
-/
-!-----------------------------------------------------------------------
-!       nam_dynhpg   Hydrostatic pressure gradient option
-!-----------------------------------------------------------------------
-!  type of pressure gradient scheme (choose one only!)
-!     ln_hpg_zco    z-coordinate - full steps                   (default T)
-!     ln_hpg_zps    z-coordinate - partial steps (interpolation)
-!     ln_hpg_sco    s-coordinate (standard jacobian formulation)
-!     ln_hpg_hel    s-coordinate (helsinki modification)
-!     ln_hpg_wdj    s-coordinate (weighted density jacobian)
-!     ln_hpg_djc    s-coordinate (Density Jacobian with Cubic polynomial)
-!     ln_hpg_rot    s-coordinate (ROTated axes scheme)
-!  parameters
-!     gamm          weighting coefficient (wdj scheme)
-&nam_dynhpg
-   ln_hpg_zco = .false.
-   ln_hpg_zps = .true.
-   ln_hpg_sco = .false.
-   ln_hpg_hel = .false.
-   ln_hpg_wdj = .false.
-   ln_hpg_djc = .false.
-   ln_hpg_rot = .false.
-   gamm       = 0.e0
-/
-!-----------------------------------------------------------------------
-!       namflg   algorithm flags (algorithm not control by CPP keys)
-!-----------------------------------------------------------------------
-!  ln_dynhpg_imp   hydrostatic pressure gradient: semi-implicit time scheme  (T)
-!                                                  centered     time scheme  (F)
-!   nn_dynhpg_rst  add dynhpg implicit variables in restart ot not (1/0)
-&namflg
-   ln_dynhpg_imp   =  .false.
-   nn_dynhpg_rst   =  0
-/
-!-----------------------------------------------------------------------
-!       nam_dynspg   surface pressure gradient   (CPP key only)
-!-----------------------------------------------------------------------
-!                                !  explicit free surface               ("key_dynspg_exp")
-!                                !  filtered free surface               ("key_dynspg_flt")
-!                                !  split-explicit free surface         ("key_dynspg_ts")
-!                                !  rigid-lid                           ("key_dynspg_rl")
-
-!-----------------------------------------------------------------------
-!       nam_dynldf   lateral diffusion on momentum
-!-----------------------------------------------------------------------
-!  Type of the operator : 
-!     ln_dynldf_lap    laplacian operator          (default T)
-!     ln_dynldf_bilap  bilaplacian operator        (default F)
-!  Direction of action  : 
-!     ln_dynldf_level  iso-level                   (default F)
-!     ln_dynldf_hor    horizontal (geopotential)   (default F)   (require "key_ldfslp" if ln_sco=T)
-!     ln_dynldf_iso    iso-neutral                 (default T)   (require "key_ldfslp")
-!  Coefficient
-!     ahm0    horizontal eddy viscosity for the dynamics (m2/s)
-!     ahmb0   background eddy viscosity for isopycnal diffusion (m2/s)
-&nam_dynldf
-   ln_dynldf_lap    =  .true.
-   ln_dynldf_bilap  =  .false.
-   ln_dynldf_level  =  .false.
-   ln_dynldf_hor    =  .true.
-   ln_dynldf_iso    =  .false.
-   ahm0    = 40000.
-   ahmb0   =     0.
-/
-
+&nam_dynvor    !   option of physics/algorithm (not control by CPP keys)
+!-----------------------------------------------------------------------
+   ln_dynvor_ene = .false. !  enstrophy conserving scheme  
+   ln_dynvor_ens = .true.  !  energy conserving scheme    
+   ln_dynvor_mix = .false. !  mixed scheme               
+   ln_dynvor_een = .false. !  energy & enstrophy scheme  
+/
+!-----------------------------------------------------------------------
+&nam_dynhpg    !   Hydrostatic pressure gradient option
+!-----------------------------------------------------------------------
+   ln_hpg_zco  = .false.   !  z-coordinate - full steps                   
+   ln_hpg_zps  = .true.    !  z-coordinate - partial steps (interpolation)
+   ln_hpg_sco  = .false.   !  s-coordinate (standard jacobian formulation)
+   ln_hpg_hel  = .false.   !  s-coordinate (helsinki modification)
+   ln_hpg_wdj  = .false.   !  s-coordinate (weighted density jacobian)
+   ln_hpg_djc  = .false.   !  s-coordinate (Density Jacobian with Cubic polynomial)
+   ln_hpg_rot  = .false.   !  s-coordinate (ROTated axes scheme)
+   gamm        = 0.e0      !  weighting coefficient (wdj scheme)
+/
+!-----------------------------------------------------------------------
+&namflg        !   algorithm flags (algorithm not control by CPP keys)
+!-----------------------------------------------------------------------
+   ln_dynhpg_imp = .false. !  hydrostatic pressure gradient: semi-implicit time scheme  (T)
+                           !                                 centered      time scheme  (F)
+   nn_dynhpg_rst =  0      !  add dynhpg implicit variables in restart ot not (1/0)
+/
+!-----------------------------------------------------------------------
+!nam_dynspg    !   surface pressure gradient   (CPP key only)
+!-----------------------------------------------------------------------
+!                          !  explicit free surface                     ("key_dynspg_exp")
+!                          !  filtered free surface                     ("key_dynspg_flt")
+!                          !  split-explicit free surface               ("key_dynspg_ts")
+!                          !  rigid-lid                                 ("key_dynspg_rl")
+
+!-----------------------------------------------------------------------
+&nam_dynldf    !   lateral diffusion on momentum
+!-----------------------------------------------------------------------
+!                               !  Type of the operator : 
+   ln_dynldf_lap    =  .true.   !     laplacian operator         
+   ln_dynldf_bilap  =  .false.  !     bilaplacian operator    
+!                               !  Direction of action  : 
+   ln_dynldf_level  =  .false.  !     iso-level               
+   ln_dynldf_hor    =  .true.   !     horizontal (geopotential)        (require "key_ldfslp" in s-coord.)
+   ln_dynldf_iso    =  .false.  !     iso-neutral                      (require "key_ldfslp")
+                                !  Coefficient
+   ahm0    = 40000.             !     horizontal eddy viscosity   [m2/s]
+   ahmb0   =     0.             !     background eddy viscosity for ldf_iso [m2/s]
+/
 !!======================================================================
 !!             Tracers & Dynamics vertical physics namelists
@@ -710,167 +473,138 @@
 
 !-----------------------------------------------------------------------
-!       namzdf   vertical physics
-!-----------------------------------------------------------------------
-!  ln_zdfevd  enhanced vertical diffusion         (default T)
-!  ln_zdfnpc  Non-Penetrative Convection          (default T)
-!  avm0       vertical eddy viscosity for the dynamic (m2/s)   (also background Kz if not "key_zdfcst")
-!  avt0       vertical eddy diffusivity for tracers (m2/s)     (also background Kz if not "key_zdfcst")
-!  avevd      vertical coefficient for enhanced diffusion scheme (m2/s)
-!  n_evdm     = 0  apply enhanced mixing on tracer only
-!             = 1  apply enhanced mixing on both tracer and momentum
-!  ln_zdfexp   vertical physics: (=T)  time splitting (T)     (Default=F)
-!                               (=F)  euler backward (F)
-!  n_zdfexp   number of sub-timestep for time splitting scheme
-&namzdf
-   ln_zdfevd = .true.
-   ln_zdfnpc = .false.
-   avm0      = 1.2e-4
-   avt0      = 1.2e-5
-   avevd     =   100.
-   n_evdm    =     1
-   ln_zdfexp =  .false.
-   n_zdfexp  =     3
-/
-!-----------------------------------------------------------------------
-!       namnpc   non penetrative convection
-!-----------------------------------------------------------------------
-!  nnpc1   non penetrative convective scheme frequency   
-!  nnpc2   non penetrative convective scheme print frequency
-&namnpc
-   nnpc1  =      1
-   nnpc2  =    365
-/
-!-----------------------------------------------------------------------
-!       namric   richardson number dependent vertical diffusion         ("key_zdfric" )
-!-----------------------------------------------------------------------
-!  avmri   maximum value of the vertical viscosity
-!  alp     coefficient of the parameterization
-!  nric    coefficient of the parameterization
-&namric
-   avmri = 100.e-4
-   alp   =      5.
-   nric  =       2
-/
-!-----------------------------------------------------------------------
-!       namtke   turbulent eddy kinetic dependent vertical diffusion    ("key_zdftke")
-!-----------------------------------------------------------------------
-!  ln_rstke    flag to restart with tke from a run without tke (default F)
-!  rn_ediff    coef. to compute vertical eddy coef. (avt=rn_ediff*mxl*sqrt(e) )
-!  rn_ediss    coef. of the Kolmogoroff dissipation
-!  rn_ebb      coef. of the surface input of tke
-!  rn_efave    coef. to applied to the tke diffusion ( avtke=rn_efave*avm )
-!  rn_emin     minimum value of tke (m^2/s^2)
-!  rn_emin0    surface minimum value of tke (m^2/s^2)
-!  nn_itke     number of restart iterative loops
-!  rn_cri      critic richardson number = 2/9 = 0.22222222 (hard coded)
-!  nn_mxl      length used = 0 bounded by the distance to surface and bottom
-!              !           = 1 bounded by the local vertical scale factor
-!              !           = 2 first vertical derivative of mixing length bounded by 1
-!              !           = 3 same criteria as case 2 but applied in a different way
-!  nn_pdl      Prandtl number = 0 no vertical prandtl number (avt=avm)
-!              !              = 1 prandtl number function of richarson number (avt=nn_pdl*avm)
-!  nn_ave      = horizontal averaged (=1) or not (=0) of avt  (default =1)
-!  nn_avb      = 0 cst background avt0, avm0 / =1 profile used on avtb
-!  ln_mxl0     mixing length scale surface value as function of wind stress or not
-!  rn_lmin     interior buoyancy lenght scale minimum value 
-!  rn_lmin0    surface  buoyancy lenght scale minimum value 
-!  nn_etau     to add tke induced by wind  = 0 no add tke induced by wind
-!              !                           = 1 add tke induced by wind
-!              !                           = 2 add tke induced by wind only at the mxl base
-!  nn_htau     TKE penetration profile type
-!  rn_efr      fraction of TKE surface value which penetrates inside the thermocline
-!  ln_lc       flag to take into account Langmuir Circulation (LC)
-!  rn_lc       coef to compute vertical velocity of LC
-!  nn_havtb    horizontal shape or not for avtb (=0/1)
-&namtke
-   ln_rstke = .false.
-   rn_ediff =     0.1
-   rn_ediss =     0.7
-   rn_ebb   =    3.75
-   rn_efave =      1.
-   rn_emin  =   1.e-6
-   rn_emin0 =   1.e-4
-   nn_itke  =      50
-   nn_mxl   =       2
-   nn_pdl   =       1
-   nn_avb   =       0
-   nn_ave   =       1
-   ln_mxl0  = .false.
-   rn_lmin  =     0.4
-   rn_lmin0 =     0.4
-   nn_etau  =       0
-   nn_htau  =       2
-   rn_efr   =    0.05
-   ln_lc    = .false.
-   rn_lc    =    0.15
-   nn_havtb =       0
-/
-!-----------------------------------------------------------------------
-!       namkpp   K-Profile Parameterization dependent vertical mixing   ("key_zdfkpp" )
-!-----------------------------------------------------------------------
-!  ln_kpprimix   shear instability mixing  (default T)
-!  difmiw        constant internal wave viscosity (m2/s)
-!  difsiw        constant internal wave diffusivity (m2/s)
-!  Riinfty       local Richardson Number limit for shear instability
-!  difri         maximum shear mixing at Rig = 0    (m2/s)
-!  bvsqcon       Brunt-Vaisala squared (1/s**2) for maximum convection
-!  difcon        maximum mixing in interior convection (m2/s)
-!  nave          = 0/1 flag for horizontal average on avt, avmu, avmv
-!  navb          = 0/1 flag for constant or profile background avt
-&namkpp
-   ln_kpprimix  = .true.
-   difmiw       =  1.e-04
-   difsiw       =  0.1e-04
-   Riinfty      =  0.8
-   difri        =  0.0050
-   bvsqcon      = -0.01e-07
-   difcon       =  1.
-   navb         =  0
-   nave         =  1
-/
-!-----------------------------------------------------------------------
-!       namddm   double diffusive mixing parameterization               ("key_zdfddm")
-!-----------------------------------------------------------------------
-!   avts    maximum avs for dd mixing 
-!   hsbfr   heat/salt buoyancy flux ratio
-&namddm
-      avts  = 1.e-4
-      hsbfr = 1.6
-/
-
+&namzdf        !   vertical physics
+!-----------------------------------------------------------------------
+   avm0        =   1.2e-4  !  vertical eddy viscosity   [m2/s]          (background Kz if not "key_zdfcst")
+   avt0        =   1.2e-5  !  vertical eddy diffusivity [m2/s]          (background Kz if not "key_zdfcst")
+   ln_zdfnpc   = .false.   !  convection: Non-Penetrative algorithm (T) or not (F)
+   ln_zdfevd   = .true.    !  convection: enhanced vertical diffusion (T) or not (F)    
+   avevd       = 100.      !  vertical coefficient for enhanced diffusion scheme [m2/s]
+   n_evdm      =   1       !  enhanced mixing apply on tracer (=0) or on tracer and momentum (=1)
+   ln_zdfexp   =  .false.  !  split explicit (T) or implicit (F) time stepping
+   n_zdfexp    =   3       !  number of sub-timestep for ln_zdfexp=T
+/
+!-----------------------------------------------------------------------
+&namnpc        !   non penetrative convection
+!-----------------------------------------------------------------------
+   nnpc1       =    1      !  non penetrative convective scheme computation frequency
+   nnpc2       =  365      !  non penetrative convective scheme print frequency
+/
+!-----------------------------------------------------------------------
+&namric        !   richardson number dependent vertical diffusion       ("key_zdfric" )
+!-----------------------------------------------------------------------
+   avmri       = 100.e-4   !  maximum value of the vertical viscosity
+   alp         =   5.      !  coefficient of the parameterization
+   nric        =   2       !  coefficient of the parameterization
+/
+!-----------------------------------------------------------------------
+&namtke        !   turbulent eddy kinetic dependent vertical diffusion  ("key_zdftke")
+!-----------------------------------------------------------------------
+   ln_rstke    = .false.   !  restart with tke from a run without tke (T) or not (F)
+   nn_itke     =  50       !  number of iterative loops if ln_rstke=T 
+   rn_ediff    =   0.1     !  coef. for vertical eddy coef. (avt=rn_ediff*mxl*sqrt(e) )
+   rn_ediss    =   0.7     !  coef. of the Kolmogoroff dissipation
+   rn_ebb      =   3.75    !  coef. of the surface input of tke
+   rn_efave    =   1.      !  boost of the tke diffusion ( avtke=rn_efave*avm )
+   rn_emin     =   1.e-6   !  minimum value of tke [m2/s2]
+   rn_emin0    =   1.e-4   !  surface minimum value of tke [m2/s2]
+   nn_mxl      =   2       !  mixing length: = 0 bounded by the distance to surface and bottom
+                           !                 = 1 bounded by the local vertical scale factor
+                           !                 = 2 first vertical derivative of mixing length bounded by 1
+                           !                 = 3 same criteria as case 2 but applied in a different way
+   nn_pdl      =   1       !  Prandtl number function of richarson number (=1, avt=pdl(Ri)*avm) or not (=0, avt=avm)
+   nn_avb      =   0       !  profile for constant background used on avt & avm (=1) or not (=0)
+   nn_ave      =   1       !  horizontal averaged on avt (=1) or not (=0) 
+   ln_mxl0     = .false.   !  mixing length scale surface value as function of wind stress (T) or not (F)
+   rn_lmin     =   0.4     !  interior buoyancy lenght scale minimum value
+   rn_lmin0    =   0.4     !  surface  buoyancy lenght scale minimum value
+   nn_etau     =   0       !  exponentially deceasing penetration of tke due to internal & intertial waves
+                           !        = 0 no penetration ( O(2 km) resolution)
+                           !        = 1 additional tke source 
+                           !        = 2 additional tke source applied only at the base of the mixed layer
+   nn_htau     =   2       !  type of exponential decrease of tke penetration
+                           !        = 0  constant 10 m length scale
+                           !        = 1  ???
+                           !        = 2  ???
+   rn_efr      =   0.05    !  fraction of surface tke value which penetrates inside the ocean
+   ln_lc       = .false.   !  Langmuir cell effect
+   rn_lc       =   0.15    !  coef. associated to Langmuir cells
+   nn_havtb    =   0       !  horizontal shape for avtb (=1) or not (=0)
+/
+!------------------------------------------------------------------------
+&namkpp        !   K-Profile Parameterization dependent vertical mixing  ("key_zdfkpp", and optionnally:
+!                                                                         "key_kppcustom" or "key_kpplktb")
+!------------------------------------------------------------------------
+   ln_kpprimix = .true.    !  shear instability mixing 
+   difmiw      =  1.0e-04  !  constant internal wave viscosity [m2/s]
+   difsiw      =  0.1e-04  !  constant internal wave diffusivity [m2/s]
+   Riinfty     =  0.8      !  local Richardson Number limit for shear instability
+   difri       =  0.0050   !  maximum shear mixing at Rig = 0    [m2/s]
+   bvsqcon     = -0.01e-07 !  Brunt-Vaisala squared for maximum convection [1/s2] 
+   difcon      =  1.       !  maximum mixing in interior convection [m2/s]
+   navb        =  0        !  horizontal averaged (=1) or not (=0) on avt and amv
+   nave        =  1        !  constant (=0) or profile (=1) background on avt
+/
+!-----------------------------------------------------------------------
+&namddm        !   double diffusive mixing parameterization                  ("key_zdfddm")
+!-----------------------------------------------------------------------
+      avts     = 1.e-4     !  maximum avs (vertical mixing on salinity)
+      hsbfr    = 1.6       !  heat/salt buoyancy flux ratio
+/
 !!======================================================================
 !!                  ***  Miscelaneous namelists  ***
 !!======================================================================
-!!   namsol      elliptic solver / island / free surface 
-!!======================================================================
-
-!-----------------------------------------------------------------------
-!       namsol   elliptic solver / island / free surface 
-!-----------------------------------------------------------------------
-!  nsolv     elliptic solver (=1 preconditioned conjugate gradient: pcg)
-!                            (=2 successive-over-relaxation: sor)
-!                            (=3 FETI currently it does not work!       ("key_feti")
-!  nsol_arp  absolute/relative (0/1) precision convergence test
-!  nmin      minimum of iterations for the SOR solver
-!  nmax      maximum of iterations for the SOR solver
-!  nmod      frequency of test for the SOR solver
-!  eps       absolute precision of the solver
-!  resmax    absolute precision for the SOR solver
-!  sor       optimal coefficient for SOR solver
-!  epsisl    absolute precision on stream function solver
-!  nmisl     maximum pcg iterations for island
-!  rnu       strength of the additional force used in free surface b.c.
-&namsol
-   nsolv     =      1
-   nsol_arp  =      0
-   nmin      =    300
-   nmax      =    800
-   nmod      =     10
-   eps       =  1.E-6
-   resmax    = 1.E-10
-   sor       =   1.92
-   epsisl    = 1.e-10
-   nmisl     =   4000
-   rnu       =     1.
+!!   nam_mpp           Massively Parallel Processing                    ("key_mpp_mpi)
+!!   nam_mpp_dyndist   Massively Parallel domain decomposition          ("key_agrif" && "key_mpp_dyndist")
+!!   namctl            Control prints & Benchmark
+!!   namsol            elliptic solver / island / free surface 
+!!======================================================================
+
+!-----------------------------------------------------------------------
+&namsol        !   elliptic solver / island / free surface 
+!-----------------------------------------------------------------------
+   nsolv       =      1    !  elliptic solver: =1 preconditioned conjugate gradient (pcg)
+                           !                   =2 successive-over-relaxation (sor)
+                           !                   =3 FETI (fet)                               ("key_feti")
+                           !                   =4 sor with extra outer halo
+   nsol_arp    =      0    !  absolute/relative (0/1) precision convergence test
+   nmin        =    300    !  minimum of iterations for the SOR solver
+   nmax        =    800    !  maximum of iterations for the SOR solver
+   nmod        =     10    !  frequency of test for the SOR solver
+   eps         =  1.e-6    !  absolute precision of the solver
+   resmax      =  1.e-10   !  absolute precision for the SOR solver
+   sor         =  1.92     !  optimal coefficient for SOR solver (to be adjusted with the domain)
+   epsisl      =  1.e-10   !  absolute precision on stream function solver
+   nmisl       =   4000    !  maximum pcg iterations for island                            ("key_islands")
+   rnu         =      1.   !  strength of the additional force used in filtered free surface
+/
+!-----------------------------------------------------------------------
+&nam_mpp      !   Massively Parallel Processing                         ("key_mpp_mpi)
+!-----------------------------------------------------------------------
+   c_mpi_send =  'S'       !  mpi send/recieve type   ='S', 'B', or 'I' for standard send,
+                           !  buffer blocking send or immediate non-blocking sends, resp.
+   nn_buffer  =   0        !  size in bytes of exported buffer ('B' case), 0 no exportation
+/
+!-----------------------------------------------------------------------
+&nam_mpp_dyndist !   Massively Parallel Distribution                    ("key_agrif" && "key_mpp_dyndist")
+!-----------------------------------------------------------------------
+   jpni       =    1       !  jpni   number of processors following i
+   jpnj       =    1       !  jpnj   number of processors following j
+   jpnij      =    1       !  jpnij  number of local domains
+/
+!-----------------------------------------------------------------------
+&namctl       !   Control prints & Benchmark
+!-----------------------------------------------------------------------
+   ln_ctl     = .false.    !  trends control print (expensive!)
+   nprint     =    0       !  level of print (0 no extra print)
+   nictls     =    0       !  start i indice of control sum (use to compare mono versus
+   nictle     =    0       !  end   i indice of control sum        multi processor runs
+   njctls     =    0       !  start j indice of control               over a subdomain)
+   njctle     =    0       !  end   j indice of control 
+   isplt      =    1       !  number of processors in i-direction
+   jsplt      =    1       !  number of processors in j-direction
+   nbench     =    0       !  Bench mode (1/0): CAUTION use zero except for bench
+                           !     (no physical validity of the results)
+   nbit_cmp   =    0       !  bit comparison mode (1/0): CAUTION use zero except for test
+                           !     of comparison between single and multiple processor runs
 /
 !!======================================================================
@@ -885,66 +619,43 @@
 
 !-----------------------------------------------------------------------
-!       namtrd    diagnostics on dynamics and/or tracer trends          ("key_trddyn" and/or "key_trdtra")
+&namtrd       !   diagnostics on dynamics and/or tracer trends             ("key_trddyn" and/or "key_trdtra")
 !                          or mixed-layer trends                        ('key_trdmld')
 !                          or barotropic vorticity                      ("key_trdvor")
 !-----------------------------------------------------------------------
-!  ntrd                time step frequency dynamics and tracers trends
-!  nctls               control surface type in mixed-layer trends (0,1 or n<jpk)
-!  ln_trdmld_restart   restart for ML diagnostics
-!  ucf                 unit conversion factor (=1 -> /seconds | =86400. -> /day)
-!  ln_trdmld_instant   flag to diagnose trends of instantantaneous or mean ML T/S
-&namtrd
-   ntrd              = 365
-   nctls             =   0
-   ln_trdmld_restart = .false.
-   ucf               =  1.
-   ln_trdmld_instant = .false.
-/
-!-----------------------------------------------------------------------
-!       namgap    level mean model-data gap ('key_diagap')
-!-----------------------------------------------------------------------
-!  ngap    time-step frequency of model-data gap computation
-!  nprg    time-step frequency of gap print in model output
-&namgap
-   ngap =  15
-   nprg =  10
-/
-!-----------------------------------------------------------------------
-!       namspr  surface pressure diagnostic
-!-----------------------------------------------------------------------
-!  nmaxp   maximum of iterations for the solver
-!  epsp    absolute precision of the solver
-!  niterp  number of iteration done by the solver
-&namspr
-   nmaxp   =   1000
-   epsp    =  1.e-3
-   niterp  =    400
-/
-!-----------------------------------------------------------------------
-!       namflo    float parameters                                      ("key_float")
-!-----------------------------------------------------------------------
-!  ln_rstflo   boolean term for float restart (true or false)
-!  nwritefl   frequency of float output file 
-!  nstockfl   frequency of float restart file 
-!  ln_argo    Argo type floats (stay at the surface each 10 days)
-!  ln_flork4  = T trajectories computed with a 4th order Runge-Kutta
-!             = F  (default)   computed with Blanke' scheme
-&namflo
-    ln_rstflo = .false.
-    nwritefl  =      75
-    nstockfl  =    5475
-    ln_argo   = .false.
-    ln_flork4 = .false.
-/
-!-----------------------------------------------------------------------
-!       namptr   Poleward Transport Diagnostic
-!-----------------------------------------------------------------------
-!  ln_diaptr  logical flag for Poleward transport computation
-!  ln_subbas  logical flag for Atlantic/Pacific/Indian basins computation
-!             need input basins mask file named "subbasins.nc"
-!  nf_ptr     Frequency of computation
-&namptr
-   ln_diaptr = .false.
-   ln_subbas = .false.
-   nf_ptr    =  15
-/
+   ntrd       = 365        !  time step frequency dynamics and tracers trends
+   nctls      =   0        !  control surface type in mixed-layer trends (0,1 or n<jpk)
+   ucf        =   1.       !  unit conversion factor (=1 -> /seconds ; =86400. -> /day)
+   ln_trdmld_restart = .false.  !  restart for ML diagnostics
+   ln_trdmld_instant = .false.  !  flag to diagnose trends of instantantaneous or mean ML T/S
+/
+!-----------------------------------------------------------------------
+&namgap       !   level mean model-data gap                             ('key_diagap')
+!-----------------------------------------------------------------------
+   ngap       =  15        !  time-step frequency of model-data gap computation
+   nprg       =  10        !  time-step frequency of gap print in model output
+/
+!-----------------------------------------------------------------------
+&namspr       !   surface pressure diagnostic
+!-----------------------------------------------------------------------
+   nmaxp      =   1000     !  maximum of iterations for the solver
+   epsp       =  1.e-3     !  absolute precision of the solver
+   niterp     =    400     !  number of iteration done by the solver
+/
+!-----------------------------------------------------------------------
+&namflo       !   float parameters                                      ("key_float")
+!-----------------------------------------------------------------------
+    ln_rstflo = .false.    !  float restart (T) or not (F)
+    nwritefl  =      75    !  frequency of writing in float output file 
+    nstockfl  =    5475    !  frequency of creation of the float restart file 
+    ln_argo   = .false.    !  Argo type floats (stay at the surface each 10 days)
+    ln_flork4 = .false.    !  trajectories computed with a 4th order Runge-Kutta (T)
+                           !  or computed with Blanke' scheme (F)
+/
+!-----------------------------------------------------------------------
+&namptr       !   Poleward Transport Diagnostic
+!-----------------------------------------------------------------------
+   ln_diaptr  = .false.    !  Poleward heat and salt transport (T) or not (F)
+   ln_subbas  = .false.    !  Atlantic/Pacific/Indian basins computation (T) or not 
+                           !  (orca configuration only, need input basins mask file named "subbasins.nc"
+   nf_ptr     =  15        !  Frequency of ptr computation [time step]
+/
Index: trunk/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_ice_lim2
===================================================================
--- trunk/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_ice_lim2	(revision 1108)
+++ trunk/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_ice_lim2	(revision 1113)
@@ -1,115 +1,62 @@
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!! NEMO/LIM2 :  1 - dynamics/advection/thermo          (namicerun)
+!! namelists    2 - ice intialisation                  (namiceini)
+!!              3 - ice dynamic                        (namicedyn)
+!!              5 - ice advection                      (namicetrp)
+!!              6 - thermodynamic                      (namicethd)
+!!              7 - ice salinity                       (namicesal)
+!!              8 - mechanical redistribution of ice   (namiceitdme)
+!!              3 - ice diagnostics                    (namicedia)
+!!              9 - ice outputs                        (namiceout)
 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-!
-! ICE namelist :  ice model option and parameter input
-! -------------
-!
-!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-!
-!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-!       namicerun   Share parameters for dynamics/advection/thermo
-!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!
-!  ln_limdyn   : switch for ice dynamics (true) or not (false)
-!  ln_limdmp   : restoring Ice thickness and Fraction leads flag
-!  acrit(1/2)  : minimum fraction for leads in the Northern (Southern) Hemisphere
-!  hnsdif      : computation of temperature in snow (=0.0) or not (=9999.0)
-!  hicdif      : computation of temperature in ice  (=0.0) or not (=9999.0)
-!
-&namicerun
-   ln_limdyn = .true. 
-   ln_limdmp = .FALSE. 
-   acrit     = 1.0e-06 , 1.0e-06
-   hsndif    = 0.0 
-   hicdif    = 0.0
+
+!-----------------------------------------------------------------------
+&namicerun     !   Share parameters for dynamics/advection/thermo
+!-----------------------------------------------------------------------
+   ln_limdyn   = .true.    !  ice dynamics (T) or thermodynamics only (F)
+   ln_limdmp   = .false.   !  restoring ice thickness and fraction leads (T) or not (F)
+   acrit       = 1.0e-06   , 1.0e-06   ! minimum fraction for leads in the Northern (Southern) Hemisphere
+   hsndif      =  0.0      !  computation of temperature in snow (=0.0) or not
+   hicdif      =  0.0      !  computation of temperature in ice  (=0.0) or not (=9999.0)
 /
-!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-!       namiceini   parameters for ice initialisation
-!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!
-!  ln_limini : Ice initialization state flag
-!  ttest     : threshold water temperature for initial sea ice
-!  hninn     : initial snow thickness in the north
-!  hginn     : initial ice thickness in the north
-!  alinn     : initial leads area in the north
-!  hnins     : initial snow thickness in the south
-!  hgins     : initial ice thickness in the south
-!  alins     : initial leads area in the south
-!
-&namiceini
-   ln_limini = .FALSE. 
-   ttest = 2.0
-   hninn = 0.5
-   hginn = 3.0
-   alinn = 0.05
-   hnins = 0.1
-   hgins = 1.0
-   alins = 0.1
+!-----------------------------------------------------------------------
+&namiceini     !   ice initialisation
+!-----------------------------------------------------------------------
+   ln_limini   = .false.   !  read the ice initial state in the file 'Ice_initialization.nc' (T) or not (F)
+   ttest       =  2.0      !  threshold water temperature for initial sea ice
+   hninn       =  0.5      !  initial snow thickness in the north
+   hginn       =  3.0      !  initial ice  thickness in the north
+   alinn       =  0.05     !  initial leads area     in the north
+   hnins       =  0.1      !  same  three parameter  in the south
+   hgins       =  1.0      !        "                 "     south   
+   alins       =  0.1      !        "                 "     south
 /
-!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-!       namicedia   parameters for ice diagnostics
-!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!
-!  fmtinf : format of the output values 
-!  nfrinf : number of variables written in one line
-!  ntmoy  : instantaneous values of ice evolution or averaging
-!  ninfo  : frequency of ouputs on file ice_evolu in case of averaging
-!
-&namicedia
-   fmtinf = '1PE13.5 '
-   nfrinf = 4
-   ntmoy  = 1
-   ninfo  = 1
+!-----------------------------------------------------------------------
+&namicedyn     !   ice dynamic
+!-----------------------------------------------------------------------
+   epsd        =   1.0e-20 !  tolerance parameter
+   alpha       =   0.5     !  coefficient for semi-implicit coriolis
+   dm          =   0.6e+03 !  diffusion constant for dynamics
+   nbiter      =   1       !  number of sub-time steps for relaxation
+   nbitdr      = 100       !  maximum number of iterations for relaxation
+   om          =   0.5     !  relaxation constant 
+   resl        =   5.0e-05 !  maximum value for the residual of relaxation
+   cw          =   5.0e-03 !  drag coefficient for oceanic stress
+   angvg       =   0.0     !  turning angle for oceanic stress
+   pstar       =   1.0e+04 !  1st bulk-rheology parameter
+   c_rhg       =  20.0     !  2nd bulk-rhelogy parameter
+   etamn       =   0.0e+07 !  minimun value for viscosity
+   creepl      =   2.0e-08 !  creep limit
+   ecc         =   2.0     !  eccentricity of the elliptical yield curve
+   ahi0        = 350.e0    !  horizontal eddy diffusivity coefficient for sea-ice [m2/s]
 /
-!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-!       namicedyn   parameters for ice dynamic
-!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!
-!  epsd   : tolerance parameter
-!  alpha  : coefficient for semi-implicit coriolis
-!  bound  : boundary conditions (=0.0 no-slip, =1.0 free-slip)
-!  dm     : diffusion constant for dynamics.
-!  nbiter : number of sub-time steps for relaxation
-!  nbitdr : maximum number of iterations for relaxation
-!  om     : relaxation constant 
-!  resl   : maximum value for the residual of relaxation 
-!  cw     : drag coefficient for oceanic stress
-!  angvg  : turning angle for oceanic stress
-!  pstar  : first bulk-rheology parameter
-!  c_rhg  : second bulk-rhelogy parameter
-!  etamn  : minimun value for viscosity
-!  creepl : creep limit
-!  ecc    : eccentricity of the elliptical yield curve
-!  ahi0   : horizontal eddy diffusivity coefficient for sea-ice (m2/s)
-!
-&namicedyn 
-   epsd   = 1.0e-20
-   alpha  = 0.5
-   dm     = 0.6e+03
-   nbiter = 1
-   nbitdr = 100
-   om     = 0.5
-   resl   = 5.0e-05
-   cw     = 5.0e-03
-   angvg  = 0.0
-   pstar  = 1.0e+04 
-   c_rhg  = 20.0
-   etamn  = 0.0e+07
-   creepl = 2.0e-08
-   ecc    = 2.0
-   ahi0   = 350.e0
+!-----------------------------------------------------------------------
+&namicetrp     !   ice transport
+!-----------------------------------------------------------------------
+   bound       =   0.      !  boundary conditions (=0.0 no-slip, =1.0 free-slip)
 /
-!
-!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-!       namicetrp   parameters for ice advection
-!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!  bound  : boundary conditions (=0.0 no-slip, =1.0 free-slip)
-&namicetrp 
-   bound  = 0.
-/
-
-!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-!       namicethd   parameters for thermodynamic computation
-!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!
+!-----------------------------------------------------------------------
+&namicethd     !   ice thermodynamic
+!-----------------------------------------------------------------------
 !  hmelt       : maximum melting at the bottom
 !  hiccrit(1/2): ice thickness for lateral accretion in the Northern (Southern) Hemisphere
@@ -132,55 +79,55 @@
 ! 
 &namicethd
-   hmelt   = -0.15
-   hiccrit = 0.3 , 0.3
-   hicmin  = 0.2
-   hiclim  = 0.05
-   amax    = 0.999 
-   swiqst  = 1.
-   sbeta   = 1.
-   parlat  = 0.0
-   hakspl  = 0.5
-   hibspl  = 0.5
-   exld    = 2.0
-   hakdif  = 1.0
-   thth    = 0.2
-   hnzst   = 0.1
-   parsub  = 1.0
-   alphs   = 1.0
+   hmelt       = -0.15     !  maximum melting at the bottom
+   hiccrit     = 0.3 , 0.3 !  ice thickness for lateral accretion in the Northern (Southern) Hemisphere
+   hicmin      = 0.2       !  ice thickness corr. to max. energy stored in brine pocket
+   hiclim      = 0.05      !  minimum ice thickness
+   amax        = 0.999     !  maximum lead fraction
+   swiqst      = 1.        !  energy stored in brine pocket (=1) or not (=0)	
+   sbeta       = 1.        !  numerical caracteritic of the scheme for diffusion in ice
+                           !        Cranck-Nicholson (=0.5), implicit (=1), explicit (=0)
+   parlat      = 0.0       !  percentage of energy used for lateral ablation
+   hakspl      = 0.5       !  slope of distr. for Hakkinen-Mellor's lateral melting
+   hibspl      = 0.5       !  slope of distribution for Hibler's lateral melting
+   exld        = 2.0       !  exponent for leads-closure rate
+   hakdif      = 1.0       !  coefficient for diffusions of ice and snow
+   thth        = 0.2       !  threshold thickness for comp. of eq. thermal conductivity
+   hnzst       = 0.1       !  thickness of the surf. layer in temp. computation
+   parsub      = 1.0       !  switch for snow sublimation or not
+   alphs       = 1.0       !  coefficient for snow density when snow ice formation
 /
+!-----------------------------------------------------------------------
+&namicedia     !   ice diagnostics
+!-----------------------------------------------------------------------
+   fmtinf      ='1PE13.5 ' !  format of the output values
+   nfrinf      = 4         !  number of variables written in one line
+   ntmoy       = 1         !  instantaneous values of ice evolution or averaging
+   ninfo       = 1         !  frequency of ouputs on file ice_evolu in case of averaging
+/
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&namiceout     !   parameters for outputs
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+   noumef      =   19      !  number of fields
 !
-!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-!       namiceout   parameters for outputs
-!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!
-!   noumef      : number of fields
-!   field
-!        title  : title of the field
-!        name   : name of the field
-!        unit   : unit of the field
-!        nc     : switch for saving field ( = 1 ) or not ( = 0 )
-!        cmulti : multiplicative constant
-!        cadd   : additive constant
-!
-&namiceout
-   noumef   = 19
-   field_1  = 'Snow thickness                     ', 'isnowthi', 'm       ', 1, 1.0, 0.0
-   field_2  = 'Ice thickness                      ', 'iicethic', 'm       ', 1, 1.0, 0.0
-   field_3  = 'Ice produced                       ', 'iiceprod', 'm/kt    ', 1, 1.0, 0.0
-   field_4  = 'Ice concentration                  ', 'ileadfra', '%       ', 1, -1.0, 1.0
-   field_5  = 'Ice temperature                    ', 'iicetemp', 'C       ', 1, 1.0, -273.15
-   field_6  = 'Oceanic flux at the ice base       ', 'ioceflxb', 'w/m2    ', 1, 1.0, 0.0
-   field_7  = 'Ice velocity u                     ', 'iicevelu', 'm/s     ', 1, 1.0, 0.0
-   field_8  = 'Ice velocity v                     ', 'iicevelv', 'm/s     ', 1, 1.0, 0.0
-   field_9  = 'Sea surface temperature            ', 'isstempe', 'C       ', 1, 1.0, -273.15
-   field_10 = 'Sea surface salinity               ', 'isssalin', 'PSU     ', 1, 1.0, 0.0
-   field_11 = 'Total flux at ocean surface        ', 'iocetflx', 'w/m2    ', 1, 1.0, 0.0
-   field_12 = 'Solar flux at ocean surface        ', 'iocesflx', 'w/m2    ', 1, 1.0, 0.0
-   field_13 = 'Non-solar flux at ocean surface    ', 'iocwnsfl', 'w/m2    ', 1, 1.0, 0.0
-   field_14 = 'Salt flux at ocean surface         ', 'iocesafl', 'kg/m2/kt', 1, 1.0, 0.0
-   field_15 = 'Wind stress u                      ', 'iocestru', 'Pa      ', 1, 1.0, 0.0
-   field_16 = 'Wind stress v                      ', 'iocestrv', 'Pa      ', 1, 1.0, 0.0 
-   field_17 = 'Solar flux at ice/ocean surface    ', 'iicesflx', 'w/m2    ', 1, 1.0, 0.0
-   field_18 = 'Non-solar flux at ice/ocean surface', 'iicenflx', 'w/m2    ', 1, 1.0, 0.0
-   field_19 = 'Snow precipitation                 ', 'isnowpre', 'kg/day  ', 1, 1.0, 0.0
+!           !         title of the field           !  name     !   units   !  save  ! multipl. ! additive !
+!           !                                      !           !           ! or not !  factor  !  factor  !
+   field_1  = 'Snow thickness                     ', 'isnowthi', 'm       ',    1   ,  1.0     ,    0.0
+   field_2  = 'Ice thickness                      ', 'iicethic', 'm       ',    1   ,  1.0     ,    0.0
+   field_3  = 'Ice produced                       ', 'iiceprod', 'm/kt    ',    1   ,  1.0     ,    0.0
+   field_4  = 'Ice concentration                  ', 'ileadfra', '%       ',    1   , -1.0     ,    1.0
+   field_5  = 'Ice temperature                    ', 'iicetemp', 'C       ',    1   ,  1.0     , -273.15
+   field_6  = 'Oceanic flux at the ice base       ', 'ioceflxb', 'w/m2    ',    1   ,  1.0     ,    0.0
+   field_7  = 'Ice velocity u                     ', 'iicevelu', 'm/s     ',    1   ,  1.0     ,    0.0
+   field_8  = 'Ice velocity v                     ', 'iicevelv', 'm/s     ',    1   ,  1.0     ,    0.0
+   field_9  = 'Sea surface temperature            ', 'isstempe', 'C       ',    1   ,  1.0     , -273.15
+   field_10 = 'Sea surface salinity               ', 'isssalin', 'PSU     ',    1   ,  1.0     ,    0.0
+   field_11 = 'Total flux at ocean surface        ', 'iocetflx', 'w/m2    ',    1   ,  1.0     ,    0.0
+   field_12 = 'Solar flux at ocean surface        ', 'iocesflx', 'w/m2    ',    1   ,  1.0     ,    0.0
+   field_13 = 'Non-solar flux at ocean surface    ', 'iocwnsfl', 'w/m2    ',    1   ,  1.0     ,    0.0
+   field_14 = 'Salt flux at ocean surface         ', 'iocesafl', 'kg/m2/kt',    1   ,  1.0     ,    0.0
+   field_15 = 'Wind stress u                      ', 'iocestru', 'Pa      ',    1   ,  1.0     ,    0.0
+   field_16 = 'Wind stress v                      ', 'iocestrv', 'Pa      ',    1   ,  1.0     ,    0.0 
+   field_17 = 'Solar flux at ice/ocean surface    ', 'iicesflx', 'w/m2    ',    1   ,  1.0     ,    0.0
+   field_18 = 'Non-solar flux at ice/ocean surface', 'iicenflx', 'w/m2    ',    1   ,  1.0     ,    0.0
+   field_19 = 'Snow precipitation                 ', 'isnowpre', 'kg/day  ',    1   ,  1.0     ,    0.0
 /      
Index: trunk/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_ice_lim3
===================================================================
--- trunk/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_ice_lim3	(revision 1108)
+++ trunk/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_ice_lim3	(revision 1113)
@@ -1,313 +1,191 @@
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!! NEMO/LIM3 :  1 - dynamics/advection/thermo          (namicerun)
+!! namelists    2 - ice intialisation                  (namiceini)
+!!              3 - ice dynamic                        (namicedyn)
+!!              4 - ice advection                      (namicetrp)
+!!              5 - thermodynamic                      (namicethd)
+!!              6 - ice salinity                       (namicesal)
+!!              7 - mechanical redistribution of ice   (namiceitdme)
+!!              8 - ice diagnostics                    (namicedia)
+!!              9 - ice outputs                        (namiceout)
 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+!-----------------------------------------------------------------------
+&namicerun     !   Share parameters for dynamics/advection/thermo
+!-----------------------------------------------------------------------
+   ln_limdyn   = .true.    !  ice dynamics (T) or thermodynamics only (F)
+   acrit       =  1.0e-02 , 1.0e-02  !  minimum fraction for leads in the Northern (Southern) Hemisphere
+   hsndif      =  0.0      !  computation of temperature in snow (=0.0) or not
+   hicdif      =  0.0      !  computation of temperature in ice  (=0.0) or not (=9999.0)
+   cai         =  1.40e-3  !  atmospheric drag over sea ice
+   cao         =  1.00e-3  !  atmospheric drag over ocean
+   ln_nicep    = .false.   !  Ice points output for debug (yes or no)
+/
+!-----------------------------------------------------------------------
+&namiceini     !   ice initialisation
+!-----------------------------------------------------------------------
+   ttest       =  2.0      !  threshold water temperature for initial sea ice
+   hninn       =  0.3      !  initial snow thickness in the north
+   hnins       =  0.1      !        "            "          south
+   hginn_u     =  3.50     !  initial undeformed ice thickness in the north
+   hgins_u     =  1.0      !        "            "              "     south
+   aginn_u     =  0.95     !  initial undeformed ice concentration in the north
+   agins_u     =  0.9      !        "            "              "         south
+   hginn_d     =  0.0      !  initial  deformed  ice thickness     in the north
+   hgins_d     =  0.0      !  
+   aginn_d     =  0.00     !  initial  deformed  ice concentration in the north
+   agins_d     =  0.00     !        "            "              "         south
+   sinn        =  6.301    !  initial salinity in the north
+   sins        =  6.301    !        "            "    south
+/
+!-----------------------------------------------------------------------
+&namicedyn     !   ice dynamic
+!-----------------------------------------------------------------------
+   epsd        =   1.0e-20 !  tolerance parameter
+   alpha       =   0.5     !  coefficient for semi-implicit coriolis
+   dm          =   0.6e+03 !  diffusion constant for dynamics
+   nbiter      =   1       !  number of sub-time steps for relaxation
+   nbitdr      = 500       !  maximum number of iterations for relaxation
+   om          =   0.5     !  relaxation constant 
+   resl        =   5.0e-05 !  maximum value for the residual of relaxation
+   cw          =   5.0e-03 !  drag coefficient for oceanic stress
+   angvg       =   0.0     !  turning angle for oceanic stress
+   pstar       =   4.0e+04 !  1st bulk-rheology parameter
+   c_rhg       =  20.0     !  2nd bulk-rhelogy parameter
+   etamn       =   0.0e+07 !  minimun value for viscosity
+   creepl      =   1.0e-12 !  creep limit
+   ecc         =   2.0     !  eccentricity of the elliptical yield curve
+   ahi0        = 350.e0    !  horizontal eddy diffusivity coefficient for sea-ice [m2/s]
+   nevp        = 300       !  number of iterations for subcycling in EVP, SB, 400
+   telast      =9600.0     !  timescale for elastic waves, SB, 720.0
+   alphaevp    =   1.0     !  coefficient for the solution of internal ice stresses
+/
+!-----------------------------------------------------------------------
+&namicetrp     !   ice transport
+!-----------------------------------------------------------------------
+   bound       =   0.      !  boundary conditions (=0.0 no-slip, =1.0 free-slip)
+/
+!-----------------------------------------------------------------------
+&namicethd     !   ice thermodynamic
+!-----------------------------------------------------------------------
+   hmelt       = -0.15     !  maximum melting at the bottom
+   hiccrit     = 0.1 , 0.1 !  ice thickness for lateral accretion in the Northern (Southern) Hemisphere
+                           !         caution 1.0, 1.0 best value to be used!!! (gilles G.)  ????
+   fraz_swi    = 0.0       !  use of frazil ice collection thickness in function of wind (1.0) or not (0.0)
+   maxfrazb    = 0.0       !  maximum portion of frazil ice collecting at the ice bottom
+   vfrazb      = 0.4166667 !  thresold drift speed for frazil ice collecting at the ice bottom
+   Cfrazb      = 5.0       !  squeezing coefficient for frazil ice collecting at the ice bottom
+   hicmin      = 0.2       !  ice thickness corr. to max. energy stored in brine pocket
+   hiclim      = 0.10      !  minimum ice thickness
+   amax        = 0.999     !  maximum lead fraction
+   sbeta       = 1.        !  numerical caracteritic of the scheme for diffusion in ice
+                           !        Cranck-Nicholson (=0.5), implicit (=1), explicit (=0)
+   parlat      = 0.0       !  percentage of energy used for lateral ablation
+   hakspl      = 0.25      !  slope of distr. for Hakkinen-Mellor's lateral melting
+   hibspl      = 0.5       !  slope of distribution for Hibler's lateral melting
+   exld        = 2.0       !  exponent for leads-closure rate
+   hakdif      = 1.0       !  coefficient for diffusions of ice and snow
+   thth        = 0.2       !  threshold thickness for comp. of eq. thermal conductivity
+   hnzst       = 0.1       !  thickness of the surf. layer in temp. computation
+   parsub      = 1.0       !  switch for snow sublimation or not
+   alphs       = 1.0       !  coefficient for snow density when snow ice formation
+   betas       = 0.6       !  exponent in lead-ice fractionation of snow precipitation 0.66
+                           !        betas = 1 -> equipartition, betas < 1 -> more on leads
+   kappa_i     = 1.0       !  extinction radiation parameter in sea ice (1.0)
+   nconv_i_thd = 50        !  maximal number of iterations for heat diffusion computation
+   maxer_i_thd = 0.0001    !  maximal error in temperature for heat diffusion computation
+   thcon_i_swi = 1         !  switch for computation of thermal conductivity in the ice
+                           !        (0) Untersteiner (1964), (1) Pringle et al. (2007)
+/
+!-----------------------------------------------------------------------
+&namicesal     !   ice salinity
+!-----------------------------------------------------------------------
+   num_sal     =  2        !  salinity option: 1 -> S = bulk_sal
+                           !                   2 -> S = S(z,t) with a simple parameterization
+                           !                   3 -> S = S(z) profile of Scwharzacher [1959]
+                           !                   4 -> S = S(h) Cox and Weeks [1974]
+   bulk_sal    =  4.0      !  if 1 is used, it represents the ice salinity
+   sal_G       =  5.00     !  restoring salinity for GD
+   time_G      =  1.728e+6 !  restoring time for GD
+   sal_F       =  2.00     !  restoring salinity for flushing
+   time_F      =  8.640e+5 !  restoring time for flushing
+   s_i_max     = 20.0      !  Maximum salinity 
+   s_i_min     =  0.1      !  Minimum tolerated ice salinity
+   s_i_0       =  3.5      !  1st salinity for salinity profile
+   s_i_1       =  4.5      !  2nd salinity for salinity profile
+/
+!-----------------------------------------------------------------------
+&namiceitdme   !   parameters for mechanical redistribution of ice 
+!-----------------------------------------------------------------------
+   ridge_scheme_swi = 0      !  which ridging scheme using (1=Rothrock,else=Hibler79)
+   Cs               =   0.50 !  shearing energy contribution to ridging
+   Cf               =  17.0  !  ratio of ridging work to PE change in ridging
+   fsnowrdg         =   0.5  !  snow fraction that survives in ridging
+   fsnowrft         =   0.5  !  snow fraction that survives in rafting
+   Gstar            =   0.15 !  fractional area of thin ice being ridged
+   astar            =   0.05 !  equivalent of gstar (0.05 for TH75 and 0.03 for weaker ice)
+   Hstar            = 100.0  !  parameter determining the maximum thickness of ridged ice
+   raftswi          =   1    !  rafting or not
+   hparmeter        =   0.75 !  threshold thickness for rafting or not
+   Craft            =   5.0  !  coefficient used in the rafting function
+   ridge_por        =   0.3  !  initial porosity of the ridged ice (typically 0.30)
+   sal_max_ridge    =  15.0  !  maximum ridged ice salinity
+   partfun_swi      =   1    !  participation function linear, TH75 (0) or exponential Letal07 (1)
+   transfun_swi     =   0    !  transfer function uniform of H80 (0) or exponential Letal07 (1)
+   brinstren_swi    =   0    !  (1) use brine volume to diminish ice strength
+/
+!-----------------------------------------------------------------------
+&namicedia     !   ice diagnostics
+!-----------------------------------------------------------------------
+   fmtinf      ='1PE13.5 ' !  format of the output values
+   nfrinf      = 4         !  number of variables written in one line
+   ntmoy       = 1         !  instantaneous values of ice evolution or averaging
+   ninfo       = 1         !  frequency of ouputs on file ice_evolu in case of averaging
+/
+!-----------------------------------------------------------------------
+&namiceout     !   parameters for outputs
+!-----------------------------------------------------------------------
+   noumef      =   37      !  number of fields
+   add_diag_swi=    1      !  1 -> diagnose distribution in thickness space
+                           !  0 -> only simple diagnostics
 !
-! ICE namelist :  ice model option and parameter input
-! -------------
-!
-!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-!
-!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-!       namicerun   Share parameters for dynamics/advection/thermo
-!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!
-!  ln_limdyn        : switch for ice dynamics (true) or not (false)
-!  acrit(1/2)  : minimum fraction for leads in the Northern (Southern) Hemisphere
-!  hnsdif      : computation of temperature in snow (=0.0) or not (=9999.0)
-!  hicdif      : computation of temperature in ice  (=0.0) or not (=9999.0)
-!  cai         : atmospheric drag over sea ice
-!  cao         : atmospheric drag over ocean
-!  ln_nicep  : Ice points output for debug (yes or no)
-!
-&namicerun
-   ln_limdyn    = .true. 
-   acrit   = 1.0e-02 , 1.0e-02
-   hsndif  = 0.0 
-   hicdif  = 0.0
-   cai     = 1.40e-3
-   cao     = 1.00e-3
-   ln_nicep  = .false.
-/
-!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-!       namiceini   parameters for ice initialisation
-!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!
-!  ttest   : threshold water temperature for initial sea ice
-!  hninn   : initial snow thickness in the north
-!  hginn_u : initial undeformed ice thickness in the north
-!  aginn_u : initial undeformed ice concentration in the north
-!  hginn_d : initial  deformed  ice thickness in the north
-!  aginn_d : initial  deformed  ice concentration in the north
-!  hnins   : initial snow thickness in the south
-!  hgins_u : initial undeformed ice thickness in the north
-!  agins_u : initial undeformed ice concentration in the north
-!  hgins_d : initial  deformed  ice thickness in the north
-!  agins_d : initial  deformed  ice concentration in the north
-!  sinn    : initial salinity in the north
-!  sins    : initial salinity in the south
-!
-&namiceini
-   ttest   = 2.0
-   hninn   = 0.3
-   hginn_u = 3.50
-   aginn_u = 0.95
-   hginn_d = 0.0
-   aginn_d = 0.00
-   hnins = 0.1
-   hgins_u = 1.0
-   agins_u = 0.9
-   hgins_d = 0.0
-   agins_d = 0.00
-   sinn  = 6.301
-   sins  = 6.301
-/
-!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-!       namicedia   parameters for ice diagnostics
-!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!
-!  fmtinf : format of the output values 
-!  nfrinf : number of variables written in one line
-!  ntmoy  : instantaneous values of ice evolution or averaging
-!  ninfo  : frequency of ouputs on file ice_evolu in case of averaging
-!
-&namicedia
-   fmtinf = '1PE13.5 '
-   nfrinf = 4
-   ntmoy  = 1
-   ninfo  = 1
-/
-!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-!       namicedyn   parameters for ice dynamic
-!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!
-!  epsd   : tolerance parameter
-!  alpha  : coefficient for semi-implicit coriolis
-!  bound  : boundary conditions (=0.0 no-slip, =1.0 free-slip)
-!  dm     : diffusion constant for dynamics.
-!  nbiter : number of sub-time steps for relaxation
-!  nbitdr : maximum number of iterations for relaxation
-!  om     : relaxation constant 
-!  resl   : maximum value for the residual of relaxation 
-!  cw     : drag coefficient for oceanic stress
-!  angvg  : turning angle for oceanic stress
-!  pstar  : first bulk-rheology parameter
-!  c_rhg  : second bulk-rhelogy parameter
-!  etamn  : minimun value for viscosity
-!  creepl : creep limit
-!  ecc    : eccentricity of the elliptical yield curve
-!  ahi0   : horizontal eddy diffusivity coefficient for sea-ice (m2/s)
-!  nevp   : number of iterations for subcycling in EVP, SB, 400
-!  telest : timescale for elastic waves, SB, 720.0
-!  alphaevp : coefficient for the solution of internal ice stresses
-!
-&namicedyn 
-   epsd   = 1.0e-20
-   alpha  = 0.5
-   dm     = 0.6e+03
-   nbiter = 1
-   nbitdr = 500
-   om     = 0.5
-   resl   = 5.0e-05
-   cw     = 5.0e-03
-   angvg  = 0.0
-   pstar  = 4.00e+04 
-   c_rhg  = 20.0
-   etamn  = 0.0e+07
-   creepl = 1.0e-12
-   ecc    = 2.0
-   ahi0   = 350.e0
-   nevp   = 300
-   telast = 9600.0
-   alphaevp = 1.0
-/
-!
-!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-!       namicetrp   parameters for ice advection
-!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!  bound  : boundary conditions (=0.0 no-slip, =1.0 free-slip)
-&namicetrp 
-   bound  = 0.
-/
-!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-!       namicethd   parameters for thermodynamic computation
-!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!
-!  hmelt       : maximum melting at the bottom
-!  hiccrit(1/2): ice thickness for lateral accretion in the Northern (Southern) Hemisphere
-!                caution 1.0, 1.0 best value to be used!!! (gilles G.)
-!  fraz_swi    : use of frazil ice collection thickness in function of wind (1.0) or not (0.0)
-!  maxfrazb    : maximum portion of frazil ice collecting at the ice bottom
-!  vfrazb      : thresold drift speed for frazil ice collecting at the ice bottom
-!  Cfrazb      : squeezing coefficient for frazil ice collecting at the ice bottom
-!  hicmin      : ice thickness corr. to max. energy stored in brine pocket
-!  hiclim      : minimum ice thickness
-!  amax        : maximum lead fraction
-!  sbeta       : numerical caracteritic of the scheme for diffusion in ice
-!               Cranck-Nicholson (=0.5), implicit (=1), explicit (=0)
-!  parlat      : percentage of energy used for lateral ablation
-!  hakspl      : slope of distr. for Hakkinen-Mellor's lateral melting
-!  hibspl      : slope of distribution for Hibler's lateral melting
-!  exld        : exponent for leads-closure rate
-!  hakdif      : coefficient for diffusions of ice and snow
-!  thth         : threshold thickness for comp. of eq. thermal conductivity
-!  hnzst       : thickness of the surf. layer in temp. computation
-!  parsub      : switch for snow sublimation or not
-!  alphs       : coefficient for snow density when snow ice formation
-!  betas       : exponent in lead-ice fractionation of snow precipitation 0.66
-!                betas = 1 -> equipartition, betas < 1 -> more on leads
-!  kappa_i     : extinction radiation parameter in sea ice (1.0)
-!  nconv_i_thd : maximal number of iterations for heat diffusion computation
-!  maxer_i_thd : maximal error in temperature for heat diffusion computation
-!  thcon_i_swi : switch for computation of thermal conductivity in the ice
-!                (0) Untersteiner (1964), (1) Pringle et al. (2007)
-! 
-&namicethd
-   hmelt   = -0.15
-   hiccrit = 0.1 , 0.1
-   fraz_swi= 0.0
-   maxfrazb= 0.0
-   vfrazb  = 0.4166667
-   Cfrazb  = 5.0
-   hicmin  = 0.2
-   hiclim  = 0.10
-   amax    = 0.999 
-   sbeta   = 1.
-   parlat  = 0.0
-   hakspl  = 0.25
-   hibspl  = 0.5
-   exld    = 2.0
-   hakdif  = 1.0
-   thth    = 0.2
-   hnzst   = 0.1
-   parsub  = 1.0
-   alphs   = 1.0
-   betas   = 0.6
-   kappa_i = 1.0 
-   nconv_i_thd = 50
-   maxer_i_thd = 0.0001
-   thcon_i_swi = 1
-/
-!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-!       namicesal   parameters for salinity calculation
-!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!
-!   num_sal = number of salinity option
-!      1 -> S = bulk_sal
-!      2 -> S = S(z,t) with a simple parameterization
-!      3 -> S = S(z) profile of Scwharzacher [1959]
-!      4 -> S = S(h) Cox and Weeks [1974]
-!   bulk_sal = if 1 is used, it represents the ice salinity
-!   sal_G  : restoring salinity for GD 
-!   time_G : restoring time for GD
-!   sal_F  : restoring salinity for flushing
-!   time_F : restoring time for flushing 
-!   s_i_max : Maximum salinity     
-!   s_i_min : Minimum tolerated ice salinity   
-!   s_i_0   : 1st salinity for salinity profile 
-!   s_i_1   : 2nd salinity for salinity profile 
-
-!
-&namicesal
-   num_sal  = 2
-   bulk_sal = 4.0
-   sal_G    = 5.00
-   time_G   = 1.728e+06
-   sal_F    = 2.00
-   time_F   = 8.640e+05
-   s_i_max  = 20.0
-   s_i_min  =  0.1
-   s_i_0    =  3.5
-   s_i_1    =  4.5
-/
-!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-!       namiceitdme   parameters for mechanical redistribution of ice 
-!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!
-!   ridge_scheme_swi ! which ridging scheme using (1=Rothrock,else=Hibler79)
-!   Cs               ! shearing energy contribution to ridging 
-!   Cf               ! ratio of ridging work to PE change in ridging        
-!   fsnowrdg         ! snow fraction that survives in ridging
-!   fsnowrdg         ! snow fraction that survives in rafting
-!   Gstar            ! fractional area of thin ice being ridged
-!   astar            ! equivalent of gstar (0.05 for TH75 and 0.03 for weaker ice)
-!   Hstar            ! parameter determining the maximum thickness of ridged ice
-!   raftswi          ! rafting or not
-!   hparmeter        ! threshold thickness for rafting or not
-!   Craft            ! coefficient used in the rafting function
-!   ridge_por        ! intial porosity of the ridged ice (typically 0.30)
-!   sal_max_ridge    ! maximum ridged ice salinity
-!   partfun_swi      ! participation function linear, TH75 (0) or exponential Letal07 (1)
-!   transfun_swi     ! transfer function uniform of H80 (0) or exponential Letal07 (1)
-!   brinstren_swi    ! (1) use brine volume to diminish ice strength
-&namiceitdme
-   ridge_scheme_swi = 0
-   Cs = 0.50
-   Cf = 17.0
-   fsnowrdg  = 0.5
-   fsnowrft  = 0.5
-   Gstar     = 0.15
-   astar     = 0.05
-   Hstar     = 100.0
-   raftswi   = 1
-   hparmeter = 0.75
-   Craft     = 5.0
-   ridge_por = 0.3
-   sal_max_ridge = 15.0
-   partfun_swi   = 1
-   transfun_swi  = 0
-   brinstren_swi = 0
-/
-!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-!       namiceout   parameters for outputs
-!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!
-!   noumef      : number of fields
-!   field
-!        title  : title of the field
-!        name   : name of the field
-!        unit   : unit of the field
-!        nc     : switch for saving field ( = 1 ) or not ( = 0 )
-!        cmulti : multiplicative constant
-!        cadd   : additive constant
-!  add_diag_swi : 1 -> diagnose distribution in thickness space
-!                 0 -> only simple diagnostics
-!
-&namiceout
-   noumef   = 37
-   field_1  = 'Ice concentration                  ', 'iiceconc', '%       ', 1, 1.0, 0.0
-   field_2  = 'Ice thickness                      ', 'iicethic', 'm       ', 1, 1.0, 0.0
-   field_3  = 'Snow thickness                     ', 'isnowthi', 'm       ', 1, 1.0, 0.0
-   field_4  = 'Daily bottom thermo ice production ', 'iicebopr', 'cm/day  ', 1, 100., 0.0
-   field_5  = 'Daily dynamic ice production       ', 'iicedypr', 'cm/day  ', 1, 100., 0.0
-   field_6  = 'Oceanic flux at the ice base       ', 'ioceflxb', 'w/m2    ', 1, 1.0, 0.0
-   field_7  = 'Ice velocity u                     ', 'iicevelu', 'm/s     ', 1, 1.0, 0.0
-   field_8  = 'Ice velocity v                     ', 'iicevelv', 'm/s     ', 1, 1.0, 0.0
-   field_9  = 'Sea surface temperature            ', 'isstempe', 'C       ', 1, 1.0, -273.15
-   field_10 = 'Sea surface salinity               ', 'isssalin', 'PSU     ', 1, 1.0, 0.0
-   field_11 = 'Total flux at ocean surface        ', 'iocetflx', 'w/m2    ', 1, 1.0, 0.0
-   field_12 = 'Solar flux at ocean surface        ', 'iocesflx', 'w/m2    ', 1, 1.0, 0.0
-   field_13 = 'Non-solar flux at ocean surface    ', 'iocwnsfl', 'w/m2    ', 1, 1.0, 0.0
-   field_14 = 'Heat flux due to brine release     ', 'iocehebr', 'w/m2    ', 1, 1.0, 0.0
-   field_15 = 'Wind stress u                      ', 'iocestru', 'Pa      ', 1, 1.0, 0.0
-   field_16 = 'Wind stress v                      ', 'iocestrv', 'Pa      ', 1, 1.0, 0.0 
-   field_17 = 'Solar flux at ice/ocean surface    ', 'iicesflx', 'w/m2    ', 1, 1.0, 0.0
-   field_18 = 'Non-solar flux at ice/ocean surface', 'iicenflx', 'w/m2    ', 1, 1.0, 0.0
-   field_19 = 'Snow precipitation                 ', 'isnowpre', 'kg/day  ', 1, 1.0, 0.0
-   field_20 = 'Mean ice salinity                  ', 'iicesali', 'psu     ', 1, 1.0, 0.0
-   field_21 = 'Mean ice age                       ', 'iiceages', 'years   ', 1, 0.002739, 0.0
-   field_22 = 'Daily lateral thermo ice prod.     ', 'iicelapr', 'cm/day  ', 1, 100., 0.0
-   field_23 = 'Daily snowice ice production       ', 'iicesipr', 'cm/day  ', 1, 100., 0.0
-   field_24 = 'Mean ice temperature               ', 'iicetemp', 'C       ', 1, 1.0, -273.15
-   field_25 = 'Ice total heat content             ', 'iiceheco', '10^9 J  ', 1, 1.0, 0.0
-   field_26 = 'Ice surface temperature            ', 'iicesurt', 'C       ', 1, 1.0, -273.15
-   field_27 = 'Snow temperature                   ', 'isnotem2', 'C       ', 1, 1.0, -273.15
-   field_28 = 'Fsbri - brine salt flux            ', 'iicfsbri', 'kg/m2/s ', 1, 1.0, 0.0
-   field_29 = 'Fseqv - equivalent FW salt flux    ', 'iicfseqv', 'kg/m2/s ', 1, 1.0, 0.0
-   field_30 = 'Brine volume                       ', 'ibrinvol', '%       ', 1, 100.0, 0.0
-   field_31 = 'Frazil ice collection thickness    ', 'iicecolf', 'm       ', 1, 1.0, 0.0
-   field_32 = 'Ice strength                       ', 'iicestre', 'N/m     ', 1, 0.001, 0.0
-   field_33 = 'Ice velocity                       ', 'iicevelo', 'm/s     ', 1, 1.0, 0.0
-   field_34 = 'Surface melt                       ', 'iicesume', 'cm/day  ', 1, 100., 0.0
-   field_35 = 'Bottom melt                        ', 'iicebome', 'cm/day  ', 1, 100., 0.0
-   field_36 = 'Divergence                         ', 'iicedive', '10-8s-1 ', 1, 1.0e8, 0.0
-   field_37 = 'Shear                              ', 'iiceshea', '10-8s-1 ', 1, 1.0e8, 0.0
-   add_diag_swi = 1
+!           !         title of the field           !  name     !   units   !  save  ! multipl. ! additive !
+!           !                                      !           !           ! or not !  factor  !  factor  !
+   field_1  = 'Ice concentration                  ', 'iiceconc', '%       ',    1   ,  1.0     ,    0.0
+   field_2  = 'Ice thickness                      ', 'iicethic', 'm       ',    1   ,  1.0     ,    0.0
+   field_3  = 'Snow thickness                     ', 'isnowthi', 'm       ',    1   ,  1.0     ,    0.0
+   field_4  = 'Daily bottom thermo ice production ', 'iicebopr', 'cm/day  ',    1   , 100.     ,    0.0
+   field_5  = 'Daily dynamic ice production       ', 'iicedypr', 'cm/day  ',    1   , 100.     ,    0.0
+   field_6  = 'Oceanic flux at the ice base       ', 'ioceflxb', 'w/m2    ',    1   ,  1.0     ,    0.0
+   field_7  = 'Ice velocity u                     ', 'iicevelu', 'm/s     ',    1   ,  1.0     ,    0.0
+   field_8  = 'Ice velocity v                     ', 'iicevelv', 'm/s     ',    1   ,  1.0     ,    0.0
+   field_9  = 'Sea surface temperature            ', 'isstempe', 'C       ',    1   ,  1.0     , -273.15
+   field_10 = 'Sea surface salinity               ', 'isssalin', 'PSU     ',    1   ,  1.0     ,    0.0
+   field_11 = 'Total flux at ocean surface        ', 'iocetflx', 'w/m2    ',    1   ,  1.0     ,    0.0
+   field_12 = 'Solar flux at ocean surface        ', 'iocesflx', 'w/m2    ',    1   ,  1.0     ,    0.0
+   field_13 = 'Non-solar flux at ocean surface    ', 'iocwnsfl', 'w/m2    ',    1   ,  1.0     ,    0.0
+   field_14 = 'Heat flux due to brine release     ', 'iocehebr', 'w/m2    ',    1   ,  1.0     ,    0.0
+   field_15 = 'Wind stress u                      ', 'iocestru', 'Pa      ',    1   ,  1.0     ,    0.0
+   field_16 = 'Wind stress v                      ', 'iocestrv', 'Pa      ',    1   ,  1.0     ,    0.0 
+   field_17 = 'Solar flux at ice/ocean surface    ', 'iicesflx', 'w/m2    ',    1   ,  1.0     ,    0.0
+   field_18 = 'Non-solar flux at ice/ocean surface', 'iicenflx', 'w/m2    ',    1   ,  1.0     ,    0.0
+   field_19 = 'Snow precipitation                 ', 'isnowpre', 'kg/day  ',    1   ,  1.0     ,    0.0
+   field_20 = 'Mean ice salinity                  ', 'iicesali', 'psu     ',    1   ,  1.0     ,    0.0
+   field_21 = 'Mean ice age                       ', 'iiceages', 'years   ',    1   ,  0.002739,    0.0
+   field_22 = 'Daily lateral thermo ice prod.     ', 'iicelapr', 'cm/day  ',    1   ,100.      ,    0.0
+   field_23 = 'Daily snowice ice production       ', 'iicesipr', 'cm/day  ',    1   ,100.      ,    0.0
+   field_24 = 'Mean ice temperature               ', 'iicetemp', 'C       ',    1   ,  1.0     , -273.15
+   field_25 = 'Ice total heat content             ', 'iiceheco', '10^9 J  ',    1   ,  1.0     ,    0.0
+   field_26 = 'Ice surface temperature            ', 'iicesurt', 'C       ',    1   ,  1.0     , -273.15
+   field_27 = 'Snow temperature                   ', 'isnotem2', 'C       ',    1   ,  1.0     , -273.15
+   field_28 = 'Fsbri - brine salt flux            ', 'iicfsbri', 'kg/m2/s ',    1   ,  1.0     ,    0.0
+   field_29 = 'Fseqv - equivalent FW salt flux    ', 'iicfseqv', 'kg/m2/s ',    1   ,  1.0     ,    0.0
+   field_30 = 'Brine volume                       ', 'ibrinvol', '%       ',    1   ,  100.0   ,    0.0
+   field_31 = 'Frazil ice collection thickness    ', 'iicecolf', 'm       ',    1   ,  1.0     ,    0.0
+   field_32 = 'Ice strength                       ', 'iicestre', 'N/m     ',    1   ,  0.001   ,    0.0
+   field_33 = 'Ice velocity                       ', 'iicevelo', 'm/s     ',    1   ,  1.0     ,    0.0
+   field_34 = 'Surface melt                       ', 'iicesume', 'cm/day  ',    1   ,100.      ,    0.0
+   field_35 = 'Bottom melt                        ', 'iicebome', 'cm/day  ',    1   ,100.      ,    0.0
+   field_36 = 'Divergence                         ', 'iicedive', '10-8s-1 ',    1   ,  1.0e8   ,    0.0
+   field_37 = 'Shear                              ', 'iiceshea', '10-8s-1 ',    1   ,  1.0e8   ,    0.0
 /      
