Fixup: FEInterfaceViews::Scalar

diff --git a/include/deal.II/fe/fe_interface_values.h b/include/deal.II/fe/fe_interface_values.h
index 70dbd0d0a5c54400dde719f71e7aab5c9dfe780e..cc3f9bf5869fde65a8c0d10f9f98764cef0e1152 100644 (file)
--- a/include/deal.II/fe/fe_interface_values.h
+++ b/include/deal.II/fe/fe_interface_values.h
@@ -71,20 +71,21 @@ namespace FEInterfaceViews
 
     /**
      * This is the type returned for gradients, for example from
-     * average_gradient().
+     * average_of_gradients().
      */
     using gradient_type =
       typename FEValuesViews::Scalar<dim, spacedim>::gradient_type;
 
     /**
-     * This is the type returned for hessians, for example from jump_hessian().
+     * This is the type returned for hessians, for example from
+     * jump_in_hessians().
      */
     using hessian_type =
       typename FEValuesViews::Scalar<dim, spacedim>::hessian_type;
 
     /**
      * This is the type returned for third derivatives, for example from
-     * jump_hessian().
+     * jump_in_hessians().
      */
     using third_derivative_type =
       typename FEValuesViews::Scalar<dim, spacedim>::third_derivative_type;
@@ -126,13 +127,13 @@ 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;
+    jump_in_values(const unsigned int interface_dof_index,
+                   const unsigned int q_point) const;
 
     /**
      * The same as above.
      *
-     * @deprecated Use the jump_value() function instead.
+     * @deprecated Use the jump_in_values() function instead.
      */
     DEAL_II_DEPRECATED
     value_type
@@ -146,13 +147,23 @@ namespace FEInterfaceViews
      * of the component selected by this view.
      */
     value_type
+    average_of_values(const unsigned int interface_dof_index,
+                      const unsigned int q_point) const;
+
+    /**
+     * The same as above.
+     *
+     * @deprecated Use the average_of_values() function instead.
+     */
+    DEAL_II_DEPRECATED
+    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.
+     * @deprecated Use the average_of_values() function instead.
      */
     DEAL_II_DEPRECATED
     value_type
@@ -166,6 +177,16 @@ namespace FEInterfaceViews
      * of the component selected by this view.
      */
     gradient_type
+    average_of_gradients(const unsigned int interface_dof_index,
+                         const unsigned int q_point) const;
+
+    /**
+     * The same as above.
+     *
+     * @deprecated Use the average_of_gradients() function instead.
+     */
+    DEAL_II_DEPRECATED
+    gradient_type
     average_gradient(const unsigned int interface_dof_index,
                      const unsigned int q_point) const;
 
@@ -176,6 +197,16 @@ namespace FEInterfaceViews
      * of the component selected by this view.
      */
     gradient_type
+    jump_in_gradients(const unsigned int interface_dof_index,
+                      const unsigned int q_point) const;
+
+    /**
+     * The same as above.
+     *
+     * @deprecated Use the jump_in_gradients() function instead.
+     */
+    DEAL_II_DEPRECATED
+    gradient_type
     jump_gradient(const unsigned int interface_dof_index,
                   const unsigned int q_point) const;
 
@@ -187,6 +218,16 @@ namespace FEInterfaceViews
      * q_point of the component selected by this view.
      */
     hessian_type
+    average_of_hessians(const unsigned int interface_dof_index,
+                        const unsigned int q_point) const;
+
+    /**
+     * The same as above.
+     *
+     * @deprecated Use the average_of_hessians() function instead.
+     */
+    DEAL_II_DEPRECATED
+    hessian_type
     average_hessian(const unsigned int interface_dof_index,
                     const unsigned int q_point) const;
 
@@ -197,6 +238,16 @@ namespace FEInterfaceViews
      * the component selected by this view.
      */
     hessian_type
+    jump_in_hessians(const unsigned int interface_dof_index,
+                     const unsigned int q_point) const;
+
+    /**
+     * The same as above.
+     *
+     * @deprecated Use the jump_in_hessians() function instead.
+     */
+    DEAL_II_DEPRECATED
+    hessian_type
     jump_hessian(const unsigned int interface_dof_index,
                  const unsigned int q_point) const;
 
@@ -207,13 +258,13 @@ 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;
+    jump_in_third_derivatives(const unsigned int interface_dof_index,
+                              const unsigned int q_point) const;
 
     /**
      * The same as above.
      *
-     * @deprecated Use the jump_third_derivative() function instead.
+     * @deprecated Use the jump_in_third_derivatives() function instead.
      */
     DEAL_II_DEPRECATED
     third_derivative_type
@@ -1671,8 +1722,8 @@ namespace FEInterfaceViews
 
   template <int dim, int spacedim>
   typename Scalar<dim, spacedim>::value_type
