Skip to content

Add rainfall_flux diagnostics at day/mon/6hr frequencies (issue #667) - #680

Open
Zubair Maalick (zmaalick) wants to merge 1 commit into
MetOffice:mainfrom
zmaalick:667_diagnostics_rainfall_flux
Open

Add rainfall_flux diagnostics at day/mon/6hr frequencies (issue #667)#680
Zubair Maalick (zmaalick) wants to merge 1 commit into
MetOffice:mainfrom
zmaalick:667_diagnostics_rainfall_flux

Conversation

@zmaalick

@zmaalick Zubair Maalick (zmaalick) commented Jul 30, 2026

Copy link
Copy Markdown

Implements three output configurations for the rainfall_flux diagnostic (UM STASH m01s05i214, lbproc=128):

  • Daily mean over land: new Group A field processed__rainfall_flux_land (= processed__total_rain * surface__land_fraction) added to the daily averaged group in file_def_diags_gal_clim.xml.
  • Monthly mean: processed__total_rain added to a new monthly output file (lfric_diagnostics_monthly, output_freq=1mo) in file_def_diags_gal_clim.xml.
  • 6-hourly mean: processed__total_rain added to a new lfric_gl_std_levs_diags_6hr file block in file_def_diags_oper_nwp_gl.xml.

Registry-only change; no Fortran/kernel/algorithm edits.

PR Summary

Sci/Tech Reviewer:
Code Reviewer: allynt

Code Quality Checklist

  • I have performed a self-review of my own code
  • My code follows the project's style guidelines
  • Comments have been included that aid understanding and enhance the readability of the code
  • My changes generate no new warnings
  • All automated checks in the CI pipeline have completed successfully

Testing

  • I have tested this change locally, using the LFRic Apps rose-stem suite
  • If any tests fail (rose-stem or CI) the reason is understood and acceptable (e.g. kgo changes)
  • I have added tests to cover new functionality as appropriate (e.g. system tests, unit tests, etc.)
  • Any new tests have been assigned an appropriate amount of compute resource and have been allocated to an appropriate testing group (i.e. the developer tests are for jobs which use a small amount of compute resource and complete in a matter of minutes)

trac.log

Security Considerations

  • I have reviewed my changes for potential security issues
  • Sensitive data is properly handled (if applicable)
  • Authentication and authorisation are properly implemented (if applicable)

Performance Impact

  • Performance of the code has been considered and, if applicable, suitable performance measurements have been conducted

AI Assistance and Attribution

  • Some of the content of this change has been produced with the assistance of Generative AI tool name (e.g., Met Office Github Copilot Enterprise, Github Copilot Personal, ChatGPT GPT-4, etc) and I have followed the Simulation Systems AI policy (including attribution labels)

Documentation

  • Where appropriate I have updated documentation related to this change and confirmed that it builds correctly

PSyclone Approval

  • If you have edited any PSyclone-related code (e.g. PSyKAl-lite, Kernel interface, optimisation scripts, LFRic data structure code) then please contact the TCD Team

Sci/Tech Review

  • I understand this area of code and the changes being added
  • The proposed changes correspond to the pull request description
  • Documentation is sufficient (do documentation papers need updating)
  • Sufficient testing has been completed

(Please alert the code reviewer via a tag when you have approved the SR)

Code Review

  • All dependencies have been resolved
  • Related Issues have been properly linked and addressed
  • CLA compliance has been confirmed
  • Code quality standards have been met
  • Tests are adequate and have passed
  • Documentation is complete and accurate
  • Security considerations have been addressed
  • Performance impact is acceptable

…fice#667)

Implements three output configurations for the rainfall_flux diagnostic
(UM STASH m01s05i214, lbproc=128):

- Daily mean over land: new Group A field processed__rainfall_flux_land
  (= processed__total_rain * surface__land_fraction) added to the daily
  averaged group in file_def_diags_gal_clim.xml.
- Monthly mean: processed__total_rain added to a new monthly output file
  (lfric_diagnostics_monthly, output_freq=1mo) in file_def_diags_gal_clim.xml.
- 6-hourly mean: processed__total_rain added to a new lfric_gl_std_levs_diags_6hr
  file block in file_def_diags_oper_nwp_gl.xml.

Registry-only change; no Fortran/kernel/algorithm edits.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@github-actions github-actions Bot added the cla-required The CLA has not yet been signed by the author of this PR - added by GA label Jul 30, 2026
@github-actions

Copy link
Copy Markdown

Hello Zubair Maalick (@zmaalick)! 👋

Thank you for your contribution. Since this is your first time contributing to this repository, we ask that you sign our Contributor Licence Agreement (CLA).

📄 You can read the CLA here.

To agree to the CLA, please add your details (GitHub username, Real Name, Affiliation, and Date) to the CONTRIBUTORS.md file (create one, if required) in the development branch for this PR. After signing the CLA, you won't need to do this again for future PRs.

@iboutle iboutle left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Zubair,

I've asked Jon for clarification, but he's away at the moment. Adding the new land-rainfall diagnostic to field_def_diags is fine.

However, I don't think you should be editing anything currently in the rose-stem suite, as none of these jobs are relevant for the CMIP diagnostics which you are adding. I've asked Jon whether we want to create a new test for the CMIP diagnostics, or whether we are happy that since they are just basic time processing of existing diagnostics, we don't need bespoke testing, it's just something that will need setting up in the actual CMIP standalone suites.

But for now, please revert any changes to the rose-stem directory.

Thanks!

@iboutle

iboutle commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

Hi Zubair,

I've asked Jon for clarification, but he's away at the moment. Adding the new land-rainfall diagnostic to field_def_diags is fine.

However, I don't think you should be editing anything currently in the rose-stem suite, as none of these jobs are relevant for the CMIP diagnostics which you are adding. I've asked Jon whether we want to create a new test for the CMIP diagnostics, or whether we are happy that since they are just basic time processing of existing diagnostics, we don't need bespoke testing, it's just something that will need setting up in the actual CMIP standalone suites.

But for now, please revert any changes to the rose-stem directory.

Thanks!

It also occurs to me that the land rainfall flux diagnostic might be wrong - what is produced here is the land fraction multiplied by the rainfall flux. Whereas I'm wondering if what is actually produced in the UM is simply the rainfall falling on any land points (i.e. the field is zeroed over sea). I'm not sure though, as the stash request is just for the total rainfall, so there must be some post-processing or other processing happening here. So actually please check if this should just be a masked version of the rainfall diagnostic (and again then probably worth a discussion with Jon whether this is best done in-model or in post-processing)

@jonseddon

Copy link
Copy Markdown

Hi iboutle thanks for all of the advice on this one. We suspect that there's a bug in UKNCSP/CDDS-CMIP7-mappings#763, which was used to generate the mapping spreadsheet. The variable should actually be output on all points. The land mask is only applied in post-processing, outside of the model.

Zubair Maalick (@zmaalick) would you be able to update the PR in light of iboutle's comment and the bug in the mappings so that the output is on all model points please?

@iboutle

iboutle commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

Hi iboutle thanks for all of the advice on this one. We suspect that there's a bug in UKNCSP/CDDS-CMIP7-mappings#763, which was used to generate the mapping spreadsheet. The variable should actually be output on all points. The land mask is only applied in post-processing, outside of the model.

Zubair Maalick (Zubair Maalick (@zmaalick)) would you be able to update the PR in light of iboutle's comment and the bug in the mappings so that the output is on all model points please?

In which case I don't think there is anything for you to do here, because the rainfall_flux is already available on all points, so nothing new needs adding.

As an aside, as you mentioned this morning, it would certainly be possible to put the masking function into the model rather than as a post-processing step.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-required The CLA has not yet been signed by the author of this PR - added by GA

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants