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

group call to apply_fedep together with other routines for external inputs #350

Merged
merged 1 commit into from
Jun 3, 2024
Merged

group call to apply_fedep together with other routines for external inputs #350

merged 1 commit into from
Jun 3, 2024

Conversation

JorgSchwinger
Copy link
Contributor

This PR provides a minor improvement of HAMOCC's code logic by grouping together all calls to routines that provide external inputs (dust, N-deposition, riverine input). Results are not bit-for-bit, but the differences are very small (tested with a 200 year NOINYOC_T62_tn21 run).

If there are preferences to wait with this PR until after #269 is merged please indicate this here.

@TomasTorsvik TomasTorsvik added this to the NorESM2.3 - BLOM/iHAMOCC milestone May 30, 2024
@TomasTorsvik TomasTorsvik added the iHAMOCC Issue mainly concerns the iHAMOCC code base label May 30, 2024
Copy link
Contributor

@TomasTorsvik TomasTorsvik left a comment

Choose a reason for hiding this comment

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

@JorgSchwinger - looks fine to me, but I suggest to put it on hold until #269 is merged as we are already in the testing phase for #269.

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.

Thanks for taking care of this. Approved. It might be even mergable without conflicts even after #269 .

@TomasTorsvik
Copy link
Contributor

@JorgSchwinger , @jmaerz - I see there is a conflict in mo_hamocc4bcm with this PR. Unless it's important to keep the history of this PR, it may be easier to just create a new branch from current master and re-apply the changes to mo_hamocc4bcm (rather than to merge master into the fix-move_dust branch, resolve the merge conflict there, and then merge fix-move_dust with master).

@JorgSchwinger
Copy link
Contributor Author

@TomasTorsvik it was only a very small change, so easy to fix. I will merge this PR now.

@JorgSchwinger JorgSchwinger merged commit d3ec954 into NorESMhub:master Jun 3, 2024
6 checks passed
@JorgSchwinger JorgSchwinger deleted the fix-move_dust branch June 3, 2024 05:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
iHAMOCC Issue mainly concerns the iHAMOCC code base
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants