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

Fix intel-oneapi builds of CAM that include changes from cam6_3_147 or newer #15

Merged

Conversation

gdicker1
Copy link

@gdicker1 gdicker1 commented Mar 8, 2024

Fixes EarthWorksOrg/EarthWorks #35 and ESCOMP/CAM #988

Note: This PR requires that EarthWorksOrg/CAM #14 is merged first, as it fixes problems introduced by integrating upstream tag cam6_3_147 as part of #14.

@gdicker1 gdicker1 added bug Something isn't working upstream Related to the upstream repo (ESCOMP/CAM) labels Mar 8, 2024
@gdicker1 gdicker1 self-assigned this Mar 8, 2024
@gdicker1 gdicker1 requested review from dazlich and areanddee March 8, 2024 22:32
@gdicker1 gdicker1 force-pushed the fix/perllogic_intel-oneapi branch from 3e52efe to 4233d93 Compare March 8, 2024 22:47
@gdicker1
Copy link
Author

gdicker1 commented Mar 8, 2024

The relevant change in this PR is only in commit 4233d93. So far the rest of these changes are duplicates from #14.

gdicker1 added a commit that referenced this pull request Mar 8, 2024
…#15)

Fix ability to build CAM with intel-oneapi compilers.
@gdicker1 gdicker1 force-pushed the fix/perllogic_intel-oneapi branch from 4233d93 to 3e9870d Compare March 13, 2024 21:57
@gdicker1
Copy link
Author

gdicker1 force-pushed the fix/perllogic_intel-oneapi branch from 4233d93 to 3e9870d

This force push makes it so the fix matches with the fix being applied upstream in ESCOMP/CAM #990

@gdicker1 gdicker1 marked this pull request as ready for review March 13, 2024 21:59
@gdicker1 gdicker1 merged commit d5e3529 into EarthWorksOrg:ew-develop Mar 13, 2024
gdicker1 pushed a commit that referenced this pull request Aug 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working upstream Related to the upstream repo (ESCOMP/CAM)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants