From 21de2e1be1c0aa243d827b0f0e9230b6409613b0 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 16 Jan 2017 16:00:34 -0700 Subject: [PATCH] Re-add the old function signature, mark as deprecated. --- .../20170116Bangerth-2 => minor/20170116Bangerth-3} | 0 include/deal.II/fe/fe_tools.h | 11 +++++++++++ source/fe/fe_tools.cc | 11 +++++++++++ source/fe/fe_tools.inst.in | 5 +++++ 4 files changed, 27 insertions(+) rename doc/news/changes/{incompatibilities/20170116Bangerth-2 => minor/20170116Bangerth-3} (100%) diff --git a/doc/news/changes/incompatibilities/20170116Bangerth-2 b/doc/news/changes/minor/20170116Bangerth-3 similarity index 100% rename from doc/news/changes/incompatibilities/20170116Bangerth-2 rename to doc/news/changes/minor/20170116Bangerth-3 diff --git a/include/deal.II/fe/fe_tools.h b/include/deal.II/fe/fe_tools.h index a4cf52596c..b5bea872a7 100644 --- a/include/deal.II/fe/fe_tools.h +++ b/include/deal.II/fe/fe_tools.h @@ -300,6 +300,17 @@ namespace FETools FullMatrix compute_node_matrix(const FiniteElement &fe); + /** + * Same as the function above, but return the matrix by reference through + * the first argument, rather than as the function's return value. + * + * @deprecated + */ + template + void + compute_node_matrix(FullMatrix &M, + const FiniteElement &fe) DEAL_II_DEPRECATED; + /** * For all possible (isotropic and anisotropic) refinement cases compute the * embedding matrices from a coarse cell to the child cells. Each column of diff --git a/source/fe/fe_tools.cc b/source/fe/fe_tools.cc index 65c4a14d12..4a054a7704 100644 --- a/source/fe/fe_tools.cc +++ b/source/fe/fe_tools.cc @@ -1666,6 +1666,17 @@ namespace FETools } + + template + void + compute_node_matrix(FullMatrix &M, + const FiniteElement &fe) + { + M = compute_node_matrix (fe); + } + + + /* template<> void diff --git a/source/fe/fe_tools.inst.in b/source/fe/fe_tools.inst.in index a1af55ec32..c3d5eb9b34 100644 --- a/source/fe/fe_tools.inst.in +++ b/source/fe/fe_tools.inst.in @@ -146,6 +146,11 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS FullMatrix compute_node_matrix(const FiniteElement &); + template + void + compute_node_matrix(FullMatrix &, + const FiniteElement &); + template void compute_component_wise( const FiniteElement & , -- 2.39.5