From: Peter Munch Date: Mon, 2 Sep 2019 08:15:16 +0000 (+0200) Subject: Rename variable X-Git-Tag: v9.2.0-rc1~1145^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8681%2Fhead;p=dealii.git Rename variable --- diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h index 87ed1542fa..5b3cf356d9 100644 --- a/include/deal.II/matrix_free/matrix_free.h +++ b/include/deal.II/matrix_free/matrix_free.h @@ -1307,7 +1307,7 @@ public: typename DoFHandler::cell_iterator get_cell_iterator(const unsigned int macro_cell_number, const unsigned int vector_number, - const unsigned int fe_component = 0) const; + const unsigned int dof_handler_index = 0) const; /** * This returns the cell iterator in deal.II speak to a given cell in the @@ -1392,7 +1392,7 @@ public: * given hp index. */ unsigned int - get_dofs_per_face(const unsigned int fe_component = 0, + get_dofs_per_face(const unsigned int dof_handler_index = 0, const unsigned int hp_active_fe_index = 0) const; /** diff --git a/include/deal.II/matrix_free/matrix_free.templates.h b/include/deal.II/matrix_free/matrix_free.templates.h index 678b8226ed..c7fb9ce1da 100644 --- a/include/deal.II/matrix_free/matrix_free.templates.h +++ b/include/deal.II/matrix_free/matrix_free.templates.h @@ -131,14 +131,14 @@ MatrixFree::renumber_dofs( template const DoFHandler & MatrixFree::get_dof_handler( - const unsigned int dof_index) const + const unsigned int dof_handler_index) const { - AssertIndexRange(dof_index, n_components()); + AssertIndexRange(dof_handler_index, n_components()); if (dof_handlers.active_dof_handler == DoFHandlers::usual) { AssertDimension(dof_handlers.dof_handler.size(), dof_handlers.n_dof_handlers); - return *dof_handlers.dof_handler[dof_index]; + return *dof_handlers.dof_handler[dof_handler_index]; } else { @@ -156,11 +156,11 @@ typename DoFHandler::cell_iterator MatrixFree::get_cell_iterator( const unsigned int macro_cell_number, const unsigned int vector_number, - const unsigned int dof_index) const + const unsigned int dof_handler_index) const { const unsigned int vectorization_length = VectorizedArrayType::n_array_elements; - AssertIndexRange(dof_index, dof_handlers.n_dof_handlers); + AssertIndexRange(dof_handler_index, dof_handlers.n_dof_handlers); AssertIndexRange(macro_cell_number, task_info.cell_partition_data.back()); AssertIndexRange(vector_number, n_components_filled(macro_cell_number)); @@ -169,7 +169,7 @@ MatrixFree::get_cell_iterator( { AssertDimension(dof_handlers.dof_handler.size(), dof_handlers.n_dof_handlers); - dofh = dof_handlers.dof_handler[dof_index]; + dofh = dof_handlers.dof_handler[dof_handler_index]; } else { @@ -193,17 +193,18 @@ typename hp::DoFHandler::active_cell_iterator MatrixFree::get_hp_cell_iterator( const unsigned int macro_cell_number, const unsigned int vector_number, - const unsigned int dof_index) const + const unsigned int dof_handler_index) const { constexpr unsigned int vectorization_length = VectorizedArrayType::n_array_elements; - AssertIndexRange(dof_index, dof_handlers.n_dof_handlers); + AssertIndexRange(dof_handler_index, dof_handlers.n_dof_handlers); AssertIndexRange(macro_cell_number, task_info.cell_partition_data.back()); AssertIndexRange(vector_number, n_components_filled(macro_cell_number)); Assert(dof_handlers.active_dof_handler == DoFHandlers::hp, ExcNotImplemented()); - const hp::DoFHandler *dofh = dof_handlers.hp_dof_handler[dof_index]; + const hp::DoFHandler *dofh = + dof_handlers.hp_dof_handler[dof_handler_index]; std::pair index = cell_level_index[macro_cell_number * vectorization_length + vector_number]; return typename hp::DoFHandler::cell_iterator(&dofh->get_triangulation(),