Skip to content

Commit 63992dd

Browse files
alperaltuntasalperaltuntas
authored
Merge pull request #302 from ESCOMP/skeb_fixes
Fixes to SKEB runtime parameters and diag field
2 parents b4d2c82 + a758adf commit 63992dd

4 files changed

Lines changed: 78 additions & 86 deletions

File tree

‎param_templates/MOM_input.yaml‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3763,6 +3763,45 @@ Global:
37633763
added to the end of the file name. This parameter is ignored for non-ensemble runs."
37643764
datatype: string
37653765
value: ".mom6"
3766+
DO_SKEB:
3767+
description: |
3768+
"default = False
3769+
If true, then stochastically perturb the currents using the stochastic kinetic
3770+
energy backscatter scheme."
3771+
datatype: logical
3772+
units: Boolean
3773+
value:
3774+
$OCN_GRID == "tx2_3v2": True
3775+
SKEB_USE_FRICT:
3776+
description: |
3777+
"default = False
3778+
If true, adds horizontal friction dissipation rate to the SKEBS amplitude."
3779+
datatype: logical
3780+
units: Boolean
3781+
value:
3782+
$OCN_GRID == "tx2_3v2": True
3783+
SKEB_USE_GM:
3784+
description: |
3785+
"default = False
3786+
If true, adds GM work rate to the SKEBS amplitude."
3787+
datatype: logical
3788+
units: Boolean
3789+
value:
3790+
$OCN_GRID == "tx2_3v2": True
3791+
SKEB_NPASS:
3792+
description: |
3793+
"[nondim] default = 0
3794+
number of passes of a 9-point smoother of the dissipation estimate."
3795+
datatype: integer
3796+
value:
3797+
$OCN_GRID == "tx2_3v2": 8
3798+
SKEB_GM_COEF:
3799+
description: |
3800+
"[nondim] default = 0.0
3801+
Fraction of GM work that is added to backscatter rate."
3802+
datatype: real
3803+
value:
3804+
$OCN_GRID == "tx2_3v2": 0.75
37663805
CVMix_CONVECTION:
37673806
BV_SQR_CONV:
37683807
description: |
@@ -3885,45 +3924,7 @@ KPP:
38853924
datatype: real
38863925
value:
38873926
$OCN_GRID == "tx2_3v2": 5.0
3888-
DO_SKEB:
3889-
description: |
3890-
"default = False
3891-
If true, then stochastically perturb the currents using the stochastic kinetic
3892-
energy backscatter scheme."
3893-
datatype: logical
3894-
units: Boolean
3895-
value:
3896-
$OCN_GRID == "tx2_3v2": True
3897-
SKEB_USE_FRICT:
3898-
description: |
3899-
"default = False
3900-
If true, adds horizontal friction dissipation rate to the SKEBS amplitude."
3901-
datatype: logical
3902-
units: Boolean
3903-
value:
3904-
$OCN_GRID == "tx2_3v2": True
3905-
SKEB_USE_GM:
3906-
description: |
3907-
"default = False
3908-
If true, adds GM work rate to the SKEBS amplitude."
3909-
datatype: logical
3910-
units: Boolean
3911-
value:
3912-
$OCN_GRID == "tx2_3v2": True
3913-
SKEB_NPASS:
3914-
description: |
3915-
"[nondim] default = 0
3916-
number of passes of a 9-point smoother of the dissipation estimate."
3917-
datatype: integer
3918-
value:
3919-
$OCN_GRID == "tx2_3v2": 8
3920-
SKEB_GM_COEF:
3921-
description: |
3922-
"[nondim] default = 0.0
3923-
Fraction of GM work that is added to backscatter rate."
3924-
datatype: real
3925-
value:
3926-
$OCN_GRID == "tx2_3v2": 0.75
3927+
39273928
MLE:
39283929
USE_BODNER23:
39293930
description: |

‎param_templates/diag_table.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ FieldLists:
2626

2727
- &kpp_diags ["KPP_OBLdepth:oml", "KPP_OBLdepth:oml_min:min", "KPP_OBLdepth:oml_max:max"]
2828

29-
- &stochastic_diags ["skeb_amp"]
30-
3129
- &forcing_flds ["tauuo", "tauvo", "friver", "prsn", "prlq", "evs", "hfsso", "rlntds",
3230
"hfsnthermds", "sfdsi", "rsntds", "hfds", "ustar",
3331
"hfsifrazil", "wfo", "vprec", "ficeberg", "fsitherm",
@@ -128,7 +126,6 @@ Files:
128126
$OCN_DIAG_MODE not in ["spinup", "none"]:
129127
[ *prognostic,
130128
*kpp_diags,
131-
*stochastic_diags,
132129
*forcing_flds,
133130
*enthalpy_flds,
134131
*surface_flds_common,

‎param_templates/json/MOM_input.json‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3059,6 +3059,44 @@
30593059
"description": "\"default = ''\nThe prefix for the restart file appendix (i.e., ensemble id for ensemble\nruns). If this prefix is found in the restart file name, the appendix is added\nright after the first occurrence of the prefix. If not found, the appendix is\nadded to the end of the file name. This parameter is ignored for non-ensemble runs.\"\n",
30603060
"datatype": "string",
30613061
"value": ".mom6"
3062+
},
3063+
"DO_SKEB": {
3064+
"description": "\"default = False\nIf true, then stochastically perturb the currents using the stochastic kinetic\nenergy backscatter scheme.\"\n",
3065+
"datatype": "logical",
3066+
"units": "Boolean",
3067+
"value": {
3068+
"$OCN_GRID == \"tx2_3v2\"": true
3069+
}
3070+
},
3071+
"SKEB_USE_FRICT": {
3072+
"description": "\"default = False\nIf true, adds horizontal friction dissipation rate to the SKEBS amplitude.\"\n",
3073+
"datatype": "logical",
3074+
"units": "Boolean",
3075+
"value": {
3076+
"$OCN_GRID == \"tx2_3v2\"": true
3077+
}
3078+
},
3079+
"SKEB_USE_GM": {
3080+
"description": "\"default = False\nIf true, adds GM work rate to the SKEBS amplitude.\"\n",
3081+
"datatype": "logical",
3082+
"units": "Boolean",
3083+
"value": {
3084+
"$OCN_GRID == \"tx2_3v2\"": true
3085+
}
3086+
},
3087+
"SKEB_NPASS": {
3088+
"description": "\"[nondim] default = 0\n number of passes of a 9-point smoother of the dissipation estimate.\"\n",
3089+
"datatype": "integer",
3090+
"value": {
3091+
"$OCN_GRID == \"tx2_3v2\"": 8
3092+
}
3093+
},
3094+
"SKEB_GM_COEF": {
3095+
"description": "\"[nondim] default = 0.0\nFraction of GM work that is added to backscatter rate.\"\n",
3096+
"datatype": "real",
3097+
"value": {
3098+
"$OCN_GRID == \"tx2_3v2\"": 0.75
3099+
}
30623100
}
30633101
},
30643102
"CVMix_CONVECTION": {
@@ -3167,44 +3205,6 @@
31673205
"value": {
31683206
"$OCN_GRID == \"tx2_3v2\"": 5.0
31693207
}
3170-
},
3171-
"DO_SKEB": {
3172-
"description": "\"default = False\nIf true, then stochastically perturb the currents using the stochastic kinetic\nenergy backscatter scheme.\"\n",
3173-
"datatype": "logical",
3174-
"units": "Boolean",
3175-
"value": {
3176-
"$OCN_GRID == \"tx2_3v2\"": true
3177-
}
3178-
},
3179-
"SKEB_USE_FRICT": {
3180-
"description": "\"default = False\nIf true, adds horizontal friction dissipation rate to the SKEBS amplitude.\"\n",
3181-
"datatype": "logical",
3182-
"units": "Boolean",
3183-
"value": {
3184-
"$OCN_GRID == \"tx2_3v2\"": true
3185-
}
3186-
},
3187-
"SKEB_USE_GM": {
3188-
"description": "\"default = False\nIf true, adds GM work rate to the SKEBS amplitude.\"\n",
3189-
"datatype": "logical",
3190-
"units": "Boolean",
3191-
"value": {
3192-
"$OCN_GRID == \"tx2_3v2\"": true
3193-
}
3194-
},
3195-
"SKEB_NPASS": {
3196-
"description": "\"[nondim] default = 0\n number of passes of a 9-point smoother of the dissipation estimate.\"\n",
3197-
"datatype": "integer",
3198-
"value": {
3199-
"$OCN_GRID == \"tx2_3v2\"": 8
3200-
}
3201-
},
3202-
"SKEB_GM_COEF": {
3203-
"description": "\"[nondim] default = 0.0\nFraction of GM work that is added to backscatter rate.\"\n",
3204-
"datatype": "real",
3205-
"value": {
3206-
"$OCN_GRID == \"tx2_3v2\"": 0.75
3207-
}
32083208
}
32093209
},
32103210
"MLE": {

‎param_templates/json/diag_table.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,6 @@
8989
"KPP_OBLdepth:oml_min:min",
9090
"KPP_OBLdepth:oml_max:max"
9191
],
92-
[
93-
"skeb_amp"
94-
],
9592
[
9693
"tauuo",
9794
"tauvo",
@@ -357,9 +354,6 @@
357354
"KPP_OBLdepth:oml_min:min",
358355
"KPP_OBLdepth:oml_max:max"
359356
],
360-
[
361-
"skeb_amp"
362-
],
363357
[
364358
"tauuo",
365359
"tauvo",

0 commit comments

Comments
 (0)