Skip to content

Commit 0e886e9

Browse files
fix unused/deprecated parmeter warnings for KPP_LT_K_METHOD, KPP_LT_VT2_METHOD, and USTAR_GUSTLESS_BUG (#320)
1 parent aa948d4 commit 0e886e9

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

param_templates/MOM_input.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2359,14 +2359,14 @@ Global:
23592359
datatype: real
23602360
units: Pa
23612361
value: 0.0004
2362-
FIX_USTAR_GUSTLESS_BUG:
2362+
USTAR_GUSTLESS_BUG:
23632363
description: |
23642364
"[Boolean] default = False
2365-
If true correct a bug in the time-averaging of the gustless wind
2365+
If true include a bug in the time-averaging of the gustless wind
23662366
friction velocity."
23672367
datatype: logical
23682368
units: Boolean
2369-
value: True
2369+
value: False
23702370
RESTART_CONTROL:
23712371
description: |
23722372
"default = 1
@@ -3881,7 +3881,7 @@ KPP:
38813881
RW16 = Function of Langmuir number based on RW16
38823882
datatype: string
38833883
value:
3884-
$COMP_WAV == "ww3": VR12
3884+
$COMP_WAV == "ww3" and $MOM6_WW3_CPL_METHOD == "legacy" : VR12
38853885
KPP_LT_VT2_METHOD:
38863886
description: |
38873887
default = "CONSTANT"
@@ -3892,7 +3892,7 @@ KPP:
38923892
LF17 = Function of Langmuir number based on LF17
38933893
datatype: string
38943894
value:
3895-
$COMP_WAV == "ww3": VR12
3895+
$COMP_WAV == "ww3" and $MOM6_WW3_CPL_METHOD =="legacy" : VR12
38963896
KPP_CVt2:
38973897
description: |
38983898
"[nondim] default = 1.6

param_templates/json/MOM_input.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1864,11 +1864,11 @@
18641864
"units": "Pa",
18651865
"value": 0.0004
18661866
},
1867-
"FIX_USTAR_GUSTLESS_BUG": {
1868-
"description": "\"[Boolean] default = False\nIf true correct a bug in the time-averaging of the gustless wind\nfriction velocity.\"\n",
1867+
"USTAR_GUSTLESS_BUG": {
1868+
"description": "\"[Boolean] default = False\nIf true include a bug in the time-averaging of the gustless wind\nfriction velocity.\"\n",
18691869
"datatype": "logical",
18701870
"units": "Boolean",
1871-
"value": true
1871+
"value": false
18721872
},
18731873
"RESTART_CONTROL": {
18741874
"description": "\"default = 1\nAn integer whose bits encode which restart files are\nwritten. Add 2 (bit 1) for a time-stamped file, and odd\n(bit 0) for a non-time-stamped file. A non-time-stamped\nrestart file is saved at the end of the run segment\nfor any non-negative value.\"\n",
@@ -3166,14 +3166,14 @@
31663166
"description": "default = \"CONSTANT\"\nMethod to enhance mixing coefficient in KPP. Valid options are:\n CONSTANT = Constant value (KPP_K_ENH_FAC)\n VR12 = Function of Langmuir number based on VR12\n RW16 = Function of Langmuir number based on RW16\n",
31673167
"datatype": "string",
31683168
"value": {
3169-
"$COMP_WAV == \"ww3\"": "VR12"
3169+
"$COMP_WAV == \"ww3\" and $MOM6_WW3_CPL_METHOD == \"legacy\"": "VR12"
31703170
}
31713171
},
31723172
"KPP_LT_VT2_METHOD": {
31733173
"description": "default = \"CONSTANT\"\nMethod to enhance Vt2 in KPP. Valid options are:\n CONSTANT = Constant value (KPP_VT2_ENH_FAC)\n VR12 = Function of Langmuir number based on VR12\n RW16 = Function of Langmuir number based on RW16\n LF17 = Function of Langmuir number based on LF17\n",
31743174
"datatype": "string",
31753175
"value": {
3176-
"$COMP_WAV == \"ww3\"": "VR12"
3176+
"$COMP_WAV == \"ww3\" and $MOM6_WW3_CPL_METHOD ==\"legacy\"": "VR12"
31773177
}
31783178
},
31793179
"KPP_CVt2": {

0 commit comments

Comments
 (0)