From: Wolfgang Bangerth Date: Fri, 31 Jul 2015 21:25:35 +0000 (-0500) Subject: Convert FE::compute_2nd(). X-Git-Tag: v8.4.0-rc2~685^2~2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=856525beb7e62c6b1d3d33e70a20bc05ca2b400a;p=dealii.git Convert FE::compute_2nd(). It only uses finite element related data. Let this be the only argument it gets. --- diff --git a/include/deal.II/fe/fe.h b/include/deal.II/fe/fe.h index 3242f99b8c..1491521bd2 100644 --- a/include/deal.II/fe/fe.h +++ b/include/deal.II/fe/fe.h @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -1969,12 +1970,12 @@ protected: /** * Compute second derivatives by finite differences of gradients. */ - void compute_2nd (const Mapping &mapping, + void compute_2nd (const Mapping &mapping, const typename Triangulation::cell_iterator &cell, - const unsigned int offset, - const typename Mapping::InternalDataBase &mapping_internal, - const InternalDataBase &fe_internal, - FEValuesData &data) const; + const unsigned int offset, + const typename Mapping::InternalDataBase &mapping_internal, + const InternalDataBase &fe_internal, + internal::FEValues::FiniteElementRelatedData &data) const; /** * Given the pattern of nonzero components for each shape function, compute diff --git a/source/fe/fe.cc b/source/fe/fe.cc index 9c5234a027..df3cf0302b 100644 --- a/source/fe/fe.cc +++ b/source/fe/fe.cc @@ -1220,7 +1220,7 @@ FiniteElement<1,2>::compute_2nd ( const unsigned int, const Mapping<1,2>::InternalDataBase &, const InternalDataBase &, - FEValuesData<1,2> &) const + internal::FEValues::FiniteElementRelatedData<1,2> &) const { Assert(false, ExcNotImplemented()); } @@ -1234,7 +1234,7 @@ FiniteElement<1,3>::compute_2nd ( const unsigned int, const Mapping<1,3>::InternalDataBase &, const InternalDataBase &, - FEValuesData<1,3> &) const + internal::FEValues::FiniteElementRelatedData<1,3> &) const { Assert(false, ExcNotImplemented()); } @@ -1249,7 +1249,7 @@ FiniteElement<2,3>::compute_2nd ( const unsigned int, const Mapping<2,3>::InternalDataBase &, const InternalDataBase &, - FEValuesData<2,3> &) const + internal::FEValues::FiniteElementRelatedData<2,3> &) const { Assert(false, ExcNotImplemented()); } @@ -1264,7 +1264,7 @@ FiniteElement::compute_2nd ( const unsigned int offset, const typename Mapping::InternalDataBase &mapping_internal, const InternalDataBase &fe_internal, - FEValuesData &data) const + internal::FEValues::FiniteElementRelatedData &data) const { Assert ((fe_internal.update_each | fe_internal.update_once) & update_hessians,