Skip to content

Commit bf8aa43

Browse files
mnlevy1981mnlevy1981
committed
Merge tag 'mi_260121' into update_MARBL_FeForcing
2 parents e6156d5 + 7ba8ebc commit bf8aa43

11 files changed

Lines changed: 106 additions & 111 deletions

File tree

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
path = MOM6
33
url = https://github.com/NCAR/MOM6.git
44
fxDONOTUSEurl = https://github.com/NCAR/MOM6.git
5-
fxtag = dev/ncar_251024b
5+
fxtag = dev/ncar_251120
66
fxrequired = AlwaysRequired
77

88
[submodule "stochastic_physics"]
99
path = externals/stochastic_physics
1010
url = https://github.com/ESCOMP/stochastic_physics.git
1111
fxDONOTUSEurl = https://github.com/ESCOMP/stochastic_physics.git
12-
fxtag = sp_250827
12+
fxtag = sp_251120
1313
fxrequired = AlwaysRequired
1414

1515
[submodule "MARBL"]

‎MOM6‎

‎cime_config/config_pes.xml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@
114114
<pes pesize="any" compset="_DATM.+_CICE.*_MOM6(?!.*%MARBL-BIO).+_SWAV">
115115
<comment>none</comment>
116116
<ntasks>
117-
<ntasks_atm>128</ntasks_atm>
118-
<ntasks_rof>128</ntasks_rof>
119-
<ntasks_cpl>128</ntasks_cpl>
120-
<ntasks_ice>128</ntasks_ice>
117+
<ntasks_atm>256</ntasks_atm>
118+
<ntasks_rof>256</ntasks_rof>
119+
<ntasks_cpl>256</ntasks_cpl>
120+
<ntasks_ice>256</ntasks_ice>
121121
<ntasks_ocn>896</ntasks_ocn>
122122
<ntasks_lnd>1</ntasks_lnd>
123123
<ntasks_wav>1</ntasks_wav>
@@ -138,7 +138,7 @@
138138
<rootpe_rof>0</rootpe_rof>
139139
<rootpe_cpl>0</rootpe_cpl>
140140
<rootpe_ice>0</rootpe_ice>
141-
<rootpe_ocn>128</rootpe_ocn>
141+
<rootpe_ocn>256</rootpe_ocn>
142142
<rootpe_lnd>0</rootpe_lnd>
143143
<rootpe_wav>0</rootpe_wav>
144144
<rootpe_glc>0</rootpe_glc>
@@ -150,7 +150,7 @@
150150
<ntasks_atm>128</ntasks_atm>
151151
<ntasks_rof>128</ntasks_rof>
152152
<ntasks_cpl>128</ntasks_cpl>
153-
<ntasks_ice>128</ntasks_ice>
153+
<ntasks_ice>256</ntasks_ice>
154154
<ntasks_ocn>2560</ntasks_ocn>
155155
<ntasks_lnd>1</ntasks_lnd>
156156
<ntasks_wav>1</ntasks_wav>
@@ -171,7 +171,7 @@
171171
<rootpe_rof>0</rootpe_rof>
172172
<rootpe_cpl>0</rootpe_cpl>
173173
<rootpe_ice>128</rootpe_ice>
174-
<rootpe_ocn>256</rootpe_ocn>
174+
<rootpe_ocn>384</rootpe_ocn>
175175
<rootpe_lnd>0</rootpe_lnd>
176176
<rootpe_wav>0</rootpe_wav>
177177
<rootpe_glc>0</rootpe_glc>
@@ -180,10 +180,10 @@
180180
<pes pesize="any" compset="_DATM.+_CICE.*_MOM6(?!.*%MARBL-BIO).+_WW3">
181181
<comment>none</comment>
182182
<ntasks>
183-
<ntasks_atm>128</ntasks_atm>
184-
<ntasks_rof>128</ntasks_rof>
185-
<ntasks_cpl>128</ntasks_cpl>
186-
<ntasks_ice>128</ntasks_ice>
183+
<ntasks_atm>384</ntasks_atm>
184+
<ntasks_rof>384</ntasks_rof>
185+
<ntasks_cpl>384</ntasks_cpl>
186+
<ntasks_ice>384</ntasks_ice>
187187
<ntasks_ocn>896</ntasks_ocn>
188188
<ntasks_lnd>1</ntasks_lnd>
189189
<ntasks_wav>128</ntasks_wav>
@@ -204,19 +204,19 @@
204204
<rootpe_rof>0</rootpe_rof>
205205
<rootpe_cpl>0</rootpe_cpl>
206206
<rootpe_ice>0</rootpe_ice>
207-
<rootpe_ocn>256</rootpe_ocn>
207+
<rootpe_ocn>512</rootpe_ocn>
208208
<rootpe_lnd>0</rootpe_lnd>
209-
<rootpe_wav>128</rootpe_wav>
209+
<rootpe_wav>384</rootpe_wav>
210210
<rootpe_glc>0</rootpe_glc>
211211
</rootpe>
212212
</pes>
213213
<pes pesize="any" compset="_DATM.+_CICE.*_MOM6%[^_]*MARBL-BIO.+_WW3">
214214
<comment>none</comment>
215215
<ntasks>
216-
<ntasks_atm>128</ntasks_atm>
217-
<ntasks_rof>128</ntasks_rof>
218-
<ntasks_cpl>128</ntasks_cpl>
219-
<ntasks_ice>128</ntasks_ice>
216+
<ntasks_atm>384</ntasks_atm>
217+
<ntasks_rof>384</ntasks_rof>
218+
<ntasks_cpl>384</ntasks_cpl>
219+
<ntasks_ice>384</ntasks_ice>
220220
<ntasks_ocn>2560</ntasks_ocn>
221221
<ntasks_lnd>1</ntasks_lnd>
222222
<ntasks_wav>128</ntasks_wav>
@@ -237,9 +237,9 @@
237237
<rootpe_rof>0</rootpe_rof>
238238
<rootpe_cpl>0</rootpe_cpl>
239239
<rootpe_ice>0</rootpe_ice>
240-
<rootpe_ocn>256</rootpe_ocn>
240+
<rootpe_ocn>512</rootpe_ocn>
241241
<rootpe_lnd>0</rootpe_lnd>
242-
<rootpe_wav>128</rootpe_wav>
242+
<rootpe_wav>384</rootpe_wav>
243243
<rootpe_glc>0</rootpe_glc>
244244
</rootpe>
245245
</pes>

