From: Wolfgang Bangerth Date: Sat, 31 Jul 2010 06:36:55 +0000 (+0000) Subject: Avoid a warning about an improperly overloaded function. X-Git-Tag: v8.0.0~5757 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f149925af3f6830a34f3c0a693f501471413abf3;p=dealii.git Avoid a warning about an improperly overloaded function. git-svn-id: https://svn.dealii.org/trunk@21606 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/mapping_q_eulerian.h b/deal.II/deal.II/include/fe/mapping_q_eulerian.h index a540b8b1b0..5a8a5e309b 100644 --- a/deal.II/deal.II/include/fe/mapping_q_eulerian.h +++ b/deal.II/deal.II/include/fe/mapping_q_eulerian.h @@ -115,7 +115,7 @@ class MappingQEulerian : public MappingQ MappingQEulerian (const unsigned int degree, const VECTOR &euler_vector, - const DoFHandler &euler_dof_handler); + const DoFHandler &euler_dof_handler); /** * Return a pointer to a copy of the @@ -187,7 +187,7 @@ class MappingQEulerian : public MappingQ * associated. */ - const SmartPointer,MappingQEulerian > euler_dof_handler; + const SmartPointer,MappingQEulerian > euler_dof_handler; private: @@ -230,7 +230,7 @@ class MappingQEulerian : public MappingQ * compute_mapping_support_points, * a function that is 'const'. */ - mutable FEValues fe_values; + mutable FEValues fe_values; /** * A variable to guard access to @@ -244,8 +244,8 @@ class MappingQEulerian : public MappingQ * configuration */ virtual void compute_mapping_support_points( - const typename Triangulation::cell_iterator &cell, - std::vector > &a) const; + const typename Triangulation::cell_iterator &cell, + std::vector > &a) const; }; diff --git a/deal.II/deal.II/source/fe/mapping_q_eulerian.cc b/deal.II/deal.II/source/fe/mapping_q_eulerian.cc index 2e35b3b463..d3d936a2ea 100644 --- a/deal.II/deal.II/source/fe/mapping_q_eulerian.cc +++ b/deal.II/deal.II/source/fe/mapping_q_eulerian.cc @@ -33,7 +33,7 @@ template MappingQEulerian:: MappingQEulerian (const unsigned int degree, const EulerVectorType &euler_vector, - const DoFHandler &euler_dof_handler) + const DoFHandler &euler_dof_handler) : MappingQ(degree, true), euler_vector(euler_vector), @@ -74,8 +74,8 @@ SupportQuadrature (const unsigned int map_degree) const QIterated q_iterated(q1d,map_degree); const unsigned int n_q_points = q_iterated.n_quadrature_points; - // we then need to define a renumbering - // vector that allows us to go from a + // we then need to define a renumbering + // vector that allows us to go from a // lexicographic numbering scheme to a hierarchic // one. this fragment is taking almost verbatim // from the MappingQ class. @@ -103,8 +103,8 @@ template void MappingQEulerian:: compute_mapping_support_points -(const typename Triangulation::cell_iterator &cell, - std::vector > &a) const +(const typename Triangulation::cell_iterator &cell, + std::vector > &a) const { // first, basic assertion @@ -116,12 +116,12 @@ compute_mapping_support_points Assert (n_dofs == vector_size,ExcWrongVectorSize(vector_size,n_dofs)); // we then transform our tria iterator - // into a dof iterator so we can + // into a dof iterator so we can // access data not associated with // triangulations - typename DoFHandler::cell_iterator dof_cell - (const_cast *> (&(cell->get_triangulation())), + typename DoFHandler::cell_iterator dof_cell + (const_cast *> (&(cell->get_triangulation())), cell->level(), cell->index(), euler_dof_handler); @@ -135,7 +135,7 @@ compute_mapping_support_points // we can then query the given // displacement field at these points // to determine the shift vector that - // maps the support points to the + // maps the support points to the // deformed configuration. // we assume that the given field contains @@ -145,7 +145,7 @@ compute_mapping_support_points // this class therefore assumes that the // first dim components represent the // actual shift vector we need, and simply - // ignores any components after that. + // ignores any components after that. // this implies that the user should order // components appropriately, or create a // separate dof handler for the displacements. @@ -167,7 +167,7 @@ compute_mapping_support_points fe_values.reinit(dof_cell); fe_values.get_function_values(euler_vector,shift_vector); - // and finally compute the positions of the + // and finally compute the positions of the // support points in the deformed // configuration. @@ -175,7 +175,7 @@ compute_mapping_support_points for(unsigned int q=0; q