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

DofTools: add missing codimension-one instantiation #16494

Merged
merged 1 commit into from
Jan 18, 2024
Merged

DofTools: add missing codimension-one instantiation #16494

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
12 changes: 7 additions & 5 deletions source/dofs/dof_tools_sparsity.inst.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,15 +257,17 @@ for (deal_II_dimension : DIMENSIONS)
}


for (deal_II_dimension : DIMENSIONS)
for (deal_II_dimension, deal_II_space_dimension : DIMENSIONS)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
for (deal_II_dimension, deal_II_space_dimension : DIMENSIONS)
for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)

We have split dim and spacedim into two separate template argument lists in other occassions.

See also

dealii/cmake/config/template-arguments.in

Line 254 in 20d2176

SPACE_DIMENSIONS := { 1; 2; 3 }

dealii/source/grid/tria.inst.in

Line 18 in a65d7b4

for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)

Copy link
Member

Choose a reason for hiding this comment

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

Hmm, we wrote (deal_II_dimension, deal_II_space_dimension : DIMENSIONS) also in other parts of the library. Maybe it's better to discuss it in a separate PR. I will prepare one.

Copy link
Member Author

Choose a reason for hiding this comment

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

@marcfehling Yes, let's fix that up in a separate PR so that we catch all occurences.

{
#if deal_II_dimension <= deal_II_space_dimension
template Table<2, DoFTools::Coupling>
DoFTools::dof_couplings_from_component_couplings(
const FiniteElement<deal_II_dimension> &fe,
const Table<2, DoFTools::Coupling> &component_couplings);
const FiniteElement<deal_II_dimension, deal_II_space_dimension> &fe,
const Table<2, DoFTools::Coupling> &component_couplings);

template std::vector<Table<2, DoFTools::Coupling>>
DoFTools::dof_couplings_from_component_couplings(
const hp::FECollection<deal_II_dimension> &fe,
const Table<2, DoFTools::Coupling> &component_couplings);
const hp::FECollection<deal_II_dimension, deal_II_space_dimension> &fe,
const Table<2, DoFTools::Coupling> &component_couplings);
#endif
}