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.

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

Remove remaining deprecations #14078

Merged
merged 5 commits into from
Jun 29, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
4 changes: 4 additions & 0 deletions doc/news/changes/incompatibilities/20220629Arndt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Removed: The deprecated QTrapezoid, ParticleHandler::locally_relevant_ids(),
masterleinad marked this conversation as resolved.
Show resolved Hide resolved
and Arkode::reinit_vector have been removed.
<br>
(Daniel Arndt, 2022/06/29)
16 changes: 0 additions & 16 deletions include/deal.II/base/quadrature_lib.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,22 +127,6 @@ class QTrapezoid : public Quadrature<dim>
};


/**
* An alias for QTrapezoid available for historic reasons. This name is
* deprecated.
*
* The class was originally named QTrapez, a poorly named choice since the
* proper name of the quadrature formula
* is "trapezoidal rule", or sometimes also called the "trapezoid rule". The
* misnomer resulted from the fact that its original authors' poor English
* language skills led them to translate the name incorrectly from the German
* "Trapezregel".
*/
template <int dim>
using QTrapez DEAL_II_DEPRECATED = QTrapezoid<dim>;



/**
* The Milne rule for numerical quadrature formula. The Milne rule is a closed
* Newton-Cotes formula and is exact for polynomials of degree 5.
Expand Down
3 changes: 1 addition & 2 deletions include/deal.II/fe/fe_tools.templates.h
Original file line number Diff line number Diff line change
Expand Up @@ -2489,8 +2489,7 @@ namespace FETools
// find sub-quadrature
position = name.find('(');
const std::string subquadrature_name(name, 0, position);
AssertThrow(subquadrature_name == "QTrapez" ||
subquadrature_name == "QTrapezoid",
AssertThrow(subquadrature_name == "QTrapezoid",
ExcNotImplemented(
"Could not detect quadrature of name " +
subquadrature_name));
Expand Down
2 changes: 1 addition & 1 deletion include/deal.II/grid/reference_cell.h
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ class ReferenceCell
*
* @note The weights of the quadrature object are left unfilled and
* consequently the object cannot usefully be used for actually
* computing integrals. This is in contrast to, for example, the QTrapez
* computing integrals. This is in contrast to, for example, the QTrapezoid
* class that correctly sets quadrature weights.
*/
template <int dim>
Expand Down
30 changes: 0 additions & 30 deletions include/deal.II/particles/particle_handler.h
Original file line number Diff line number Diff line change
Expand Up @@ -654,27 +654,6 @@ namespace Particles
types::particle_index
get_next_free_particle_index() const;

/**
* Extract an IndexSet with global dimensions equal to
* get_next_free_particle_index(), containing the locally owned
* particle indices.
*
* This function can be used to construct distributed vectors and matrices
* to manipulate particles using linear algebra operations.
*
* Notice that it is the user's responsibility to guarantee that particle
* indices are unique, and no check is performed to verify that this is the
* case, nor that the union of all IndexSet objects on each mpi process is
* complete.
*
* @return An IndexSet of size get_next_free_particle_index(), containing
* n_locally_owned_particle() indices.
*
* @deprecated Use locally_owned_particle_ids() instead.
*/
DEAL_II_DEPRECATED IndexSet
locally_relevant_ids() const;

/**
* Extract an IndexSet with global dimensions equal to
* get_next_free_particle_index(), containing the locally owned
Expand Down Expand Up @@ -1403,15 +1382,6 @@ namespace Particles
output_vector.compress(VectorOperation::insert);
}



template <int dim, int spacedim>
inline IndexSet
ParticleHandler<dim, spacedim>::locally_relevant_ids() const
{
return this->locally_owned_particle_ids();
}

} // namespace Particles

DEAL_II_NAMESPACE_CLOSE
Expand Down
11 changes: 0 additions & 11 deletions include/deal.II/sundials/arkode.h
Original file line number Diff line number Diff line change
Expand Up @@ -569,17 +569,6 @@ namespace SUNDIALS
void *
get_arkode_memory() const;

/**
* A function object that was used to `reinit` the given vector. Setting
* this field does no longer have any effect and all auxiliary vectors are
* reinit-ed automatically based on the user-supplied vector in solve_ode().
*
* @deprecated This function is no longer used and can be safely removed in
* user code.
*/
DEAL_II_DEPRECATED
std::function<void(VectorType &)> reinit_vector;

/**
* A function object that users may supply and that is intended to compute
* the explicit part of the IVP right hand side. Sets $explicit_f = f_E(t,
Expand Down
4 changes: 2 additions & 2 deletions source/grid/manifold_lib.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1689,10 +1689,10 @@ TransfiniteInterpolationManifold<dim, spacedim>::initialize(
//
// In the co-dimension one case (meaning dim < spacedim) we have to fall
// back to a simple GridTools::affine_cell_approximation<dim>() which
// requires 2^dim points, instead. Thus, initialize the QIteraded
// requires 2^dim points, instead. Thus, initialize the QIterated
// quadrature with no subdivisions.
std::vector<Point<dim>> unit_points =
QIterated<dim>(QTrapez<1>(), (dim == spacedim ? 2 : 1)).get_points();
QIterated<dim>(QTrapezoid<1>(), (dim == spacedim ? 2 : 1)).get_points();
std::vector<Point<spacedim>> real_points(unit_points.size());

for (const auto &cell : triangulation.active_cell_iterators())
Expand Down
4 changes: 0 additions & 4 deletions source/sundials/arkode.cc
Original file line number Diff line number Diff line change
Expand Up @@ -679,10 +679,6 @@ namespace SUNDIALS
void
ARKode<VectorType>::set_functions_to_trigger_an_assert()
{
reinit_vector = [](VectorType &) {
AssertThrow(false, ExcFunctionNotProvided("reinit_vector"));
};

solver_should_restart = [](const double, VectorType &) -> bool {
return false;
};
Expand Down
2 changes: 1 addition & 1 deletion tests/bits/point_value_03.cc
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ check()
parallel::distributed::Triangulation<dim> tria(MPI_COMM_WORLD);
make_mesh(tria);

FE_Q<dim> element(QIterated<1>(QTrapez<1>(), 3));
FE_Q<dim> element(QIterated<1>(QTrapezoid<1>(), 3));
DoFHandler<dim> dof(tria);
dof.distribute_dofs(element);

Expand Down
2 changes: 1 addition & 1 deletion tests/matrix_free/tensor_product_evaluate_01.cc
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ test(const unsigned int degree)

const std::vector<Point<dim>> evaluation_points =
dim == 3 ? QGauss<dim>(2).get_points() :
QIterated<dim>(QTrapez<1>(), 3).get_points();
QIterated<dim>(QTrapezoid<1>(), 3).get_points();

deallog << "Evaluate in " << dim << "d with polynomial degree " << degree
<< std::endl;
Expand Down
2 changes: 1 addition & 1 deletion tests/matrix_free/tensor_product_evaluate_02.cc
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ test(const unsigned int degree)

const std::vector<Point<dim>> evaluation_points =
dim == 3 ? QGauss<dim>(2).get_points() :
QIterated<dim>(QTrapez<1>(), 3).get_points();
QIterated<dim>(QTrapezoid<1>(), 3).get_points();

deallog << "Evaluate in " << dim << "d with polynomial degree " << degree
<< std::endl;
Expand Down
2 changes: 1 addition & 1 deletion tests/matrix_free/tensor_product_evaluate_03.cc
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ test(const unsigned int degree)

const std::vector<Point<dim>> evaluation_points =
dim == 3 ? QGauss<dim>(2).get_points() :
QIterated<dim>(QTrapez<1>(), 3).get_points();
QIterated<dim>(QTrapezoid<1>(), 3).get_points();

deallog << "Evaluate in " << dim << "d with polynomial degree " << degree
<< std::endl;
Expand Down
2 changes: 1 addition & 1 deletion tests/matrix_free/tensor_product_evaluate_04.cc
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ test(const unsigned int degree)

const std::vector<Point<dim>> evaluation_points =
dim == 3 ? QGauss<dim>(2).get_points() :
QIterated<dim>(QTrapez<1>(), 3).get_points();
QIterated<dim>(QTrapezoid<1>(), 3).get_points();

deallog << "Evaluate in " << dim << "d with polynomial degree " << degree
<< std::endl;
Expand Down
2 changes: 1 addition & 1 deletion tests/matrix_free/tensor_product_evaluate_05.cc
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ test(const unsigned int degree)

const std::vector<Point<dim>> evaluation_points =
dim == 3 ? QGauss<dim>(2).get_points() :
QIterated<dim>(QTrapez<1>(), 3).get_points();
QIterated<dim>(QTrapezoid<1>(), 3).get_points();

deallog << "Evaluate in " << dim << "d with polynomial degree " << degree
<< std::endl;
Expand Down
2 changes: 1 addition & 1 deletion tests/matrix_free/tensor_product_evaluate_06.cc
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ test(const unsigned int degree)

const std::vector<Point<dim>> evaluation_points =
dim == 3 ? QGauss<dim>(2).get_points() :
QIterated<dim>(QTrapez<1>(), 3).get_points();
QIterated<dim>(QTrapezoid<1>(), 3).get_points();

deallog << "Evaluate in " << dim << "d with polynomial degree " << degree
<< std::endl;
Expand Down