From: David Wells Date: Sun, 11 Feb 2018 21:17:51 +0000 (-0500) Subject: Use 'virtual' and 'override' consistently. X-Git-Tag: v9.0.0-rc1~443^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=100e1639ea631f78e9d59780e6435499d50b0aef;p=dealii.git Use 'virtual' and 'override' consistently. --- diff --git a/include/deal.II/fe/mapping.h b/include/deal.II/fe/mapping.h index 558ad22393..d72b8f78d8 100644 --- a/include/deal.II/fe/mapping.h +++ b/include/deal.II/fe/mapping.h @@ -292,7 +292,8 @@ public: /** * Virtual destructor. */ - virtual ~Mapping () = default; + virtual + ~Mapping () override = default; /** * Return a pointer to a copy of the present object. The caller of this copy @@ -541,7 +542,8 @@ public: /** * Virtual destructor for derived classes */ - virtual ~InternalDataBase () = default; + virtual + ~InternalDataBase () = default; /** * A set of update flags specifying the kind of information that an @@ -562,7 +564,8 @@ public: /** * Return an estimate (in bytes) or the memory consumption of this object. */ - virtual std::size_t memory_consumption () const; + virtual + std::size_t memory_consumption () const; }; @@ -827,7 +830,8 @@ protected: * filled; which ones need to be filled is determined by the update flags * stored inside the @p internal_data object. */ - virtual void + virtual + void fill_fe_face_values (const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, @@ -860,7 +864,8 @@ protected: * filled; which ones need to be filled is determined by the update flags * stored inside the @p internal_data object. */ - virtual void + virtual + void fill_fe_subface_values (const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const unsigned int subface_no, diff --git a/include/deal.II/fe/mapping_c1.h b/include/deal.II/fe/mapping_c1.h index 7406099ddd..3326e532c2 100644 --- a/include/deal.II/fe/mapping_c1.h +++ b/include/deal.II/fe/mapping_c1.h @@ -77,7 +77,8 @@ protected: * interpolating the boundary (as does the base class), but rather such * that the resulting cubic mapping is a continuous one. */ - virtual void + virtual + void add_line_support_points (const typename Triangulation::cell_iterator &cell, std::vector > &a) const override; @@ -90,7 +91,8 @@ protected: * interpolating the boundary (as does the base class), but rather such * that the resulting cubic mapping is a continuous one. */ - virtual void + virtual + void add_quad_support_points(const typename Triangulation::cell_iterator &cell, std::vector > &a) const override; }; diff --git a/include/deal.II/fe/mapping_cartesian.h b/include/deal.II/fe/mapping_cartesian.h index 9cbdfd35ec..124586ff49 100644 --- a/include/deal.II/fe/mapping_cartesian.h +++ b/include/deal.II/fe/mapping_cartesian.h @@ -70,7 +70,8 @@ public: * Return @p true because MappingCartesian preserves vertex * locations. */ - bool preserves_vertex_locations () const; + virtual + bool preserves_vertex_locations () const override; /** * @name Mapping points between reference and real cells @@ -81,13 +82,13 @@ public: virtual Point transform_unit_to_real_cell (const typename Triangulation::cell_iterator &cell, - const Point &p) const; + const Point &p) const override; // for documentation, see the Mapping base class virtual Point transform_real_to_unit_cell (const typename Triangulation::cell_iterator &cell, - const Point &p) const; + const Point &p) const override; /** * @} @@ -104,7 +105,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -112,7 +113,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -120,7 +121,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -128,7 +129,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -136,7 +137,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; /** * @} @@ -172,7 +173,8 @@ private: /** * Return an estimate (in bytes) or the memory consumption of this object. */ - virtual std::size_t memory_consumption () const; + virtual + std::size_t memory_consumption () const override; /** * Extents of the last cell we have seen in the coordinate directions, @@ -194,25 +196,25 @@ private: // documentation can be found in Mapping::requires_update_flags() virtual UpdateFlags - requires_update_flags (const UpdateFlags update_flags) const; + requires_update_flags (const UpdateFlags update_flags) const override; // documentation can be found in Mapping::get_data() virtual typename Mapping::InternalDataBase * get_data (const UpdateFlags, - const Quadrature &quadrature) const; + const Quadrature &quadrature) const override; // documentation can be found in Mapping::get_face_data() virtual typename Mapping::InternalDataBase * get_face_data (const UpdateFlags flags, - const Quadrature& quadrature) const; + const Quadrature& quadrature) const override; // documentation can be found in Mapping::get_subface_data() virtual typename Mapping::InternalDataBase * get_subface_data (const UpdateFlags flags, - const Quadrature& quadrature) const; + const Quadrature& quadrature) const override; // documentation can be found in Mapping::fill_fe_values() virtual @@ -221,24 +223,26 @@ private: const CellSimilarity::Similarity cell_similarity, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const; + internal::FEValues::MappingRelatedData &output_data) const override; // documentation can be found in Mapping::fill_fe_face_values() - virtual void + virtual + void fill_fe_face_values (const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const; + internal::FEValues::MappingRelatedData &output_data) const override; // documentation can be found in Mapping::fill_fe_subface_values() - virtual void + virtual + void fill_fe_subface_values (const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const unsigned int subface_no, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const; + internal::FEValues::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 fa9b9155d3..ab1049f01d 100644 --- a/include/deal.II/fe/mapping_fe_field.h +++ b/include/deal.II/fe/mapping_fe_field.h @@ -133,7 +133,7 @@ public: * class always returns @p false. */ virtual - bool preserves_vertex_locations () const; + bool preserves_vertex_locations () const override; /** @@ -145,13 +145,13 @@ public: virtual Point transform_unit_to_real_cell (const typename Triangulation::cell_iterator &cell, - const Point &p) const; + const Point &p) const override; // for documentation, see the Mapping base class virtual Point transform_real_to_unit_cell (const typename Triangulation::cell_iterator &cell, - const Point &p) const; + const Point &p) const override; /** * @} @@ -168,7 +168,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -176,7 +176,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -184,7 +184,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -192,7 +192,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -200,7 +200,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; /** * @} @@ -234,7 +234,7 @@ private: // documentation can be found in Mapping::requires_update_flags() virtual UpdateFlags - requires_update_flags (const UpdateFlags update_flags) const; + requires_update_flags (const UpdateFlags update_flags) const override; public: /** @@ -321,7 +321,8 @@ public: /** * Return an estimate (in bytes) or the memory consumption of this object. */ - virtual std::size_t memory_consumption () const; + virtual + std::size_t memory_consumption () const override; /** * Values of shape functions. Access by function @p shape. @@ -446,19 +447,19 @@ private: virtual InternalData * get_data (const UpdateFlags, - const Quadrature &quadrature) const; + const Quadrature &quadrature) const override; // documentation can be found in Mapping::get_face_data() virtual typename Mapping::InternalDataBase * get_face_data (const UpdateFlags flags, - const Quadrature& quadrature) const; + const Quadrature& quadrature) const override; // documentation can be found in Mapping::get_subface_data() virtual typename Mapping::InternalDataBase * get_subface_data (const UpdateFlags flags, - const Quadrature& quadrature) const; + const Quadrature& quadrature) const override; // documentation can be found in Mapping::fill_fe_values() virtual @@ -467,24 +468,26 @@ private: const CellSimilarity::Similarity cell_similarity, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const; + internal::FEValues::MappingRelatedData &output_data) const override; // documentation can be found in Mapping::fill_fe_face_values() - virtual void + virtual + void fill_fe_face_values (const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const; + internal::FEValues::MappingRelatedData &output_data) const override; // documentation can be found in Mapping::fill_fe_subface_values() - virtual void + virtual + void fill_fe_subface_values (const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const unsigned int subface_no, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const; + internal::FEValues::MappingRelatedData &output_data) const override; /** * @} @@ -550,7 +553,8 @@ private: /** * See the documentation of the base class for detailed information. */ - virtual void + virtual + void compute_shapes_virtual (const std::vector > &unit_points, typename MappingFEField::InternalData &data) const; diff --git a/include/deal.II/fe/mapping_manifold.h b/include/deal.II/fe/mapping_manifold.h index 7d0b483c40..8551586da4 100644 --- a/include/deal.II/fe/mapping_manifold.h +++ b/include/deal.II/fe/mapping_manifold.h @@ -79,7 +79,7 @@ public: * vertices always lies on the underlying Manifold. */ virtual - bool preserves_vertex_locations () const; + bool preserves_vertex_locations () const override; /** * @name Mapping points between reference and real cells @@ -90,13 +90,13 @@ public: virtual Point transform_unit_to_real_cell (const typename Triangulation::cell_iterator &cell, - const Point &p) const; + const Point &p) const override; // for documentation, see the Mapping base class virtual Point transform_real_to_unit_cell (const typename Triangulation::cell_iterator &cell, - const Point &p) const; + const Point &p) const override; /** * @} @@ -113,7 +113,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -121,7 +121,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -129,7 +129,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -137,7 +137,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -145,7 +145,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; /** * @} @@ -217,7 +217,8 @@ public: /** * Return an estimate (in bytes) or the memory consumption of this object. */ - virtual std::size_t memory_consumption () const; + virtual + std::size_t memory_consumption () const override; /** * The current cell vertices. @@ -336,25 +337,25 @@ public: // documentation can be found in Mapping::requires_update_flags() virtual UpdateFlags - requires_update_flags (const UpdateFlags update_flags) const; + requires_update_flags (const UpdateFlags update_flags) const override; // documentation can be found in Mapping::get_data() virtual InternalData * get_data (const UpdateFlags, - const Quadrature &quadrature) const; + const Quadrature &quadrature) const override; // documentation can be found in Mapping::get_face_data() virtual InternalData * get_face_data (const UpdateFlags flags, - const Quadrature& quadrature) const; + const Quadrature& quadrature) const override; // documentation can be found in Mapping::get_subface_data() virtual InternalData * get_subface_data (const UpdateFlags flags, - const Quadrature& quadrature) const; + const Quadrature& quadrature) const override; // documentation can be found in Mapping::fill_fe_values() virtual @@ -363,24 +364,26 @@ public: const CellSimilarity::Similarity cell_similarity, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - dealii::internal::FEValues::MappingRelatedData &output_data) const; + dealii::internal::FEValues::MappingRelatedData &output_data) const override; // documentation can be found in Mapping::fill_fe_face_values() - virtual void + virtual + void fill_fe_face_values (const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - dealii::internal::FEValues::MappingRelatedData &output_data) const; + dealii::internal::FEValues::MappingRelatedData &output_data) const override; // documentation can be found in Mapping::fill_fe_subface_values() - virtual void + virtual + void fill_fe_subface_values (const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const unsigned int subface_no, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - dealii::internal::FEValues::MappingRelatedData &output_data) const; + dealii::internal::FEValues::MappingRelatedData &output_data) const override; /** * @} diff --git a/include/deal.II/fe/mapping_q.h b/include/deal.II/fe/mapping_q.h index 1b09075a0a..8afa178b65 100644 --- a/include/deal.II/fe/mapping_q.h +++ b/include/deal.II/fe/mapping_q.h @@ -118,7 +118,7 @@ public: * this class preserves vertex locations. */ virtual - bool preserves_vertex_locations () const; + bool preserves_vertex_locations () const override; /** * Transform the point @p p on the unit cell to the point @p p_real on the @@ -128,7 +128,7 @@ public: Point transform_unit_to_real_cell ( const typename Triangulation::cell_iterator &cell, - const Point &p) const; + const Point &p) const override; /** * Transform the point @p p on the real cell to the point @p p_unit on the @@ -154,7 +154,7 @@ public: virtual Point transform_real_to_unit_cell (const typename Triangulation::cell_iterator &cell, - const Point &p) const; + const Point &p) const override; // for documentation, see the Mapping base class virtual @@ -162,7 +162,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -170,7 +170,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -178,7 +178,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -186,7 +186,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -194,12 +194,13 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; /** * Return a pointer to a copy of the present object. The caller of this copy * then assumes ownership of it. */ + virtual std::unique_ptr> clone () const override; @@ -243,7 +244,8 @@ protected: /** * Return an estimate (in bytes) or the memory consumption of this object. */ - virtual std::size_t memory_consumption () const; + virtual + std::size_t memory_consumption () const override; /** * Flag that is set by the fill_fe_[[sub]face]_values function. @@ -271,25 +273,25 @@ protected: // documentation can be found in Mapping::requires_update_flags() virtual UpdateFlags - requires_update_flags (const UpdateFlags update_flags) const; + requires_update_flags (const UpdateFlags update_flags) const override; // documentation can be found in Mapping::get_data() virtual InternalData * get_data (const UpdateFlags, - const Quadrature &quadrature) const; + const Quadrature &quadrature) const override; // documentation can be found in Mapping::get_face_data() virtual InternalData * get_face_data (const UpdateFlags flags, - const Quadrature& quadrature) const; + const Quadrature& quadrature) const override; // documentation can be found in Mapping::get_subface_data() virtual InternalData * get_subface_data (const UpdateFlags flags, - const Quadrature& quadrature) const; + const Quadrature& quadrature) const override; // documentation can be found in Mapping::fill_fe_values() virtual @@ -298,24 +300,26 @@ protected: const CellSimilarity::Similarity cell_similarity, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const; + internal::FEValues::MappingRelatedData &output_data) const override; // documentation can be found in Mapping::fill_fe_face_values() - virtual void + virtual + void fill_fe_face_values (const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const; + internal::FEValues::MappingRelatedData &output_data) const override; // documentation can be found in Mapping::fill_fe_subface_values() - virtual void + virtual + void fill_fe_subface_values (const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const unsigned int subface_no, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const; + internal::FEValues::MappingRelatedData &output_data) const override; /** * @} diff --git a/include/deal.II/fe/mapping_q1_eulerian.h b/include/deal.II/fe/mapping_q1_eulerian.h index 1675899df9..fb3e5a74ea 100644 --- a/include/deal.II/fe/mapping_q1_eulerian.h +++ b/include/deal.II/fe/mapping_q1_eulerian.h @@ -116,7 +116,7 @@ public: */ virtual std::array, GeometryInfo::vertices_per_cell> - get_vertices (const typename Triangulation::cell_iterator &cell) const; + get_vertices (const typename Triangulation::cell_iterator &cell) const override; /** * Return a pointer to a copy of the present object. The caller of this copy @@ -130,7 +130,8 @@ public: * preserve vertex locations (unless the translation vector happens to * provide for zero displacements at vertex locations). */ - bool preserves_vertex_locations () const; + virtual + bool preserves_vertex_locations () const override; /** * Exception. @@ -154,7 +155,7 @@ protected: const CellSimilarity::Similarity cell_similarity, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const; + internal::FEValues::MappingRelatedData &output_data) const override; /** * Compute the support points of the mapping. For the current class, these @@ -164,7 +165,7 @@ protected: */ virtual std::vector > - compute_mapping_support_points(const typename Triangulation::cell_iterator &cell) const; + compute_mapping_support_points(const typename Triangulation::cell_iterator &cell) const override; /** * Reference to the vector of shifts. diff --git a/include/deal.II/fe/mapping_q_eulerian.h b/include/deal.II/fe/mapping_q_eulerian.h index 98c20b21f2..78e5afc9f1 100644 --- a/include/deal.II/fe/mapping_q_eulerian.h +++ b/include/deal.II/fe/mapping_q_eulerian.h @@ -119,7 +119,7 @@ public: */ virtual std::array, GeometryInfo::vertices_per_cell> - get_vertices (const typename Triangulation::cell_iterator &cell) const; + get_vertices (const typename Triangulation::cell_iterator &cell) const override; /** * Return a pointer to a copy of the present object. The caller of this copy @@ -134,7 +134,7 @@ public: * provide zero displacements at vertex locations). */ virtual - bool preserves_vertex_locations () const; + bool preserves_vertex_locations () const override; /** * Exception which is thrown when the mapping is being evaluated at @@ -157,7 +157,7 @@ protected: const CellSimilarity::Similarity cell_similarity, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const; + internal::FEValues::MappingRelatedData &output_data) const override; /** * Reference to the vector of shifts. @@ -200,7 +200,7 @@ private: */ virtual std::array, GeometryInfo::vertices_per_cell> - get_vertices (const typename Triangulation::cell_iterator &cell) const; + get_vertices (const typename Triangulation::cell_iterator &cell) const override; /** * Compute the positions of the support points in the current @@ -209,7 +209,7 @@ private: */ virtual std::vector > - compute_mapping_support_points(const typename Triangulation::cell_iterator &cell) const; + compute_mapping_support_points(const typename Triangulation::cell_iterator &cell) const override; /** * Always return @p false because MappingQEulerianGeneric does not in general @@ -217,7 +217,7 @@ private: * provide for zero displacements at vertex locations). */ virtual - bool preserves_vertex_locations () const; + bool preserves_vertex_locations () const override; private: /** diff --git a/include/deal.II/fe/mapping_q_generic.h b/include/deal.II/fe/mapping_q_generic.h index 1e3086c53d..71e6339527 100644 --- a/include/deal.II/fe/mapping_q_generic.h +++ b/include/deal.II/fe/mapping_q_generic.h @@ -155,7 +155,7 @@ public: * this class preserves vertex locations. */ virtual - bool preserves_vertex_locations () const; + bool preserves_vertex_locations () const override; /** * @name Mapping points between reference and real cells @@ -166,13 +166,13 @@ public: virtual Point transform_unit_to_real_cell (const typename Triangulation::cell_iterator &cell, - const Point &p) const; + const Point &p) const override; // for documentation, see the Mapping base class virtual Point transform_real_to_unit_cell (const typename Triangulation::cell_iterator &cell, - const Point &p) const; + const Point &p) const override; /** * @} @@ -189,7 +189,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -197,7 +197,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -205,7 +205,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -213,7 +213,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; // for documentation, see the Mapping base class virtual @@ -221,7 +221,7 @@ public: transform (const ArrayView > &input, const MappingType type, const typename Mapping::InternalDataBase &internal, - const ArrayView > &output) const; + const ArrayView > &output) const override; /** * @} @@ -358,7 +358,8 @@ public: /** * Return an estimate (in bytes) or the memory consumption of this object. */ - virtual std::size_t memory_consumption () const; + virtual + std::size_t memory_consumption () const override; /** * Values of shape functions. Access by function @p shape. @@ -529,25 +530,25 @@ public: // documentation can be found in Mapping::requires_update_flags() virtual UpdateFlags - requires_update_flags (const UpdateFlags update_flags) const; + requires_update_flags (const UpdateFlags update_flags) const override; // documentation can be found in Mapping::get_data() virtual InternalData * get_data (const UpdateFlags, - const Quadrature &quadrature) const; + const Quadrature &quadrature) const override; // documentation can be found in Mapping::get_face_data() virtual InternalData * get_face_data (const UpdateFlags flags, - const Quadrature& quadrature) const; + const Quadrature& quadrature) const override; // documentation can be found in Mapping::get_subface_data() virtual InternalData * get_subface_data (const UpdateFlags flags, - const Quadrature& quadrature) const; + const Quadrature& quadrature) const override; // documentation can be found in Mapping::fill_fe_values() virtual @@ -556,24 +557,26 @@ public: const CellSimilarity::Similarity cell_similarity, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - dealii::internal::FEValues::MappingRelatedData &output_data) const; + dealii::internal::FEValues::MappingRelatedData &output_data) const override; // documentation can be found in Mapping::fill_fe_face_values() - virtual void + virtual + void fill_fe_face_values (const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - dealii::internal::FEValues::MappingRelatedData &output_data) const; + dealii::internal::FEValues::MappingRelatedData &output_data) const override; // documentation can be found in Mapping::fill_fe_subface_values() - virtual void + virtual + void fill_fe_subface_values (const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const unsigned int subface_no, const Quadrature &quadrature, const typename Mapping::InternalDataBase &internal_data, - dealii::internal::FEValues::MappingRelatedData &output_data) const; + dealii::internal::FEValues::MappingRelatedData &output_data) const override; /** * @}