Improvements to tke diagnostic#487
Conversation
| class vn31_t487(MacroUpgrade): | ||
| # Upgrade macro for #487 by Adrian Lock | ||
|
|
||
| BEFORE_TAG = "vn3.1_t368" |
There was a problem hiding this comment.
Hi Adrian, This Before Tag should be vn3.1 as the branch currently is (it might change when main is merged in).
There was a problem hiding this comment.
Thanks James. Ah, I was thinking I would need to follow the revision in the lfric_atm/rose-app.conf, ie https://github.com/Adrian-Lock/lfric_apps/blob/main905c_improve_tke_diag/rose-stem/app/lfric_atm/rose-app.conf, but that's not the case then? This branch is made from main (at revision ...905c) because I didn't want major clashes with Ben's removal of j-loops.
There was a problem hiding this comment.
No, it should use the latest AFTER_TAG of the versions.py file they're in, which in this case is still the latest release. This also means that if you were to add multiple macros in the same PR they might have different BEFORE_TAGs.
When apply_macros.py gets run it will copy this macro to places which use um-boundary_layer metadata and update the BEFORE_TAG to match the correct for that file.
There was a problem hiding this comment.
OK, thanks, that makes sense and now fixed.
James Bruten (james-bruten-mo)
left a comment
There was a problem hiding this comment.
Cheers, macro looks good now
Co-authored-by: iboutle <135141261+iboutle@users.noreply.github.com>
Co-authored-by: iboutle <135141261+iboutle@users.noreply.github.com>
Co-authored-by: iboutle <135141261+iboutle@users.noreply.github.com>
MichaelWhitall
left a comment
There was a problem hiding this comment.
Many thanks for this Adrian; I've looked through the branch and I think I've satisfied myself this is implementing exactly the same changes as the equivalent UM branch where I've copied the related code from the comorph_dev branch: https://github.com/MetOffice/um/compare/main...MichaelWhitall:um:vn14.1_improve_tke_diag
Just a couple of quick questions Re where I've spotted differences between the above UM branch and the changes here (I think there are good reasons but can I just check I've correctly understood the code?); see the in-line comments...
Cheers!
Mike
MichaelWhitall
left a comment
There was a problem hiding this comment.
That's great, thanks lots for clarifying; that's great you've been tidying-up and removing code for unused options! Sci/Tech review approved.
Cheers!
Mike
|
Hi Adrian, would it be possible to resolve the conflicts on the branch and ill start testing :), thanks. Adrian Lock (@Adrian-Lock) |
|
No problem, conflicts merged. I've left the checksums as they were, because main has added a new namelist variable to the comorph_dev app and so those will need to be updated with the data from the merged branch. Is that something you can do? |
|
Yes thank you for the resovling that. Yeah leave it with me thank you. |
PR Summary
Sci/Tech Reviewer: MichaelWhitall
Code Reviewer: Cameron Bateman (@cameronbateman-mo)
The boundary layer scheme diagnoses a vertical velocity variance (w_var, and thence turbulent kinetic energy, TKE) that is used by other physics parametrizations to quantify subgrid variability. In the CoMorph convection scheme, for example, the ratio Km/sqrt(w_var) is used as the turbulence length-scale. However, issues with both the local and non-local contributions to TKE have been identified and those are corrected here. The corrections are controlled via the namelist logocal
improved_tke_diagEquivalent changes in the UM: vn14.1_improve_tke_diag
closes #232
Code Quality Checklist
Testing
trac.log
Test Suite Results - lfric_apps - main905c_improve_tke_diag/run4
Suite Information
Task Information
❌ failed tasks - 5
⌛ waiting tasks - 2
Test branch (from main with kgo updated) and update macro applied:
test2_improve_tke_diag
trac.log:
Test Suite Results - lfric_apps - test2_improve_tke_diag/run1
Suite Information
Task Information
✅ succeeded tasks - 1536
Security Considerations
Performance Impact
AI Assistance and Attribution
Documentation
Needs to be added to the Boundary Layer documentation paper but will have to wait until it is ported. I've opened issue #490 to do this separately.
PSyclone Approval
Sci/Tech Review
**As noted above, adding documentation for this change is pending the boundary-layer scheme doc being ported into lfric_apps (underway in PR #465) and will be addressed in a later PR.(Please alert the code reviewer via a tag when you have approved the SR)
Code Review