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

reconcile with dev-access-esm1.6 - interface code #551

Merged
merged 3 commits into from
Mar 3, 2025
Merged

Conversation

JhanSrbinovsky
Copy link
Collaborator

@JhanSrbinovsky JhanSrbinovsky commented Feb 25, 2025

CABLE

Description

Reconcile developments in ESM1.6 with CABLE:main

There are changes across utilities since directories as well BUT here it is only those in coupled/ that are considered.

Post shuffling these files around to facilitate building a library. What happens to them is irrelevant really.

These modified and added files are from dev-access-esm1.6.

Testing

  • Are the changes bitwise-compatible with the main branch? If working on an optional feature, are the results bitwise-compatible when this feature is off? If yes, copy benchcab output showing successful completion of the bitwise compatibility tests or equivalent results below this line.

So - I haven't actually done the testing BUT considering none of these fits are even in the build they cant impact anything


📚 Documentation preview 📚: https://cable--551.org.readthedocs.build/en/551/

@JhanSrbinovsky JhanSrbinovsky linked an issue Feb 25, 2025 that may be closed by this pull request
Copy link
Member

@ccarouge ccarouge left a comment

Choose a reason for hiding this comment

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

Good to go once you fixed the conflict with the snow aging stuff. Ian put some changes directly in CABLE repo for the ESM1.6 so needs to make sure what we need to see at the end. There are some commented lines that would be best to remove instead of using comments.

@JhanSrbinovsky
Copy link
Collaborator Author

JhanSrbinovsky commented Feb 28, 2025

h no - the message was deleted - I think the conflict was in cbm. merging should show up any difference.

..... starting at line 157 in the new version

@JhanSrbinovsky JhanSrbinovsky merged commit 630e2e1 into main Mar 3, 2025
7 checks passed
@JhanSrbinovsky JhanSrbinovsky deleted the sync_ESM1.6 branch March 3, 2025 23:56
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.

2 participants