Changeset 7438 for branches/2016/dev_merge_2016
- Timestamp:
- 2016-12-02T12:08:52+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2016/dev_merge_2016/NEMOGCM/CONFIG/SHARED/namelist_ref
r7421 r7438 970 970 rn_tfe_itf = 1. ! ITF tidal dissipation efficiency 971 971 / 972 <<<<<<< .working973 972 !----------------------------------------------------------------------- 974 973 &namzdf_tmx_new ! internal wave-driven mixing parameterization ("key_zdftmx_new" & "key_zdfddm") … … 978 977 ln_tsdiff = .true. ! account for differential T/S mixing (T) or not (F) 979 978 / 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 efficiency987 ln_tsdiff = .true. ! account for differential T/S mixing (T) or not (F)988 /989 >>>>>>> .merge-right.r7388990 991 979 !!====================================================================== 992 980 !! *** Miscellaneous namelists *** … … 1087 1075 / 1088 1076 !----------------------------------------------------------------------- 1089 <<<<<<< .working1090 &namdiu ! Cool skin and warm layer models (default F)1091 =======1092 1077 &namdiu ! Cool skin and warm layer models (default F) 1093 1078 !----------------------------------------------------------------------- … … 1097 1082 !----------------------------------------------------------------------- 1098 1083 &namflo ! float parameters ("key_float") 1099 >>>>>>> .merge-right.r73881100 1084 !----------------------------------------------------------------------- 1101 1085 ln_diurnal = .false. ! … … 1135 1119 / 1136 1120 !----------------------------------------------------------------------- 1137 <<<<<<< .working1138 1121 &nam_diatmb ! Top Middle Bottom Output (default F) 1139 =======1140 &nam_diatmb ! Top Middle Bottom Output (default F)1141 1122 !----------------------------------------------------------------------- 1142 1123 ln_diatmb = .false. ! Choose Top Middle and Bottom output or not … … 1149 1130 !----------------------------------------------------------------------- 1150 1131 &namnc4 ! netcdf4 chunking and compression settings ("key_netcdf4") 1151 >>>>>>> .merge-right.r73881152 1132 !----------------------------------------------------------------------- 1153 1133 ln_diatmb = .false. ! Choose Top Middle and Bottom output or not
Note: See TracChangeset
for help on using the changeset viewer.