Changeset 6335


Ignore:
Timestamp:
2016-02-19T14:15:31+01:00 (5 years ago)
Author:
timgraham
Message:

Added nam_tmx_new namelist to namelist_ref to avoid a conflict in merge with fcm make

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5107_mld_zint/NEMOGCM/CONFIG/SHARED/namelist_ref

    r6072 r6335  
    904904!!    namzdf_ddm    double diffusive mixing parameterization            ("key_zdfddm") 
    905905!!    namzdf_tmx    tidal mixing parameterization                       ("key_zdftmx") 
     906!!    namzdf_tmx_new    new tidal mixing parameterization               ("key_zdftmx_new") 
    906907!!    namzdf_mldzint vertically-interpolated mixed-layer depth parameters 
    907908!!====================================================================== 
     
    10101011   ln_tmx_itf  = .true.    !  ITF specific parameterisation 
    10111012   rn_tfe_itf  = 1.        !  ITF tidal dissipation efficiency 
     1013/ 
     1014!----------------------------------------------------------------------- 
     1015&namzdf_tmx_new    !   new tidal mixing parameterization                ("key_zdftmx_new") 
     1016!----------------------------------------------------------------------- 
     1017   nn_zpyc     = 1         !  pycnocline-intensified dissipation scales as N (=1) or N^2 (=2) 
     1018   ln_mevar    = .true.    !  variable (T) or constant (F) mixing efficiency 
     1019   ln_tsdiff   = .true.    !  account for differential T/S mixing (T) or not (F) 
    10121020/ 
    10131021!------------------------------------------------------------------------------------------ 
Note: See TracChangeset for help on using the changeset viewer.