From d8bfbe31a15737286dd41cf29d571f4aa5d41e56 Mon Sep 17 00:00:00 2001 From: David Wells Date: Tue, 6 Dec 2022 15:34:13 -0500 Subject: [PATCH] MappingRelatedData: remove extra dealii:: qualifications. --- include/deal.II/fe/fe.h | 9 +++------ include/deal.II/fe/fe_dgp_nonparametric.h | 9 +++------ include/deal.II/fe/fe_enriched.h | 9 +++------ include/deal.II/fe/fe_face.h | 9 +++------ include/deal.II/fe/fe_nedelec_sz.h | 6 +++--- include/deal.II/fe/fe_nothing.h | 9 +++------ include/deal.II/fe/fe_p1nc.h | 4 ++-- include/deal.II/fe/fe_poly.h | 9 +++------ include/deal.II/fe/fe_poly.templates.h | 9 +++------ include/deal.II/fe/fe_poly_face.h | 9 +++------ include/deal.II/fe/fe_poly_face.templates.h | 12 +++--------- include/deal.II/fe/fe_poly_tensor.h | 9 +++------ include/deal.II/fe/fe_system.h | 9 +++------ include/deal.II/fe/fe_values.h | 2 +- include/deal.II/fe/mapping.h | 8 ++++---- include/deal.II/fe/mapping_cartesian.h | 4 ++-- include/deal.II/fe/mapping_fe.h | 6 +++--- include/deal.II/fe/mapping_fe_field.h | 2 +- include/deal.II/fe/mapping_manifold.h | 6 +++--- include/deal.II/fe/mapping_q.h | 10 +++++----- source/fe/fe.cc | 6 ++---- source/fe/fe_dgp_nonparametric.cc | 9 +++------ source/fe/fe_enriched.cc | 9 +++------ source/fe/fe_face.cc | 12 +++--------- source/fe/fe_nedelec_sz.cc | 6 +++--- source/fe/fe_nothing.cc | 12 +++--------- source/fe/fe_p1nc.cc | 4 ++-- source/fe/fe_poly_tensor.cc | 9 +++------ source/fe/fe_system.cc | 9 +++------ source/fe/mapping.cc | 7 +++---- source/fe/mapping_cartesian.cc | 4 ++-- source/fe/mapping_fe_field.cc | 2 +- source/fe/mapping_q.cc | 4 ++-- 33 files changed, 90 insertions(+), 153 deletions(-) diff --git a/include/deal.II/fe/fe.h b/include/deal.II/fe/fe.h index ad60ab4507..ac2b887bab 100644 --- a/include/deal.II/fe/fe.h +++ b/include/deal.II/fe/fe.h @@ -2918,8 +2918,7 @@ protected: const Quadrature & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping<1, spacedim> & mapping, const typename Mapping<1, spacedim>::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData<1, - spacedim> + const internal::FEValuesImplementation::MappingRelatedData<1, spacedim> & mapping_data, const typename FiniteElement<1, spacedim>::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData<1, @@ -420,8 +419,7 @@ protected: const hp::QCollection<0> & quadrature, const Mapping<1, spacedim> & mapping, const typename Mapping<1, spacedim>::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData<1, - spacedim> + const internal::FEValuesImplementation::MappingRelatedData<1, spacedim> & mapping_data, const typename FiniteElement<1, spacedim>::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData<1, @@ -436,8 +434,7 @@ protected: const Quadrature<0> & quadrature, const Mapping<1, spacedim> & mapping, const typename Mapping<1, spacedim>::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData<1, - spacedim> + const internal::FEValuesImplementation::MappingRelatedData<1, spacedim> & mapping_data, const typename FiniteElement<1, spacedim>::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData<1, diff --git a/include/deal.II/fe/fe_nedelec_sz.h b/include/deal.II/fe/fe_nedelec_sz.h index 043164c345..7574541b25 100644 --- a/include/deal.II/fe/fe_nedelec_sz.h +++ b/include/deal.II/fe/fe_nedelec_sz.h @@ -177,7 +177,7 @@ protected: const Quadrature & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fedata, dealii::internal::FEValuesImplementation::FiniteElementRelatedData @@ -197,7 +197,7 @@ protected: const hp::QCollection & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fedata, dealii::internal::FEValuesImplementation::FiniteElementRelatedData @@ -214,7 +214,7 @@ protected: const Quadrature & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fedata, dealii::internal::FEValuesImplementation::FiniteElementRelatedData diff --git a/include/deal.II/fe/fe_nothing.h b/include/deal.II/fe/fe_nothing.h index a81cc64408..b3fbb1d844 100644 --- a/include/deal.II/fe/fe_nothing.h +++ b/include/deal.II/fe/fe_nothing.h @@ -196,8 +196,7 @@ public: const Quadrature & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping<2, 2> & mapping, const Mapping<2, 2>::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData<2, 2> + const internal::FEValuesImplementation::MappingRelatedData<2, 2> & mapping_data, const InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData<2, 2> @@ -376,7 +376,7 @@ private: const Quadrature<1> & quadrature, const Mapping<2, 2> & mapping, const Mapping<2, 2>::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData<2, 2> + const internal::FEValuesImplementation::MappingRelatedData<2, 2> & mapping_data, const InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData<2, 2> diff --git a/include/deal.II/fe/fe_poly.h b/include/deal.II/fe/fe_poly.h index 7752b281f1..211d23aa1d 100644 --- a/include/deal.II/fe/fe_poly.h +++ b/include/deal.II/fe/fe_poly.h @@ -380,8 +380,7 @@ protected: const Quadrature & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData::fill_fe_values( const Quadrature & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData::fill_fe_face_values( const hp::QCollection & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData::fill_fe_subface_values( const Quadrature & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData::fill_fe_values( const Quadrature &, const Mapping &, const typename Mapping::InternalDataBase &, - const dealii::internal::FEValuesImplementation::MappingRelatedData - &, + const internal::FEValuesImplementation::MappingRelatedData &, const typename FiniteElement::InternalDataBase &, dealii::internal::FEValuesImplementation::FiniteElementRelatedData @@ -115,9 +113,7 @@ FE_PolyFace::fill_fe_face_values( const hp::QCollection &quadrature, const Mapping &, const typename Mapping::InternalDataBase &, - const dealii::internal::FEValuesImplementation::MappingRelatedData - &, + const internal::FEValuesImplementation::MappingRelatedData &, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData @@ -211,9 +207,7 @@ FE_PolyFace::fill_fe_subface_values( const Quadrature &quadrature, const Mapping &, const typename Mapping::InternalDataBase &, - const dealii::internal::FEValuesImplementation::MappingRelatedData - &, + const internal::FEValuesImplementation::MappingRelatedData &, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData diff --git a/include/deal.II/fe/fe_poly_tensor.h b/include/deal.II/fe/fe_poly_tensor.h index 6d1730c316..197d6dc7d4 100644 --- a/include/deal.II/fe/fe_poly_tensor.h +++ b/include/deal.II/fe/fe_poly_tensor.h @@ -424,8 +424,7 @@ protected: const Quadrature & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData + internal::FEValuesImplementation::MappingRelatedData mapping_output; diff --git a/include/deal.II/fe/mapping.h b/include/deal.II/fe/mapping.h index ab85730c03..ef42a7d6d8 100644 --- a/include/deal.II/fe/mapping.h +++ b/include/deal.II/fe/mapping.h @@ -904,7 +904,7 @@ protected: const CellSimilarity::Similarity cell_similarity, const Quadrature & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const = 0; /** @@ -937,7 +937,7 @@ protected: const unsigned int face_no, const hp::QCollection & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const; /** @@ -985,7 +985,7 @@ protected: const unsigned int subface_no, const Quadrature & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const = 0; /** @@ -999,7 +999,7 @@ protected: const typename Triangulation::cell_iterator &cell, const NonMatching::ImmersedSurfaceQuadrature & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const; /** diff --git a/include/deal.II/fe/mapping_cartesian.h b/include/deal.II/fe/mapping_cartesian.h index 93df82c2fe..5ad69760f5 100644 --- a/include/deal.II/fe/mapping_cartesian.h +++ b/include/deal.II/fe/mapping_cartesian.h @@ -180,7 +180,7 @@ public: const typename Triangulation::cell_iterator &cell, const ArrayView> & unit_points, const UpdateFlags update_flags, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const; /** @@ -295,7 +295,7 @@ private: const typename Triangulation::cell_iterator &cell, const NonMatching::ImmersedSurfaceQuadrature & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const override; /** diff --git a/include/deal.II/fe/mapping_fe.h b/include/deal.II/fe/mapping_fe.h index 3941a098bc..835900593f 100644 --- a/include/deal.II/fe/mapping_fe.h +++ b/include/deal.II/fe/mapping_fe.h @@ -426,7 +426,7 @@ public: const CellSimilarity::Similarity cell_similarity, const Quadrature & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const override; using Mapping::fill_fe_face_values; @@ -438,7 +438,7 @@ public: const unsigned int face_no, const hp::QCollection & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const override; // documentation can be found in Mapping::fill_fe_subface_values() @@ -449,7 +449,7 @@ public: const unsigned int subface_no, const Quadrature & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const override; /** diff --git a/include/deal.II/fe/mapping_fe_field.h b/include/deal.II/fe/mapping_fe_field.h index 676369469d..308c210812 100644 --- a/include/deal.II/fe/mapping_fe_field.h +++ b/include/deal.II/fe/mapping_fe_field.h @@ -539,7 +539,7 @@ protected: const typename Triangulation::cell_iterator &cell, const NonMatching::ImmersedSurfaceQuadrature & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const override; /** diff --git a/include/deal.II/fe/mapping_manifold.h b/include/deal.II/fe/mapping_manifold.h index 0ac895c6c3..6ff095eadd 100644 --- a/include/deal.II/fe/mapping_manifold.h +++ b/include/deal.II/fe/mapping_manifold.h @@ -353,7 +353,7 @@ private: const CellSimilarity::Similarity cell_similarity, const Quadrature & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const override; using Mapping::fill_fe_face_values; @@ -365,7 +365,7 @@ private: const unsigned int face_no, const hp::QCollection & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const override; // documentation can be found in Mapping::fill_fe_subface_values() @@ -376,7 +376,7 @@ private: const unsigned int subface_no, const Quadrature & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const override; /** diff --git a/include/deal.II/fe/mapping_q.h b/include/deal.II/fe/mapping_q.h index ec5750303d..b4eb85e9f7 100644 --- a/include/deal.II/fe/mapping_q.h +++ b/include/deal.II/fe/mapping_q.h @@ -252,7 +252,7 @@ public: const typename Triangulation::cell_iterator &cell, const ArrayView> & unit_points, const UpdateFlags update_flags, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const; /** @@ -582,7 +582,7 @@ protected: const CellSimilarity::Similarity cell_similarity, const Quadrature & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const override; using Mapping::fill_fe_face_values; @@ -594,7 +594,7 @@ protected: const unsigned int face_no, const hp::QCollection & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const override; // documentation can be found in Mapping::fill_fe_subface_values() @@ -605,7 +605,7 @@ protected: const unsigned int subface_no, const Quadrature & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const override; // documentation can be found in Mapping::fill_fe_immersed_surface_values() @@ -614,7 +614,7 @@ protected: const typename Triangulation::cell_iterator &cell, const NonMatching::ImmersedSurfaceQuadrature & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const override; /** diff --git a/source/fe/fe.cc b/source/fe/fe.cc index bf93b102d1..c913633c25 100644 --- a/source/fe/fe.cc +++ b/source/fe/fe.cc @@ -1325,8 +1325,7 @@ FiniteElement::fill_fe_face_values( const hp::QCollection & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData::fill_fe_face_values( const Quadrature & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData::fill_fe_values( const Quadrature &, const Mapping &, const typename Mapping::InternalDataBase &, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData::fill_fe_face_values( const hp::QCollection &, const Mapping &, const typename Mapping::InternalDataBase &, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData::fill_fe_subface_values( const Quadrature &, const Mapping &, const typename Mapping::InternalDataBase &, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData::fill_fe_values( const Quadrature & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, internal::FEValuesImplementation::FiniteElementRelatedData @@ -564,8 +563,7 @@ FE_Enriched::fill_fe_face_values( const hp::QCollection & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, internal::FEValuesImplementation::FiniteElementRelatedData @@ -602,8 +600,7 @@ FE_Enriched::fill_fe_subface_values( const Quadrature & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, internal::FEValuesImplementation::FiniteElementRelatedData diff --git a/source/fe/fe_face.cc b/source/fe/fe_face.cc index 0eb5168a77..430d1465c7 100644 --- a/source/fe/fe_face.cc +++ b/source/fe/fe_face.cc @@ -696,9 +696,7 @@ FE_FaceQ<1, spacedim>::fill_fe_values( const Quadrature<1> &, const Mapping<1, spacedim> &, const typename Mapping<1, spacedim>::InternalDataBase &, - const dealii::internal::FEValuesImplementation::MappingRelatedData<1, - spacedim> - &, + const internal::FEValuesImplementation::MappingRelatedData<1, spacedim> &, const typename FiniteElement<1, spacedim>::InternalDataBase &, dealii::internal::FEValuesImplementation::FiniteElementRelatedData<1, spacedim> @@ -717,9 +715,7 @@ FE_FaceQ<1, spacedim>::fill_fe_face_values( const hp::QCollection<0> &, const Mapping<1, spacedim> &, const typename Mapping<1, spacedim>::InternalDataBase &, - const dealii::internal::FEValuesImplementation::MappingRelatedData<1, - spacedim> - &, + const internal::FEValuesImplementation::MappingRelatedData<1, spacedim> &, const typename FiniteElement<1, spacedim>::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData<1, spacedim> @@ -744,9 +740,7 @@ FE_FaceQ<1, spacedim>::fill_fe_subface_values( const Quadrature<0> &, const Mapping<1, spacedim> &, const typename Mapping<1, spacedim>::InternalDataBase &, - const dealii::internal::FEValuesImplementation::MappingRelatedData<1, - spacedim> - &, + const internal::FEValuesImplementation::MappingRelatedData<1, spacedim> &, const typename FiniteElement<1, spacedim>::InternalDataBase &, dealii::internal::FEValuesImplementation::FiniteElementRelatedData<1, spacedim> diff --git a/source/fe/fe_nedelec_sz.cc b/source/fe/fe_nedelec_sz.cc index ca9ece055e..17c9f98fba 100644 --- a/source/fe/fe_nedelec_sz.cc +++ b/source/fe/fe_nedelec_sz.cc @@ -2605,7 +2605,7 @@ FE_NedelecSZ::fill_fe_values( const Quadrature & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase &mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData @@ -2786,7 +2786,7 @@ FE_NedelecSZ::fill_fe_face_values( const hp::QCollection & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData @@ -2987,7 +2987,7 @@ FE_NedelecSZ::fill_fe_subface_values( const Quadrature & /*quadrature*/, const Mapping & /*mapping*/, const typename Mapping::InternalDataBase & /*mapping_internal*/, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & /*mapping_data*/, const typename FiniteElement::InternalDataBase & /*fe_internal*/, dealii::internal::FEValuesImplementation::FiniteElementRelatedData diff --git a/source/fe/fe_nothing.cc b/source/fe/fe_nothing.cc index 2e25bcddd6..8848e62d5f 100644 --- a/source/fe/fe_nothing.cc +++ b/source/fe/fe_nothing.cc @@ -142,9 +142,7 @@ FE_Nothing::fill_fe_values( const Quadrature &, const Mapping &, const typename Mapping::InternalDataBase &, - const dealii::internal::FEValuesImplementation::MappingRelatedData - &, + const internal::FEValuesImplementation::MappingRelatedData &, const typename FiniteElement::InternalDataBase &, dealii::internal::FEValuesImplementation::FiniteElementRelatedData @@ -163,9 +161,7 @@ FE_Nothing::fill_fe_face_values( const hp::QCollection &, const Mapping &, const typename Mapping::InternalDataBase &, - const dealii::internal::FEValuesImplementation::MappingRelatedData - &, + const internal::FEValuesImplementation::MappingRelatedData &, const typename FiniteElement::InternalDataBase &, dealii::internal::FEValuesImplementation::FiniteElementRelatedData @@ -185,9 +181,7 @@ FE_Nothing::fill_fe_subface_values( const Quadrature &, const Mapping &, const typename Mapping::InternalDataBase &, - const dealii::internal::FEValuesImplementation::MappingRelatedData - &, + const internal::FEValuesImplementation::MappingRelatedData &, const typename FiniteElement::InternalDataBase &, dealii::internal::FEValuesImplementation::FiniteElementRelatedData diff --git a/source/fe/fe_p1nc.cc b/source/fe/fe_p1nc.cc index 0a0c1ca327..a1ea0d19a0 100644 --- a/source/fe/fe_p1nc.cc +++ b/source/fe/fe_p1nc.cc @@ -250,7 +250,7 @@ FE_P1NC::fill_fe_face_values( const hp::QCollection<1> & quadrature, const Mapping<2, 2> & mapping, const Mapping<2, 2>::InternalDataBase &, - const dealii::internal::FEValuesImplementation::MappingRelatedData<2, 2> &, + const internal::FEValuesImplementation::MappingRelatedData<2, 2> &, const InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData<2, 2> &output_data) const @@ -298,7 +298,7 @@ FE_P1NC::fill_fe_subface_values( const Quadrature<1> & quadrature, const Mapping<2, 2> & mapping, const Mapping<2, 2>::InternalDataBase &, - const dealii::internal::FEValuesImplementation::MappingRelatedData<2, 2> &, + const internal::FEValuesImplementation::MappingRelatedData<2, 2> &, const InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData<2, 2> &output_data) const diff --git a/source/fe/fe_poly_tensor.cc b/source/fe/fe_poly_tensor.cc index 636d39e6b1..cf6bdb1377 100644 --- a/source/fe/fe_poly_tensor.cc +++ b/source/fe/fe_poly_tensor.cc @@ -436,8 +436,7 @@ FE_PolyTensor::fill_fe_values( const Quadrature & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData::fill_fe_face_values( const hp::QCollection & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData::fill_fe_subface_values( const Quadrature & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData::fill_fe_values( const Quadrature & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData::fill_fe_face_values( const hp::QCollection & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData::fill_fe_subface_values( const Quadrature & quadrature, const Mapping & mapping, const typename Mapping::InternalDataBase & mapping_internal, - const dealii::internal::FEValuesImplementation::MappingRelatedData + const internal::FEValuesImplementation::MappingRelatedData & mapping_data, const typename FiniteElement::InternalDataBase &fe_internal, dealii::internal::FEValuesImplementation::FiniteElementRelatedData::fill_fe_immersed_surface_values( const typename Triangulation::cell_iterator &, const NonMatching::ImmersedSurfaceQuadrature &, const typename Mapping::InternalDataBase &, - dealii::internal::FEValuesImplementation::MappingRelatedData &) - const + internal::FEValuesImplementation::MappingRelatedData &) const { AssertThrow(false, ExcNotImplemented()); } @@ -177,7 +176,7 @@ Mapping::fill_fe_face_values( const unsigned int face_no, const hp::QCollection & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const { // base class version, implement overridden function in derived classes @@ -194,7 +193,7 @@ Mapping::fill_fe_face_values( const unsigned int face_no, const Quadrature & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const { Assert(false, diff --git a/source/fe/mapping_cartesian.cc b/source/fe/mapping_cartesian.cc index b08f0d73a2..9437ab5304 100644 --- a/source/fe/mapping_cartesian.cc +++ b/source/fe/mapping_cartesian.cc @@ -549,7 +549,7 @@ MappingCartesian::fill_mapping_data_for_generic_points( const typename Triangulation::cell_iterator &cell, const ArrayView> & unit_points, const UpdateFlags update_flags, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const { if (update_flags == update_default) @@ -699,7 +699,7 @@ MappingCartesian::fill_fe_immersed_surface_values( const typename Triangulation::cell_iterator &cell, const NonMatching::ImmersedSurfaceQuadrature & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const { AssertDimension(dim, spacedim); diff --git a/source/fe/mapping_fe_field.cc b/source/fe/mapping_fe_field.cc index 58be345c39..49beaf6afc 100644 --- a/source/fe/mapping_fe_field.cc +++ b/source/fe/mapping_fe_field.cc @@ -1778,7 +1778,7 @@ MappingFEField::fill_fe_immersed_surface_values( const typename Triangulation::cell_iterator &cell, const NonMatching::ImmersedSurfaceQuadrature & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const { AssertDimension(dim, spacedim); diff --git a/source/fe/mapping_q.cc b/source/fe/mapping_q.cc index 6b2b27f9f2..c55cae5e07 100644 --- a/source/fe/mapping_q.cc +++ b/source/fe/mapping_q.cc @@ -1266,7 +1266,7 @@ MappingQ::fill_fe_immersed_surface_values( const typename Triangulation::cell_iterator &cell, const NonMatching::ImmersedSurfaceQuadrature & quadrature, const typename Mapping::InternalDataBase & internal_data, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const { Assert(dim == spacedim, ExcNotImplemented()); @@ -1399,7 +1399,7 @@ MappingQ::fill_mapping_data_for_generic_points( const typename Triangulation::cell_iterator &cell, const ArrayView> & unit_points, const UpdateFlags update_flags, - dealii::internal::FEValuesImplementation::MappingRelatedData + internal::FEValuesImplementation::MappingRelatedData &output_data) const { if (update_flags == update_default) -- 2.39.5