From 9d62e8f45a0b6fa28a2a9bd7cb6ee45a4b727821 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 8 Jan 2015 15:32:35 -0600 Subject: [PATCH] Remove deprecated functions with names that contain cell_normal. --- doc/news/changes.h | 5 ++++- include/deal.II/fe/fe_values.h | 26 -------------------------- source/fe/fe_values.cc | 8 -------- tests/codim_one/bem.cc | 12 ++++++------ tests/codim_one/gradients.cc | 6 +++--- tests/codim_one/mapping_01.cc | 4 ++-- tests/codim_one/mapping_02.cc | 4 ++-- tests/codim_one/surface.cc | 4 ++-- 8 files changed, 19 insertions(+), 50 deletions(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index eeafdafe44..48ddc448aa 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -112,7 +112,10 @@ inconvenience this causes. term 2nd_derivatives were removed in favor of those with names containing hessian. Similarly, functions with names including function_grads were removed in - favor of those called function_gradients. + favor of those called function_gradients. Finally, + the cell_normal_vector functions were replaced by + normal_vector ones. In all cases, the new functions + have been around for a while. diff --git a/include/deal.II/fe/fe_values.h b/include/deal.II/fe/fe_values.h index abf488fb82..37278865a6 100644 --- a/include/deal.II/fe/fe_values.h +++ b/include/deal.II/fe/fe_values.h @@ -2171,21 +2171,6 @@ public: const std::vector > &original, MappingType mapping) const; - /** - * @deprecated Use normal_vector() instead. - * - * Return the outward normal vector to the cell at the ith - * quadrature point. The length of the vector is normalized to one. - */ - const Point &cell_normal_vector (const unsigned int i) const DEAL_II_DEPRECATED; - - /** - * @deprecated Use get_normal_vectors() instead. - * - * Returns the vectors normal to the cell in each of the quadrature points. - */ - const std::vector > &get_cell_normal_vectors () const DEAL_II_DEPRECATED; - //@} /// @name Extractors Methods to extract individual components @@ -4081,17 +4066,6 @@ FEValuesBase::normal_vector (const unsigned int i) const -template -inline -const Point & -FEValuesBase::cell_normal_vector (const unsigned int i) const -{ - return this->normal_vector(i); -} - - - - /*------------------------ Inline functions: FEValues ----------------------------*/ diff --git a/source/fe/fe_values.cc b/source/fe/fe_values.cc index d0566b0d29..42e53aeef7 100644 --- a/source/fe/fe_values.cc +++ b/source/fe/fe_values.cc @@ -3147,14 +3147,6 @@ FEValuesBase::get_normal_vectors () const -template -const std::vector > & -FEValuesBase::get_cell_normal_vectors () const -{ - return this->get_normal_vectors (); -} - - template void FEValuesBase::transform ( diff --git a/tests/codim_one/bem.cc b/tests/codim_one/bem.cc index 8d7894c1be..3aeb12ab38 100644 --- a/tests/codim_one/bem.cc +++ b/tests/codim_one/bem.cc @@ -246,11 +246,11 @@ BEM::assemble_system() FEValues fe_values_i (fe, quadrature_formula, update_JxW_values | - update_cell_normal_vectors | + update_normal_vectors | update_quadrature_points ), fe_values_j (fe, quadrature_formula, update_JxW_values | - update_cell_normal_vectors | + update_normal_vectors | update_quadrature_points ); const unsigned int dofs_per_cell = fe.dofs_per_cell; @@ -289,7 +289,7 @@ BEM::assemble_system() { fe_values_i.reinit (cell_i); - cell_normals_i = fe_values_i.get_cell_normal_vectors(); + cell_normals_i = fe_values_i.get_normal_vectors(); cell_i->get_dof_indices (local_dof_indices_i); // if (cell_i->index()%100==0) @@ -353,7 +353,7 @@ BEM::assemble_system() for (cell_j=dof_handler.begin_active(); cell_j!=endc; ++cell_j) { fe_values_j.reinit (cell_j); - cell_normals_j = fe_values_j.get_cell_normal_vectors(); + cell_normals_j = fe_values_j.get_normal_vectors(); cell_j->get_dof_indices (local_dof_indices_j); if (cell_j != cell_i) @@ -568,7 +568,7 @@ BEM::solve() q_iterated, update_values | update_gradients | - update_cell_normal_vectors ); + update_normal_vectors ); std::vector< Point > cell_normals(q_iterated.size()); std::vector< Point > cell_tangentials(q_iterated.size()); @@ -596,7 +596,7 @@ BEM::solve() // std::cout< fe_values (fe, q_midpoint, update_values | update_JxW_values | - update_cell_normal_vectors | + update_normal_vectors | update_gradients); // finite elements used for the @@ -83,7 +83,7 @@ void test(std::string filename) DoFHandler dof_handler_help (triangulation); dof_handler_help.distribute_dofs (fe_help); FEValues fe_values_help (fe_help, q_midpoint, - update_cell_normal_vectors); + update_normal_vectors); deallog << "no. of cells "<< triangulation.n_cells() < get_dof_indices (local_dof_indices); - cell_normals = fe_values.get_cell_normal_vectors(); + cell_normals = fe_values.get_normal_vectors(); // The cell tangential is calculated // in the midpoint of the cell. For diff --git a/tests/codim_one/mapping_01.cc b/tests/codim_one/mapping_01.cc index d564a87e4d..c80bad5c1a 100644 --- a/tests/codim_one/mapping_01.cc +++ b/tests/codim_one/mapping_01.cc @@ -53,7 +53,7 @@ void test () MappingQ1 mapping; FE_Q fe (1); - FEValues fe_values (mapping, fe, quadrature, update_cell_normal_vectors); + FEValues fe_values (mapping, fe, quadrature, update_normal_vectors); for (typename Triangulation::active_cell_iterator cell = boundary_mesh.begin_active(); cell != boundary_mesh.end(); @@ -66,7 +66,7 @@ void test () for (unsigned int q=0; q