From: Wolfgang Bangerth Date: Mon, 20 Jul 2015 18:24:24 +0000 (-0500) Subject: Pass CellSimilarity arguments by value rather than by reference. X-Git-Tag: v8.4.0-rc2~740^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af6702a3aa3d359520b3e937e454c5555466050b;p=dealii.git Pass CellSimilarity arguments by value rather than by reference. These are integral valued arguments for which references are not necessary. They are also all input arguments. --- diff --git a/include/deal.II/fe/fe.h b/include/deal.II/fe/fe.h index 2bd6306476..3242f99b8c 100644 --- a/include/deal.II/fe/fe.h +++ b/include/deal.II/fe/fe.h @@ -2064,7 +2064,7 @@ protected: const typename Mapping::InternalDataBase &mapping_internal, const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data, - CellSimilarity::Similarity &cell_similarity) const = 0; + const CellSimilarity::Similarity cell_similarity) const = 0; /** * Fill the fields of FEFaceValues. This function performs all the diff --git a/include/deal.II/fe/fe_dgp_nonparametric.h b/include/deal.II/fe/fe_dgp_nonparametric.h index a9caaf9baa..cbca0ffbf6 100644 --- a/include/deal.II/fe/fe_dgp_nonparametric.h +++ b/include/deal.II/fe/fe_dgp_nonparametric.h @@ -539,7 +539,7 @@ protected: const typename Mapping::InternalDataBase &mapping_internal, const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data, - CellSimilarity::Similarity &cell_similarity) const; + const CellSimilarity::Similarity cell_similarity) const; /** * Implementation of the same function in FiniteElement. diff --git a/include/deal.II/fe/fe_face.h b/include/deal.II/fe/fe_face.h index 5393a42097..b2442d7eb9 100644 --- a/include/deal.II/fe/fe_face.h +++ b/include/deal.II/fe/fe_face.h @@ -250,7 +250,7 @@ protected: 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; + const CellSimilarity::Similarity cell_similarity) const; virtual void fill_fe_face_values (const Mapping<1,spacedim> &mapping, diff --git a/include/deal.II/fe/fe_nothing.h b/include/deal.II/fe/fe_nothing.h index 9081f5f22d..880d8edcf6 100644 --- a/include/deal.II/fe/fe_nothing.h +++ b/include/deal.II/fe/fe_nothing.h @@ -162,7 +162,7 @@ public: const typename Mapping::InternalDataBase &mapping_data, const typename Mapping::InternalDataBase &fedata, FEValuesData &data, - CellSimilarity::Similarity &cell_similarity) const; + const CellSimilarity::Similarity cell_similarity) const; /** * Fill the fields of FEFaceValues. This function performs all the diff --git a/include/deal.II/fe/fe_poly.h b/include/deal.II/fe/fe_poly.h index 50cd713981..68cec5a107 100644 --- a/include/deal.II/fe/fe_poly.h +++ b/include/deal.II/fe/fe_poly.h @@ -175,7 +175,7 @@ protected: const typename Mapping::InternalDataBase &mapping_internal, const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data, - CellSimilarity::Similarity &cell_similarity) const; + const CellSimilarity::Similarity cell_similarity) const; virtual void fill_fe_face_values (const Mapping &mapping, diff --git a/include/deal.II/fe/fe_poly.templates.h b/include/deal.II/fe/fe_poly.templates.h index 1a1e0390bf..61b6e9fb02 100644 --- a/include/deal.II/fe/fe_poly.templates.h +++ b/include/deal.II/fe/fe_poly.templates.h @@ -254,7 +254,7 @@ FE_Poly::fill_fe_values const typename Mapping::InternalDataBase &mapping_data, const typename Mapping::InternalDataBase &fedata, FEValuesData &data, - CellSimilarity::Similarity &cell_similarity) const + const CellSimilarity::Similarity cell_similarity) const { // convert data object to internal // data for this class. fails with diff --git a/include/deal.II/fe/fe_poly_face.h b/include/deal.II/fe/fe_poly_face.h index c1195d795b..574df43aff 100644 --- a/include/deal.II/fe/fe_poly_face.h +++ b/include/deal.II/fe/fe_poly_face.h @@ -163,7 +163,7 @@ protected: const typename Mapping::InternalDataBase &mapping_internal, const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data, - CellSimilarity::Similarity &cell_similarity) const; + const CellSimilarity::Similarity cell_similarity) const; virtual void fill_fe_face_values (const Mapping &mapping, diff --git a/include/deal.II/fe/fe_poly_face.templates.h b/include/deal.II/fe/fe_poly_face.templates.h index 1af8143aab..22fe72a672 100644 --- a/include/deal.II/fe/fe_poly_face.templates.h +++ b/include/deal.II/fe/fe_poly_face.templates.h @@ -178,7 +178,7 @@ FE_PolyFace::fill_fe_values const typename Mapping::InternalDataBase &, const typename Mapping::InternalDataBase &, FEValuesData &, - CellSimilarity::Similarity &) const + const CellSimilarity::Similarity ) const { // Do nothing, since we do not have // values in the interior diff --git a/include/deal.II/fe/fe_poly_tensor.h b/include/deal.II/fe/fe_poly_tensor.h index 7444d8ea7d..7922b709e6 100644 --- a/include/deal.II/fe/fe_poly_tensor.h +++ b/include/deal.II/fe/fe_poly_tensor.h @@ -188,7 +188,7 @@ protected: const typename Mapping::InternalDataBase &mapping_internal, const typename Mapping::InternalDataBase &fe_internal, FEValuesData &data, - CellSimilarity::Similarity &cell_similarity) const; + const CellSimilarity::Similarity cell_similarity) const; virtual void fill_fe_face_values (const Mapping &mapping, diff --git a/include/deal.II/fe/fe_system.h b/include/deal.II/fe/fe_system.h index 72f4872738..6389200db5 100644 --- a/include/deal.II/fe/fe_system.h +++ b/include/deal.II/fe/fe_system.h @@ -825,7 +825,7 @@ protected: const typename Mapping::InternalDataBase &mapping_data, const typename Mapping::InternalDataBase &fe_data, FEValuesData &data, - CellSimilarity::Similarity &cell_similarity) const; + const CellSimilarity::Similarity cell_similarity) const; /** * Implementation of the same function in FiniteElement. diff --git a/source/fe/fe_dgp_nonparametric.cc b/source/fe/fe_dgp_nonparametric.cc index 76df292954..b8bf0faaa8 100644 --- a/source/fe/fe_dgp_nonparametric.cc +++ b/source/fe/fe_dgp_nonparametric.cc @@ -284,7 +284,7 @@ FE_DGPNonparametric::fill_fe_values ( const typename Mapping::InternalDataBase &, const typename Mapping::InternalDataBase &fe_data, FEValuesData &data, - CellSimilarity::Similarity &/*cell_similarity*/) const + const CellSimilarity::Similarity /*cell_similarity*/) const { const UpdateFlags flags(fe_data.current_update_flags()); Assert (flags & update_quadrature_points, ExcInternalError()); diff --git a/source/fe/fe_face.cc b/source/fe/fe_face.cc index a6cc234172..85b909dc1d 100644 --- a/source/fe/fe_face.cc +++ b/source/fe/fe_face.cc @@ -524,7 +524,7 @@ FE_FaceQ<1,spacedim>::fill_fe_values const typename Mapping<1,spacedim>::InternalDataBase &, const typename Mapping<1,spacedim>::InternalDataBase &, FEValuesData<1,spacedim> &, - CellSimilarity::Similarity &) const + const CellSimilarity::Similarity ) const { // Do nothing, since we do not have values in the interior } diff --git a/source/fe/fe_nothing.cc b/source/fe/fe_nothing.cc index 3c2a37a272..8ffc976137 100644 --- a/source/fe/fe_nothing.cc +++ b/source/fe/fe_nothing.cc @@ -123,7 +123,7 @@ fill_fe_values (const Mapping & /*mapping*/, const typename Mapping::InternalDataBase & /*mapping_data*/, const typename Mapping::InternalDataBase & /*fedata*/, FEValuesData & /*data*/, - CellSimilarity::Similarity & /*cell_similarity*/) const + const CellSimilarity::Similarity /*cell_similarity*/) const { // leave data fields empty } diff --git a/source/fe/fe_poly.cc b/source/fe/fe_poly.cc index cd8880af0d..cf31ba690f 100644 --- a/source/fe/fe_poly.cc +++ b/source/fe/fe_poly.cc @@ -36,7 +36,7 @@ FE_Poly,1,2>::fill_fe_values const Mapping<1,2>::InternalDataBase &mapping_data, const Mapping<1,2>::InternalDataBase &fedata, FEValuesData<1,2> &data, - CellSimilarity::Similarity &cell_similarity) const + const CellSimilarity::Similarity cell_similarity) const { // convert data object to internal // data for this class. fails with @@ -74,7 +74,7 @@ FE_Poly,2,3>::fill_fe_values const Mapping<2,3>::InternalDataBase &mapping_data, const Mapping<2,3>::InternalDataBase &fedata, FEValuesData<2,3> &data, - CellSimilarity::Similarity &cell_similarity) const + const CellSimilarity::Similarity cell_similarity) const { // assert that the following dynamics @@ -110,7 +110,7 @@ FE_Poly,1,2>::fill_fe_values ( const Mapping<1,2>::InternalDataBase &mapping_data, const Mapping<1,2>::InternalDataBase &fedata, FEValuesData<1,2> &data, - CellSimilarity::Similarity &cell_similarity) const + const CellSimilarity::Similarity cell_similarity) const { // convert data object to internal // data for this class. fails with @@ -148,7 +148,7 @@ FE_Poly,2,3>::fill_fe_values const Mapping<2,3>::InternalDataBase &mapping_data, const Mapping<2,3>::InternalDataBase &fedata, FEValuesData<2,3> &data, - CellSimilarity::Similarity &cell_similarity) const + const CellSimilarity::Similarity cell_similarity) const { Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); const InternalData &fe_data = static_cast (fedata); diff --git a/source/fe/fe_poly_tensor.cc b/source/fe/fe_poly_tensor.cc index 891f249094..99cb7a2fc7 100644 --- a/source/fe/fe_poly_tensor.cc +++ b/source/fe/fe_poly_tensor.cc @@ -396,7 +396,7 @@ FE_PolyTensor::fill_fe_values ( const typename Mapping::InternalDataBase &mapping_data, const typename Mapping::InternalDataBase &fedata, FEValuesData &data, - CellSimilarity::Similarity &cell_similarity) const + const CellSimilarity::Similarity cell_similarity) const { // convert data object to internal // data for this class. fails with diff --git a/source/fe/fe_system.cc b/source/fe/fe_system.cc index fcf4b88a10..0583588a0e 100644 --- a/source/fe/fe_system.cc +++ b/source/fe/fe_system.cc @@ -1040,7 +1040,7 @@ FESystem::fill_fe_values ( const typename Mapping::InternalDataBase &mapping_data, const typename Mapping::InternalDataBase &fe_data, FEValuesData &data, - CellSimilarity::Similarity &cell_similarity) const + const CellSimilarity::Similarity cell_similarity) const { compute_fill(mapping, cell, invalid_face_number, invalid_face_number, quadrature, cell_similarity, mapping_data, fe_data, data);