Repository navigation
Improved blending of 1D and 3D turbulence schemes #752
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.
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
Changes from 27 commits
878b733
ab43d37
3a5cf6e
3874e79
270f63c
ab7db55
813ed93
da7a76a
60dcdc6
ffb8522
c6fdd1f
0fb3ab2
d0f6bcd
b44202e
0ae3208
f625c55
ca0fc68
883e980
5c1d525
33b4eb0
60a23e8
1d41171
f0ca8a8
b8fe776
a8deda2
942c88e
f7eda4e
ed48fbf
fd7c127
deef98d
1963746
eab63a8
b499158
bea6d4e
26c0353
fdad8b1
5ab3f6e
4404a1c
bddc22b
91963a7
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
|
Adrian-Lock marked this conversation as resolved.
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| [namelist:mixing] | ||
| cap_blended_ml=.true. | ||
| method='blend_cth_shcu_only' | ||
| shallow_cu_maxtop=3000.0 | ||
| smagorinsky=.true. |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| Inner product checksum rho = 4839977E | ||
| Inner product checksum theta = 5135493C | ||
| Inner product checksum u = 612F4556 | ||
| Inner product checksum mr1 = 4090F41B | ||
| Inner product checksum mr2 = 35AC7EDC | ||
| Inner product checksum mr3 = 2FA559EC | ||
| Inner product checksum mr4 = 33F4FDAE | ||
| Inner product checksum mr5 = BEDF860 | ||
| Inner product checksum mr6 = 0 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| Inner product checksum rho = 483997BF | ||
| Inner product checksum theta = 5135495F | ||
| Inner product checksum u = 612F491D | ||
| Inner product checksum mr1 = 4090F962 | ||
| Inner product checksum mr2 = 35B6E523 | ||
| Inner product checksum mr3 = 2FA5A395 | ||
| Inner product checksum mr4 = 33F4FE66 | ||
| Inner product checksum mr5 = BECFC40 | ||
| Inner product checksum mr6 = 0 |
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -3786,12 +3786,38 @@ help=Options for Smagorinsky subgrid mixing scheme: | |||||||||||||||||||
| =_________________________________________________________________ | ||||||||||||||||||||
| =Blended scheme + 1D BL above | ||||||||||||||||||||
| = As above, but relaxes to 1D BL above BL | ||||||||||||||||||||
| =_________________________________________________________________ | ||||||||||||||||||||
| =Blended scheme + cloud-top of for shallow cu | ||||||||||||||||||||
| = As above, but use cloud-top as blending length-scale only for | ||||||||||||||||||||
| = shallow cu | ||||||||||||||||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. CTH is used in the option title without explicit reference to what is being referred to. |
||||||||||||||||||||
| = | ||||||||||||||||||||
| = WARNING: This option currently does not conserve energy and as | ||||||||||||||||||||
| = a result may be unstable. | ||||||||||||||||||||
| = WARNING: This option will only conserve if | ||||||||||||||||||||
| = conservative_diffusion is true | ||||||||||||||||||||
| sort-key=Panel-A05 | ||||||||||||||||||||
| value-titles=3D Smagorinsky, 2D Smagorinsky + 1D BL, Blended scheme + Smag above, Blended scheme + 1D BL above | ||||||||||||||||||||
| values='3d_smag', '2d_smag', 'blend_smag_fa','blend_1dbl_fa' | ||||||||||||||||||||
| trigger=namelist:mixing=shallow_cu_maxtop: 'blend_cth_shcu_only' ; | ||||||||||||||||||||
|
Adrian-Lock marked this conversation as resolved.
|
||||||||||||||||||||
| =namelist:mixing=cap_blended_ml: 'blend_smag_fa', 'blend_1dbl_fa', 'blend_cth_shcu_only' ; | ||||||||||||||||||||
| value-titles=3D Smagorinsky, 2D Smagorinsky + 1D BL, Blended scheme + Smag above, | ||||||||||||||||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||||||||||||||||||||
| =Blended scheme + 1D BL above, Blended scheme with CTH for shallow cu only | ||||||||||||||||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||||
| values='3d_smag', '2d_smag', 'blend_smag_fa','blend_1dbl_fa','blend_cth_shcu_only' | ||||||||||||||||||||
|
|
||||||||||||||||||||
| [namelist:mixing=cap_blended_ml] | ||||||||||||||||||||
| compulsory=true | ||||||||||||||||||||
| description=Cap the blended mixing length by the 1D | ||||||||||||||||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||||||||||||||||||||
| help=If true this caps the magnitude of the blended 1D-3D mixing length | ||||||||||||||||||||
| =by the 1D mixing length | ||||||||||||||||||||
|
Adrian-Lock marked this conversation as resolved.
Outdated
|
||||||||||||||||||||
| !kind=default | ||||||||||||||||||||
| sort-key=Panel-A05a | ||||||||||||||||||||
| type=logical | ||||||||||||||||||||
|
|
||||||||||||||||||||
| [namelist:mixing=shallow_cu_maxtop] | ||||||||||||||||||||
| compulsory=true | ||||||||||||||||||||
| description=Max permitted cloud top height for shallow cu blending | ||||||||||||||||||||
| help=The maximum permitted cloud top height (in metres) for shallow cumulus | ||||||||||||||||||||
| =to be diagosed, as then used for method=blending_option=blend_cth_shcu_only | ||||||||||||||||||||
| =to use the cumulus parcel top height as the length scale in the blending weight | ||||||||||||||||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
These don't read right to the general user and has link errors, Please review suggested text |
||||||||||||||||||||
| !kind=default | ||||||||||||||||||||
| sort-key=Panel-A05b | ||||||||||||||||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Assume the max cloud top height needs to be +ve? |
||||||||||||||||||||
| type=real | ||||||||||||||||||||
|
|
||||||||||||||||||||
| [namelist:mixing=mix_factor] | ||||||||||||||||||||
| compulsory=true | ||||||||||||||||||||
|
|
||||||||||||||||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I apologize for conducting the review while you were still working on. I missed the comment from two posts ago. Thank you for replacing trac.log with latest one. I think it looks fine.
And I also noticed that there seem trailing-whitespaces in the documentation (from L2127 to L2141 in
bl_scheme_doc.rst) as alerted by the the automated checks. I am so sorry for letting you know after approving once.