From: Wolfgang Bangerth Date: Tue, 27 Jun 2017 12:55:07 +0000 (-0600) Subject: Update for style. X-Git-Tag: v9.0.0-rc1~1467^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=919f7a4c88a22f182fbaf519d62435e39e680d82;p=dealii.git Update for style. --- diff --git a/include/deal.II/dofs/dof_handler.h b/include/deal.II/dofs/dof_handler.h index 360461f0e0..c238e6f144 100644 --- a/include/deal.II/dofs/dof_handler.h +++ b/include/deal.II/dofs/dof_handler.h @@ -1139,6 +1139,8 @@ DoFHandler::has_level_dofs() const return mg_number_cache.size()>0; } + + template inline bool @@ -1147,6 +1149,8 @@ DoFHandler::has_active_dofs() const return number_cache.n_global_dofs>0; } + + template inline types::global_dof_index @@ -1155,6 +1159,8 @@ DoFHandler::n_dofs () const return number_cache.n_global_dofs; } + + template inline types::global_dof_index DoFHandler::n_dofs (const unsigned int level) const @@ -1165,6 +1171,7 @@ types::global_dof_index DoFHandler::n_dofs (const unsigned int le } + template unsigned int DoFHandler::n_locally_owned_dofs() const @@ -1173,6 +1180,7 @@ DoFHandler::n_locally_owned_dofs() const } + template const IndexSet & DoFHandler::locally_owned_dofs() const @@ -1180,14 +1188,19 @@ DoFHandler::locally_owned_dofs() const return number_cache.locally_owned_dofs; } + + template const IndexSet & DoFHandler::locally_owned_mg_dofs(const unsigned int level) const { - Assert(level < this->get_triangulation().n_global_levels(), ExcMessage("invalid level in locally_owned_mg_dofs")); + Assert(level < this->get_triangulation().n_global_levels(), + ExcMessage("invalid level in locally_owned_mg_dofs")); return mg_number_cache[level].locally_owned_dofs; } + + template const std::vector & DoFHandler::n_locally_owned_dofs_per_processor() const @@ -1196,6 +1209,7 @@ DoFHandler::n_locally_owned_dofs_per_processor() const } + template const std::vector & DoFHandler::locally_owned_dofs_per_processor () const @@ -1203,6 +1217,8 @@ DoFHandler::locally_owned_dofs_per_processor () const return number_cache.locally_owned_dofs_per_processor; } + + template const std::vector & DoFHandler::locally_owned_mg_dofs_per_processor (const unsigned int level) const @@ -1212,12 +1228,14 @@ DoFHandler::locally_owned_mg_dofs_per_processor (const unsigned i } + template inline const FiniteElement & DoFHandler::get_fe () const { - Assert(selected_fe!=nullptr, ExcMessage("You are trying to access the DoFHandler's FiniteElement object before it has been initialized.")); + Assert(selected_fe!=nullptr, + ExcMessage("You are trying to access the DoFHandler's FiniteElement object before it has been initialized.")); return *selected_fe; } @@ -1243,6 +1261,7 @@ DoFHandler::block_info () const } + template template types::global_dof_index @@ -1275,6 +1294,7 @@ namespace internal } + template template void DoFHandler::save (Archive &ar, @@ -1297,6 +1317,7 @@ void DoFHandler::save (Archive &ar, } + template template void DoFHandler::load (Archive &ar, @@ -1340,28 +1361,32 @@ void DoFHandler::load (Archive &ar, } -template + + +template inline -types::global_dof_index DoFHandler::MGVertexDoFs::get_index ( - const unsigned int level, - const unsigned int dof_number) const +types::global_dof_index +DoFHandler::MGVertexDoFs::get_index (const unsigned int level, + const unsigned int dof_number) const { Assert ((level >= coarsest_level) && (level <= finest_level), ExcInvalidLevel (level)); return indices[indices_offset[level - coarsest_level] + dof_number]; } + template inline -void DoFHandler::MGVertexDoFs::set_index ( - const unsigned int level, - const unsigned int dof_number, - const types::global_dof_index index) +void +DoFHandler::MGVertexDoFs::set_index (const unsigned int level, + const unsigned int dof_number, + const types::global_dof_index index) { Assert ((level >= coarsest_level) && (level <= finest_level), ExcInvalidLevel (level)); indices[indices_offset[level - coarsest_level] + dof_number] = index; } + #endif // DOXYGEN DEAL_II_NAMESPACE_CLOSE diff --git a/include/deal.II/hp/dof_handler.h b/include/deal.II/hp/dof_handler.h index 81e4da9484..a8f0b05c1e 100644 --- a/include/deal.II/hp/dof_handler.h +++ b/include/deal.II/hp/dof_handler.h @@ -717,7 +717,7 @@ namespace hp << "You tried to do something on level " << arg1 << ", but this level is empty."); - protected: + private: /** * Address of the triangulation to work on. @@ -985,6 +985,7 @@ namespace hp } + template inline types::global_dof_index @@ -994,6 +995,7 @@ namespace hp } + template types::global_dof_index DoFHandler::n_locally_owned_dofs() const @@ -1002,6 +1004,7 @@ namespace hp } + template const IndexSet & DoFHandler::locally_owned_dofs() const @@ -1010,6 +1013,7 @@ namespace hp } + template const std::vector & DoFHandler::n_locally_owned_dofs_per_processor() const @@ -1018,6 +1022,7 @@ namespace hp } + template const std::vector & DoFHandler::locally_owned_dofs_per_processor () const