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 main with develop #14

Merged
merged 41 commits into from
Dec 22, 2022
Merged

Sync main with develop #14

merged 41 commits into from
Dec 22, 2022

Conversation

sanAkel
Copy link
Collaborator

@sanAkel sanAkel commented Dec 22, 2022

This PR simple does what the title states!

darianboggs and others added 30 commits June 9, 2022 21:42
…pr1586

Update MOM6: routine maintenance-2022-11-10
Due to changes at Heroku, we need to transition to use a GitHub Action for label enforcement. The current label enforcer no longer works, so PRs will be "stuck" until this is fixed.
…forcer-ocean

Move to use GitHub Action for Label Enforcement
…o FRACICE for ACG to work. You can check auto-generated code at: src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/GEOSdatasea_GridComp/
…OM6_GEOSPlug_DeclarePointer___.h and MOM6_GEOSPlug_GetPointer___.h are NOT being used right now, because a few variables are dummy imports (e.g., SWHEAT) and exports (e.g, DH, T, S) from MOM6 ocean model. Unless these dummy imports and exports disappear and connectivity is CLEANED up, using these ACG files is almost impossible.Someday when MOM5 is deprecated, revisit.
sanAkel and others added 10 commits December 21, 2022 19:31
… marked as DUMMY_EXPORT, they are there only because of messy connectivities.
…ices, can not use Declare and Get Pointers because same names are used (twice) to import and export- ACG creates statements twice, so it cannot used unless these imports and exports are RENAMED. If they are renamed- NOW, all connectivity gets messed up- so do it another day
@sanAkel sanAkel added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Dec 22, 2022
@sanAkel sanAkel requested a review from a team as a code owner December 22, 2022 19:40
@sanAkel sanAkel requested a review from a team as a code owner December 22, 2022 19:40
@sanAkel sanAkel self-assigned this Dec 22, 2022
mathomp4
mathomp4 previously approved these changes Dec 22, 2022
@mathomp4 mathomp4 added the Contingent - DNA Do Not Approve (DNA). These changes are contingent on other PRs label Dec 22, 2022
@github-actions
Copy link

Label error. Requires exactly 0 of: Contingent - DNA, Needs Lead Approval, Contingent -- Do Not Approve. Found: 0 diff, Contingent - DNA

@github-actions
Copy link

Label error. Requires exactly 0 of: Contingent - DNA, Needs Lead Approval, Contingent -- Do Not Approve. Found: 0 diff, Contingent - DNA

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.

Fixed up CI

@mathomp4 mathomp4 removed the Contingent - DNA Do Not Approve (DNA). These changes are contingent on other PRs label Dec 22, 2022
@mathomp4 mathomp4 merged commit 11e52a3 into main Dec 22, 2022
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants