@@ -740,7 +740,7 @@ Global:
740740 datatype : logical
741741 units : Boolean
742742 value :
743- $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : True
743+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : False
744744 $OCN_GRID == "tx0.25v1" : True
745745 KHTH_SLOPE_CFF :
746746 description : |
@@ -1055,7 +1055,7 @@ Global:
10551055 datatype : logical
10561056 units : Boolean
10571057 value :
1058- $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : True
1058+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : False
10591059 SMAG_LAP_CONST :
10601060 description : |
10611061 "[nondim] default = 0.0
@@ -1151,15 +1151,39 @@ Global:
11511151 datatype : real
11521152 units : nondim
11531153 value :
1154- $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : 75 .0
1154+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : 85 .0
11551155 LEITHY_CK :
11561156 description : |
11571157 "[nondim] default = 1.0
11581158 Fraction of biharmonic dissipation that gets backscattered, in Leith+E."
11591159 datatype : real
11601160 units : nondim
11611161 value :
1162- $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : 0.0
1162+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : 1.0
1163+ TAPER_LEITHY :
1164+ description : |
1165+ "[Boolean] default = False
1166+ If true, Leith+E c_K coefficient is tapered to zero below a threshold depth."
1167+ datatype : logical
1168+ units : Boolean
1169+ value :
1170+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : True
1171+ LEITHY_DEPTH :
1172+ description : |
1173+ "[m] default = 800.0
1174+ Leith+E backscatter starts tapering below this depth."
1175+ datatype : real
1176+ units : m
1177+ value :
1178+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : 1000.0
1179+ LEITHY_WIDTH :
1180+ description : |
1181+ "[m] default = 400.0
1182+ Leith+E backscatter is zero below LEITHY_DEPTH+LEITHY_WIDTH."
1183+ datatype : real
1184+ units : m
1185+ value :
1186+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : 500.0
11631187 USE_LAND_MASK_FOR_HVISC :
11641188 description : |
11651189 "[Boolean] default = False
@@ -1171,6 +1195,30 @@ Global:
11711195 datatype : logical
11721196 units : Boolean
11731197 value : True
1198+ USE_KH_BG_2D :
1199+ description : |
1200+ "[Boolean] default = False
1201+ If true, read a file containing 2-d background harmonic viscosities. The
1202+ final viscosity is the maximum of the other terms and this background value."
1203+ datatype : logical
1204+ units : Boolean
1205+ value :
1206+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : True
1207+ KH_BG_2D_FILENAME :
1208+ description : |
1209+ "default = 'KH_background_2d.nc'
1210+ The filename containing a 2d map of Kh."
1211+ datatype : string
1212+ value :
1213+ $OCN_GRID == "tx2_3v2" : " KH_BG_2D_tx2_3v2_260427.nc"
1214+ $OCN_GRID == "tx2_3v3" : " KH_BG_2D_tx2_3v3_260427.nc"
1215+ KH_BG_2D_VARNAME :
1216+ description : |
1217+ "default = 'Kh'
1218+ The name in the input file of the horizontal viscosity variable."
1219+ datatype : string
1220+ value :
1221+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : " KH"
11741222 FRICTWORK_BUG :
11751223 description : |
11761224 "[Boolean] default = True
@@ -1202,6 +1250,16 @@ Global:
12021250 value :
12031251 $OCN_GRID == "MISOMIP" : False
12041252 else : True
1253+ CHANNEL_DRAG_MAX_BBL_THICK :
1254+ description : |
1255+ "[m] default = -1.0
1256+ The maximum bottom boundary layer thickness over which the channel drag is
1257+ exerted, or a negative value for no fixed limit, instead basing the BBL
1258+ thickness on the bottom stress, rotation and stratification."
1259+ datatype : real
1260+ units : m
1261+ value :
1262+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : 5.0
12051263 HBBL :
12061264 description : |
12071265 "[m]
@@ -1319,7 +1377,9 @@ Global:
13191377 function independently at each point."
13201378 datatype : logical
13211379 units : Boolean
1322- value : False
1380+ value :
1381+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : True
1382+ else : False
13231383 GILL_EQUATORIAL_LD :
13241384 description : |
13251385 "[Boolean] default = False
@@ -1366,6 +1426,15 @@ Global:
13661426 value :
13671427 $OCN_GRID == "MISOMIP" : 2.0
13681428 else : 0.1
1429+ CORRECT_BBL_BOUNDS :
1430+ description : |
1431+ "[Boolean] default = False
1432+ If true, uses the correct bounds on the BBL thickness and viscosity so that
1433+ the bottom layer feels the intended drag."
1434+ datatype : logical
1435+ units : Boolean
1436+ value :
1437+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : True
13691438 BOUND_BT_CORRECTION :
13701439 description : |
13711440 "[Boolean] default = False
@@ -1580,15 +1649,6 @@ Global:
15801649 units : none
15811650 value :
15821651 $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : True
1583- MLE_DENSITY_DIFF :
1584- description : |
1585- "[kg/m3] default = 0.03
1586- Density difference used to detect the mixed-layer depth for the
1587- mixed-layer eddy parameterization by Fox-Kemper et al. (2010)."
1588- datatype : real
1589- units : kg/m3
1590- value :
1591- $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : 0.02
15921652 MLE_FRONT_LENGTH :
15931653 description : |
15941654 "[m] default = 0.0
@@ -2245,6 +2305,7 @@ Global:
22452305 units : truncations save_interval-1
22462306 value :
22472307 $OCN_GRID == "tx0.25v1" : 100000
2308+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : 1000000
22482309 else : 0
22492310 OCEAN_SURFACE_STAGGER :
22502311 description : |
@@ -2508,7 +2569,7 @@ Global:
25082569 datatype : real
25092570 units : nondim
25102571 value :
2511- $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : 0.9
2572+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : 0.5
25122573 KH_RES_FN_POWER :
25132574 description : |
25142575 "[nondim] default = 2
@@ -2528,7 +2589,7 @@ Global:
25282589 datatype : real
25292590 units : nondim
25302591 value :
2531- $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : 0.4
2592+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : 0.5
25322593 MEKE_GEOMETRIC :
25332594 description : |
25342595 "[Boolean] default = False
@@ -2546,7 +2607,7 @@ Global:
25462607 datatype : real
25472608 units : nondim
25482609 value :
2549- $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : 0.06
2610+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : 0.07
25502611 MEKE_KHTH_FAC :
25512612 description : |
25522613 "[nondim] default = 0.0
@@ -3356,6 +3417,7 @@ Global:
33563417 units : nondim
33573418 value :
33583419 $OCN_GRID == "MISOMIP" : 0.0
3420+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : 0.01
33593421 IGNORE_FLUXES_OVER_LAND :
33603422 description : |
33613423 "[Boolean] default = False
@@ -3927,14 +3989,15 @@ MLE:
39273989 datatype : logical
39283990 units : Boolean
39293991 value :
3930- $OCN_GRID in ["tx2_3v2", "tx2_3v3"] : True
3992+ $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $COMP_ATM == "cam" : True
3993+ else : False
39313994 CR_FILE :
39323995 description : |
39333996 "The path to the file containing the Cr fields."
39343997 datatype : string
39353998 value :
3936- $OCN_GRID == "tx2_3v2" : " mle-cr-mask_20250627.nc"
3937- $OCN_GRID == "tx2_3v3" : " mle_cr_labsea_mask_tx2_3v3_260306.nc"
3999+ $OCN_GRID == "tx2_3v2" and $COMP_ATM == "cam" : " mle-cr-mask_20250627.nc"
4000+ $OCN_GRID == "tx2_3v3" and $COMP_ATM == "cam" : " mle_cr_labsea_mask_tx2_3v3_260306.nc"
39384001 WAVE_ENHANCED_USTAR :
39394002 description : |
39404003 "default = False
0 commit comments