From: Daniel Arndt Date: Mon, 6 May 2019 20:05:55 +0000 (-0400) Subject: Use dof_handler instead of dof X-Git-Tag: v9.1.0-rc1~124^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f87eaa5cb434df554ae2fb817b1b45ddb1a498e;p=dealii.git Use dof_handler instead of dof --- diff --git a/examples/step-63/step-63.cc b/examples/step-63/step-63.cc index 00518581ca..ba6230ca31 100644 --- a/examples/step-63/step-63.cc +++ b/examples/step-63/step-63.cc @@ -187,23 +187,23 @@ namespace Step63 // smoothers template std::vector - create_downstream_cell_ordering(const DoFHandler &dof, + create_downstream_cell_ordering(const DoFHandler &dof_handler, const Tensor<1, dim> direction, const unsigned int level) { std::vector::level_cell_iterator> ordered_cells; - ordered_cells.reserve(dof.get_triangulation().n_cells(level)); + ordered_cells.reserve(dof_handler.get_triangulation().n_cells(level)); const DoFRenumbering:: CompareDownstream::level_cell_iterator, dim> comparator(direction); - for (const auto &cell : dof.cell_iterators_on_level(level)) + for (const auto &cell : dof_handler.cell_iterators_on_level(level)) ordered_cells.push_back(cell); std::sort(ordered_cells.begin(), ordered_cells.end(), comparator); std::vector ordered_indices; - ordered_indices.reserve(dof.get_triangulation().n_cells(level)); + ordered_indices.reserve(dof_handler.get_triangulation().n_cells(level)); for (const auto &cell : ordered_cells) ordered_indices.push_back(cell->index()); @@ -213,22 +213,22 @@ namespace Step63 template std::vector - create_downstream_cell_ordering(const DoFHandler &dof, + create_downstream_cell_ordering(const DoFHandler &dof_handler, const Tensor<1, dim> direction) { std::vector::active_cell_iterator> ordered_cells; - ordered_cells.reserve(dof.get_triangulation().n_active_cells()); + ordered_cells.reserve(dof_handler.get_triangulation().n_active_cells()); const DoFRenumbering:: CompareDownstream::active_cell_iterator, dim> comparator(direction); - for (const auto &cell : dof.active_cell_iterators()) + for (const auto &cell : dof_handler.active_cell_iterators()) ordered_cells.push_back(cell); std::sort(ordered_cells.begin(), ordered_cells.end(), comparator); std::vector ordered_indices; - ordered_indices.reserve(dof.get_triangulation().n_active_cells()); + ordered_indices.reserve(dof_handler.get_triangulation().n_active_cells()); for (const auto &cell : ordered_cells) ordered_indices.push_back(cell->index()); @@ -240,15 +240,15 @@ namespace Step63 template std::vector - create_random_cell_ordering(const DoFHandler &dof, + create_random_cell_ordering(const DoFHandler &dof_handler, const unsigned int level) { - const unsigned int n_cells = dof.get_triangulation().n_cells(level); + const unsigned int n_cells = dof_handler.get_triangulation().n_cells(level); std::vector ordered_cells; ordered_cells.reserve(n_cells); - for (const auto &cell : dof.cell_iterators_on_level(level)) + for (const auto &cell : dof_handler.cell_iterators_on_level(level)) ordered_cells.push_back(cell->index()); // shuffle the elements @@ -269,14 +269,15 @@ namespace Step63 template std::vector - create_random_cell_ordering(const DoFHandler &dof) + create_random_cell_ordering(const DoFHandler &dof_handler) { - const unsigned int n_cells = dof.get_triangulation().n_active_cells(); + const unsigned int n_cells = + dof_handler.get_triangulation().n_active_cells(); std::vector ordered_cells; ordered_cells.reserve(n_cells); - for (const auto &cell : dof.active_cell_iterators()) + for (const auto &cell : dof_handler.active_cell_iterators()) ordered_cells.push_back(cell->index()); // shuffle the elements