From: Wolfgang Bangerth Date: Sun, 19 Jul 2015 14:58:34 +0000 (-0500) Subject: Mark two more of the FiniteElement::fill_fe_values arguments as const. X-Git-Tag: v8.4.0-rc2~740^2~2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=863c8a55746b403e9ddc095e9fd5015e3c9cfb69;p=dealii.git Mark two more of the FiniteElement::fill_fe_values arguments as const. These two arguments were supposed to be input arguments, but weren't marked as const. Do this here, and document the respective functions better. --- diff --git a/include/deal.II/fe/fe.h b/include/deal.II/fe/fe.h index 8475130c63..2bd6306476 100644 --- a/include/deal.II/fe/fe.h +++ b/include/deal.II/fe/fe.h @@ -1972,8 +1972,8 @@ protected: void compute_2nd (const Mapping &mapping, const typename Triangulation::cell_iterator &cell, const unsigned int offset, - typename Mapping::InternalDataBase &mapping_internal, - InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const InternalDataBase &fe_internal, FEValuesData &data) const; /** @@ -2061,8 +2061,8 @@ protected: fill_fe_values (const Mapping &mapping, const typename Triangulation::cell_iterator &cell, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_internal, - typename Mapping::InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data, CellSimilarity::Similarity &cell_similarity) const = 0; @@ -2078,8 +2078,8 @@ protected: const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_internal, - typename Mapping::InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data) const = 0; /** @@ -2095,8 +2095,8 @@ protected: const unsigned int face_no, const unsigned int sub_no, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_internal, - typename Mapping::InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data) const = 0; friend class InternalDataBase; diff --git a/include/deal.II/fe/fe_dgp_nonparametric.h b/include/deal.II/fe/fe_dgp_nonparametric.h index 2e4b3ffdaf..a9caaf9baa 100644 --- a/include/deal.II/fe/fe_dgp_nonparametric.h +++ b/include/deal.II/fe/fe_dgp_nonparametric.h @@ -536,8 +536,8 @@ protected: fill_fe_values (const Mapping &mapping, const typename Triangulation::cell_iterator &cell, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_internal, - typename Mapping::InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data, CellSimilarity::Similarity &cell_similarity) const; @@ -549,8 +549,8 @@ protected: const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_internal, - typename Mapping::InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data) const ; /** @@ -562,8 +562,8 @@ protected: const unsigned int face_no, const unsigned int sub_no, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_internal, - typename Mapping::InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data) const ; private: diff --git a/include/deal.II/fe/fe_face.h b/include/deal.II/fe/fe_face.h index 42498990fb..5393a42097 100644 --- a/include/deal.II/fe/fe_face.h +++ b/include/deal.II/fe/fe_face.h @@ -247,8 +247,8 @@ protected: fill_fe_values (const Mapping<1,spacedim> &mapping, const typename Triangulation<1,spacedim>::cell_iterator &cell, const Quadrature<1> &quadrature, - typename Mapping<1,spacedim>::InternalDataBase &mapping_internal, - typename Mapping<1,spacedim>::InternalDataBase &fe_internal, + const typename Mapping<1,spacedim>::InternalDataBase &mapping_internal, + const typename Mapping<1,spacedim>::InternalDataBase &fe_internal, FEValuesData<1,spacedim> &data, CellSimilarity::Similarity &cell_similarity) const; @@ -257,8 +257,8 @@ protected: const typename Triangulation<1,spacedim>::cell_iterator &cell, const unsigned int face_no, const Quadrature<0> &quadrature, - typename Mapping<1,spacedim>::InternalDataBase &mapping_internal, - typename Mapping<1,spacedim>::InternalDataBase &fe_internal, + const typename Mapping<1,spacedim>::InternalDataBase &mapping_internal, + const typename Mapping<1,spacedim>::InternalDataBase &fe_internal, FEValuesData<1,spacedim> &data) const ; virtual void @@ -267,8 +267,8 @@ protected: const unsigned int face_no, const unsigned int sub_no, const Quadrature<0> &quadrature, - typename Mapping<1,spacedim>::InternalDataBase &mapping_internal, - typename Mapping<1,spacedim>::InternalDataBase &fe_internal, + const typename Mapping<1,spacedim>::InternalDataBase &mapping_internal, + const typename Mapping<1,spacedim>::InternalDataBase &fe_internal, FEValuesData<1,spacedim> &data) const ; diff --git a/include/deal.II/fe/fe_nothing.h b/include/deal.II/fe/fe_nothing.h index ae556d61d5..9081f5f22d 100644 --- a/include/deal.II/fe/fe_nothing.h +++ b/include/deal.II/fe/fe_nothing.h @@ -159,8 +159,8 @@ public: fill_fe_values (const Mapping &mapping, const typename Triangulation::cell_iterator &cell, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fedata, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fedata, FEValuesData &data, CellSimilarity::Similarity &cell_similarity) const; @@ -177,8 +177,8 @@ public: const typename Triangulation::cell_iterator &cell, const unsigned int face, const Quadrature & quadrature, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fedata, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fedata, FEValuesData &data) const; /** @@ -195,8 +195,8 @@ public: const unsigned int face, const unsigned int subface, const Quadrature & quadrature, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fedata, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fedata, FEValuesData &data) const; /** diff --git a/include/deal.II/fe/fe_poly.h b/include/deal.II/fe/fe_poly.h index 4ba1f27830..50cd713981 100644 --- a/include/deal.II/fe/fe_poly.h +++ b/include/deal.II/fe/fe_poly.h @@ -172,8 +172,8 @@ protected: fill_fe_values (const Mapping &mapping, const typename Triangulation::cell_iterator &cell, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_internal, - typename Mapping::InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data, CellSimilarity::Similarity &cell_similarity) const; @@ -182,8 +182,8 @@ protected: const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_internal, - typename Mapping::InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data) const ; virtual void @@ -192,8 +192,8 @@ protected: const unsigned int face_no, const unsigned int sub_no, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_internal, - typename Mapping::InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data) const ; diff --git a/include/deal.II/fe/fe_poly.templates.h b/include/deal.II/fe/fe_poly.templates.h index ca03688c76..1a1e0390bf 100644 --- a/include/deal.II/fe/fe_poly.templates.h +++ b/include/deal.II/fe/fe_poly.templates.h @@ -251,8 +251,8 @@ FE_Poly::fill_fe_values (const Mapping &mapping, const typename Triangulation::cell_iterator &cell, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fedata, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fedata, FEValuesData &data, CellSimilarity::Similarity &cell_similarity) const { @@ -260,8 +260,8 @@ FE_Poly::fill_fe_values // data for this class. fails with // an exception if that is not // possible - Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); - InternalData &fe_data = static_cast (fedata); + Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); + const InternalData &fe_data = static_cast (fedata); const UpdateFlags flags(fe_data.current_update_flags()); @@ -290,16 +290,16 @@ fill_fe_face_values (const Mapping &mapping, const typename Triangulation::cell_iterator &cell, const unsigned int face, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fedata, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fedata, FEValuesData &data) const { // convert data object to internal // data for this class. fails with // an exception if that is not // possible - Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); - InternalData &fe_data = static_cast (fedata); + Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); + const InternalData &fe_data = static_cast (fedata); // offset determines which data set // to take (all data sets for all @@ -405,16 +405,16 @@ FE_Poly::fill_fe_subface_values (const Mapping const unsigned int face, const unsigned int subface, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fedata, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fedata, FEValuesData &data) const { // convert data object to internal // data for this class. fails with // an exception if that is not // possible - Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); - InternalData &fe_data = static_cast (fedata); + Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); + const InternalData &fe_data = static_cast (fedata); // offset determines which data set // to take (all data sets for all diff --git a/include/deal.II/fe/fe_poly_face.h b/include/deal.II/fe/fe_poly_face.h index e328155a23..c1195d795b 100644 --- a/include/deal.II/fe/fe_poly_face.h +++ b/include/deal.II/fe/fe_poly_face.h @@ -160,8 +160,8 @@ protected: fill_fe_values (const Mapping &mapping, const typename Triangulation::cell_iterator &cell, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_internal, - typename Mapping::InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data, CellSimilarity::Similarity &cell_similarity) const; @@ -170,8 +170,8 @@ protected: const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_internal, - typename Mapping::InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data) const ; virtual void @@ -180,8 +180,8 @@ protected: const unsigned int face_no, const unsigned int sub_no, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_internal, - typename Mapping::InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data) const ; diff --git a/include/deal.II/fe/fe_poly_face.templates.h b/include/deal.II/fe/fe_poly_face.templates.h index 9249620cb1..1af8143aab 100644 --- a/include/deal.II/fe/fe_poly_face.templates.h +++ b/include/deal.II/fe/fe_poly_face.templates.h @@ -175,8 +175,8 @@ FE_PolyFace::fill_fe_values (const Mapping &, const typename Triangulation::cell_iterator &, const Quadrature &, - typename Mapping::InternalDataBase &, - typename Mapping::InternalDataBase &, + const typename Mapping::InternalDataBase &, + const typename Mapping::InternalDataBase &, FEValuesData &, CellSimilarity::Similarity &) const { @@ -193,16 +193,16 @@ FE_PolyFace::fill_fe_face_values ( const typename Triangulation::cell_iterator &, const unsigned int face, const Quadrature& quadrature, - typename Mapping::InternalDataBase &, - typename Mapping::InternalDataBase &fedata, + const typename Mapping::InternalDataBase &, + const typename Mapping::InternalDataBase &fedata, FEValuesData &data) const { // convert data object to internal // data for this class. fails with // an exception if that is not // possible - Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); - InternalData &fe_data = static_cast (fedata); + Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); + const InternalData &fe_data = static_cast (fedata); const UpdateFlags flags(fe_data.update_once | fe_data.update_each); @@ -257,16 +257,16 @@ FE_PolyFace::fill_fe_subface_values ( const unsigned int face, const unsigned int subface, const Quadrature& quadrature, - typename Mapping::InternalDataBase &, - typename Mapping::InternalDataBase &fedata, + const typename Mapping::InternalDataBase &, + const typename Mapping::InternalDataBase &fedata, FEValuesData &data) const { // convert data object to internal // data for this class. fails with // an exception if that is not // possible - Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); - InternalData &fe_data = static_cast (fedata); + Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); + const InternalData &fe_data = static_cast (fedata); const UpdateFlags flags(fe_data.update_once | fe_data.update_each); diff --git a/include/deal.II/fe/fe_poly_tensor.h b/include/deal.II/fe/fe_poly_tensor.h index 9bdedbf393..7444d8ea7d 100644 --- a/include/deal.II/fe/fe_poly_tensor.h +++ b/include/deal.II/fe/fe_poly_tensor.h @@ -185,8 +185,8 @@ protected: fill_fe_values (const Mapping &mapping, const typename Triangulation::cell_iterator &cell, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_internal, - typename Mapping::InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data, CellSimilarity::Similarity &cell_similarity) const; @@ -195,8 +195,8 @@ protected: const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_internal, - typename Mapping::InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data) const ; virtual void @@ -205,8 +205,8 @@ protected: const unsigned int face_no, const unsigned int sub_no, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_internal, - typename Mapping::InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data) const ; /** diff --git a/include/deal.II/fe/fe_system.h b/include/deal.II/fe/fe_system.h index 1514b1e0ed..72f4872738 100644 --- a/include/deal.II/fe/fe_system.h +++ b/include/deal.II/fe/fe_system.h @@ -822,8 +822,8 @@ protected: fill_fe_values (const Mapping &mapping, const typename Triangulation::cell_iterator &cell, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fe_data, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fe_data, FEValuesData &data, CellSimilarity::Similarity &cell_similarity) const; @@ -838,8 +838,8 @@ protected: const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fe_data, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fe_data, FEValuesData &data) const; /** @@ -854,8 +854,8 @@ protected: const unsigned int face_no, const unsigned int sub_no, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fe_data, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fe_data, FEValuesData &data) const; @@ -875,9 +875,9 @@ protected: const unsigned int face_no, const unsigned int sub_no, const Quadrature &quadrature, - CellSimilarity::Similarity cell_similarity, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fe_data, + const CellSimilarity::Similarity cell_similarity, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fe_data, FEValuesData &data) const; private: @@ -1050,8 +1050,8 @@ private: const unsigned int sub_no, const Quadrature &quadrature, CellSimilarity::Similarity cell_similarity, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fedata, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fedata, const unsigned int base_element, FEValuesData &data) const; diff --git a/source/fe/fe.cc b/source/fe/fe.cc index feb9f106e1..9c5234a027 100644 --- a/source/fe/fe.cc +++ b/source/fe/fe.cc @@ -1218,11 +1218,10 @@ FiniteElement<1,2>::compute_2nd ( const Mapping<1,2> &, const Triangulation<1,2>::cell_iterator &, const unsigned int, - Mapping<1,2>::InternalDataBase &, - InternalDataBase &, + const Mapping<1,2>::InternalDataBase &, + const InternalDataBase &, FEValuesData<1,2> &) const { - Assert(false, ExcNotImplemented()); } @@ -1233,11 +1232,10 @@ FiniteElement<1,3>::compute_2nd ( const Mapping<1,3> &, const Triangulation<1,3>::cell_iterator &, const unsigned int, - Mapping<1,3>::InternalDataBase &, - InternalDataBase &, + const Mapping<1,3>::InternalDataBase &, + const InternalDataBase &, FEValuesData<1,3> &) const { - Assert(false, ExcNotImplemented()); } @@ -1249,11 +1247,10 @@ FiniteElement<2,3>::compute_2nd ( const Mapping<2,3> &, const Triangulation<2,3>::cell_iterator &, const unsigned int, - Mapping<2,3>::InternalDataBase &, - InternalDataBase &, + const Mapping<2,3>::InternalDataBase &, + const InternalDataBase &, FEValuesData<2,3> &) const { - Assert(false, ExcNotImplemented()); } @@ -1265,8 +1262,8 @@ FiniteElement::compute_2nd ( const Mapping &mapping, const typename Triangulation::cell_iterator &cell, const unsigned int offset, - typename Mapping::InternalDataBase &mapping_internal, - InternalDataBase &fe_internal, + const typename Mapping::InternalDataBase &mapping_internal, + const InternalDataBase &fe_internal, FEValuesData &data) const { Assert ((fe_internal.update_each | fe_internal.update_once) diff --git a/source/fe/fe_dgp_nonparametric.cc b/source/fe/fe_dgp_nonparametric.cc index 303e1ffc63..76df292954 100644 --- a/source/fe/fe_dgp_nonparametric.cc +++ b/source/fe/fe_dgp_nonparametric.cc @@ -281,8 +281,8 @@ FE_DGPNonparametric::fill_fe_values ( const Mapping &, const typename Triangulation::cell_iterator &, const Quadrature &, - typename Mapping::InternalDataBase &, - typename Mapping::InternalDataBase &fe_data, + const typename Mapping::InternalDataBase &, + const typename Mapping::InternalDataBase &fe_data, FEValuesData &data, CellSimilarity::Similarity &/*cell_similarity*/) const { @@ -321,8 +321,8 @@ FE_DGPNonparametric::fill_fe_face_values ( const typename Triangulation::cell_iterator &, const unsigned int, const Quadrature&, - typename Mapping::InternalDataBase &, - typename Mapping::InternalDataBase &fe_data, + const typename Mapping::InternalDataBase &, + const typename Mapping::InternalDataBase &fe_data, FEValuesData &data) const { const UpdateFlags flags(fe_data.update_once | fe_data.update_each); @@ -361,8 +361,8 @@ FE_DGPNonparametric::fill_fe_subface_values ( const unsigned int, const unsigned int, const Quadrature&, - typename Mapping::InternalDataBase &, - typename Mapping::InternalDataBase &fe_data, + const typename Mapping::InternalDataBase &, + const typename Mapping::InternalDataBase &fe_data, FEValuesData &data) const { const UpdateFlags flags(fe_data.update_once | fe_data.update_each); diff --git a/source/fe/fe_face.cc b/source/fe/fe_face.cc index 7b961e689d..a6cc234172 100644 --- a/source/fe/fe_face.cc +++ b/source/fe/fe_face.cc @@ -521,8 +521,8 @@ FE_FaceQ<1,spacedim>::fill_fe_values (const Mapping<1,spacedim> &, const typename Triangulation<1,spacedim>::cell_iterator &, const Quadrature<1> &, - typename Mapping<1,spacedim>::InternalDataBase &, - typename Mapping<1,spacedim>::InternalDataBase &, + const typename Mapping<1,spacedim>::InternalDataBase &, + const typename Mapping<1,spacedim>::InternalDataBase &, FEValuesData<1,spacedim> &, CellSimilarity::Similarity &) const { @@ -538,8 +538,8 @@ FE_FaceQ<1,spacedim>::fill_fe_face_values ( const typename Triangulation<1,spacedim>::cell_iterator &, const unsigned int face, const Quadrature<0> &, - typename Mapping<1,spacedim>::InternalDataBase &, - typename Mapping<1,spacedim>::InternalDataBase &fedata, + const typename Mapping<1,spacedim>::InternalDataBase &, + const typename Mapping<1,spacedim>::InternalDataBase &fedata, FEValuesData<1,spacedim> &data) const { const UpdateFlags flags(fedata.update_once | fedata.update_each); @@ -562,11 +562,11 @@ FE_FaceQ<1,spacedim>::fill_fe_subface_values ( const unsigned int , const unsigned int , const Quadrature<0> &, - typename Mapping<1,spacedim>::InternalDataBase &, - typename Mapping<1,spacedim>::InternalDataBase &, + const typename Mapping<1,spacedim>::InternalDataBase &, + const typename Mapping<1,spacedim>::InternalDataBase &, FEValuesData<1,spacedim> &) const { - Assert(false, ExcMessage("Should not fille subface values in 1D")); + Assert(false, ExcMessage("There are no sub-face values to fill in 1D!")); } diff --git a/source/fe/fe_nothing.cc b/source/fe/fe_nothing.cc index 259326b237..3c2a37a272 100644 --- a/source/fe/fe_nothing.cc +++ b/source/fe/fe_nothing.cc @@ -120,8 +120,8 @@ FE_Nothing:: fill_fe_values (const Mapping & /*mapping*/, const typename Triangulation::cell_iterator & /*cell*/, const Quadrature & /*quadrature*/, - typename Mapping::InternalDataBase & /*mapping_data*/, - typename Mapping::InternalDataBase & /*fedata*/, + const typename Mapping::InternalDataBase & /*mapping_data*/, + const typename Mapping::InternalDataBase & /*fedata*/, FEValuesData & /*data*/, CellSimilarity::Similarity & /*cell_similarity*/) const { @@ -137,8 +137,8 @@ fill_fe_face_values (const Mapping & /*mapping*/, const typename Triangulation::cell_iterator & /*cell*/, const unsigned int /*face*/, const Quadrature & /*quadrature*/, - typename Mapping::InternalDataBase & /*mapping_data*/, - typename Mapping::InternalDataBase & /*fedata*/, + const typename Mapping::InternalDataBase & /*mapping_data*/, + const typename Mapping::InternalDataBase & /*fedata*/, FEValuesData & /*data*/) const { // leave data fields empty @@ -152,8 +152,8 @@ fill_fe_subface_values (const Mapping & /*mapping*/, const unsigned int /*face*/, const unsigned int /*subface*/, const Quadrature & /*quadrature*/, - typename Mapping::InternalDataBase & /*mapping_data*/, - typename Mapping::InternalDataBase & /*fedata*/, + const typename Mapping::InternalDataBase & /*mapping_data*/, + const typename Mapping::InternalDataBase & /*fedata*/, FEValuesData & /*data*/) const { // leave data fields empty diff --git a/source/fe/fe_poly.cc b/source/fe/fe_poly.cc index b6563fb3fb..cd8880af0d 100644 --- a/source/fe/fe_poly.cc +++ b/source/fe/fe_poly.cc @@ -33,8 +33,8 @@ FE_Poly,1,2>::fill_fe_values (const Mapping<1,2> &mapping, const Triangulation<1,2>::cell_iterator &cell, const Quadrature<1> &quadrature, - Mapping<1,2>::InternalDataBase &mapping_data, - Mapping<1,2>::InternalDataBase &fedata, + const Mapping<1,2>::InternalDataBase &mapping_data, + const Mapping<1,2>::InternalDataBase &fedata, FEValuesData<1,2> &data, CellSimilarity::Similarity &cell_similarity) const { @@ -42,8 +42,8 @@ FE_Poly,1,2>::fill_fe_values // data for this class. fails with // an exception if that is not // possible - Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); - InternalData &fe_data = static_cast (fedata); + Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); + const InternalData &fe_data = static_cast (fedata); const UpdateFlags flags(fe_data.current_update_flags()); @@ -71,16 +71,16 @@ FE_Poly,2,3>::fill_fe_values (const Mapping<2,3> &mapping, const Triangulation<2,3>::cell_iterator &cell, const Quadrature<2> &quadrature, - Mapping<2,3>::InternalDataBase &mapping_data, - Mapping<2,3>::InternalDataBase &fedata, + const Mapping<2,3>::InternalDataBase &mapping_data, + const Mapping<2,3>::InternalDataBase &fedata, FEValuesData<2,3> &data, CellSimilarity::Similarity &cell_similarity) const { // assert that the following dynamics // cast is really well-defined. - Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); - InternalData &fe_data = static_cast (fedata); + Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); + const InternalData &fe_data = static_cast (fedata); const UpdateFlags flags(fe_data.current_update_flags()); @@ -107,8 +107,8 @@ FE_Poly,1,2>::fill_fe_values ( const Mapping<1,2> &mapping, const Triangulation<1,2>::cell_iterator &cell, const Quadrature<1> &quadrature, - Mapping<1,2>::InternalDataBase &mapping_data, - Mapping<1,2>::InternalDataBase &fedata, + const Mapping<1,2>::InternalDataBase &mapping_data, + const Mapping<1,2>::InternalDataBase &fedata, FEValuesData<1,2> &data, CellSimilarity::Similarity &cell_similarity) const { @@ -117,8 +117,8 @@ FE_Poly,1,2>::fill_fe_values ( // an exception if that is not // possible - Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); - InternalData &fe_data = static_cast (fedata); + Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); + const InternalData &fe_data = static_cast (fedata); const UpdateFlags flags(fe_data.current_update_flags()); @@ -145,13 +145,13 @@ FE_Poly,2,3>::fill_fe_values (const Mapping<2,3> &mapping, const Triangulation<2,3>::cell_iterator &cell, const Quadrature<2> &quadrature, - Mapping<2,3>::InternalDataBase &mapping_data, - Mapping<2,3>::InternalDataBase &fedata, + const Mapping<2,3>::InternalDataBase &mapping_data, + const Mapping<2,3>::InternalDataBase &fedata, FEValuesData<2,3> &data, CellSimilarity::Similarity &cell_similarity) const { - Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); - InternalData &fe_data = static_cast (fedata); + Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); + const InternalData &fe_data = static_cast (fedata); const UpdateFlags flags(fe_data.current_update_flags()); diff --git a/source/fe/fe_poly_tensor.cc b/source/fe/fe_poly_tensor.cc index d150565226..891f249094 100644 --- a/source/fe/fe_poly_tensor.cc +++ b/source/fe/fe_poly_tensor.cc @@ -393,8 +393,8 @@ FE_PolyTensor::fill_fe_values ( const Mapping &mapping, const typename Triangulation::cell_iterator &cell, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fedata, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fedata, FEValuesData &data, CellSimilarity::Similarity &cell_similarity) const { @@ -402,9 +402,9 @@ FE_PolyTensor::fill_fe_values ( // data for this class. fails with // an exception if that is not // possible - Assert (dynamic_cast (&fedata) != 0, + Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); - InternalData &fe_data = static_cast (fedata); + const InternalData &fe_data = static_cast (fedata); const unsigned int n_q_points = quadrature.size(); const UpdateFlags flags(fe_data.current_update_flags()); @@ -614,17 +614,17 @@ FE_PolyTensor::fill_fe_face_values ( const typename Triangulation::cell_iterator &cell, const unsigned int face, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fedata, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fedata, FEValuesData &data) const { // convert data object to internal // data for this class. fails with // an exception if that is not // possible - Assert (dynamic_cast (&fedata) != 0, + Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); - InternalData &fe_data = static_cast (fedata); + const InternalData &fe_data = static_cast (fedata); const unsigned int n_q_points = quadrature.size(); // offset determines which data set @@ -819,17 +819,17 @@ FE_PolyTensor::fill_fe_subface_values ( const unsigned int face, const unsigned int subface, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fedata, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fedata, FEValuesData &data) const { // convert data object to internal // data for this class. fails with // an exception if that is not // possible - Assert (dynamic_cast (&fedata) != 0, + Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); - InternalData &fe_data = static_cast (fedata); + const InternalData &fe_data = static_cast (fedata); const unsigned int n_q_points = quadrature.size(); diff --git a/source/fe/fe_system.cc b/source/fe/fe_system.cc index d764dd6697..fcf4b88a10 100644 --- a/source/fe/fe_system.cc +++ b/source/fe/fe_system.cc @@ -1037,8 +1037,8 @@ FESystem::fill_fe_values ( const Mapping &mapping, const typename Triangulation::cell_iterator &cell, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fe_data, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fe_data, FEValuesData &data, CellSimilarity::Similarity &cell_similarity) const { @@ -1055,8 +1055,8 @@ FESystem::fill_fe_face_values ( const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fe_data, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fe_data, FEValuesData &data) const { compute_fill (mapping, cell, face_no, invalid_face_number, quadrature, @@ -1074,8 +1074,8 @@ FESystem::fill_fe_subface_values ( const unsigned int face_no, const unsigned int sub_no, const Quadrature &quadrature, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fe_data, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fe_data, FEValuesData &data) const { compute_fill (mapping, cell, face_no, sub_no, quadrature, @@ -1094,12 +1094,12 @@ FESystem::compute_fill_one_base ( const unsigned int sub_no, const Quadrature &quadrature, CellSimilarity::Similarity cell_similarity, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fedata, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fedata, const unsigned int base_no, FEValuesData &data) const { - InternalData &fe_data = static_cast (fedata); + const InternalData &fe_data = static_cast (fedata); const unsigned int n_q_points = quadrature.size(); const FiniteElement & @@ -1243,9 +1243,9 @@ FESystem::compute_fill ( const unsigned int face_no, const unsigned int sub_no, const Quadrature &quadrature, - CellSimilarity::Similarity cell_similarity, - typename Mapping::InternalDataBase &mapping_data, - typename Mapping::InternalDataBase &fedata, + const CellSimilarity::Similarity cell_similarity, + const typename Mapping::InternalDataBase &mapping_data, + const typename Mapping::InternalDataBase &fedata, FEValuesData &data) const { const unsigned int n_q_points = quadrature.size(); @@ -1254,8 +1254,8 @@ FESystem::compute_fill ( // data for this class. fails with // an exception if that is not // possible - Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); - InternalData &fe_data = static_cast (fedata); + Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); + const InternalData &fe_data = static_cast (fedata); // Either dim_1==dim // (fill_fe_values) or dim_1==dim-1