Added Vector::get_function_values_from_local_dof_values

diff --git a/include/deal.II/fe/fe_values.h b/include/deal.II/fe/fe_values.h
index e4f5b920e778a540eef710b96c0120dbb1a0fb22..c6fe38f0d0fb91b83510f402756c2237e1fd1ddf 100644 (file)
--- a/include/deal.II/fe/fe_values.h
+++ b/include/deal.II/fe/fe_values.h
@@ -582,6 +582,62 @@ namespace FEValuesViews
      */
     typedef dealii::Tensor<4,spacedim>          third_derivative_type;
 
+    /**
+     * A struct that provides the output type for the product of the value
+     * and derivatives of basis functions of the Vector view and any @p Number type.
+     */
+    template <typename Number>
+    struct OutputType
+    {
+      /**
+       * A typedef for the data type of the product of a @p Number and the
+       * values of the view the Vector class.
+       */
+      typedef typename ProductType<typename std::remove_cv<Number>::type, typename Vector<dim,spacedim>::value_type>::type value_type;
+
+      /**
+       * A typedef for the data type of the product of a @p Number and the
+       * gradients of the view the Vector class.
+       */
+      typedef typename ProductType<typename std::remove_cv<Number>::type, typename Vector<dim,spacedim>::gradient_type>::type gradient_type;
+
+      /**
+       * A typedef for the data type of the product of a @p Number and the
+       * symmetric gradients of the view the Vector class.
+       */
+      typedef typename ProductType<typename std::remove_cv<Number>::type, typename Vector<dim,spacedim>::symmetric_gradient_type>::type symmetric_gradient_type;
+
+      /**
+       * A typedef for the data type of the product of a @p Number and the
+       * divergences of the view the Vector class.
+       */
+      typedef typename ProductType<typename std::remove_cv<Number>::type, typename Vector<dim,spacedim>::divergence_type>::type divergence_type;
+
+      /**
+       * A typedef for the data type of the product of a @p Number and the
+       * laplacians of the view the Vector class.
+       */
+      typedef typename ProductType<typename std::remove_cv<Number>::type, typename Vector<dim,spacedim>::value_type>::type laplacian_type;
+
+      /**
+       * A typedef for the data type of the product of a @p Number and the
+       * curls of the view the Vector class.
+       */
+      typedef typename ProductType<typename std::remove_cv<Number>::type, typename Vector<dim,spacedim>::curl_type>::type curl_type;
+
+      /**
+       * A typedef for the data type of the product of a @p Number and the
+       * hessians of the view the Vector class.
+       */
+      typedef typename ProductType<typename std::remove_cv<Number>::type, typename Vector<dim,spacedim>::hessian_type>::type hessian_type;
+
+      /**
+       * A typedef for the data type of the product of a @p Number and the
+       * third derivatives of the view the Vector class.
+       */
+      typedef typename ProductType<typename std::remove_cv<Number>::type, typename Vector<dim,spacedim>::third_derivative_type>::type third_derivative_type;
+    };
+
     /**
      * A structure where for each shape function we pre-compute a bunch of
      * data that will make later accesses much cheaper.
@@ -786,6 +842,30 @@ namespace FEValuesViews
     void get_function_values (const InputVector &fe_function,
                               std::vector<typename ProductType<value_type,typename InputVector::value_type>::type> &values) const;
 
+    /**
+     * Same as above, but using a vector of local degree-of-freedom values.
+     *
+     * The @p dof_values vector must have a length equal to number of DoFs on
+     * a cell, and  each entry @p dof_values[i] is the value of the local DoF
+     * @p i. The fundamental prerequisite for the @p InputVector is that it must
+     * be possible to create an ArrayView from it; this is satisfied by the
+     * @p std::vector class.
+     *
+     * The DoF values typically would be obtained in the following way:
+     * @code
+     * Vector<double> local_dof_values(cell->get_fe().dofs_per_cell);
+     * cell->get_dof_values(solution, local_dof_values);
+     * @endcode
+     * or, for a generic @p Number type,
+     * @code
+     * std::vector<Number> local_dof_values(cell->get_fe().dofs_per_cell);
+     * cell->get_dof_values(solution, local_dof_values.begin(), local_dof_values.end());
+     * @endcode
+     */
+    template <class InputVector>
+    void get_function_values_from_local_dof_values (const InputVector &dof_values,
+                                                    std::vector<typename OutputType<typename InputVector::value_type>::value_type> &values) const;
+
     /**
      * Return the gradients of the selected vector components of the finite
      * element function characterized by <tt>fe_function</tt> at the

diff --git a/source/fe/fe_values.cc b/source/fe/fe_values.cc
index c26294d7ba4103c71d86d248679b6c81473cc3a0..3dc2a33af160f27f994f8620e58648d4119a263f 100644 (file)
--- a/source/fe/fe_values.cc
+++ b/source/fe/fe_values.cc
@@ -1509,6 +1509,25 @@ namespace FEValuesViews
 
 
 
+  template <int dim, int spacedim>
+  template <class InputVector>
+  void
+  Vector<dim,spacedim>::
+  get_function_values_from_local_dof_values (const InputVector &dof_values,
+                                             std::vector<typename OutputType<typename InputVector::value_type>::value_type> &values) const
+  {
+    Assert (fe_values->update_flags & update_values,
+            (typename FEValuesBase<dim,spacedim>::ExcAccessToUninitializedField("update_values")));
+    Assert (fe_values->present_cell.get() != nullptr,
+            ExcMessage ("FEValues object is not reinit'ed to any cell"));
+    AssertDimension (dof_values.size(), fe_values->dofs_per_cell);
+
+    internal::do_function_values<dim,spacedim>
+    (make_array_view(dof_values.begin(), dof_values.end()),
+     fe_values->finite_element_output.shape_values, shape_function_data, values);
+  }
+
+
 
   template <int dim, int spacedim>
   template <class InputVector>

diff --git a/source/fe/fe_values.inst.in b/source/fe/fe_values.inst.in
index 69c7931298425e8db0093fcdd18ce528d0961175..f0b789a19ce84dd3888f38427b96029737057ec0 100644 (file)
--- a/source/fe/fe_values.inst.in
+++ b/source/fe/fe_values.inst.in
@@ -169,6 +169,13 @@ for (VEC : GENERAL_CONTAINER_TYPES;
     void FEValuesViews::Scalar<deal_II_dimension, deal_II_space_dimension>
     ::get_function_third_derivatives_from_local_dof_values<VEC<Number>>
             (const VEC<Number>&, std::vector<typename OutputType<Number>::third_derivative_type>&) const;
+
+
+
+    template
+    void FEValuesViews::Vector<deal_II_dimension, deal_II_space_dimension>
+    ::get_function_values_from_local_dof_values<VEC<Number>>
+            (const VEC<Number>&, std::vector<typename OutputType<Number>::value_type>&) const;
 #endif
 }