Remove unused option core #5192
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bangerth
requested changes
Jul 7, 2023
| @@ -109,12 +109,8 @@ namespace aspect | |||
| if (geometry_model.has_curved_elements()) | |||
| return std::make_unique<MappingQCache<dim>>(4); | |||
|
|
|||
| #if !DEAL_II_VERSION_GTE(9,4,0) || DEAL_II_VERSION_GTE(9,4,1) | |||
There was a problem hiding this comment.
Just talking myself through this: The condition means that deal.II either (i) is prior to 9.4, or (ii) 9.4.1 or later. The former cannot happen any more, but it is conceivable that someone uses deal.II 9.4.0. So I think the right change here is to replace this line by
#if DEAL_II_VERSION_GTE(9,4,1)
and leave the rest of the code we have here.
There was a problem hiding this comment.
Oh right, looked over the '!'
tjhei
approved these changes
Jul 7, 2023
|
Do you know how to "squash" the six commits into one? This way, there would only be one commit that encapsulates everything, and the various detours you took will no longer be visible :-) |
mfmweerdesteijn
force-pushed
the
remove_unused_option_core
branch
from
0444394
to
39319f8
Compare
mfmweerdesteijn
force-pushed
the
remove_unused_option_core
branch
from
39319f8
to
5061df5
Compare
bangerth
approved these changes
Jul 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Checklist. Please read and check each box with an X. Delete any part not applicable. Ask on the forum if you need help with any step.
Describe what you did in this PR and why you did it.
Before your first pull request:
For all pull requests:
For new features/models or changes of existing features: