From: dallmann Date: Fri, 10 Aug 2012 10:09:28 +0000 (+0000) Subject: Convert unsigned int to global_dof_index X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecb7fbcc6cda1f39cfa0f3983520f19a1de871a5;p=dealii-svn.git Convert unsigned int to global_dof_index git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@25867 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/dofs/dof_renumbering.h b/deal.II/include/deal.II/dofs/dof_renumbering.h index f760b6d86c..14b20df650 100644 --- a/deal.II/include/deal.II/dofs/dof_renumbering.h +++ b/deal.II/include/deal.II/dofs/dof_renumbering.h @@ -424,8 +424,8 @@ namespace DoFRenumbering /** * Return true if c1 less c2. */ - bool operator () (const std::pair,unsigned int> &c1, - const std::pair,unsigned int> &c2) const + bool operator () (const std::pair,types::global_dof_index> &c1, + const std::pair,types::global_dof_index> &c2) const { const Point diff = c2.first-c1.first; return (diff*dir > 0 || (diff*dir==0 && c1.second void - compute_Cuthill_McKee (std::vector& new_dof_indices, + compute_Cuthill_McKee (std::vector& new_dof_indices, const DH&, const bool reversed_numbering = false, const bool use_constraints = false); @@ -545,7 +545,7 @@ namespace DoFRenumbering */ template void - compute_king_ordering (std::vector& new_dof_indices, + compute_king_ordering (std::vector& new_dof_indices, const DH&, const bool reversed_numbering = false, const bool use_constraints = false); @@ -591,7 +591,7 @@ namespace DoFRenumbering */ template void - compute_minimum_degree (std::vector& new_dof_indices, + compute_minimum_degree (std::vector& new_dof_indices, const DH&, const bool reversed_numbering = false, const bool use_constraints = false); @@ -620,7 +620,7 @@ namespace DoFRenumbering Cuthill_McKee (DH& dof_handler, const bool reversed_numbering = false, const bool use_constraints = false, - const std::vector &starting_indices = std::vector()); + const std::vector &starting_indices = std::vector()); /** * Computes the renumbering @@ -633,11 +633,11 @@ namespace DoFRenumbering */ template void - compute_Cuthill_McKee (std::vector& new_dof_indices, + compute_Cuthill_McKee (std::vector& new_dof_indices, const DH&, const bool reversed_numbering = false, const bool use_constraints = false, - const std::vector &starting_indices = std::vector()); + const std::vector &starting_indices = std::vector()); /** * Renumber the degrees of @@ -667,7 +667,7 @@ namespace DoFRenumbering Cuthill_McKee (MGDoFHandler &dof_handler, const unsigned int level, const bool reversed_numbering = false, - const std::vector &starting_indices = std::vector ()); + const std::vector &starting_indices = std::vector ()); /** * Sort the degrees of freedom by @@ -784,8 +784,8 @@ namespace DoFRenumbering * the renumbering vector. */ template - unsigned int - compute_component_wise (std::vector& new_dof_indices, + types::global_dof_index + compute_component_wise (std::vector& new_dof_indices, const ITERATOR& start, const ENDITERATOR& end, const std::vector &target_component); @@ -846,8 +846,8 @@ namespace DoFRenumbering */ template void - compute_cell_wise_dg (std::vector& renumbering, - std::vector& inverse_renumbering, + compute_cell_wise_dg (std::vector& renumbering, + std::vector& inverse_renumbering, const DH &dof_handler, const std::vector &cell_order); @@ -862,8 +862,8 @@ namespace DoFRenumbering */ template void - compute_cell_wise (std::vector& renumbering, - std::vector& inverse_renumbering, + compute_cell_wise (std::vector& renumbering, + std::vector& inverse_renumbering, const DH &dof_handler, const std::vector &cell_order); @@ -903,8 +903,8 @@ namespace DoFRenumbering */ template void - compute_cell_wise_dg (std::vector& renumbering, - std::vector& inverse_renumbering, + compute_cell_wise_dg (std::vector& renumbering, + std::vector& inverse_renumbering, const MGDoFHandler& dof_handler, const unsigned int level, const std::vector::cell_iterator>& cell_order); @@ -921,8 +921,8 @@ namespace DoFRenumbering */ template void - compute_cell_wise (std::vector& renumbering, - std::vector& inverse_renumbering, + compute_cell_wise (std::vector& renumbering, + std::vector& inverse_renumbering, const MGDoFHandler& dof_handler, const unsigned int level, const std::vector::cell_iterator>& cell_order); @@ -1027,7 +1027,7 @@ namespace DoFRenumbering */ template void - compute_downstream_dg (std::vector& new_dof_indices, + compute_downstream_dg (std::vector& new_dof_indices, const DH& dof_handler, const Point& direction); @@ -1042,8 +1042,8 @@ namespace DoFRenumbering */ template void - compute_downstream (std::vector& new_dof_indices, - std::vector& reverse, + compute_downstream (std::vector& new_dof_indices, + std::vector& reverse, const DH& dof_handler, const Point& direction, const bool dof_wise_renumbering); @@ -1054,8 +1054,8 @@ namespace DoFRenumbering */ template void - compute_downstream_dg (std::vector& new_dof_indices, - std::vector& reverse, + compute_downstream_dg (std::vector& new_dof_indices, + std::vector& reverse, const DH& dof_handler, const Point& direction); @@ -1070,8 +1070,8 @@ namespace DoFRenumbering */ template void - compute_downstream (std::vector& new_dof_indices, - std::vector& reverse, + compute_downstream (std::vector& new_dof_indices, + std::vector& reverse, const MGDoFHandler& dof_handler, const unsigned int level, const Point& direction, @@ -1083,8 +1083,8 @@ namespace DoFRenumbering */ template void - compute_downstream_dg (std::vector& new_dof_indices, - std::vector& reverse, + compute_downstream_dg (std::vector& new_dof_indices, + std::vector& reverse, const MGDoFHandler& dof_handler, const unsigned int level, const Point& direction); @@ -1132,7 +1132,7 @@ namespace DoFRenumbering */ template void - compute_clockwise_dg (std::vector& new_dof_indices, + compute_clockwise_dg (std::vector& new_dof_indices, const DH& dof_handler, const Point& center, const bool counter); @@ -1166,7 +1166,7 @@ namespace DoFRenumbering */ template void - compute_sort_selected_dofs_back (std::vector& new_dof_indices, + compute_sort_selected_dofs_back (std::vector& new_dof_indices, const DH& dof_handler, const std::vector& selected_dofs); @@ -1188,7 +1188,7 @@ namespace DoFRenumbering */ template void - compute_random (std::vector &new_dof_indices, + compute_random (std::vector &new_dof_indices, const DH& dof_handler); /** @@ -1241,7 +1241,7 @@ namespace DoFRenumbering */ template void - compute_subdomain_wise (std::vector &new_dof_indices, + compute_subdomain_wise (std::vector &new_dof_indices, const DH &dof_handler); /** diff --git a/deal.II/source/dofs/dof_renumbering.cc b/deal.II/source/dofs/dof_renumbering.cc index 4bc6041317..c3a9b3c0a6 100644 --- a/deal.II/source/dofs/dof_renumbering.cc +++ b/deal.II/source/dofs/dof_renumbering.cc @@ -82,7 +82,7 @@ namespace DoFRenumbering WrapDoFIterator (const T& t) : T(t) {} - void get_dof_indices (std::vector& v) const + void get_dof_indices (std::vector& v) const { (*this)->get_dof_indices(v); } @@ -108,7 +108,7 @@ namespace DoFRenumbering WrapMGDoFIterator (const T& t) : T(t) {} - void get_dof_indices (std::vector& v) const + void get_dof_indices (std::vector& v) const { (*this)->get_mg_dof_indices(v); } @@ -185,7 +185,7 @@ namespace DoFRenumbering const bool reversed_numbering, const bool use_constraints) { - std::vector renumbering(dof_handler.n_dofs(), + std::vector renumbering(dof_handler.n_dofs(), DH::invalid_dof_index); compute_Cuthill_McKee(renumbering, dof_handler, reversed_numbering, use_constraints); @@ -199,7 +199,7 @@ namespace DoFRenumbering template void - compute_Cuthill_McKee (std::vector& new_dof_indices, + compute_Cuthill_McKee (std::vector& new_dof_indices, const DH &dof_handler, const bool reversed_numbering, const bool use_constraints) @@ -253,7 +253,7 @@ namespace DoFRenumbering const bool reversed_numbering, const bool use_constraints) { - std::vector renumbering(dof_handler.n_dofs(), + std::vector renumbering(dof_handler.n_dofs(), DH::invalid_dof_index); compute_king_ordering(renumbering, dof_handler, reversed_numbering, use_constraints); @@ -267,7 +267,7 @@ namespace DoFRenumbering template void - compute_king_ordering (std::vector& new_dof_indices, + compute_king_ordering (std::vector& new_dof_indices, const DH &dof_handler, const bool reversed_numbering, const bool use_constraints) @@ -317,7 +317,7 @@ namespace DoFRenumbering const bool reversed_numbering, const bool use_constraints) { - std::vector renumbering(dof_handler.n_dofs(), + std::vector renumbering(dof_handler.n_dofs(), DH::invalid_dof_index); compute_minimum_degree(renumbering, dof_handler, reversed_numbering, use_constraints); @@ -331,7 +331,7 @@ namespace DoFRenumbering template void - compute_minimum_degree (std::vector& new_dof_indices, + compute_minimum_degree (std::vector& new_dof_indices, const DH &dof_handler, const bool reversed_numbering, const bool use_constraints) @@ -436,9 +436,9 @@ namespace DoFRenumbering Cuthill_McKee (DH& dof_handler, const bool reversed_numbering, const bool use_constraints, - const std::vector &starting_indices) + const std::vector &starting_indices) { - std::vector renumbering(dof_handler.n_dofs(), + std::vector renumbering(dof_handler.n_dofs(), DH::invalid_dof_index); compute_Cuthill_McKee(renumbering, dof_handler, reversed_numbering, use_constraints, starting_indices); @@ -453,11 +453,11 @@ namespace DoFRenumbering template void - compute_Cuthill_McKee (std::vector& new_indices, + compute_Cuthill_McKee (std::vector& new_indices, const DH& dof_handler, const bool reversed_numbering, const bool use_constraints, - const std::vector& starting_indices) + const std::vector& starting_indices) { // make the connection graph. in // more than 2d use an intermediate @@ -515,7 +515,7 @@ namespace DoFRenumbering void Cuthill_McKee (MGDoFHandler &dof_handler, const unsigned int level, const bool reversed_numbering, - const std::vector &starting_indices) + const std::vector &starting_indices) { //TODO: we should be doing the same here as in the other compute_CMK function to preserve some memory @@ -544,7 +544,7 @@ namespace DoFRenumbering component_wise (DoFHandler &dof_handler, const std::vector &component_order_arg) { - std::vector renumbering (dof_handler.n_locally_owned_dofs(), + std::vector renumbering (dof_handler.n_locally_owned_dofs(), DoFHandler::invalid_dof_index); typedef @@ -589,7 +589,7 @@ namespace DoFRenumbering component_wise (hp::DoFHandler &dof_handler, const std::vector &component_order_arg) { - std::vector renumbering (dof_handler.n_dofs(), + std::vector renumbering (dof_handler.n_dofs(), hp::DoFHandler::invalid_dof_index); typedef @@ -623,7 +623,7 @@ namespace DoFRenumbering const unsigned int level, const std::vector &component_order_arg) { - std::vector renumbering (dof_handler.n_dofs(level), + std::vector renumbering (dof_handler.n_dofs(level), DoFHandler::invalid_dof_index); typedef @@ -678,8 +678,8 @@ namespace DoFRenumbering template - unsigned int - compute_component_wise (std::vector& new_indices, + types::global_dof_index + compute_component_wise (std::vector& new_indices, const ITERATOR & start, const ENDITERATOR& end, const std::vector &component_order_arg) @@ -872,7 +872,7 @@ namespace DoFRenumbering // now concatenate all the // components in the order the user // desired to see - unsigned int next_free_index = 0; + types::global_dof_index next_free_index = 0; for (unsigned int component=0; component::const_iterator @@ -903,9 +903,9 @@ namespace DoFRenumbering { // helper function for hierarchical() template - unsigned int + types::global_dof_index compute_hierarchical_recursive ( - unsigned int next_free, + types::global_dof_index next_free, std::vector& new_indices, const iterator & cell, const IndexSet & locally_owned) @@ -953,12 +953,12 @@ namespace DoFRenumbering void hierarchical (DoFHandler &dof_handler) { - std::vector renumbering (dof_handler.n_locally_owned_dofs(), + std::vector renumbering (dof_handler.n_locally_owned_dofs(), DoFHandler::invalid_dof_index); typename DoFHandler::cell_iterator cell; - unsigned int next_free = 0; + types::global_dof_index next_free = 0; const IndexSet locally_owned = dof_handler.locally_owned_dofs(); const parallel::distributed::Triangulation * tria @@ -1028,7 +1028,7 @@ namespace DoFRenumbering sort_selected_dofs_back (DH& dof_handler, const std::vector& selected_dofs) { - std::vector renumbering(dof_handler.n_dofs(), + std::vector renumbering(dof_handler.n_dofs(), DH::invalid_dof_index); compute_sort_selected_dofs_back(renumbering, dof_handler, selected_dofs); @@ -1039,11 +1039,11 @@ namespace DoFRenumbering template void - compute_sort_selected_dofs_back (std::vector& new_indices, + compute_sort_selected_dofs_back (std::vector& new_indices, const DH& dof_handler, const std::vector& selected_dofs) { - const unsigned int n_dofs = dof_handler.n_dofs(); + const types::global_dof_index n_dofs = dof_handler.n_dofs(); Assert (selected_dofs.size() == n_dofs, ExcDimensionMismatch (selected_dofs.size(), n_dofs)); @@ -1052,13 +1052,13 @@ namespace DoFRenumbering Assert (new_indices.size() == n_dofs, ExcDimensionMismatch(new_indices.size(), n_dofs)); - const unsigned int n_selected_dofs = std::count (selected_dofs.begin(), + const types::global_dof_index n_selected_dofs = std::count (selected_dofs.begin(), selected_dofs.end(), false); - unsigned int next_unselected = 0; - unsigned int next_selected = n_selected_dofs; - for (unsigned int i=0; i,unsigned int> > support_point_list + const types::global_dof_index n_dofs = dof.n_dofs(); + std::vector,types::global_dof_index> > support_point_list (n_dofs); const hp::FECollection fe_collection (dof.get_fe ()); @@ -1525,7 +1525,7 @@ namespace DoFRenumbering ComparePointwiseDownstream comparator (direction); std::sort (support_point_list.begin(), support_point_list.end(), comparator); - for (unsigned int i=0; i::ExcFEHasNoSupportPoints()); - const unsigned int n_dofs = dof.n_dofs(level); - std::vector,unsigned int> > support_point_list + const types::global_dof_index n_dofs = dof.n_dofs(level); + std::vector,types::global_dof_index> > support_point_list (n_dofs); Quadrature q_dummy(dof.get_fe().get_unit_support_points()); @@ -1648,7 +1648,7 @@ namespace DoFRenumbering ComparePointwiseDownstream comparator (direction); std::sort (support_point_list.begin(), support_point_list.end(), comparator); - for (unsigned int i=0; i renumbering(dof_handler.n_dofs(), + std::vector renumbering(dof_handler.n_dofs(), DH::invalid_dof_index); compute_random(renumbering, dof_handler); @@ -1793,7 +1793,7 @@ namespace DoFRenumbering void subdomain_wise (DH &dof_handler) { - std::vector renumbering(dof_handler.n_dofs(), + std::vector renumbering(dof_handler.n_dofs(), DH::invalid_dof_index); compute_subdomain_wise(renumbering, dof_handler); @@ -1804,10 +1804,10 @@ namespace DoFRenumbering template void - compute_subdomain_wise (std::vector &new_dof_indices, + compute_subdomain_wise (std::vector &new_dof_indices, const DH &dof_handler) { - const unsigned int n_dofs = dof_handler.n_dofs(); + const types::global_dof_index n_dofs = dof_handler.n_dofs(); Assert (new_dof_indices.size() == n_dofs, ExcDimensionMismatch (new_dof_indices.size(), n_dofs)); @@ -1830,9 +1830,9 @@ namespace DoFRenumbering // this order also after reordering std::fill (new_dof_indices.begin(), new_dof_indices.end(), numbers::invalid_unsigned_int); - unsigned int next_free_index = 0; - for (unsigned int subdomain=0; subdomain