Improved blending of 1D and 3D turbulence schemes - #752
Adrian Lock (Adrian-Lock) wants to merge 28 commits into
Conversation
…hallow CTH instead of zhpar
iboutle
left a comment
There was a problem hiding this comment.
Thanks Adrian,
My main comment is around the new test being introduced. blopt4 is a bit opaque, especially given this magic number doesn't really mean anything in the lfric namelist. But also, I'm reluctant to end up with a plethora of different tests for every individual namelist option. So...
- how about calling the test
raldev, and it can be built on with other things aimed at future RAL releases - In the optional config, instead of duplicating everything from the ral3 config, just include the bits which you need that are different from the ral3 config, and then include both when setting up the test.
- Call the optional config something descriptive like
blend_shcuor suchlike.- To get the metadata checker not to fail, you may have to include slightly more than you need here, as it needs to be a valid config that can be applied to the base app. That probably just means including the options needed to switch Smagorinsky on, since that is off in the base app.
Thanks!
…w options under a better named blend_shcu opt file
No, there's no way around this - PRs are always attached to a single branch, and branches headed for main will always have main merged onto them at some point prior to commit - so it's generally not a good idea to put "vn3.2" in the branch name of anything headed to main. What you can do is tag the revision of the branch prior to merging main on: |
|
Sorry, that was co-pilot's suggestion to rename the branch, which it claimed would mean github would then automatically update the PR to the new name. Rather than close the PR, which is what it actually did! Presumably it interpreted the rename as a deletion of the vn3.2 branch. At least it would let me reinstate the old vn3.2 branch and then reopen this PR. Interestingly I now have a copy of my vn3.2 branch ("main_blending_opt4" that I attempted to rename it to) but that's going to be even more confusing if I upgrade my vn3.2 branch to main, so I'll just delete that one! Sorry about this... |
I hope it's ok but I've gone for now with adding my two new namelist variables ( |
|
My rose stem developer test with main merged into vn3.2_blending_opt4 has passed everything except the |
|
Thank you for reflecting my comments. I apologize that I missed the bug in OMP directive. I confirmed everything looks fine. So, I am happy to pass this PR to Code reviewer.
Yes, I agree with your suggestion. I will resolve conflicts in my branch (in #734) flexibly if the timing of merge is after yours. |
|
Just managed to recreate the trac.log for my merged-main revision so now pasted into this PR. I've also updated the kgo in the branch, consistent with the evolution of main from stable |
James Bruten (james-bruten-mo)
left a comment
There was a problem hiding this comment.
A couple of code owner requests from me
| BEFORE_TAG = "vn3.2_t479" | ||
| AFTER_TAG = "vn3.2_t752" | ||
|
|
||
| def upgrade(self, config, meta_config=None): |
There was a problem hiding this comment.
I think you need a second self.add_setting for the shallow_cu_maxtop variable
There was a problem hiding this comment.
Oh yes, good spot, thanks. Bizarrely, I'd also left out the return config, self.reports, maybe in the merge of main (not sure why it still worked), so added that back in too.
| "wallclock": 20, | ||
| "build_memory": [1, "GB"], | ||
| "build_wallclock": 25, | ||
| "build_wallclock": 45, |
There was a problem hiding this comment.
Could you revert these changes please - the issue with the builds timing out is more complex that just the time limit being too short
There was a problem hiding this comment.
Done in latest commit
|
|
||
| inherit={{local_build_inherit|upper}} | ||
| execution time limit = PT25M | ||
| execution time limit = PT40M |
There was a problem hiding this comment.
Same as the default directives file
There was a problem hiding this comment.
Done in latest commit
|
Thanks James Bruten (@james-bruten-mo). I think I've corrected those and I reran the macro on a test branch to make sure it still worked, which it did. |
James Bruten (james-bruten-mo)
left a comment
There was a problem hiding this comment.
Thanks Adrian, all good for my parts now
|
Just removed the end-of-line white space I'd added in the documentation, that was causing lint sphinx errors. Many thanks, Shusuke, for pointing those out |
| vertical mixing was beneficial for the development of the convection, | ||
| and that without this a widespread stratiform cloud layer could develop | ||
| instead. | ||
| Under ``blending_option``\ :math:`=`\ 4, then, if such a shallow cumulus |
There was a problem hiding this comment.
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.
|
Thank you for reflecting my comment. Although I have no idea why sphinx check wasn't triggered in the latest revision, I confirmed trailing-whitespace has been removed. So, I am happy to approve again. |
PR Summary
Sci/Tech Reviewer: Shusuke Nishimoto (@mo-snishimoto)
Code Reviewer: Ricky Wong (@mo-rickywong)
RMED problem #111 and development ticket #113 document problems found with the scale-aware wind gust diagnostic (stash 3515) that are much improved by these revisions to the
method= 'blend_cth_shcu_only'option for how the 1D column and 3D Smagorinsky turbulence schemes are blended as a function of resolution. There is also potential for small benefit from including an additional new option(cap_blended_ml)to cap the blended length scale to be at most the physical length scale from the 1D scheme.Code Quality Checklist
Testing
trac.log
Test Suite Results - lfric_apps - testmain_blending_opt4/run1
Suite Information
Task Information
❌ failed tasks - 3
⌛ waiting tasks - 2
Security Considerations
Performance Impact
AI Assistance and Attribution
Documentation
PSyclone Approval
Sci/Tech Review
(Please alert the code reviewer via a tag when you have approved the SR)
Code Review