From: heister Date: Mon, 7 Jan 2013 16:06:49 +0000 (+0000) Subject: merge from mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e0e484c189facc10576d1aaa2fe7d8cab26a40f;p=dealii-svn.git merge from mainline git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@27963 0785d39b-7218-0410-832d-ea1e28bc413d --- 0e0e484c189facc10576d1aaa2fe7d8cab26a40f diff --cc deal.II/examples/step-37/step-37.cc index 0da8d2474f,fb8834e003..fcd628917a --- a/deal.II/examples/step-37/step-37.cc +++ b/deal.II/examples/step-37/step-37.cc @@@ -273,9 -272,9 +272,9 @@@ namespace Step3 void clear(); - void reinit (const MGDoFHandler &dof_handler, + void reinit (const DoFHandler &dof_handler, - const ConstraintMatrix &constraints, + const ConstraintMatrix &constraints, - const unsigned int level = numbers::invalid_unsigned_int); + const unsigned int level = numbers::invalid_unsigned_int); unsigned int m () const; unsigned int n () const; @@@ -398,8 -397,8 +397,8 @@@ // FEEvaluation class (and its template arguments) will be explained below. template void - LaplaceOperator::reinit (const MGDoFHandler &dof_handler, + LaplaceOperator::reinit (const DoFHandler &dof_handler, - const ConstraintMatrix &constraints, + const ConstraintMatrix &constraints, const unsigned int level) { typename MatrixFree::AdditionalData additional_data; diff --cc deal.II/include/deal.II/matrix_free/mapping_info.h index bfd47e83c0,481fe26814..4eb7cab711 --- a/deal.II/include/deal.II/matrix_free/mapping_info.h +++ b/deal.II/include/deal.II/matrix_free/mapping_info.h @@@ -88,11 -79,10 +79,10 @@@ namespace interna */ UpdateFlags compute_update_flags (const UpdateFlags update_flags, - const std::vector > &quad) const; + const std::vector > &quad) const; /** - * Returns the type of a given cell as - * detected during initialization. + * Returns the type of a given cell as detected during initialization. */ CellType get_cell_type (const unsigned int cell_chunk_no) const; diff --cc deal.II/include/deal.II/multigrid/mg_tools.h index 4cce7ed888,e2d05f0fd3..5876442e9d --- a/deal.II/include/deal.II/multigrid/mg_tools.h +++ b/deal.II/include/deal.II/multigrid/mg_tools.h @@@ -231,9 -231,9 +231,9 @@@ namespace MGTool */ template void - make_boundary_list (const MGDoFHandler &mg_dof, + make_boundary_list (const DoFHandler &mg_dof, const typename FunctionMap::type &function_map, - std::vector > &boundary_indices, + std::vector > &boundary_indices, const ComponentMask &component_mask = ComponentMask()); /** @@@ -285,9 -285,9 +285,9 @@@ */ template void - extract_inner_interface_dofs (const MGDoFHandler &mg_dof_handler, + extract_inner_interface_dofs (const DoFHandler &mg_dof_handler, - std::vector > &interface_dofs, - std::vector > &boundary_interface_dofs); + std::vector > &interface_dofs, + std::vector > &boundary_interface_dofs); /** * Does the same as the function above, @@@ -295,13 -295,13 +295,13 @@@ */ template void - extract_inner_interface_dofs (const MGDoFHandler &mg_dof_handler, + extract_inner_interface_dofs (const DoFHandler &mg_dof_handler, - std::vector > &interface_dofs); + std::vector > &interface_dofs); template void - extract_non_interface_dofs (const MGDoFHandler &mg_dof_handler, + extract_non_interface_dofs (const DoFHandler &mg_dof_handler, - std::vector > &non_interface_dofs); + std::vector > &non_interface_dofs); } /* @} */