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

Update components to be in line with GCM #103

Merged
merged 5 commits into from
Jul 29, 2021

Conversation

mathomp4
Copy link
Member

@mathomp4 mathomp4 commented Jul 6, 2021

This PR is to bring the components.yaml in the GEOSadas "up to date" with the GEOSgcm after the v5.29.0 release.

The changes are:

  • ESMA_env v3.2.1 → v3.3.0
  • ESMA_cmake v3.4.2 → v3.5.2
  • MAPL v2.6.7 → v2.7.0
  • FVdycoreCubed_GridComp v1.2.13 → v1.2.15
  • GEOSgcm_App v1.4.1 → v1.5.2
  • GEOSana_GridComp v1.4.1 → v1.4.2

Pretty much all these changes are due to changes in Baselibs from 6.1.0 to 6.2.4 (ESMA_env and ESMA_cmake) to support development with GFE libraries (CMake change), as well as to support newer MAPL (which in develop and later tags will REQUIRE Baselibs 6.2.4).

But, one more reason to facilitate this is because if we can move the GEOSadas up to "in sync" with the GEOSgcm, I can update the CI in MAPL so that every pull request to MAPL must build the GEOSadas. But, we need to bring GEOSadas up to date.

This should be zero-diff as far as I know because (as @sdrabenh can attest) the switch to Baselibs 6.2.4 was a zero-diff change (v10.19.1 → v10.19.2).

@mathomp4 mathomp4 added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Jul 6, 2021
@mathomp4 mathomp4 self-assigned this Jul 6, 2021
@mathomp4 mathomp4 requested a review from a team as a code owner July 6, 2021 20:09
@mathomp4 mathomp4 added the Contingent - DNA Do Not Approve (DNA). These changes are contingent on other PRs label Jul 6, 2021
@mathomp4
Copy link
Member Author

mathomp4 commented Jul 6, 2021

Note: I've put a blocker label on this because in my testing, I hit the weird geos_StateIO.F90 bug that requires an update to GEOSana_GridComp. @rtodling has a fix/workaround for this. → See GEOS-ESM/GEOSana_GridComp#47

@mathomp4
Copy link
Member Author

mathomp4 commented Jul 6, 2021

Confirmed in my CI Docker image. I updated a slew of repos to present and then fixed geos_StateIO.F90 with the code changes from @rtodling and it builds! Huzzah!

@rtodling
Copy link
Collaborator

What does Contingent DNA mean? I understand the meaning of both words, just not sure what they mean in the context of our codes! Sorry.

@gmao-msienkie gmao-msienkie added Contingent - DNA Do Not Approve (DNA). These changes are contingent on other PRs and removed Contingent - DNA Do Not Approve (DNA). These changes are contingent on other PRs labels Jul 20, 2021
@gmao-msienkie
Copy link
Contributor

Oops, clicked on the Contingent DNA label when I was checking the meaning - sorry!
It means: Do Not Approve (DNA). These changes are contingent on other PRs
@rtodling If you click on the gear by the labels, you can see a list with descriptions

@mathomp4
Copy link
Member Author

Yes, as @gmao-msienkie said, it means "Contingent - Do Not Approve". (It was a "label" we came up with long ago, but if you have a label name/etc. you prefer)

I means don't approve/merge this until the PR it needs is pulled in (which is GEOS-ESM/GEOSana_GridComp#47 or GEOS-ESM/GEOSana_GridComp#48). Once that is pulled in and released, then this PR can come in.

@mathomp4 mathomp4 removed the Contingent - DNA Do Not Approve (DNA). These changes are contingent on other PRs label Jul 21, 2021
@mathomp4
Copy link
Member Author

GEOSana_GridComp v1.4.2 (with the weird compiler fix) has been released. I've updated this PR to include that updated tag.

I'm going to do a build on discover to make sure all is well. If so, @rtodling could maybe do a check. As far as I know, this should be zero-diff to 5.29.0.1 (at least the GCM was zero-diff with all these updates).

@mathomp4
Copy link
Member Author

The build of this branch on discover worked. So that's nice!

@mathomp4
Copy link
Member Author

UPDATE: The GEOSgcm has released v10.19.3. I'm not sure if I should push those changes on to this branch? Or wait until this is in and then pull in the changes? There is a chance the 10.19.3 updates could be non-zero-diff to the ADAS??

Copy link
Collaborator

@rtodling rtodling left a comment

Choose a reason for hiding this comment

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

Matt,
develop has moved ahead of your changes ... but in different places .. I am approving this and will test it out once you finalize the merge.
Thanks

@mathomp4
Copy link
Member Author

Matt,
develop has moved ahead of your changes ... but in different places .. I am approving this and will test it out once you finalize the merge.
Thanks

@rtodling Actually the GCM has moved ahead as well. Would you like me to update this PR to be in sync with GCM v10.19.3?

@rtodling rtodling merged commit 0b4bf81 into develop Jul 29, 2021
@mathomp4 mathomp4 deleted the feature/mathomp4/update-adas-components-to-gcm branch July 29, 2021 19:27
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