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

Sync tag sdr_v2.1.2.6 into develop #232

Merged
merged 17 commits into from
May 18, 2023

Conversation

sdrabenh
Copy link
Collaborator

@sdrabenh sdrabenh commented May 12, 2023

@amdasilva this PR captures the changes made to accommodate Krok. Please see the owners of the commits below for questions. There were several merge conflicts, so hopefully my hand-merges are correct. I'm unsure at this point whether this PR is 0-diff or not. I would have to test this to be sure. In the meantime I will mark it as both.

@sdrabenh sdrabenh requested review from a team and amdasilva as code owners May 12, 2023 20:28
@github-actions
Copy link

Label error. Requires at least 1 of: 0 diff, 0 diff trivial, Non 0-diff, 0 diff structural, 0-diff trivial, Not 0-diff, 0-diff, automatic, 0-diff uncoupled. Found:

@github-actions
Copy link

Label error. Requires at least 1 of: 0 diff, 0 diff trivial, Non 0-diff, 0 diff structural, 0-diff trivial, Not 0-diff, 0-diff, automatic, 0-diff uncoupled. Found:

@sdrabenh sdrabenh added 0 diff The changes in this pull request have verified to be zero-diff with the target branch. Non 0-diff The changes in this pull request are non-zero-diff labels May 12, 2023
amdasilva
amdasilva previously approved these changes May 12, 2023
Copy link
Collaborator

@amdasilva amdasilva left a comment

Choose a reason for hiding this comment

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

It looks good, but see #231 regarding architecture violation (which has been introduced prior to this PR).

@sdrabenh
Copy link
Collaborator Author

It looks good, but see #231 regarding architecture violation (which has been introduced prior to this PR).

I will raise this with @wmputman on Monday

@mathomp4
Copy link
Member

@sdrabenh I updated the CHANGELOG.md in this branch to remove all the references to sdr_* tags as well as remove redundant entries (e.g., GOCART Data).

@mathomp4
Copy link
Member

mathomp4 commented May 12, 2023

Also just fixed a bad-merge line causing a CI failure.

And updated the components.yaml to match GEOSgcm v11. I think that might also have been an issue.

@mathomp4 mathomp4 requested a review from amdasilva May 13, 2023 17:28
@mathomp4
Copy link
Member

Update: I've added the bugfix I talk about in #234 here as well as I think it is a bug.

Copy link
Collaborator

@amdasilva amdasilva left a comment

Choose a reason for hiding this comment

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

As I mentioned before, the microphysics callback needs work as it now consulting the GCM rc file to find out about its coupling context, something that is an architecture violation.

@amdasilva amdasilva merged commit 2896dcc into develop May 18, 2023
@amdasilva amdasilva deleted the feature/sdrabenh/sdr_v2.1.2.6_into_develop branch May 18, 2023 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 diff The changes in this pull request have verified to be zero-diff with the target branch. Non 0-diff The changes in this pull request are non-zero-diff
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants