From: bangerth Date: Sat, 5 Jan 2013 04:40:58 +0000 (+0000) Subject: Merge from upstream. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49e5b5f1fb997e7ec2c8c72c20d44a86ab848fce;p=dealii-svn.git Merge from upstream. git-svn-id: https://svn.dealii.org/branches/branch_deprecated@27930 0785d39b-7218-0410-832d-ea1e28bc413d --- 49e5b5f1fb997e7ec2c8c72c20d44a86ab848fce diff --cc deal.II/include/deal.II/dofs/dof_renumbering.h index 3326700325,799916ed57..8b2310ff0a --- a/deal.II/include/deal.II/dofs/dof_renumbering.h +++ b/deal.II/include/deal.II/dofs/dof_renumbering.h @@@ -1129,44 -1071,36 +1071,55 @@@ namespace DoFRenumberin * level. See the other function * with the same name. */ - template + template void - downstream (MGDoFHandler &dof_handler, + downstream (DH &dof_handler, const unsigned int level, - const Point &direction, + const Point &direction, const bool dof_wise_renumbering = false); - // The following three are only temporary for compatibility reasons and will be removed in 8.0 + /** - * @deprecated Use downstream() - * instead. ++ * This function does the downstream numbering for the individual ++ * levels of a multigrid hierarchy, but not for the global degrees ++ * of freedom. ++ * ++ * @deprecated Call downstream() function that takes a level ++ * argument for each of the levels of the multigrid hierarchy. + */ - template + template void - downstream_dg (MGDoFHandler &dof_handler, - const unsigned int level, - const Point &direction) DEAL_II_DEPRECATED; + downstream (MGDoFHandler &dof_handler, + const Point &direction, - const bool dof_wise_renumbering = false); ++ const bool dof_wise_renumbering = false) DEAL_II_DEPRECATED; + + /** - * @deprecated The new function - * of this name computes the - * renumbering and its inverse at - * the same time. So, at least if - * you need both, you should use - * the other one. - * - * Computes the renumbering - * vector needed by the - * downstream_dg() function. Does - * not perform the renumbering on - * the DoFHandler dofs but - * returns the renumbering - * vector. ++ * @deprecated Use downstream() instead. ++ */ ++ template ++ void ++ downstream_dg (DH &dof, ++ const Point &direction) DEAL_II_DEPRECATED; + + template + void + downstream_dg (DH &dof, + const Point &direction) + { + downstream(dof, direction); + } + ++ ++ /** ++ * @deprecated Use downstream() instead. + */ - template + template void - compute_downstream_dg (std::vector &new_dof_indices, - const DH &dof_handler, - const Point &direction) DEAL_II_DEPRECATED; + downstream_dg (DH &dof, + unsigned int level, - const Point &direction) ++ const Point &direction) DEAL_II_DEPRECATED + { + downstream(dof, level, direction); + } /** * Computes the renumbering diff --cc deal.II/include/deal.II/multigrid/mg_tools.h index 78c79079e9,f7310a8387..5876442e9d --- a/deal.II/include/deal.II/multigrid/mg_tools.h +++ b/deal.II/include/deal.II/multigrid/mg_tools.h @@@ -203,9 -203,9 +203,9 @@@ namespace MGTool */ template void - count_dofs_per_component (const MGDoFHandler &mg_dof, + count_dofs_per_component (const DoFHandler &mg_dof, std::vector > &result, - std::vector target_component); + std::vector target_component) DEAL_II_DEPRECATED; /** * Generate a list of those diff --cc deal.II/source/dofs/dof_handler_policy.cc index 00358b0d10,9c9316f256..998df0fafe --- a/deal.II/source/dofs/dof_handler_policy.cc +++ b/deal.II/source/dofs/dof_handler_policy.cc @@@ -251,9 -252,9 +252,9 @@@ namespace interna next_free_dof); // update the cache used for cell dof indices - for (typename DoFHandler::cell_iterator + for (typename DoFHandler::level_cell_iterator cell = dof_handler.begin(); cell != dof_handler.end(); ++cell) - if (cell->subdomain_id() != types::artificial_subdomain_id) + if (cell->subdomain_id() != numbers::artificial_subdomain_id) cell->update_cell_dof_indices_cache (); // finally restore the user flags