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

Make sure stuff in compat.h/cc is guarded by a deal.II version. #5503

Merged
merged 1 commit into from
Nov 28, 2023

Conversation

bangerth
Copy link
Contributor

#5474 added a copy of SphericalManifold to ASPECT because of the broken interface in deal.II releases. This patch adds #if guards on the deal.II version to make sure we know when we can remove these things again.

Related to #5421.

@bangerth
Copy link
Contributor Author

I meant to add that I waited with this patch, rather than include it in the original PR, because we needed to wait for the deal.II images used in our CI check to cycle.

@bangerth
Copy link
Contributor Author

The one failure is the MGTransfer one that we're seeing elsewhere as well. It is unrelated to this patch.

@gassmoeller gassmoeller merged commit e062250 into geodynamics:main Nov 28, 2023
4 of 5 checks passed
@bangerth bangerth deleted the compat branch December 7, 2023 04:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants