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 CellId::to_cell #14070

Merged
merged 2 commits into from
Jun 29, 2022
Merged

Remove CellId::to_cell #14070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d40cab8
Remove CellId::to_cell
masterleinad Jun 28, 2022
1dbabce
Also remove explicit instantiations
masterleinad Jun 29, 2022
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
3 changes: 3 additions & 0 deletions doc/news/changes/incompatibilities/20220628Arndt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Removed: The deprecated member function CellId::to_cell() has been removed.
<br>
(Daniel Arndt, 2022/06/28)
9 changes: 0 additions & 9 deletions include/deal.II/grid/cell_id.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,6 @@ class CellId
binary_type
to_binary() const;

/**
* Return a cell_iterator to the cell represented by this CellId.
*
* @deprecated Use Triangulation::create_cell_iterator() instead.
*/
template <int dim, int spacedim>
DEAL_II_DEPRECATED typename Triangulation<dim, spacedim>::cell_iterator
to_cell(const Triangulation<dim, spacedim> &tria) const;

/**
* Compare two CellId objects for equality.
*/
Expand Down
9 changes: 0 additions & 9 deletions source/grid/cell_id.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,6 @@ CellId::to_string() const
}



template <int dim, int spacedim>
typename Triangulation<dim, spacedim>::cell_iterator
CellId::to_cell(const Triangulation<dim, spacedim> &tria) const
{
return tria.create_cell_iterator(*this);
}


// explicit instantiations
#include "cell_id.inst"

Expand Down
11 changes: 0 additions & 11 deletions source/grid/cell_id.inst.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,6 @@



for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
{
#if deal_II_dimension <= deal_II_space_dimension
template Triangulation<deal_II_dimension,
deal_II_space_dimension>::cell_iterator
CellId::to_cell(
const Triangulation<deal_II_dimension, deal_II_space_dimension> &tria)
const;
#endif
}

for (deal_II_dimension : DIMENSIONS)
{
template CellId::binary_type CellId::to_binary<deal_II_dimension>() const;
Expand Down
4 changes: 2 additions & 2 deletions tests/distributed_grids/refine_periodic_02.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,10 @@ test()
<< "n_levels: " << tr.n_levels() << std::endl;

for (const auto &id : marked_coarsen)
CellId(id).to_cell(tr)->set_coarsen_flag();
tr.create_cell_iterator(CellId(id))->set_coarsen_flag();

for (const auto &id : marked_refine)
CellId(id).to_cell(tr)->set_refine_flag();
tr.create_cell_iterator(CellId(id))->set_refine_flag();

deallog << "execute_coarsening_and_refinement()..." << std::endl;

Expand Down