FEInterfaceViews::Scalar: Make interface consistent with FEValuesExtractors::Scalar

diff --git a/include/deal.II/fe/fe_interface_values.h b/include/deal.II/fe/fe_interface_values.h
index d304ba360abcadec6e77fefc7ddfbbd01d196e78..d4270923aa65323e95eda889133aa4fbb560429a 100644 (file)
--- a/include/deal.II/fe/fe_interface_values.h
+++ b/include/deal.II/fe/fe_interface_values.h
@@ -126,6 +126,16 @@ namespace FEInterfaceViews
      * of the component selected by this view.
      */
     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;
 
@@ -136,6 +146,16 @@ namespace FEInterfaceViews
      * of the component selected by this view.
      */
     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;
 
@@ -187,6 +207,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;
 
@@ -1611,8 +1641,8 @@ namespace FEInterfaceViews
 
   template <int dim, int spacedim>
   typename Scalar<dim, spacedim>::value_type
-  Scalar<dim, spacedim>::jump(const unsigned int interface_dof_index,
-                              const unsigned int q_point) const
+  Scalar<dim, spacedim>::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];
 
@@ -1635,8 +1665,18 @@ namespace FEInterfaceViews
 
   template <int dim, int spacedim>
   typename Scalar<dim, spacedim>::value_type
-  Scalar<dim, spacedim>::average(const unsigned int interface_dof_index,
-                                 const unsigned int q_point) const
+  Scalar<dim, spacedim>::jump(const unsigned int interface_dof_index,
+                              const unsigned int q_point) const
+  {
+    return jump_value(interface_dof_index, q_point);
+  }
+
+
+
+  template <int dim, int spacedim>
+  typename Scalar<dim, spacedim>::value_type
+  Scalar<dim, spacedim>::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];
 
@@ -1662,6 +1702,16 @@ namespace FEInterfaceViews
 
 
 
+  template <int dim, int spacedim>
+  typename Scalar<dim, spacedim>::value_type
+  Scalar<dim, spacedim>::average(const unsigned int interface_dof_index,
+                                 const unsigned int q_point) const
+  {
+    return average_value(interface_dof_index, q_point);
+  }
+
+
+
   template <int dim, int spacedim>
   typename Scalar<dim, spacedim>::gradient_type
   Scalar<dim, spacedim>::average_gradient(
@@ -1749,7 +1799,7 @@ namespace FEInterfaceViews
 
   template <int dim, int spacedim>
   typename Scalar<dim, spacedim>::third_derivative_type
-  Scalar<dim, spacedim>::jump_3rd_derivative(
+  Scalar<dim, spacedim>::jump_third_derivative(
     const unsigned int interface_dof_index,
     const unsigned int q_point) const
   {
@@ -1775,6 +1825,17 @@ namespace FEInterfaceViews
 
 
 
+  template <int dim, int spacedim>
+  typename Scalar<dim, spacedim>::third_derivative_type
+  Scalar<dim, spacedim>::jump_3rd_derivative(
+    const unsigned int interface_dof_index,
+    const unsigned int q_point) const
+  {
+    return jump_third_derivative(interface_dof_index, q_point);
+  }
+
+
+
   template <int dim, int spacedim>
   typename Scalar<dim, spacedim>::hessian_type
   Scalar<dim, spacedim>::jump_hessian(const unsigned int interface_dof_index,