-  Scalar<dim, spacedim>::jump_value(const unsigned int interface_dof_index,
-                                    const unsigned int q_point) const
+  Scalar<dim, spacedim>::jump_in_values(const unsigned int interface_dof_index,
+                                        const unsigned int q_point) const
   {
     const auto dof_pair = this->fe_interface->dofmap[interface_dof_index];
 
@@ -1698,15 +1749,16 @@ namespace FEInterfaceViews
   Scalar<dim, spacedim>::jump(const unsigned int interface_dof_index,
                               const unsigned int q_point) const
   {
-    return jump_value(interface_dof_index, q_point);
+    return jump_in_values(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
+  Scalar<dim, spacedim>::average_of_values(
+    const unsigned int interface_dof_index,
+    const unsigned int q_point) const
   {
     const auto dof_pair = this->fe_interface->dofmap[interface_dof_index];
 
@@ -1737,14 +1789,14 @@ namespace FEInterfaceViews
   Scalar<dim, spacedim>::average(const unsigned int interface_dof_index,
                                  const unsigned int q_point) const
   {
-    return average_value(interface_dof_index, q_point);
+    return average_of_values(interface_dof_index, q_point);
   }
 
 
 
   template <int dim, int spacedim>
   typename Scalar<dim, spacedim>::gradient_type
-  Scalar<dim, spacedim>::average_gradient(
+  Scalar<dim, spacedim>::average_of_gradients(
     const unsigned int interface_dof_index,
     const unsigned int q_point) const
   {
@@ -1770,11 +1822,22 @@ namespace FEInterfaceViews
   }
 
 
+  template <int dim, int spacedim>
+  typename Scalar<dim, spacedim>::gradient_type
+  Scalar<dim, spacedim>::average_gradient(
+    const unsigned int interface_dof_index,
+    const unsigned int q_point) const
+  {
+    return average_of_gradients(interface_dof_index, q_point);
+  }
+
+
 
   template <int dim, int spacedim>
   typename Scalar<dim, spacedim>::gradient_type
-  Scalar<dim, spacedim>::jump_gradient(const unsigned int interface_dof_index,
-                                       const unsigned int q_point) const
+  Scalar<dim, spacedim>::jump_in_gradients(
+    const unsigned int interface_dof_index,
+    const unsigned int q_point) const
   {
     const auto dof_pair = this->fe_interface->dofmap[interface_dof_index];
 
@@ -1799,10 +1862,21 @@ namespace FEInterfaceViews
 
 
 
+  template <int dim, int spacedim>
+  typename Scalar<dim, spacedim>::gradient_type
+  Scalar<dim, spacedim>::jump_gradient(const unsigned int interface_dof_index,
+                                       const unsigned int q_point) const
+  {
+    return jump_in_gradients(interface_dof_index, q_point);
+  }
+
+
+
   template <int dim, int spacedim>
   typename Scalar<dim, spacedim>::hessian_type
-  Scalar<dim, spacedim>::average_hessian(const unsigned int interface_dof_index,
-                                         const unsigned int q_point) const
+  Scalar<dim, spacedim>::average_of_hessians(
+    const unsigned int interface_dof_index,
+    const unsigned int q_point) const
   {
     const auto dof_pair = this->fe_interface->dofmap[interface_dof_index];
 
@@ -1827,9 +1901,19 @@ namespace FEInterfaceViews
 
 
 
+  template <int dim, int spacedim>
+  typename Scalar<dim, spacedim>::hessian_type
+  Scalar<dim, spacedim>::average_hessian(const unsigned int interface_dof_index,
+                                         const unsigned int q_point) const
+  {
+    return average_of_hessians(interface_dof_index, q_point);
+  }
+
+
+
   template <int dim, int spacedim>
   typename Scalar<dim, spacedim>::third_derivative_type
-  Scalar<dim, spacedim>::jump_third_derivative(
+  Scalar<dim, spacedim>::jump_in_third_derivatives(
     const unsigned int interface_dof_index,
     const unsigned int q_point) const
   {
@@ -1861,15 +1945,16 @@ namespace FEInterfaceViews
     const unsigned int interface_dof_index,
     const unsigned int q_point) const
   {
-    return jump_third_derivative(interface_dof_index, q_point);
+    return jump_in_third_derivatives(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,
-                                      const unsigned int q_point) const
+  Scalar<dim, spacedim>::jump_in_hessians(
+    const unsigned int interface_dof_index,
+    const unsigned int q_point) const
   {
     const auto dof_pair = this->fe_interface->dofmap[interface_dof_index];
 
@@ -1894,6 +1979,16 @@ namespace FEInterfaceViews
 
 
 
+  template <int dim, int spacedim>
+  typename Scalar<dim, spacedim>::hessian_type
+  Scalar<dim, spacedim>::jump_hessian(const unsigned int interface_dof_index,
+                                      const unsigned int q_point) const
+  {
+    return jump_in_hessians(interface_dof_index, q_point);
+  }
+
+
+
   template <int dim, int spacedim>
   Vector<dim, spacedim>::Vector(
     const FEInterfaceValues<dim, spacedim> &fe_interface,