revert mistaken merge in tasks_lfric_atm.cylc

[mo-marqh]

PR Summary

Sci/Tech Reviewer:
Code Reviewer:

The merged change #214 altered the setup of the lfric_atm task dict, but part of that change was reverted by #163

this looks like a merge error, a chunk of code was added, and a chunk of code removed by #214 next door was re-inserted.
perhaps a conflict resolution error?

this change restores the configuration of C896 tests to the state as mandated by #214

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

[mo-marqh]

Tom Hill (@tom-j-h) please may you cross check this change and compare
mo-marqh@376f3a8#diff-b3eb2de2973fad9d752853ffe3ac899ca7710fddbec0504716ed2040329968c2

to the intent for #163

I think that the re-insertion of the configuration for C896 was not related to your change, and essentially backed out part of #214

Please may you share your opinion on this?

[iboutle]

I concur with your analysis that this was a mistake in the merge - this is much easier to do now because github doesn't automatically resolve the changes within file when there aren't conflicts like fcm did, but relies on the author to select each difference by hand, which can easily result in the wrong one being selected!

[Tom Hill (tom-j-h)]

Yes, looks like I made a mistake merging main at some point. Thanks for fixing.