From 9ebcae00a8c188330358b84d2f88cd01fb303a57 Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Mon, 29 Jun 2020 08:50:20 +0200 Subject: [PATCH] Remove DoFHandlerType from fe_tools.h --- include/deal.II/fe/fe_tools.h | 26 +++++----------- .../fe/fe_tools_interpolate.templates.h | 30 +++++++------------ 2 files changed, 18 insertions(+), 38 deletions(-) diff --git a/include/deal.II/fe/fe_tools.h b/include/deal.II/fe/fe_tools.h index 6f3f4b486a..3d1970df31 100644 --- a/include/deal.II/fe/fe_tools.h +++ b/include/deal.II/fe/fe_tools.h @@ -644,17 +644,12 @@ namespace FETools * by calling the @p distribute function of your hanging node constraints * object. */ - template class DoFHandlerType1, - template class DoFHandlerType2, - class InVector, - class OutVector> + template void - interpolate(const DoFHandlerType1 &dof1, - const InVector & u1, - const DoFHandlerType2 &dof2, - OutVector & u2); + interpolate(const DoFHandler &dof1, + const InVector & u1, + const DoFHandler &dof2, + OutVector & u2); /** * Compute the interpolation of a the @p dof1-function @p u1 to a @p @@ -672,17 +667,12 @@ namespace FETools * the discontinuities. Therefore the mean value is taken at the DoF values * at the discontinuities. */ - template class DoFHandlerType1, - template class DoFHandlerType2, - class InVector, - class OutVector> + template void interpolate( - const DoFHandlerType1 & dof1, + const DoFHandler & dof1, const InVector & u1, - const DoFHandlerType2 & dof2, + const DoFHandler & dof2, const AffineConstraints &constraints, OutVector & u2); diff --git a/include/deal.II/fe/fe_tools_interpolate.templates.h b/include/deal.II/fe/fe_tools_interpolate.templates.h index 01a278f9f8..adb96ff720 100644 --- a/include/deal.II/fe/fe_tools_interpolate.templates.h +++ b/include/deal.II/fe/fe_tools_interpolate.templates.h @@ -59,17 +59,12 @@ DEAL_II_NAMESPACE_OPEN namespace FETools { - template class DoFHandlerType1, - template class DoFHandlerType2, - class InVector, - class OutVector> + template void - interpolate(const DoFHandlerType1 &dof1, - const InVector & u1, - const DoFHandlerType2 &dof2, - OutVector & u2) + interpolate(const DoFHandler &dof1, + const InVector & u1, + const DoFHandler &dof2, + OutVector & u2) { AffineConstraints dummy; dummy.close(); @@ -78,17 +73,12 @@ namespace FETools - template class DoFHandlerType1, - template class DoFHandlerType2, - class InVector, - class OutVector> + template void interpolate( - const DoFHandlerType1 & dof1, + const DoFHandler & dof1, const InVector & u1, - const DoFHandlerType2 & dof2, + const DoFHandler & dof2, const AffineConstraints &constraints, OutVector & u2) { @@ -132,10 +122,10 @@ namespace FETools std::unique_ptr>>> interpolation_matrices; - typename DoFHandlerType1::active_cell_iterator + typename DoFHandler::active_cell_iterator cell1 = dof1.begin_active(), endc1 = dof1.end(); - typename DoFHandlerType2::active_cell_iterator + typename DoFHandler::active_cell_iterator cell2 = dof2.begin_active(), endc2 = dof2.end(); (void)endc2; -- 2.39.5