Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

final parameter changes for beta05 #226

Merged
merged 1 commit into from
Jan 28, 2025
Merged

final parameter changes for beta05 #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cime_config/testdefs/testlist_mom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<option name="wallclock">01:00:00</option>
</options>
</test>
<test name="SMS_Ld2" grid="ne30pg3_t232" compset="BLT1850" testmods="mom/bcompset">
<test name="SMS_Ld2" grid="ne30pg3_t232" compset="BLT1850">
<machines>
<machine name="derecho" compiler="intel" category="aux_mom"/>
<machine name="derecho" compiler="intel" category="pr_mom"/>
Expand Down
12 changes: 5 additions & 7 deletions param_templates/MOM_input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,9 +998,7 @@ Global:
If true, use a Laplacian horizontal viscosity."
datatype: logical
units: Boolean
value:
$OCN_GRID == "tx2_3v2": False
else: True
value: True
KH:
description: |
"[m2 s-1] default = 0.0
Expand Down Expand Up @@ -1071,15 +1069,15 @@ Global:
datatype: logical
units: Boolean
value:
$OCN_GRID == "tx2_3v2": False
$OCN_GRID == "tx2_3v2": True
LEITH_AH:
description: |
"[Boolean] default = False
If true, use a biharmonic Leith nonlinear eddy viscosity."
datatype: logical
units: Boolean
value:
$OCN_GRID == "tx2_3v2": True
$OCN_GRID == "tx2_3v2": False
LEITH_BI_CONST:
description: |
"[nondim] default = 0.0
Expand All @@ -1088,7 +1086,7 @@ Global:
datatype: real
units: nondim
value:
$OCN_GRID == "tx2_3v2": 128.0
$OCN_GRID == "tx2_3v2": 75.0
LEITHY_CK:
description: |
"[nondim] default = 1.0
Expand Down Expand Up @@ -3769,6 +3767,6 @@ KPP:
parameter, the OBL depth is always at least as deep as the first layer."
datatype: real
value:
$OCN_GRID == "tx2_3v2": 2.5
$OCN_GRID == "tx2_3v2": 5.0
...

13 changes: 5 additions & 8 deletions param_templates/json/MOM_input.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,10 +755,7 @@
"description": "\"[Boolean] default = False\nIf true, use a Laplacian horizontal viscosity.\"\n",
"datatype": "logical",
"units": "Boolean",
"value": {
"$OCN_GRID == \"tx2_3v2\"": false,
"else": true
}
"value": true
},
"KH": {
"description": "\"[m2 s-1] default = 0.0\nThe background Laplacian horizontal viscosity.\"\n",
Expand Down Expand Up @@ -818,23 +815,23 @@
"datatype": "logical",
"units": "Boolean",
"value": {
"$OCN_GRID == \"tx2_3v2\"": false
"$OCN_GRID == \"tx2_3v2\"": true
}
},
"LEITH_AH": {
"description": "\"[Boolean] default = False\nIf true, use a biharmonic Leith nonlinear eddy viscosity.\"\n",
"datatype": "logical",
"units": "Boolean",
"value": {
"$OCN_GRID == \"tx2_3v2\"": true
"$OCN_GRID == \"tx2_3v2\"": false
}
},
"LEITH_BI_CONST": {
"description": "\"[nondim] default = 0.0\nThe nondimensional biharmonic Leith constant, typical values are thus far\nundetermined.\"\n",
"datatype": "real",
"units": "nondim",
"value": {
"$OCN_GRID == \"tx2_3v2\"": 128.0
"$OCN_GRID == \"tx2_3v2\"": 75.0
}
},
"LEITHY_CK": {
Expand Down Expand Up @@ -3057,7 +3054,7 @@
"description": "\"[m] default = 0.0\nIf non-zero, a minimum depth to use for KPP OBL depth. Independent of this\nparameter, the OBL depth is always at least as deep as the first layer.\"\n",
"datatype": "real",
"value": {
"$OCN_GRID == \"tx2_3v2\"": 2.5
"$OCN_GRID == \"tx2_3v2\"": 5.0
}
}
}
Expand Down
Loading