Changeset 9858 for branches

Timestamp:

2018-06-29T10:56:15+02:00 (6 years ago)

Author:

mathiot

Message:

forgot to remove sn_qisf, ln_divisf, ln_conserve from namelist ref

File:

• branches/UKMO/dev_isf_flx_UKESM_r9321/NEMOGCM/CONFIG/SHARED/namelist_ref (modified) (3 diffs)

branches/UKMO/dev_isf_flx_UKESM_r9321/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -471 +471 @@
 !              !           !  (if <0  months)  !   name   !    (logical)   !  (T/F)  ! 'monthly' ! filename ! pairing  !
 ! nn_isf == 4
-   sn_qisf      = 'rnfisf' ,         -12      ,'sohflisf',    .false.      , .true.  , 'yearly'  ,  ''      ,   ''
    sn_fwfisf    = 'rnfisf' ,         -12      ,'sowflisf',    .false.      , .true.  , 'yearly'  ,  ''      ,   ''
 ! nn_isf == 3
@@ -480 +479 @@
 ! nn_isf == 2
    sn_Leff_isf = 'rnfisf' ,       0          ,'Leff'         ,   .false.  , .true.  , 'yearly'  ,  ''      ,   ''
-! for all case
-   ln_divisf   = .true.  ! apply isf melting as a mass flux or in the salinity trend. (maybe I should remove this option as for runoff?)
 ! only for nn_isf = 1 or 2
    rn_gammat0  = 1.0e-4   ! gammat coefficient used in blk formula
@@ -489 +486 @@
    rn_hisf_tbl =  30.      ! thickness of the top boundary layer           (Losh et al. 2008)
                           ! 0 => thickness of the tbl = thickness of the first wet cell
-   ln_conserve = .true.   ! conservative case (take into account meltwater advection)
    nn_gammablk = 1        ! 0 = cst Gammat (= gammat/s)
                           ! 1 = velocity dependend Gamma (u* * gammat/s)  (Jenkins et al. 2010)