From: Jean-Paul Pelteret <jppelteret@gmail.com>
Date: Thu, 10 Aug 2017 22:57:58 +0000 (-0600)
Subject: Added Vector::get_function_divergences_from_local_dof_values
X-Git-Tag: v9.0.0-rc1~1291^2~10
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02429804afd0d0eed1e297232656f56e8fbf1ab5;p=dealii.git

Added Vector::get_function_divergences_from_local_dof_values
---

diff --git a/include/deal.II/fe/fe_values.h b/include/deal.II/fe/fe_values.h
index 895543894b..45b8dd9463 100644
--- a/include/deal.II/fe/fe_values.h
+++ b/include/deal.II/fe/fe_values.h
@@ -952,6 +952,13 @@ namespace FEValuesViews
     void get_function_divergences (const InputVector &fe_function,
                                    std::vector<typename ProductType<divergence_type,typename InputVector::value_type>::type> &divergences) const;
 
+    /**
+     * @copydoc FEValuesViews::Vector::get_function_values_from_local_dof_values()
+     */
+    template <class InputVector>
+    void get_function_divergences_from_local_dof_values (const InputVector &dof_values,
+                                                         std::vector<typename OutputType<typename InputVector::value_type>::divergence_type> &divergences) const;
+
     /**
      * Return the curl of the selected vector components of the finite element
      * function characterized by <tt>fe_function</tt> at the quadrature points
diff --git a/source/fe/fe_values.cc b/source/fe/fe_values.cc
index 8a3289b105..9650c53a6f 100644
--- a/source/fe/fe_values.cc
+++ b/source/fe/fe_values.cc
@@ -716,14 +716,15 @@ namespace FEValuesViews
     do_function_divergences (const ArrayView<Number> &dof_values,
                              const Table<2,dealii::Tensor<1,spacedim> > &shape_gradients,
                              const std::vector<typename Vector<dim,spacedim>::ShapeFunctionData> &shape_function_data,
-                             std::vector<typename ProductType<Number,double>::type> &divergences)
+                             std::vector<typename Vector<dim,spacedim>::template OutputType<Number>::divergence_type> &divergences)
     {
       const unsigned int dofs_per_cell = dof_values.size();
       const unsigned int n_quadrature_points = dofs_per_cell > 0 ?
                                                shape_gradients[0].size() : divergences.size();
       AssertDimension (divergences.size(), n_quadrature_points);
 
-      std::fill (divergences.begin(), divergences.end(), typename ProductType<Number,double>::type());
+      std::fill (divergences.begin(), divergences.end(),
+                 typename Vector<dim,spacedim>::template OutputType<Number>::divergence_type());
 
       for (unsigned int shape_function=0;
            shape_function<dofs_per_cell; ++shape_function)
@@ -1642,6 +1643,28 @@ namespace FEValuesViews
      fe_values->finite_element_output.shape_gradients, shape_function_data, divergences);
   }
 
+
+
+  template <int dim, int spacedim>
+  template <class InputVector>
+  void
+  Vector<dim,spacedim>::
+  get_function_divergences_from_local_dof_values(const InputVector &dof_values,
+                                                 std::vector<typename OutputType<typename InputVector::value_type>::divergence_type> &divergences) const
+  {
+    Assert (fe_values->update_flags & update_gradients,
+            (typename FEValuesBase<dim,spacedim>::ExcAccessToUninitializedField("update_gradients")));
+    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_divergences<dim,spacedim>
+    (make_array_view(dof_values.begin(), dof_values.end()),
+     fe_values->finite_element_output.shape_gradients, shape_function_data, divergences);
+  }
+
+
+
   template <int dim, int spacedim>
   template <class InputVector>
   void
diff --git a/source/fe/fe_values.inst.in b/source/fe/fe_values.inst.in
index b0b722db57..8d3ab27c5b 100644
--- a/source/fe/fe_values.inst.in
+++ b/source/fe/fe_values.inst.in
@@ -186,6 +186,11 @@ for (VEC : GENERAL_CONTAINER_TYPES;
     void FEValuesViews::Vector<deal_II_dimension, deal_II_space_dimension>
     ::get_function_symmetric_gradients_from_local_dof_values<VEC<Number>>
             (const VEC<Number>&, std::vector<typename OutputType<Number>::symmetric_gradient_type>&) const;
+
+    template
+    void FEValuesViews::Vector<deal_II_dimension, deal_II_space_dimension>
+    ::get_function_divergences_from_local_dof_values<VEC<Number>>
+            (const VEC<Number>&, std::vector<typename OutputType<Number>::divergence_type>&) const;
 #endif
 }