‎cime_config/testdefs/testmods_dirs/mom/no_stoch_physics/user_nl_mom‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
DO_SKEB=False
2+
SKEB_USE_GM=False
3+
SKEB_USE_FRICT=False

‎externals/stochastic_physics‎

‎param_templates/MOM_input.yaml‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3770,6 +3770,45 @@ Global:
37703770
added to the end of the file name. This parameter is ignored for non-ensemble runs."
37713771
datatype: string
37723772
value: ".mom6"
3773+
DO_SKEB:
3774+
description: |
3775+
"default = False
3776+
If true, then stochastically perturb the currents using the stochastic kinetic
3777+
energy backscatter scheme."
3778+
datatype: logical
3779+
units: Boolean
3780+
value:
3781+
$OCN_GRID == "tx2_3v2": True
3782+
SKEB_USE_FRICT:
3783+
description: |
3784+
"default = False
3785+
If true, adds horizontal friction dissipation rate to the SKEBS amplitude."
3786+
datatype: logical
3787+
units: Boolean
3788+
value:
3789+
$OCN_GRID == "tx2_3v2": True
3790+
SKEB_USE_GM:
3791+
description: |
3792+
"default = False
3793+
If true, adds GM work rate to the SKEBS amplitude."
3794+
datatype: logical
3795+
units: Boolean
3796+
value:
3797+
$OCN_GRID == "tx2_3v2": True
3798+
SKEB_NPASS:
3799+
description: |
3800+
"[nondim] default = 0
3801+
number of passes of a 9-point smoother of the dissipation estimate."
3802+
datatype: integer
3803+
value:
3804+
$OCN_GRID == "tx2_3v2": 8
3805+
SKEB_GM_COEF:
3806+
description: |
3807+
"[nondim] default = 0.0
3808+
Fraction of GM work that is added to backscatter rate."
3809+
datatype: real
3810+
value:
3811+
$OCN_GRID == "tx2_3v2": 0.75
37733812
CVMix_CONVECTION:
37743813
BV_SQR_CONV:
37753814
description: |
@@ -3892,45 +3931,7 @@ KPP:
38923931
datatype: real
38933932
value:
38943933
$OCN_GRID == "tx2_3v2": 5.0
3895-
DO_SKEB:
3896-
description: |
3897-
"default = False
3898-
If true, then stochastically perturb the currents using the stochastic kinetic
3899-
energy backscatter scheme."
3900-
datatype: logical
3901-
units: Boolean
3902-
value:
3903-
$OCN_GRID == "tx2_3v2": True
3904-
SKEB_USE_FRICT:
3905-
description: |
3906-
"default = False
3907-
If true, adds horizontal friction dissipation rate to the SKEBS amplitude."
3908-
datatype: logical
3909-
units: Boolean
3910-
value:
3911-
$OCN_GRID == "tx2_3v2": True
3912-
SKEB_USE_GM:
3913-
description: |
3914-
"default = False
3915-
If true, adds GM work rate to the SKEBS amplitude."
3916-
datatype: logical
3917-
units: Boolean
3918-
value:
3919-
$OCN_GRID == "tx2_3v2": True
3920-
SKEB_NPASS:
3921-
description: |
3922-
"[nondim] default = 0
3923-
number of passes of a 9-point smoother of the dissipation estimate."
3924-
datatype: integer
3925-
value:
3926-
$OCN_GRID == "tx2_3v2": 8
3927-
SKEB_GM_COEF:
3928-
description: |
3929-
"[nondim] default = 0.0
3930-
Fraction of GM work that is added to backscatter rate."
3931-
datatype: real
3932-
value:
3933-
$OCN_GRID == "tx2_3v2": 0.75
3934+
39343935
MLE:
39353936
USE_BODNER23:
39363937
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/input_nml.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ mpp_io_nml:
6060
nam_stochy:
6161
stochini:
6262
values:
63-
$CONTINUE_RUN == True: .true.
63+
$CONTINUE_RUN == True or $RUN_TYPE == "branch": .true.
6464
else: .false.
6565
new_lscale:
6666
values: .true.

