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.

Sign up for GitHub

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

Jump to bottom

Remove unused option core #5192

Merged
merged 1 commit into from
Jul 8, 2023
Merged

Remove unused option core #5192

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/simulator/core.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ 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)
Copy link
Contributor

Choose a reason for hiding this comment

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

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh right, looked over the '!'

#if DEAL_II_VERSION_GTE(9,4,1)
if (Plugins::plugin_type_matches<const InitialTopographyModel::ZeroTopography<dim>>(initial_topography_model))
return std::make_unique<MappingCartesian<dim>>();
#else
Expand Down