New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 7438 – NEMO

Changeset 7438


Ignore:
Timestamp:
2016-12-02T12:08:52+01:00 (7 years ago)
Author:
cbricaud
Message:

correct bug due to merge of namelist_ref

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2016/dev_merge_2016/NEMOGCM/CONFIG/SHARED/namelist_ref

    r7421 r7438  
    970970   rn_tfe_itf  = 1.        !  ITF tidal dissipation efficiency 
    971971/ 
    972 <<<<<<< .working 
    973972!----------------------------------------------------------------------- 
    974973&namzdf_tmx_new !   internal wave-driven mixing parameterization        ("key_zdftmx_new" & "key_zdfddm") 
     
    978977   ln_tsdiff   = .true.    !  account for differential T/S mixing (T) or not (F) 
    979978/ 
    980  
    981 ======= 
    982 !----------------------------------------------------------------------- 
    983 &namzdf_tmx_new !   internal wave-driven mixing parameterization        ("key_zdftmx_new" & "key_zdfddm") 
    984 !----------------------------------------------------------------------- 
    985    nn_zpyc     = 1         !  pycnocline-intensified dissipation scales as N (=1) or N^2 (=2) 
    986    ln_mevar    = .true.    !  variable (T) or constant (F) mixing efficiency 
    987    ln_tsdiff   = .true.    !  account for differential T/S mixing (T) or not (F) 
    988 / 
    989 >>>>>>> .merge-right.r7388 
    990  
    991979!!====================================================================== 
    992980!!                  ***  Miscellaneous namelists  *** 
     
    10871075/ 
    10881076!----------------------------------------------------------------------- 
    1089 <<<<<<< .working 
    1090 &namdiu        !   Cool skin and warm layer models                       (default F) 
    1091 ======= 
    10921077&namdiu        !   Cool skin and warm layer models                       (default F) 
    10931078!----------------------------------------------------------------------- 
     
    10971082!----------------------------------------------------------------------- 
    10981083&namflo       !   float parameters                                      ("key_float") 
    1099 >>>>>>> .merge-right.r7388 
    11001084!----------------------------------------------------------------------- 
    11011085   ln_diurnal      = .false.   !  
     
    11351119/ 
    11361120!----------------------------------------------------------------------- 
    1137 <<<<<<< .working 
    11381121&nam_diatmb    !  Top Middle Bottom Output                               (default F) 
    1139 ======= 
    1140 &nam_diatmb    !  Top Middle Bottom Output                               (default F) 
    11411122!----------------------------------------------------------------------- 
    11421123   ln_diatmb   = .false.   !  Choose Top Middle and Bottom output or not 
     
    11491130!----------------------------------------------------------------------- 
    11501131&namnc4        !   netcdf4 chunking and compression settings            ("key_netcdf4") 
    1151 >>>>>>> .merge-right.r7388 
    11521132!----------------------------------------------------------------------- 
    11531133   ln_diatmb   = .false.   !  Choose Top Middle and Bottom output or not 
Note: See TracChangeset for help on using the changeset viewer.