‎param_templates/json/MOM_input.json‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3066,6 +3066,44 @@
30663066
"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",
30673067
"datatype": "string",
30683068
"value": ".mom6"
3069+
},
3070+
"DO_SKEB": {
3071+
"description": "\"default = False\nIf true, then stochastically perturb the currents using the stochastic kinetic\nenergy backscatter scheme.\"\n",
3072+
"datatype": "logical",
3073+
"units": "Boolean",
3074+
"value": {
3075+
"$OCN_GRID == \"tx2_3v2\"": true
3076+
}
3077+
},
3078+
"SKEB_USE_FRICT": {
3079+
"description": "\"default = False\nIf true, adds horizontal friction dissipation rate to the SKEBS amplitude.\"\n",
3080+
"datatype": "logical",
3081+
"units": "Boolean",
3082+
"value": {
3083+
"$OCN_GRID == \"tx2_3v2\"": true
3084+
}
3085+
},
3086+
"SKEB_USE_GM": {
3087+
"description": "\"default = False\nIf true, adds GM work rate to the SKEBS amplitude.\"\n",
3088+
"datatype": "logical",
3089+
"units": "Boolean",
3090+
"value": {
3091+
"$OCN_GRID == \"tx2_3v2\"": true
3092+
}
3093+
},
3094+
"SKEB_NPASS": {
3095+
"description": "\"[nondim] default = 0\n number of passes of a 9-point smoother of the dissipation estimate.\"\n",
3096+
"datatype": "integer",
3097+
"value": {
3098+
"$OCN_GRID == \"tx2_3v2\"": 8
3099+
}
3100+
},
3101+
"SKEB_GM_COEF": {
3102+
"description": "\"[nondim] default = 0.0\nFraction of GM work that is added to backscatter rate.\"\n",
3103+
"datatype": "real",
3104+
"value": {
3105+
"$OCN_GRID == \"tx2_3v2\"": 0.75
3106+
}
30693107
}
30703108
},
30713109
"CVMix_CONVECTION": {
@@ -3174,44 +3212,6 @@
31743212
"value": {
31753213
"$OCN_GRID == \"tx2_3v2\"": 5.0
31763214
}
3177-
},
3178-
"DO_SKEB": {
3179-
"description": "\"default = False\nIf true, then stochastically perturb the currents using the stochastic kinetic\nenergy backscatter scheme.\"\n",
3180-
"datatype": "logical",
3181-
"units": "Boolean",
3182-
"value": {
3183-
"$OCN_GRID == \"tx2_3v2\"": true
3184-
}
3185-
},
3186-
"SKEB_USE_FRICT": {
3187-
"description": "\"default = False\nIf true, adds horizontal friction dissipation rate to the SKEBS amplitude.\"\n",
3188-
"datatype": "logical",
3189-
"units": "Boolean",
3190-
"value": {
3191-
"$OCN_GRID == \"tx2_3v2\"": true
3192-
}
3193-
},
3194-
"SKEB_USE_GM": {
3195-
"description": "\"default = False\nIf true, adds GM work rate to the SKEBS amplitude.\"\n",
3196-
"datatype": "logical",
3197-
"units": "Boolean",
3198-
"value": {
3199-
"$OCN_GRID == \"tx2_3v2\"": true
3200-
}
3201-
},
3202-
"SKEB_NPASS": {
3203-
"description": "\"[nondim] default = 0\n number of passes of a 9-point smoother of the dissipation estimate.\"\n",
3204-
"datatype": "integer",
3205-
"value": {
3206-
"$OCN_GRID == \"tx2_3v2\"": 8
3207-
}
3208-
},
3209-
"SKEB_GM_COEF": {
3210-
"description": "\"[nondim] default = 0.0\nFraction of GM work that is added to backscatter rate.\"\n",
3211-
"datatype": "real",
3212-
"value": {
3213-
"$OCN_GRID == \"tx2_3v2\"": 0.75
3214-
}
32153215
}
32163216
},
32173217
"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)