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

Incorporate more WAM changes from IFS CY49R1 #37

Merged

Conversation

cxzk
Copy link
Contributor

@cxzk cxzk commented Oct 23, 2024

This incorporates more changes that were done in ecWAM in IFS CY49R1 (where it's still integrated into the IFS source) into the standalone version of ecWAM.

NOTE: this is ideally needed in a develop-1.3.2 branch, to produce a 1.3.2.1 release, given that develop-1.3 and 1.3.3 are unfortunately no longer bit-identical to 1.3.2 which is what's used in IFS develop, in order to be able to do a clean IFS CY49R1 -> develop merge.

Contains IFS-3715: bugfix erroneous output in oops

@cxzk cxzk self-assigned this Oct 23, 2024
@awnawab
Copy link
Contributor

awnawab commented Oct 24, 2024

Hi @cxzk. Many thanks for porting over the fix 🙏 The GPU dev branch needed to stay on 49R1 science, but needed a non bitid but scientifically neutral fix to cure a numerical instability exposed when running on GPUs. I thought we wouldn't need any more fixes to CY49R1 and we might get away with having just two develop branches ("develop" is updated to 49R2 science). That's how we ended up without a develop branch that's bitid to 49R1. I've now created develop-1.3.2. Could you please rebase your PR on that?

Secondly, rather than tagging a release for every fix, I would suggest ifs-bundle develop should track develop-1.3.2. And right before we need to release an ifs-bundle tag, we can tag ecwam too.

@cxzk cxzk changed the base branch from develop-1.3 to develop-1.3.2 October 24, 2024 08:40
@cxzk
Copy link
Contributor Author

cxzk commented Oct 24, 2024

Thanks @awnawab - that's now rebased on develop-1.3.2

Copy link
Contributor

@awnawab awnawab left a comment

Choose a reason for hiding this comment

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

Many thanks for porting over this fix! 🙏 The macos CI failures are unrelated to this PR and have something to do with pip. I'll investigate these separately.

@cxzk
Copy link
Contributor Author

cxzk commented Oct 25, 2024

Anything to wait for before we merge this? (I'm keen to proceed with the IFS CY49R1->develop merge that's dependent on this.)

@wdeconinck wdeconinck merged commit 33d575a into ecmwf-ifs:develop-1.3.2 Oct 28, 2024
9 of 11 checks passed
awnawab pushed a commit to awnawab/ecwam that referenced this pull request Nov 19, 2024
awnawab pushed a commit to awnawab/ecwam that referenced this pull request Nov 22, 2024
awnawab pushed a commit to awnawab/ecwam that referenced this pull request Nov 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants