This brings the argument list in line with the changes made to Mapping in #1204.
In essence, it is all about sorting the list in a halfway reasonable order. No
functional changes.
The patch changes all of the derived finite element classes as well. In some cases
it changes the name of arguments to match a uniform style.
*/
virtual
void
- fill_fe_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const CellSimilarity::Similarity cell_similarity,
const Quadrature<dim> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const InternalDataBase &fe_internal,
const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
- dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data,
- const CellSimilarity::Similarity cell_similarity) const = 0;
+ const InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const = 0;
virtual
void
- fill_fe_face_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
const unsigned int face_no,
const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const InternalDataBase &fe_internal,
const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const InternalDataBase &fe_internal,
dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const = 0;
virtual
void
- fill_fe_subface_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
const unsigned int face_no,
const unsigned int sub_no,
const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const InternalDataBase &fe_internal,
const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const InternalDataBase &fe_internal,
dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const = 0;
friend class InternalDataBase;
virtual
void
- fill_fe_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const Quadrature<dim> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
- const CellSimilarity::Similarity cell_similarity) const;
+ fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const CellSimilarity::Similarity cell_similarity,
+ const Quadrature<dim> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
virtual
void
- fill_fe_face_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face_no,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+ fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
virtual
void
- fill_fe_subface_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face_no,
- const unsigned int sub_no,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+ fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const unsigned int sub_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
private:
virtual
void
- fill_fe_values (const Mapping<1,spacedim> &mapping,
- const typename Triangulation<1,spacedim>::cell_iterator &cell,
- const Quadrature<1> &quadrature,
- const typename Mapping<1,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<1,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<1,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<1,spacedim> &output_data,
- const CellSimilarity::Similarity cell_similarity) const;
+ fill_fe_values (const typename Triangulation<1,spacedim>::cell_iterator &cell,
+ const CellSimilarity::Similarity cell_similarity,
+ const Quadrature<1> &quadrature,
+ const Mapping<1,spacedim> &mapping,
+ const typename Mapping<1,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<1, spacedim> &mapping_data,
+ const typename FiniteElement<1,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<1, spacedim> &output_data) const;
virtual
void
- fill_fe_face_values (const Mapping<1,spacedim> &mapping,
- const typename Triangulation<1,spacedim>::cell_iterator &cell,
- const unsigned int face_no,
- const Quadrature<0> &quadrature,
- const typename Mapping<1,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<1,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<1,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<1,spacedim> &output_data) const;
+ fill_fe_face_values (const typename Triangulation<1,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const Quadrature<0> &quadrature,
+ const Mapping<1,spacedim> &mapping,
+ const typename Mapping<1,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<1, spacedim> &mapping_data,
+ const typename FiniteElement<1,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<1, spacedim> &output_data) const;
virtual
void
- fill_fe_subface_values (const Mapping<1,spacedim> &mapping,
- const typename Triangulation<1,spacedim>::cell_iterator &cell,
- const unsigned int face_no,
- const unsigned int sub_no,
- const Quadrature<0> &quadrature,
- const typename Mapping<1,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<1,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<1,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<1,spacedim> &output_data) const;
+ fill_fe_subface_values (const typename Triangulation<1,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const unsigned int sub_no,
+ const Quadrature<0> &quadrature,
+ const Mapping<1,spacedim> &mapping,
+ const typename Mapping<1,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<1, spacedim> &mapping_data,
+ const typename FiniteElement<1,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<1, spacedim> &output_data) const;
/**
virtual
void
- fill_fe_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const Quadrature<dim> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
- const CellSimilarity::Similarity cell_similarity) const;
+ fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const CellSimilarity::Similarity cell_similarity,
+ const Quadrature<dim> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
virtual
void
- fill_fe_face_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face_no,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+ fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
virtual
void
- fill_fe_subface_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face_no,
- const unsigned int sub_no,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+ fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const unsigned int sub_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
/**
* Prepare internal data structures and fill in values independent of the
virtual
void
- fill_fe_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const Quadrature<dim> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
- const CellSimilarity::Similarity cell_similarity) const;
+ fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const CellSimilarity::Similarity cell_similarity,
+ const Quadrature<dim> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
virtual
void
- fill_fe_face_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face_no,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+ fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
virtual
void
- fill_fe_subface_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face_no,
- const unsigned int sub_no,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+ fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const unsigned int sub_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
/**
* Determine the values that need to be computed on the unit cell to be able
template <class POLY, int dim, int spacedim>
void
FE_Poly<POLY,dim,spacedim>::
-fill_fe_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &,
- const Quadrature<dim> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
- const CellSimilarity::Similarity cell_similarity) const
+fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+ const CellSimilarity::Similarity cell_similarity,
+ const Quadrature<dim> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
{
// convert data object to internal
// data for this class. fails with
// an exception if that is not
// possible
- Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
- const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+ Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+ const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
const UpdateFlags flags(fe_data.update_each);
template <class POLY, int dim, int spacedim>
void
FE_Poly<POLY,dim,spacedim>::
-fill_fe_face_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
+fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
{
// convert data object to internal
// data for this class. fails with
// an exception if that is not
// possible
- Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
- const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+ Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+ const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
// offset determines which data set
// to take (all data sets for all
// faces are stored contiguously)
const typename QProjector<dim>::DataSetDescriptor offset
- = QProjector<dim>::DataSetDescriptor::face (face,
- cell->face_orientation(face),
- cell->face_flip(face),
- cell->face_rotation(face),
+ = QProjector<dim>::DataSetDescriptor::face (face_no,
+ cell->face_orientation(face_no),
+ cell->face_flip(face_no),
+ cell->face_rotation(face_no),
quadrature.size());
const UpdateFlags flags(fe_data.update_each);
template <class POLY, int dim, int spacedim>
void
FE_Poly<POLY,dim,spacedim>::
-fill_fe_subface_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face,
- const unsigned int subface,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
+fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const unsigned int sub_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
{
// convert data object to internal
// data for this class. fails with
// an exception if that is not
// possible
- Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
- const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+ Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+ const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
// offset determines which data set
// to take (all data sets for all
// sub-faces are stored contiguously)
const typename QProjector<dim>::DataSetDescriptor offset
- = QProjector<dim>::DataSetDescriptor::subface (face, subface,
- cell->face_orientation(face),
- cell->face_flip(face),
- cell->face_rotation(face),
+ = QProjector<dim>::DataSetDescriptor::subface (face_no, sub_no,
+ cell->face_orientation(face_no),
+ cell->face_flip(face_no),
+ cell->face_rotation(face_no),
quadrature.size(),
- cell->subface_case(face));
+ cell->subface_case(face_no));
const UpdateFlags flags(fe_data.update_each);
virtual
void
- fill_fe_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const Quadrature<dim> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
- const CellSimilarity::Similarity cell_similarity) const;
+ fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const CellSimilarity::Similarity cell_similarity,
+ const Quadrature<dim> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
virtual
void
- fill_fe_face_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face_no,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+ fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
virtual
void
- fill_fe_subface_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face_no,
- const unsigned int sub_no,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+ fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const unsigned int sub_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
/**
* Determine the values that need to be computed on the unit cell to be able
template <class POLY, int dim, int spacedim>
void
FE_PolyFace<POLY,dim,spacedim>::
-fill_fe_values (const Mapping<dim,spacedim> &,
- const typename Triangulation<dim,spacedim>::cell_iterator &,
+fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+ const CellSimilarity::Similarity ,
const Quadrature<dim> &,
+ const Mapping<dim,spacedim> &,
const typename Mapping<dim,spacedim>::InternalDataBase &,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &,
const typename FiniteElement<dim,spacedim>::InternalDataBase &,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &,
- const CellSimilarity::Similarity ) const
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &) const
{
// Do nothing, since we do not have
// values in the interior
template <class POLY, int dim, int spacedim>
void
FE_PolyFace<POLY,dim,spacedim>::
-fill_fe_face_values (const Mapping<dim,spacedim> &,
- const typename Triangulation<dim,spacedim>::cell_iterator &,
- const unsigned int face,
- const Quadrature<dim-1>& quadrature,
+fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+ const unsigned int face_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &,
const typename Mapping<dim,spacedim>::InternalDataBase &,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
{
// convert data object to internal
// data for this class. fails with
// an exception if that is not
// possible
- Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
- const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+ Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+ const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
if (fe_data.update_each & update_values)
for (unsigned int i=0; i<quadrature.size(); ++i)
// Fill data for quad shape functions
if (this->dofs_per_quad !=0)
{
- const unsigned int foffset = this->first_quad_index + this->dofs_per_quad * face;
+ const unsigned int foffset = this->first_quad_index + this->dofs_per_quad * face_no;
for (unsigned int k=0; k<this->dofs_per_quad; ++k)
output_data.shape_values(foffset+k,i) = fe_data.shape_values[k+this->first_face_quad_index][i];
}
for (unsigned int line=0; line<GeometryInfo<dim>::lines_per_face; ++line)
{
for (unsigned int k=0; k<this->dofs_per_line; ++k)
- output_data.shape_values(foffset+GeometryInfo<dim>::face_to_cell_lines(face, line)*this->dofs_per_line+k,i)
+ output_data.shape_values(foffset+GeometryInfo<dim>::face_to_cell_lines(face_no, line)*this->dofs_per_line+k,i)
= fe_data.shape_values[k+(line*this->dofs_per_line)+this->first_face_line_index][i];
}
}
// Fill data for vertex shape functions
if (this->dofs_per_vertex != 0)
for (unsigned int lvertex=0; lvertex<GeometryInfo<dim>::vertices_per_face; ++lvertex)
- output_data.shape_values(GeometryInfo<dim>::face_to_cell_vertices(face, lvertex),i)
+ output_data.shape_values(GeometryInfo<dim>::face_to_cell_vertices(face_no, lvertex),i)
= fe_data.shape_values[lvertex][i];
break;
}
template <class POLY, int dim, int spacedim>
void
FE_PolyFace<POLY,dim,spacedim>::
-fill_fe_subface_values (const Mapping<dim,spacedim> &,
- const typename Triangulation<dim,spacedim>::cell_iterator &,
- const unsigned int face,
- const unsigned int subface,
- const Quadrature<dim-1>& quadrature,
+fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+ const unsigned int face_no,
+ const unsigned int sub_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &,
const typename Mapping<dim,spacedim>::InternalDataBase &,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
{
// convert data object to internal
// data for this class. fails with
// an exception if that is not
// possible
- Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
- const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+ Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+ const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
- const unsigned int foffset = fe_data.shape_values.size() * face;
- const unsigned int offset = subface*quadrature.size();
+ const unsigned int foffset = fe_data.shape_values.size() * face_no;
+ const unsigned int offset = sub_no*quadrature.size();
if (fe_data.update_each & update_values)
{
virtual
void
- fill_fe_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const Quadrature<dim> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
- const CellSimilarity::Similarity cell_similarity) const;
+ fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const CellSimilarity::Similarity cell_similarity,
+ const Quadrature<dim> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
virtual
void
- fill_fe_face_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face_no,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+ fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
virtual
void
- fill_fe_subface_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face_no,
- const unsigned int sub_no,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+ fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const unsigned int sub_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
/**
* Fields of cell-independent data for FE_PolyTensor. Stores the values of
virtual
void
- fill_fe_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const Quadrature<dim> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
- const CellSimilarity::Similarity cell_similarity) const;
+ fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const CellSimilarity::Similarity cell_similarity,
+ const Quadrature<dim> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
virtual
void
- fill_fe_face_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face_no,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+ fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
virtual
void
- fill_fe_subface_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face_no,
- const unsigned int sub_no,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+ fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const unsigned int sub_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
/**
* Do the work for the three <tt>fill_fe*_values</tt> functions.
template <int dim, int spacedim>
void
FE_DGPNonparametric<dim,spacedim>::
-fill_fe_values (const Mapping<dim,spacedim> &,
- const typename Triangulation<dim,spacedim>::cell_iterator &,
+fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+ const CellSimilarity::Similarity ,
const Quadrature<dim> &,
+ const Mapping<dim,spacedim> &,
const typename Mapping<dim,spacedim>::InternalDataBase &,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_data,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
- const CellSimilarity::Similarity /*cell_similarity*/) const
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
{
- Assert (fe_data.update_each & update_quadrature_points, ExcInternalError());
+ Assert (fe_internal.update_each & update_quadrature_points, ExcInternalError());
const unsigned int n_q_points = mapping_data.quadrature_points.size();
- std::vector<double> values(fe_data.update_each & update_values ? this->dofs_per_cell : 0);
- std::vector<Tensor<1,dim> > grads(fe_data.update_each & update_gradients ? this->dofs_per_cell : 0);
- std::vector<Tensor<2,dim> > grad_grads(fe_data.update_each & update_hessians ? this->dofs_per_cell : 0);
+ std::vector<double> values(fe_internal.update_each & update_values ? this->dofs_per_cell : 0);
+ std::vector<Tensor<1,dim> > grads(fe_internal.update_each & update_gradients ? this->dofs_per_cell : 0);
+ std::vector<Tensor<2,dim> > grad_grads(fe_internal.update_each & update_hessians ? this->dofs_per_cell : 0);
std::vector<Tensor<3,dim> > empty_vector_of_3rd_order_tensors;
std::vector<Tensor<4,dim> > empty_vector_of_4th_order_tensors;
- if (fe_data.update_each & (update_values | update_gradients))
+ if (fe_internal.update_each & (update_values | update_gradients))
for (unsigned int i=0; i<n_q_points; ++i)
{
polynomial_space.compute(mapping_data.quadrature_points[i],
empty_vector_of_3rd_order_tensors,
empty_vector_of_4th_order_tensors);
- if (fe_data.update_each & update_values)
+ if (fe_internal.update_each & update_values)
for (unsigned int k=0; k<this->dofs_per_cell; ++k)
output_data.shape_values[k][i] = values[k];
- if (fe_data.update_each & update_gradients)
+ if (fe_internal.update_each & update_gradients)
for (unsigned int k=0; k<this->dofs_per_cell; ++k)
output_data.shape_gradients[k][i] = grads[k];
- if (fe_data.update_each & update_hessians)
+ if (fe_internal.update_each & update_hessians)
for (unsigned int k=0; k<this->dofs_per_cell; ++k)
output_data.shape_hessians[k][i] = grad_grads[k];
}
template <int dim, int spacedim>
void
FE_DGPNonparametric<dim,spacedim>::
-fill_fe_face_values (const Mapping<dim,spacedim> &,
- const typename Triangulation<dim,spacedim>::cell_iterator &,
- const unsigned int,
- const Quadrature<dim-1>&,
+fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+ const unsigned int ,
+ const Quadrature<dim-1> &,
+ const Mapping<dim,spacedim> &,
const typename Mapping<dim,spacedim>::InternalDataBase &,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_data,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
{
- Assert (fe_data.update_each & update_quadrature_points, ExcInternalError());
+ Assert (fe_internal.update_each & update_quadrature_points, ExcInternalError());
const unsigned int n_q_points = mapping_data.quadrature_points.size();
- std::vector<double> values(fe_data.update_each & update_values ? this->dofs_per_cell : 0);
- std::vector<Tensor<1,dim> > grads(fe_data.update_each & update_gradients ? this->dofs_per_cell : 0);
- std::vector<Tensor<2,dim> > grad_grads(fe_data.update_each & update_hessians ? this->dofs_per_cell : 0);
+ std::vector<double> values(fe_internal.update_each & update_values ? this->dofs_per_cell : 0);
+ std::vector<Tensor<1,dim> > grads(fe_internal.update_each & update_gradients ? this->dofs_per_cell : 0);
+ std::vector<Tensor<2,dim> > grad_grads(fe_internal.update_each & update_hessians ? this->dofs_per_cell : 0);
std::vector<Tensor<3,dim> > empty_vector_of_3rd_order_tensors;
std::vector<Tensor<4,dim> > empty_vector_of_4th_order_tensors;
- if (fe_data.update_each & (update_values | update_gradients))
+ if (fe_internal.update_each & (update_values | update_gradients))
for (unsigned int i=0; i<n_q_points; ++i)
{
polynomial_space.compute(mapping_data.quadrature_points[i],
empty_vector_of_3rd_order_tensors,
empty_vector_of_4th_order_tensors);
- if (fe_data.update_each & update_values)
+ if (fe_internal.update_each & update_values)
for (unsigned int k=0; k<this->dofs_per_cell; ++k)
output_data.shape_values[k][i] = values[k];
- if (fe_data.update_each & update_gradients)
+ if (fe_internal.update_each & update_gradients)
for (unsigned int k=0; k<this->dofs_per_cell; ++k)
output_data.shape_gradients[k][i] = grads[k];
- if (fe_data.update_each & update_hessians)
+ if (fe_internal.update_each & update_hessians)
for (unsigned int k=0; k<this->dofs_per_cell; ++k)
output_data.shape_hessians[k][i] = grad_grads[k];
}
template <int dim, int spacedim>
void
FE_DGPNonparametric<dim,spacedim>::
-fill_fe_subface_values (const Mapping<dim,spacedim> &,
- const typename Triangulation<dim,spacedim>::cell_iterator &,
- const unsigned int,
- const unsigned int,
- const Quadrature<dim-1>&,
+fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+ const unsigned int ,
+ const unsigned int ,
+ const Quadrature<dim-1> &,
+ const Mapping<dim,spacedim> &,
const typename Mapping<dim,spacedim>::InternalDataBase &,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_data,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
{
- Assert (fe_data.update_each & update_quadrature_points, ExcInternalError());
+ Assert (fe_internal.update_each & update_quadrature_points, ExcInternalError());
const unsigned int n_q_points = mapping_data.quadrature_points.size();
- std::vector<double> values(fe_data.update_each & update_values ? this->dofs_per_cell : 0);
- std::vector<Tensor<1,dim> > grads(fe_data.update_each & update_gradients ? this->dofs_per_cell : 0);
- std::vector<Tensor<2,dim> > grad_grads(fe_data.update_each & update_hessians ? this->dofs_per_cell : 0);
+ std::vector<double> values(fe_internal.update_each & update_values ? this->dofs_per_cell : 0);
+ std::vector<Tensor<1,dim> > grads(fe_internal.update_each & update_gradients ? this->dofs_per_cell : 0);
+ std::vector<Tensor<2,dim> > grad_grads(fe_internal.update_each & update_hessians ? this->dofs_per_cell : 0);
std::vector<Tensor<3,dim> > empty_vector_of_3rd_order_tensors;
std::vector<Tensor<4,dim> > empty_vector_of_4th_order_tensors;
- if (fe_data.update_each & (update_values | update_gradients))
+ if (fe_internal.update_each & (update_values | update_gradients))
for (unsigned int i=0; i<n_q_points; ++i)
{
polynomial_space.compute(mapping_data.quadrature_points[i],
empty_vector_of_3rd_order_tensors,
empty_vector_of_4th_order_tensors);
- if (fe_data.update_each & update_values)
+ if (fe_internal.update_each & update_values)
for (unsigned int k=0; k<this->dofs_per_cell; ++k)
output_data.shape_values[k][i] = values[k];
- if (fe_data.update_each & update_gradients)
+ if (fe_internal.update_each & update_gradients)
for (unsigned int k=0; k<this->dofs_per_cell; ++k)
output_data.shape_gradients[k][i] = grads[k];
- if (fe_data.update_each & update_hessians)
+ if (fe_internal.update_each & update_hessians)
for (unsigned int k=0; k<this->dofs_per_cell; ++k)
output_data.shape_hessians[k][i] = grad_grads[k];
}
template <int spacedim>
void
FE_FaceQ<1,spacedim>::
-fill_fe_values(const Mapping<1,spacedim> &,
- const typename Triangulation<1,spacedim>::cell_iterator &,
+fill_fe_values(const typename Triangulation<1,spacedim>::cell_iterator &,
+ const CellSimilarity::Similarity ,
const Quadrature<1> &,
+ const Mapping<1,spacedim> &,
const typename Mapping<1,spacedim>::InternalDataBase &,
+ const dealii::internal::FEValues::MappingRelatedData<1, spacedim> &,
const typename FiniteElement<1,spacedim>::InternalDataBase &,
- const internal::FEValues::MappingRelatedData<1,spacedim> &,
- internal::FEValues::FiniteElementRelatedData<1,spacedim> &,
- const CellSimilarity::Similarity ) const
+ dealii::internal::FEValues::FiniteElementRelatedData<1, spacedim> &) const
{
// Do nothing, since we do not have values in the interior
}
template <int spacedim>
void
FE_FaceQ<1,spacedim>::
-fill_fe_face_values (const Mapping<1,spacedim> &,
- const typename Triangulation<1,spacedim>::cell_iterator &,
- const unsigned int face,
+fill_fe_face_values (const typename Triangulation<1,spacedim>::cell_iterator &,
+ const unsigned int face,
const Quadrature<0> &,
+ const Mapping<1,spacedim> &,
const typename Mapping<1,spacedim>::InternalDataBase &,
- const typename FiniteElement<1,spacedim>::InternalDataBase &fedata,
- const internal::FEValues::MappingRelatedData<1,spacedim> &,
- internal::FEValues::FiniteElementRelatedData<1,spacedim> &output_data) const
+ const dealii::internal::FEValues::MappingRelatedData<1, spacedim> &,
+ const typename FiniteElement<1,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<1, spacedim> &output_data) const
{
const unsigned int foffset = face;
- if (fedata.update_each & update_values)
+ if (fe_internal.update_each & update_values)
{
for (unsigned int k=0; k<this->dofs_per_cell; ++k)
output_data.shape_values(k,0) = 0.;
template <int spacedim>
void
FE_FaceQ<1,spacedim>::
-fill_fe_subface_values (const Mapping<1,spacedim> &,
- const typename Triangulation<1,spacedim>::cell_iterator &,
- const unsigned int ,
- const unsigned int ,
+fill_fe_subface_values (const typename Triangulation<1,spacedim>::cell_iterator &,
+ const unsigned int ,
+ const unsigned int ,
const Quadrature<0> &,
+ const Mapping<1,spacedim> &,
const typename Mapping<1,spacedim>::InternalDataBase &,
+ const dealii::internal::FEValues::MappingRelatedData<1, spacedim> &,
const typename FiniteElement<1,spacedim>::InternalDataBase &,
- const internal::FEValues::MappingRelatedData<1,spacedim> &,
- internal::FEValues::FiniteElementRelatedData<1,spacedim> &) const
+ dealii::internal::FEValues::FiniteElementRelatedData<1, spacedim> &) const
{
Assert(false, ExcMessage("There are no sub-face values to fill in 1D!"));
}
template <int dim, int spacedim>
void
FE_Nothing<dim,spacedim>::
-fill_fe_values (const Mapping<dim,spacedim> & /*mapping*/,
- const typename Triangulation<dim,spacedim>::cell_iterator & /*cell*/,
- const Quadrature<dim> & /*quadrature*/,
- const typename Mapping<dim,spacedim>::InternalDataBase & /*mapping_data*/,
- const typename FiniteElement<dim,spacedim>::InternalDataBase & /*fedata*/,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &/*mapping_data*/,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &/*output_data*/,
- const CellSimilarity::Similarity /*cell_similarity*/) const
+fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+ const CellSimilarity::Similarity ,
+ const Quadrature<dim> &,
+ const Mapping<dim,spacedim> &,
+ const typename Mapping<dim,spacedim>::InternalDataBase &,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &) const
{
// leave data fields empty
}
template <int dim, int spacedim>
void
FE_Nothing<dim,spacedim>::
-fill_fe_face_values (const Mapping<dim,spacedim> & /*mapping*/,
- const typename Triangulation<dim,spacedim>::cell_iterator & /*cell*/,
- const unsigned int /*face*/,
- const Quadrature<dim-1> & /*quadrature*/,
- const typename Mapping<dim,spacedim>::InternalDataBase & /*mapping_data*/,
- const typename FiniteElement<dim,spacedim>::InternalDataBase & /*fedata*/,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &/*mapping_data*/,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &/*output_data*/) const
+fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+ const unsigned int ,
+ const Quadrature<dim-1> &,
+ const Mapping<dim,spacedim> &,
+ const typename Mapping<dim,spacedim>::InternalDataBase &,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &) const
{
// leave data fields empty
}
+
+
template <int dim, int spacedim>
void
FE_Nothing<dim,spacedim>::
-fill_fe_subface_values (const Mapping<dim,spacedim> & /*mapping*/,
- const typename Triangulation<dim,spacedim>::cell_iterator & /*cell*/,
- const unsigned int /*face*/,
- const unsigned int /*subface*/,
- const Quadrature<dim-1> & /*quadrature*/,
- const typename Mapping<dim,spacedim>::InternalDataBase & /*mapping_data*/,
- const typename FiniteElement<dim,spacedim>::InternalDataBase & /*fedata*/,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &/*mapping_data*/,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &/*output_data*/) const
+fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+ const unsigned int ,
+ const unsigned int ,
+ const Quadrature<dim-1> &,
+ const Mapping<dim,spacedim> &,
+ const typename Mapping<dim,spacedim>::InternalDataBase &,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &) const
{
// leave data fields empty
}
+
+
template <int dim, int spacedim>
bool
FE_Nothing<dim,spacedim>::is_dominating() const
template <>
void
FE_Poly<TensorProductPolynomials<1>,1,2>::
-fill_fe_values (const Mapping<1,2> &mapping,
- const Triangulation<1,2>::cell_iterator &,
- const Quadrature<1> &quadrature,
- const Mapping<1,2>::InternalDataBase &mapping_internal,
- const FiniteElement<1,2>::InternalDataBase &fedata,
- const internal::FEValues::MappingRelatedData<1,2> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<1,2> &output_data,
- const CellSimilarity::Similarity cell_similarity) const
+fill_fe_values (const Triangulation<1,2>::cell_iterator &,
+ const CellSimilarity::Similarity cell_similarity,
+ const Quadrature<1> &quadrature,
+ const Mapping<1,2> &mapping,
+ const Mapping<1,2>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<1,2> &mapping_data,
+ const FiniteElement<1,2>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<1,2> &output_data) const
{
// convert data object to internal
// data for this class. fails with
// an exception if that is not
// possible
- Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
- const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+ Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+ const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
for (unsigned int k=0; k<this->dofs_per_cell; ++k)
{
template <>
void
FE_Poly<TensorProductPolynomials<2>,2,3>::
-fill_fe_values (const Mapping<2,3> &mapping,
- const Triangulation<2,3>::cell_iterator &,
- const Quadrature<2> &quadrature,
- const Mapping<2,3>::InternalDataBase &mapping_internal,
- const FiniteElement<2,3>::InternalDataBase &fedata,
- const internal::FEValues::MappingRelatedData<2,3> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<2,3> &output_data,
- const CellSimilarity::Similarity cell_similarity) const
+fill_fe_values (const Triangulation<2,3>::cell_iterator &,
+ const CellSimilarity::Similarity cell_similarity,
+ const Quadrature<2> &quadrature,
+ const Mapping<2,3> &mapping,
+ const Mapping<2,3>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<2,3> &mapping_data,
+ const FiniteElement<2,3>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<2,3> &output_data) const
{
// assert that the following dynamics
// cast is really well-defined.
- Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
- const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+ Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+ const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
for (unsigned int k=0; k<this->dofs_per_cell; ++k)
{
template <>
void
FE_Poly<PolynomialSpace<1>,1,2>::
-fill_fe_values (const Mapping<1,2> &mapping,
- const Triangulation<1,2>::cell_iterator &,
- const Quadrature<1> &quadrature,
- const Mapping<1,2>::InternalDataBase &mapping_internal,
- const FiniteElement<1,2>::InternalDataBase &fedata,
- const internal::FEValues::MappingRelatedData<1,2> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<1,2> &output_data,
- const CellSimilarity::Similarity cell_similarity) const
+fill_fe_values (const Triangulation<1,2>::cell_iterator &,
+ const CellSimilarity::Similarity cell_similarity,
+ const Quadrature<1> &quadrature,
+ const Mapping<1,2> &mapping,
+ const Mapping<1,2>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<1,2> &mapping_data,
+ const FiniteElement<1,2>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<1,2> &output_data) const
{
// convert data object to internal
// data for this class. fails with
// an exception if that is not
// possible
- Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
- const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+ Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+ const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
for (unsigned int k=0; k<this->dofs_per_cell; ++k)
{
template <>
void
FE_Poly<PolynomialSpace<2>,2,3>::
-fill_fe_values (const Mapping<2,3> &mapping,
- const Triangulation<2,3>::cell_iterator &,
- const Quadrature<2> &quadrature,
- const Mapping<2,3>::InternalDataBase &mapping_internal,
- const FiniteElement<2,3>::InternalDataBase &fedata,
- const internal::FEValues::MappingRelatedData<2,3> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<2,3> &output_data,
- const CellSimilarity::Similarity cell_similarity) const
+fill_fe_values (const Triangulation<2,3>::cell_iterator &,
+ const CellSimilarity::Similarity cell_similarity,
+ const Quadrature<2> &quadrature,
+ const Mapping<2,3> &mapping,
+ const Mapping<2,3>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<2,3> &mapping_data,
+ const FiniteElement<2,3>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<2,3> &output_data) const
{
- Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
- const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+ Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+ const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
for (unsigned int k=0; k<this->dofs_per_cell; ++k)
{
template <class POLY, int dim, int spacedim>
void
FE_PolyTensor<POLY,dim,spacedim>::
-fill_fe_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const Quadrature<dim> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
- const CellSimilarity::Similarity cell_similarity) const
+fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const CellSimilarity::Similarity cell_similarity,
+ const Quadrature<dim> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
{
// convert data object to internal
// data for this class. fails with
// an exception if that is not
// possible
- Assert (dynamic_cast<const InternalData *> (&fedata) != 0,
+ Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0,
ExcInternalError());
- const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+ const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
const unsigned int n_q_points = quadrature.size();
template <class POLY, int dim, int spacedim>
void
FE_PolyTensor<POLY,dim,spacedim>::
-fill_fe_face_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
+fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
{
// convert data object to internal
// data for this class. fails with
// an exception if that is not
// possible
- Assert (dynamic_cast<const InternalData *> (&fedata) != 0,
+ Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0,
ExcInternalError());
- const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+ const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
const unsigned int n_q_points = quadrature.size();
// offset determines which data set
// faces are stored contiguously)
const typename QProjector<dim>::DataSetDescriptor offset
- = QProjector<dim>::DataSetDescriptor::face (face,
- cell->face_orientation(face),
- cell->face_flip(face),
- cell->face_rotation(face),
+ = QProjector<dim>::DataSetDescriptor::face (face_no,
+ cell->face_orientation(face_no),
+ cell->face_flip(face_no),
+ cell->face_rotation(face_no),
n_q_points);
//TODO: Size assertions
template <class POLY, int dim, int spacedim>
void
FE_PolyTensor<POLY,dim,spacedim>::
-fill_fe_subface_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face,
- const unsigned int subface,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
+fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const unsigned int sub_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
{
// convert data object to internal
// data for this class. fails with
// an exception if that is not
// possible
- Assert (dynamic_cast<const InternalData *> (&fedata) != 0,
+ Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0,
ExcInternalError());
- const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+ const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
const unsigned int n_q_points = quadrature.size();
// to take (all data sets for all
// sub-faces are stored contiguously)
const typename QProjector<dim>::DataSetDescriptor offset
- = QProjector<dim>::DataSetDescriptor::subface (face, subface,
- cell->face_orientation(face),
- cell->face_flip(face),
- cell->face_rotation(face),
+ = QProjector<dim>::DataSetDescriptor::subface (face_no, sub_no,
+ cell->face_orientation(face_no),
+ cell->face_flip(face_no),
+ cell->face_rotation(face_no),
n_q_points,
- cell->subface_case(face));
+ cell->subface_case(face_no));
// Assert(mapping_type == independent
// || ( mapping_type == independent_on_cartesian
template <int dim, int spacedim>
void
FESystem<dim,spacedim>::
-fill_fe_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const Quadrature<dim> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_data,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
- const CellSimilarity::Similarity cell_similarity) const
+fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const CellSimilarity::Similarity cell_similarity,
+ const Quadrature<dim> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
{
compute_fill(mapping, cell, invalid_face_number, invalid_face_number,
- quadrature, cell_similarity, mapping_internal, fe_data,
+ quadrature, cell_similarity, mapping_internal, fe_internal,
mapping_data, output_data);
}
template <int dim, int spacedim>
void
FESystem<dim,spacedim>::
-fill_fe_face_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face_no,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_data,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
+fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
{
compute_fill (mapping, cell, face_no, invalid_face_number, quadrature,
- CellSimilarity::none, mapping_internal, fe_data,
+ CellSimilarity::none, mapping_internal, fe_internal,
mapping_data, output_data);
}
template <int dim, int spacedim>
void
FESystem<dim,spacedim>::
-fill_fe_subface_values (const Mapping<dim,spacedim> &mapping,
- const typename Triangulation<dim,spacedim>::cell_iterator &cell,
- const unsigned int face_no,
- const unsigned int sub_no,
- const Quadrature<dim-1> &quadrature,
- const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_data,
- const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
- internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
+fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+ const unsigned int face_no,
+ const unsigned int sub_no,
+ const Quadrature<dim-1> &quadrature,
+ const Mapping<dim,spacedim> &mapping,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+ const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
+ dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
{
compute_fill (mapping, cell, face_no, sub_no, quadrature,
- CellSimilarity::none, mapping_internal, fe_data,
+ CellSimilarity::none, mapping_internal, fe_internal,
mapping_data, output_data);
}
const Quadrature<dim_1> &quadrature,
const CellSimilarity::Similarity cell_similarity,
const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
- const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
+ const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
{
// data for this class. fails with
// an exception if that is not
// possible
- Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
- const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+ Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+ const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
// Either dim_1==dim
// (fill_fe_values) or dim_1==dim-1
// copied from base_data to data on each face, therefore use
// base_fe_data.update_flags.
if (face_no==invalid_face_number)
- base_fe.fill_fe_values(mapping, cell, *cell_quadrature, mapping_internal,
- base_fe_data, mapping_data, base_data, cell_similarity);
+ base_fe.fill_fe_values(cell, cell_similarity,
+ *cell_quadrature,
+ mapping, mapping_internal, mapping_data,
+ base_fe_data, base_data);
else if (sub_no==invalid_face_number)
- base_fe.fill_fe_face_values(mapping, cell, face_no,
- *face_quadrature, mapping_internal, base_fe_data, mapping_data, base_data);
+ base_fe.fill_fe_face_values(cell, face_no,
+ *face_quadrature,
+ mapping, mapping_internal, mapping_data,
+ base_fe_data, base_data);
else
- base_fe.fill_fe_subface_values(mapping, cell, face_no, sub_no,
- *face_quadrature, mapping_internal, base_fe_data, mapping_data, base_data);
+ base_fe.fill_fe_subface_values(cell, face_no, sub_no,
+ *face_quadrature,
+ mapping, mapping_internal, mapping_data,
+ base_fe_data, base_data);
// now data has been generated, so copy it. we used to work by
// looping over all base elements (i.e. this outer loop), then over
// already filled by the mapping, let it compute the
// data for the mapped shape function values, gradients,
// etc.
- this->get_fe().fill_fe_values(this->get_mapping(),
- *this->present_cell,
- quadrature,
+ this->get_fe().fill_fe_values(*this->present_cell,
+ this->cell_similarity,
+ this->quadrature,
+ this->get_mapping(),
*this->mapping_data,
- *this->fe_data,
this->mapping_output,
- this->finite_element_output,
- this->cell_similarity);
+ *this->fe_data,
+ this->finite_element_output);
}
*this->mapping_data,
this->mapping_output);
- this->get_fe().fill_fe_face_values(this->get_mapping(),
- *this->present_cell, face_no,
+ this->get_fe().fill_fe_face_values(*this->present_cell,
+ face_no,
this->quadrature,
+ this->get_mapping(),
*this->mapping_data,
- *this->fe_data,
this->mapping_output,
+ *this->fe_data,
this->finite_element_output);
}
*this->mapping_data,
this->mapping_output);
- this->get_fe().fill_fe_subface_values(this->get_mapping(),
- *this->present_cell,
- face_no, subface_no,
+ this->get_fe().fill_fe_subface_values(*this->present_cell,
+ face_no,
+ subface_no,
this->quadrature,
+ this->get_mapping(),
*this->mapping_data,
- *this->fe_data,
this->mapping_output,
+ *this->fe_data,
this->finite_element_output);
}