From 7aaacf201e14dccab5f8e8b845578b8f4b50364e Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Tue, 8 Jun 2021 17:45:38 +0200 Subject: [PATCH] FEInterfaceViews::Vector: Make interface consistent with FEValuesViews::Vector --- include/deal.II/fe/fe_interface_values.h | 71 ++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 5 deletions(-) diff --git a/include/deal.II/fe/fe_interface_values.h b/include/deal.II/fe/fe_interface_values.h index d4270923aa..379782faf1 100644 --- a/include/deal.II/fe/fe_interface_values.h +++ b/include/deal.II/fe/fe_interface_values.h @@ -301,6 +301,16 @@ namespace FEInterfaceViews * @p interface_dof_index in the quadrature point @p q_point. */ value_type + jump_value(const unsigned int interface_dof_index, + const unsigned int q_point) const; + + /** + * The same as above. + * + * @deprecated Use the jump_value() function instead. + */ + DEAL_II_DEPRECATED + value_type jump(const unsigned int interface_dof_index, const unsigned int q_point) const; @@ -310,6 +320,16 @@ namespace FEInterfaceViews * function @p interface_dof_index in the quadrature point @p q_point. */ value_type + average_value(const unsigned int interface_dof_index, + const unsigned int q_point) const; + + /** + * The same as above. + * + * @deprecated Use the average_value() function instead. + */ + DEAL_II_DEPRECATED + value_type average(const unsigned int interface_dof_index, const unsigned int q_point) const; @@ -359,6 +379,16 @@ namespace FEInterfaceViews * the component selected by this view. */ third_derivative_type + jump_third_derivative(const unsigned int interface_dof_index, + const unsigned int q_point) const; + + /** + * The same as above. + * + * @deprecated Use the jump_third_derivative() function instead. + */ + DEAL_II_DEPRECATED + third_derivative_type jump_3rd_derivative(const unsigned int interface_dof_index, const unsigned int q_point) const; @@ -1897,8 +1927,8 @@ namespace FEInterfaceViews template typename Vector::value_type - Vector::jump(const unsigned int interface_dof_index, - const unsigned int q_point) const + Vector::jump_value(const unsigned int interface_dof_index, + const unsigned int q_point) const { const auto dof_pair = this->fe_interface->dofmap[interface_dof_index]; @@ -1921,8 +1951,18 @@ namespace FEInterfaceViews template typename Vector::value_type - Vector::average(const unsigned int interface_dof_index, - const unsigned int q_point) const + Vector::jump(const unsigned int interface_dof_index, + const unsigned int q_point) const + { + return jump_value(interface_dof_index, q_point); + } + + + + template + typename Vector::value_type + Vector::average_value(const unsigned int interface_dof_index, + const unsigned int q_point) const { const auto dof_pair = this->fe_interface->dofmap[interface_dof_index]; @@ -1948,6 +1988,16 @@ namespace FEInterfaceViews + template + typename Vector::value_type + Vector::average(const unsigned int interface_dof_index, + const unsigned int q_point) const + { + return average_value(interface_dof_index, q_point); + } + + + template typename Vector::gradient_type Vector::average_gradient( @@ -2063,7 +2113,7 @@ namespace FEInterfaceViews template typename Vector::third_derivative_type - Vector::jump_3rd_derivative( + Vector::jump_third_derivative( const unsigned int interface_dof_index, const unsigned int q_point) const { @@ -2086,6 +2136,17 @@ namespace FEInterfaceViews return value; } + + + + template + typename Vector::third_derivative_type + Vector::jump_3rd_derivative( + const unsigned int interface_dof_index, + const unsigned int q_point) const + { + return jump_third_derivative(interface_dof_index, q_point); + } } // namespace FEInterfaceViews #endif // DOXYGEN -- 2.39.5