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

Incorporate CAM changes to ncdata and MPAS-A version #57

Merged
merged 3 commits into from
Jul 19, 2024

Conversation

gdicker1
Copy link
Contributor

This PR updates Externals.cfg to bring in the results of EarthWorksOrg/CAM PRs #21 and #22

gdicker1 added 2 commits July 18, 2024 14:40
This incorporates the already merged tag for EarthWorksOrg/CAM EarthWorksOrg#21
This helps address correctness issues that occurred after incorporating
the cam-ew2.0.004 tag which switched to a v7.x OpenACC version that was
made compatible with CAM.
@gdicker1 gdicker1 marked this pull request as draft July 18, 2024 20:47
@gdicker1
Copy link
Contributor Author

Status of Sub-PRs:

Once both these PRs are merged (and tagged) this PR will be moved out of draft

@gdicker1 gdicker1 self-assigned this Jul 18, 2024
@gdicker1 gdicker1 added enhancement New feature or request external Has to do with externals EW specific This has to do with EarthWorks only - files, goals, code that probably won't be wanted upstream labels Jul 18, 2024
@gdicker1 gdicker1 changed the base branch from main to develop July 18, 2024 20:48
@gdicker1 gdicker1 marked this pull request as ready for review July 19, 2024 16:15
@gdicker1
Copy link
Contributor Author

gdicker1 commented Jul 19, 2024

I plan to merge this PR in about an hour, added reviewers just for visibility.

Though EWOrg/CAM 22 is "closed" it should have been detected as a "merge"

@gdicker1 gdicker1 merged commit 36bf8d8 into EarthWorksOrg:develop Jul 19, 2024
gdicker1 added a commit to gdicker1/EarthWorks that referenced this pull request Aug 22, 2024
8f78adc Bump to 0.8.4
1ee334a Merge pull request EarthWorksOrg#58 from ESMCI/fix/hashid
e705f72 fix hash id and tag parsing
36b4b92 Bump to 0.8.3
654d233 Merge pull request EarthWorksOrg#57 from ESMCI/fix_test_output
0a4ea71 update the way tags are identified
6ee78d6 correct count of test fails
75a0337 Bump to 0.8.2
7136066 Merge pull request EarthWorksOrg#54 from ESMCI/fix/tag-not-found
a90de4f update to fetch tag first
a6e43fc Bump to 0.8.1
229ba03 Merge pull request EarthWorksOrg#53 from ESMCI/fix/ssh_access
e9cd2be better fix for issue with ssh access
c624b61 Bump to 0.8.0
6ccf617 Merge pull request EarthWorksOrg#51 from ESMCI/fix/recursive
53fce57 no need to make submodule objects persist
dae1c82 now working with issue EarthWorksOrg#50
ded91fd all tests passing, issue EarthWorksOrg#50 fixed
62a338b all pytests now passing
143abac tests a-d all pass
2b021fd add documentation to submodule.py
72211d2 add the new submodule class
82dd7a4 test_b_update now working
a7d8b4e all pytests passing
5322019 Bump to 0.7.9
1f07cb6 Merge pull request EarthWorksOrg#49 from ESMCI/fix/fxDONOTUSEurl
31ce71b use poetry update to update poetry.lock file
46043f0 add code of conduct (issue EarthWorksOrg#35)
0c3d683 dependabot changes and issue EarthWorksOrg#48

git-subtree-dir: .lib/git-fleximod
git-subtree-split: 8f78adcb0386cf496de377b9a92705e44f3f9a37
gdicker1 added a commit to gdicker1/EarthWorks that referenced this pull request Aug 28, 2024
8f78adc Bump to 0.8.4
1ee334a Merge pull request EarthWorksOrg#58 from ESMCI/fix/hashid
e705f72 fix hash id and tag parsing
36b4b92 Bump to 0.8.3
654d233 Merge pull request EarthWorksOrg#57 from ESMCI/fix_test_output
0a4ea71 update the way tags are identified
6ee78d6 correct count of test fails
75a0337 Bump to 0.8.2
7136066 Merge pull request EarthWorksOrg#54 from ESMCI/fix/tag-not-found
a90de4f update to fetch tag first
a6e43fc Bump to 0.8.1
229ba03 Merge pull request EarthWorksOrg#53 from ESMCI/fix/ssh_access
e9cd2be better fix for issue with ssh access
c624b61 Bump to 0.8.0
6ccf617 Merge pull request EarthWorksOrg#51 from ESMCI/fix/recursive
53fce57 no need to make submodule objects persist
dae1c82 now working with issue EarthWorksOrg#50
ded91fd all tests passing, issue EarthWorksOrg#50 fixed
62a338b all pytests now passing
143abac tests a-d all pass
2b021fd add documentation to submodule.py
72211d2 add the new submodule class
82dd7a4 test_b_update now working
a7d8b4e all pytests passing
5322019 Bump to 0.7.9
1f07cb6 Merge pull request EarthWorksOrg#49 from ESMCI/fix/fxDONOTUSEurl
31ce71b use poetry update to update poetry.lock file
46043f0 add code of conduct (issue EarthWorksOrg#35)
0c3d683 dependabot changes and issue EarthWorksOrg#48

git-subtree-dir: .lib/git-fleximod
git-subtree-split: 8f78adcb0386cf496de377b9a92705e44f3f9a37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request EW specific This has to do with EarthWorks only - files, goals, code that probably won't be wanted upstream external Has to do with externals
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant