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

CICE6 cmake and namelist updates for post release v6.5.0 merge #925

Merged
merged 7 commits into from
Jun 10, 2024

Conversation

zhaobin74
Copy link
Contributor

@zhaobin74 zhaobin74 commented May 3, 2024

This PR updated CMake and ice_in (CICE6 config file) to be consistent with upstream merge of CICE6.

Zero-diff for AMIP and coupled CICE4.

Depends on GEOS-ESM/CICE#6 and GEOS-ESM/Icepack#5, and GEOS-ESM/GEOSgcm#779

@zhaobin74 zhaobin74 added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label May 3, 2024
@zhaobin74 zhaobin74 requested a review from a team May 3, 2024 13:36
@zhaobin74 zhaobin74 requested review from a team as code owners May 3, 2024 13:36
@zhaobin74 zhaobin74 added the Contingent - DNA These changes are contingent on other PRs (DNA=do not approve) label May 3, 2024
Copy link

github-actions bot commented May 3, 2024

This PR is being prevented from merging because you have added one of our blocking labels: Contingent - DNA, Needs Lead Approval, Contingent -- Do Not Approve. You'll need to remove it before this PR can be merged.

sanAkel
sanAkel previously approved these changes May 6, 2024
@sanAkel
Copy link
Contributor

sanAkel commented May 30, 2024

@zhaobin74
It's better to separate PRs that change:

  • icepack (e.g., cmake change).
  • code change (lhf).

From maintenance point of view- for your future reference.

@zhaobin74
Copy link
Contributor Author

@zhaobin74 It's better to separate PRs that change:

  • icepack (e.g., cmake change).
  • code change (lhf).

From maintenance point of view- for your future reference.

Thanks for approving, @sanAkel. I will split them in future PRs.

Copy link
Member

@mathomp4 mathomp4 left a comment

Choose a reason for hiding this comment

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

Trust in Bin! Approve for Cmake

@mathomp4 mathomp4 merged commit 462d45d into develop Jun 10, 2024
3 of 7 checks passed
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. Contingent - DNA These changes are contingent on other PRs (DNA=do not approve)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants