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

Deprecate GridTools::CellDataTransferBuffer #13833

Merged
merged 2 commits into from
May 27, 2022
Merged

Deprecate GridTools::CellDataTransferBuffer #13833

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b41251d
Deprecate GridTools::CellDataTransferBuffer
kronbichler May 26, 2022
f71c1d3
Move function definitions inline to fix compiler warnings
kronbichler May 26, 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
83 changes: 38 additions & 45 deletions include/deal.II/grid/grid_tools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3297,9 +3297,12 @@ namespace GridTools
*
* Type @p T is assumed to be serializable by <code>boost::serialization</code> (for
* example <code>unsigned int</code> or <code>std::vector@<double@></code>).
*
* @deprecated The implementation in deal.II has been rewritten, making this class
* obsolete for use within deal.II. Use your own data structures instead.
*/
template <int dim, typename T>
struct CellDataTransferBuffer
struct DEAL_II_DEPRECATED CellDataTransferBuffer
{
/**
* A vector to store IDs of cells to be transferred.
Expand All @@ -3321,7 +3324,23 @@ namespace GridTools
*/
template <class Archive>
void
save(Archive &ar, const unsigned int version) const;
save(Archive &ar, const unsigned int) const
{
// Implement the code inline as some compilers do otherwise complain
// about the use of a deprecated interface.
Assert(cell_ids.size() == data.size(),
ExcDimensionMismatch(cell_ids.size(), data.size()));
// archive the cellids in an efficient binary format
const std::size_t n_cells = cell_ids.size();
ar & n_cells;
for (const auto &id : cell_ids)
{
CellId::binary_type binary_cell_id = id.template to_binary<dim>();
ar & binary_cell_id;
}

ar &data;
}

/**
* Read the data of this object from a stream for the purpose of
Expand All @@ -3331,7 +3350,23 @@ namespace GridTools
*/
template <class Archive>
void
load(Archive &ar, const unsigned int version);
load(Archive &ar, const unsigned int)
{
// Implement the code inline as some compilers do otherwise complain
// about the use of a deprecated interface.
std::size_t n_cells;
ar & n_cells;
cell_ids.clear();
cell_ids.reserve(n_cells);
for (unsigned int c = 0; c < n_cells; ++c)
{
CellId::binary_type value;
ar & value;
cell_ids.emplace_back(value);
}
ar &data;
}


#ifdef DOXYGEN
/**
Expand Down Expand Up @@ -4276,48 +4311,6 @@ namespace GridTools



template <int dim, typename T>
template <class Archive>
void
CellDataTransferBuffer<dim, T>::save(Archive &ar,
const unsigned int /*version*/) const
{
Assert(cell_ids.size() == data.size(),
ExcDimensionMismatch(cell_ids.size(), data.size()));
// archive the cellids in an efficient binary format
const std::size_t n_cells = cell_ids.size();
ar & n_cells;
for (const auto &id : cell_ids)
{
CellId::binary_type binary_cell_id = id.template to_binary<dim>();
ar & binary_cell_id;
}

ar &data;
}



template <int dim, typename T>
template <class Archive>
void
CellDataTransferBuffer<dim, T>::load(Archive &ar,
const unsigned int /*version*/)
{
std::size_t n_cells;
ar & n_cells;
cell_ids.clear();
cell_ids.reserve(n_cells);
for (unsigned int c = 0; c < n_cells; ++c)
{
CellId::binary_type value;
ar & value;
cell_ids.emplace_back(value);
}
ar &data;
}


namespace internal
{
template <typename DataType,
Expand Down