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
Merged
James Bruten (james-bruten-mo)
merged 40 commits into
MetOffice:main
from
Adrian-Lock:vn3.2_blending_opt4
Oct 23, 2026
Merged
Changes from 37 commits
Commits
Show all changes
40 commits
Select commit
Hold shift + click to select a range
878b733
Add meta data fro blending option 4
Adrian-Lock ab43d37
Bug fixes
Adrian-Lock 3a5cf6e
Extras for blending opt4: include blended L cap by 1d L; use actual s…
Adrian-Lock 3874e79
Add code needed in bdy_expl2
Adrian-Lock 270f63c
Put mixing length cap on its own switch, cap_blended_ml
Adrian-Lock ab7db55
Merge branch 'vn3.1_blending_opt4' into vn3.2_blending_opt4
Adrian-Lock 813ed93
Add upgrade macro
Adrian-Lock da7a76a
Add new code documentation
Adrian-Lock 60dcdc6
Add rose stem test for new options
Adrian-Lock ffb8522
Add rose stem test resources
Adrian-Lock c6fdd1f
Add checksums for new rose stem tasks
Adrian-Lock 0fb3ab2
Fixes for unit tests
Adrian-Lock d0f6bcd
And add my other new namelist variable to the unit tests
Adrian-Lock b44202e
Following reviewer suggestion to add a ral_dev task and include my ne…
Adrian-Lock 0ae3208
Correct name of opt file
Adrian-Lock f625c55
Change name to cumulus_cth, as suggested by sci-tech reviewer
Adrian-Lock ca0fc68
Manual merge from #730, increase build times on AzSpice
Adrian-Lock 883e980
Add checksum for new ral_dev task
Adrian-Lock 5c1d525
Update checksum for azspice
Adrian-Lock 33b4eb0
Update checksum and correct README file
Adrian-Lock 60a23e8
Suggestions from sci-tech review
Adrian-Lock 1d41171
Merge remote-tracking branch 'origin' into vn3.2_blending_opt4
Adrian-Lock f0ca8a8
Update new lfric unit tests with my new namelist variables
Adrian-Lock b8fe776
Correct upgrade macro
Adrian-Lock a8deda2
Bug fix
Adrian-Lock 942c88e
Add revised checksums to be consistent with changes on main
Adrian-Lock f7eda4e
Code reviewer responses: correct upgrade macro and revert AzSpice tim…
Adrian-Lock ed48fbf
Remove end-of-line whitespace from new documentation
Adrian-Lock fd7c127
Update science/gungho/rose-meta/lfric-gungho/HEAD/rose-meta.conf
Adrian-Lock deef98d
Updates to rose-meta.conf from code review
Adrian-Lock 1963746
Apply suggestion from @mo-rickywong
Adrian-Lock eab63a8
Apply suggestion from @mo-rickywong
Adrian-Lock b499158
Update ex_coef.F90
Adrian-Lock bea6d4e
Update ex_coef.F90
Adrian-Lock 26c0353
Update rose-meta.conf
Adrian-Lock fdad8b1
Update rose-meta.conf
Adrian-Lock 5ab3f6e
lowercase min
Adrian-Lock 4404a1c
Merge branch 'main' into vn3.2_blending_opt4
james-bruten-mo bddc22b
apply macros
james-bruten-mo 91963a7
update kgos
james-bruten-mo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
...gos/lfric_atm/azspice/checksum_lfric_atm_ral_dev-seuk_MG_azspice_gnu_fast-debug-32bit.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
9 changes: 9 additions & 0 deletions
9
...meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral_dev-seuk_MG_ex1a_cce_fast-debug-32bit.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -3768,7 +3768,7 @@ type=real | |||||||
|
|
||||||||
| [namelist:mixing=method] | ||||||||
| compulsory=true | ||||||||
| description=Smagorinsky subgrid mixing scheme option | ||||||||
| description=Smagorinsky (Smag) subgrid mixing scheme option | ||||||||
| !enumeration=true | ||||||||
| help=Options for Smagorinsky subgrid mixing scheme: | ||||||||
| =_________________________________________________________________ | ||||||||
|
|
@@ -3786,12 +3786,42 @@ help=Options for Smagorinsky subgrid mixing scheme: | |||||||
| =_________________________________________________________________ | ||||||||
| =Blended scheme + 1D BL above | ||||||||
| = As above, but relaxes to 1D BL above BL | ||||||||
| =_________________________________________________________________ | ||||||||
| =Blended scheme only using cloud top in shallow clouds | ||||||||
| = As above, but use cloud-top height as blending length-scale only | ||||||||
| = for shallow cumulus clouds | ||||||||
| = | ||||||||
| = 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 Smag, 2D Smag + 1D BL, Blended scheme + Smag above, | ||||||||
| =Blended scheme + 1D BL above, Blended scheme using cloud top only in shallow clouds | ||||||||
| 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 at the 1D | ||||||||
| help=In the the blended subgrid mixing scheme (namelist:mixing=method) the physical | ||||||||
| =mixing length from the one-dimensional scheme is combined with the grid-dependent | ||||||||
| =Smagorinsky mixing length. This option caps this blended mixing length to be at | ||||||||
| =most the one dimensional mixing length | ||||||||
| !kind=default | ||||||||
| sort-key=Panel-A05a | ||||||||
| type=logical | ||||||||
|
|
||||||||
| [namelist:mixing=shallow_cu_maxtop] | ||||||||
| compulsory=true | ||||||||
| description=Max. permitted cloud top height for shallow cloud blending | ||||||||
| help=The maximum permitted cloud top height (in metres) for shallow cumulus clouds | ||||||||
| =to be diagnosed. This is used in the blending weight length-scale calculation | ||||||||
| =when "Blended scheme using cloud top only in shallow clouds" is selected for | ||||||||
| =the blended subgrid mixing scheme (namelist:mixing=method). | ||||||||
| !kind=default | ||||||||
| range=0.0: | ||||||||
| 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 | ||||||||
|
|
||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.