Skip to content
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

fix sedfluxb for release-1.6 branch #402

Merged
merged 1 commit into from
Sep 13, 2024

Conversation

TomasTorsvik
Copy link
Contributor

Same as PR #401 , but for release-1.6

@TomasTorsvik TomasTorsvik added the bug Something isn't working label Sep 13, 2024
@TomasTorsvik TomasTorsvik added this to the NorESM2.3 - BLOM/iHAMOCC milestone Sep 13, 2024
@TomasTorsvik TomasTorsvik self-assigned this Sep 13, 2024
Copy link
Collaborator

@jmaerz jmaerz left a comment

Choose a reason for hiding this comment

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

Hi @TomasTorsvik , thanks for providing this fix in the release branch. Any chance to cherry pick this bug fix on top of former release branches (i.e. BLOM version for NorESM2.1(?) that enables MCT-based, to large extend CMIP6-backward-compatible BLOM runs)?

@TomasTorsvik
Copy link
Contributor Author

Hi @TomasTorsvik , thanks for providing this fix in the release branch. Any chance to cherry pick this bug fix on top of former release branches (i.e. BLOM version for NorESM2.1(?) that enables MCT-based, to large extend CMIP6-backward-compatible BLOM runs)?

@jmaerz - I'm happy to have this fix also for NorESM2.1, I didn't check if it was relevant for release-1.5. I guess we don't do bug fixes for NorESM2.0 (unless it was introduced there at some stage after v2.0.1).

In this case I found it easier to just re-apply the code change. With cherry-pick I'm always a bit nervous about pulling in changes that were not intended, but in principle I don't have anything against it.

@TomasTorsvik TomasTorsvik merged commit 0b45bd7 into NorESMhub:release-1.6 Sep 13, 2024
6 checks passed
@TomasTorsvik TomasTorsvik deleted the r1.6_fix_sedfluxb branch September 13, 2024 12:38
@jmaerz
Copy link
Collaborator

jmaerz commented Sep 13, 2024

I fear, it was introduced with the N-cycle #269 ( 916352e) - hence any release afterward (+ NorESM pointing to those releases)... I am really sorry for this hassle.

@TomasTorsvik
Copy link
Contributor Author

@jmaerz - No worries. I gather this doesn't affect release-1.5 in that case?

@jmaerz
Copy link
Collaborator

jmaerz commented Sep 13, 2024

Hi @TomasTorsvik , trying to browse through the release history, yes, it would affect 1.6.0 onward. As far as I understand, changing the BLOM user_nl should enable running the model in a mode that is to large extend backwards compatible (apart from small bug fixes like the sediment sinking, sediment alkalinity, etc.) - trying to figure this out through #354 which means that the current fix should suffice then. Thanks again!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants