From: bangerth Date: Mon, 17 Oct 2011 21:08:41 +0000 (+0000) Subject: Reindent. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=171e3e530734506f6000006bbebc19d30e461879;p=dealii-svn.git Reindent. git-svn-id: https://svn.dealii.org/trunk@24619 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/numerics/matrices.h b/deal.II/include/deal.II/numerics/matrices.h index e624416121..3a20c4dc8a 100644 --- a/deal.II/include/deal.II/numerics/matrices.h +++ b/deal.II/include/deal.II/numerics/matrices.h @@ -209,167 +209,167 @@ namespace TrilinosWrappers */ namespace MatrixCreator { - /** - * Assemble the mass matrix. If no - * coefficient is given, it is assumed - * to be unity. - * - * If the library is configured - * to use multithreading, this - * function works in parallel. - * - * See the general doc of this class - * for more information. - */ - template - void create_mass_matrix (const Mapping &mapping, - const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const Function * const a = 0); + /** + * Assemble the mass matrix. If no + * coefficient is given, it is assumed + * to be unity. + * + * If the library is configured + * to use multithreading, this + * function works in parallel. + * + * See the general doc of this class + * for more information. + */ + template + void create_mass_matrix (const Mapping &mapping, + const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const Function * const a = 0); - /** - * Calls the create_mass_matrix() - * function, see above, with - * mapping=MappingQ1@(). - */ - template - void create_mass_matrix (const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const Function * const a = 0); + /** + * Calls the create_mass_matrix() + * function, see above, with + * mapping=MappingQ1@(). + */ + template + void create_mass_matrix (const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const Function * const a = 0); - /** - * Assemble the mass matrix and a - * right hand side vector. If no - * coefficient is given, it is - * assumed to be unity. - * - * If the library is configured - * to use multithreading, this - * function works in parallel. - * - * See the general doc of this - * class for more information. - */ - template - void create_mass_matrix (const Mapping &mapping, - const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const Function &rhs, - Vector &rhs_vector, - const Function * const a = 0); + /** + * Assemble the mass matrix and a + * right hand side vector. If no + * coefficient is given, it is + * assumed to be unity. + * + * If the library is configured + * to use multithreading, this + * function works in parallel. + * + * See the general doc of this + * class for more information. + */ + template + void create_mass_matrix (const Mapping &mapping, + const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const Function &rhs, + Vector &rhs_vector, + const Function * const a = 0); - /** - * Calls the create_mass_matrix() - * function, see above, with - * mapping=MappingQ1@(). - */ - template - void create_mass_matrix (const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const Function &rhs, - Vector &rhs_vector, - const Function * const a = 0); - /** - * Same function as above, but for hp - * objects. - */ - template - void create_mass_matrix (const hp::MappingCollection &mapping, - const hp::DoFHandler &dof, - const hp::QCollection &q, - SparseMatrix &matrix, - const Function * const a = 0); + /** + * Calls the create_mass_matrix() + * function, see above, with + * mapping=MappingQ1@(). + */ + template + void create_mass_matrix (const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const Function &rhs, + Vector &rhs_vector, + const Function * const a = 0); + /** + * Same function as above, but for hp + * objects. + */ + template + void create_mass_matrix (const hp::MappingCollection &mapping, + const hp::DoFHandler &dof, + const hp::QCollection &q, + SparseMatrix &matrix, + const Function * const a = 0); - /** - * Same function as above, but for hp - * objects. - */ - template - void create_mass_matrix (const hp::DoFHandler &dof, - const hp::QCollection &q, - SparseMatrix &matrix, - const Function * const a = 0); + /** + * Same function as above, but for hp + * objects. + */ + template + void create_mass_matrix (const hp::DoFHandler &dof, + const hp::QCollection &q, + SparseMatrix &matrix, + const Function * const a = 0); - /** - * Same function as above, but for hp - * objects. - */ - template - void create_mass_matrix (const hp::MappingCollection &mapping, - const hp::DoFHandler &dof, - const hp::QCollection &q, - SparseMatrix &matrix, - const Function &rhs, - Vector &rhs_vector, - const Function * const a = 0); + /** + * Same function as above, but for hp + * objects. + */ + template + void create_mass_matrix (const hp::MappingCollection &mapping, + const hp::DoFHandler &dof, + const hp::QCollection &q, + SparseMatrix &matrix, + const Function &rhs, + Vector &rhs_vector, + const Function * const a = 0); - /** - * Same function as above, but for hp - * objects. - */ - template - void create_mass_matrix (const hp::DoFHandler &dof, - const hp::QCollection &q, - SparseMatrix &matrix, - const Function &rhs, - Vector &rhs_vector, - const Function * const a = 0); + /** + * Same function as above, but for hp + * objects. + */ + template + void create_mass_matrix (const hp::DoFHandler &dof, + const hp::QCollection &q, + SparseMatrix &matrix, + const Function &rhs, + Vector &rhs_vector, + const Function * const a = 0); - /** - * Assemble the mass matrix and a - * right hand side vector along - * the boundary. - * - * The matrix is assumed to - * already be initialized with a - * suiting sparsity pattern (the - * DoFHandler provides an - * appropriate function). - * - * If the library is configured - * to use multithreading, this - * function works in parallel. - * - * @arg @p weight: an optional - * weight for the computation of - * the mass matrix. If no weight - * is given, it is set to one. - * - * @arg @p component_mapping: if - * the components in @p - * boundary_functions and @p dof - * do not coincide, this vector - * allows them to be remapped. If - * the vector is not empty, it - * has to have one entry for each - * component in @p dof. This - * entry is the component number - * in @p boundary_functions that - * should be used for this - * component in @p dof. By - * default, no remapping is - * applied. - * - * @todo This function does not - * work for finite elements with - * cell-dependent shape functions. - */ - template + /** + * Assemble the mass matrix and a + * right hand side vector along + * the boundary. + * + * The matrix is assumed to + * already be initialized with a + * suiting sparsity pattern (the + * DoFHandler provides an + * appropriate function). + * + * If the library is configured + * to use multithreading, this + * function works in parallel. + * + * @arg @p weight: an optional + * weight for the computation of + * the mass matrix. If no weight + * is given, it is set to one. + * + * @arg @p component_mapping: if + * the components in @p + * boundary_functions and @p dof + * do not coincide, this vector + * allows them to be remapped. If + * the vector is not empty, it + * has to have one entry for each + * component in @p dof. This + * entry is the component number + * in @p boundary_functions that + * should be used for this + * component in @p dof. By + * default, no remapping is + * applied. + * + * @todo This function does not + * work for finite elements with + * cell-dependent shape functions. + */ + template - void create_boundary_mass_matrix (const Mapping &mapping, - const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const typename FunctionMap::type &boundary_functions, - Vector &rhs_vector, - std::vector&dof_to_boundary_mapping, - const Function * const weight = 0, - std::vector component_mapping = std::vector()); + void create_boundary_mass_matrix (const Mapping &mapping, + const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const typename FunctionMap::type &boundary_functions, + Vector &rhs_vector, + std::vector&dof_to_boundary_mapping, + const Function * const weight = 0, + std::vector component_mapping = std::vector()); // * Same function, but for 1d. // */ @@ -395,43 +395,43 @@ namespace MatrixCreator - /** - * Calls the - * create_boundary_mass_matrix() - * function, see above, with - * mapping=MappingQ1@(). - */ - template + /** + * Calls the + * create_boundary_mass_matrix() + * function, see above, with + * mapping=MappingQ1@(). + */ + template - void create_boundary_mass_matrix (const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const typename FunctionMap::type &boundary_functions, - Vector &rhs_vector, - std::vector&dof_to_boundary_mapping, - const Function * const a = 0, - std::vector component_mapping = std::vector()); + void create_boundary_mass_matrix (const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const typename FunctionMap::type &boundary_functions, + Vector &rhs_vector, + std::vector&dof_to_boundary_mapping, + const Function * const a = 0, + std::vector component_mapping = std::vector()); - /** - * Same function as above, but for hp - * objects. - */ - template + /** + * Same function as above, but for hp + * objects. + */ + template - void create_boundary_mass_matrix (const hp::MappingCollection &mapping, - const hp::DoFHandler &dof, - const hp::QCollection &q, - SparseMatrix &matrix, - const typename FunctionMap::type &boundary_functions, - Vector &rhs_vector, - std::vector&dof_to_boundary_mapping, - const Function * const a = 0, - std::vector component_mapping = std::vector()); + void create_boundary_mass_matrix (const hp::MappingCollection &mapping, + const hp::DoFHandler &dof, + const hp::QCollection &q, + SparseMatrix &matrix, + const typename FunctionMap::type &boundary_functions, + Vector &rhs_vector, + std::vector&dof_to_boundary_mapping, + const Function * const a = 0, + std::vector component_mapping = std::vector()); - /** - * Same function as above, but for hp - * objects. - */ + /** + * Same function as above, but for hp + * objects. + */ // // void create_boundary_mass_matrix (const hp::MappingCollection<1,1> &mapping, // const hp::DoFHandler<1,1> &dof, @@ -442,144 +442,144 @@ namespace MatrixCreator // std::vector&dof_to_boundary_mapping, // const Function<1> * const a = 0); - /** - * Same function as above, but for hp - * objects. - */ - template + /** + * Same function as above, but for hp + * objects. + */ + template - void create_boundary_mass_matrix (const hp::DoFHandler &dof, - const hp::QCollection &q, - SparseMatrix &matrix, - const typename FunctionMap::type &boundary_functions, - Vector &rhs_vector, - std::vector&dof_to_boundary_mapping, - const Function * const a = 0, - std::vector component_mapping = std::vector()); + void create_boundary_mass_matrix (const hp::DoFHandler &dof, + const hp::QCollection &q, + SparseMatrix &matrix, + const typename FunctionMap::type &boundary_functions, + Vector &rhs_vector, + std::vector&dof_to_boundary_mapping, + const Function * const a = 0, + std::vector component_mapping = std::vector()); - /** - * Assemble the Laplace - * matrix. If no coefficient is - * given, it is assumed to be - * constant one. - * - * If the library is configured - * to use multithreading, this - * function works in parallel. - * - * See the general doc of this - * class for more information. - */ - template - void create_laplace_matrix (const Mapping &mapping, - const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const Function * const a = 0); + /** + * Assemble the Laplace + * matrix. If no coefficient is + * given, it is assumed to be + * constant one. + * + * If the library is configured + * to use multithreading, this + * function works in parallel. + * + * See the general doc of this + * class for more information. + */ + template + void create_laplace_matrix (const Mapping &mapping, + const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const Function * const a = 0); - /** - * Calls the - * create_laplace_matrix() - * function, see above, with - * mapping=MappingQ1@(). - */ - template - void create_laplace_matrix (const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const Function * const a = 0); + /** + * Calls the + * create_laplace_matrix() + * function, see above, with + * mapping=MappingQ1@(). + */ + template + void create_laplace_matrix (const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const Function * const a = 0); - /** - * Assemble the Laplace matrix - * and a right hand side - * vector. If no coefficient is - * given, it is assumed to be - * constant one. - * - * If the library is configured - * to use multithreading, this - * function works in parallel. - * - * See the general doc of this - * class for more information. - */ - template - void create_laplace_matrix (const Mapping &mapping, - const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const Function &rhs, - Vector &rhs_vector, - const Function * const a = 0); + /** + * Assemble the Laplace matrix + * and a right hand side + * vector. If no coefficient is + * given, it is assumed to be + * constant one. + * + * If the library is configured + * to use multithreading, this + * function works in parallel. + * + * See the general doc of this + * class for more information. + */ + template + void create_laplace_matrix (const Mapping &mapping, + const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const Function &rhs, + Vector &rhs_vector, + const Function * const a = 0); - /** - * Calls the - * create_laplace_matrix() - * function, see above, with - * mapping=MappingQ1@(). - */ - template - void create_laplace_matrix (const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const Function &rhs, - Vector &rhs_vector, - const Function * const a = 0); + /** + * Calls the + * create_laplace_matrix() + * function, see above, with + * mapping=MappingQ1@(). + */ + template + void create_laplace_matrix (const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const Function &rhs, + Vector &rhs_vector, + const Function * const a = 0); - /** - * Like the functions above, but for hp - * dof handlers, mappings, and quadrature - * collections. - */ - template - void create_laplace_matrix (const hp::MappingCollection &mapping, - const hp::DoFHandler &dof, - const hp::QCollection &q, - SparseMatrix &matrix, - const Function * const a = 0); + /** + * Like the functions above, but for hp + * dof handlers, mappings, and quadrature + * collections. + */ + template + void create_laplace_matrix (const hp::MappingCollection &mapping, + const hp::DoFHandler &dof, + const hp::QCollection &q, + SparseMatrix &matrix, + const Function * const a = 0); - /** - * Like the functions above, but for hp - * dof handlers, mappings, and quadrature - * collections. - */ - template - void create_laplace_matrix (const hp::DoFHandler &dof, - const hp::QCollection &q, - SparseMatrix &matrix, - const Function * const a = 0); + /** + * Like the functions above, but for hp + * dof handlers, mappings, and quadrature + * collections. + */ + template + void create_laplace_matrix (const hp::DoFHandler &dof, + const hp::QCollection &q, + SparseMatrix &matrix, + const Function * const a = 0); - /** - * Like the functions above, but for hp - * dof handlers, mappings, and quadrature - * collections. - */ - template - void create_laplace_matrix (const hp::MappingCollection &mapping, - const hp::DoFHandler &dof, - const hp::QCollection &q, - SparseMatrix &matrix, - const Function &rhs, - Vector &rhs_vector, - const Function * const a = 0); + /** + * Like the functions above, but for hp + * dof handlers, mappings, and quadrature + * collections. + */ + template + void create_laplace_matrix (const hp::MappingCollection &mapping, + const hp::DoFHandler &dof, + const hp::QCollection &q, + SparseMatrix &matrix, + const Function &rhs, + Vector &rhs_vector, + const Function * const a = 0); - /** - * Like the functions above, but for hp - * dof handlers, mappings, and quadrature - * collections. - */ - template - void create_laplace_matrix (const hp::DoFHandler &dof, - const hp::QCollection &q, - SparseMatrix &matrix, - const Function &rhs, - Vector &rhs_vector, - const Function * const a = 0); + /** + * Like the functions above, but for hp + * dof handlers, mappings, and quadrature + * collections. + */ + template + void create_laplace_matrix (const hp::DoFHandler &dof, + const hp::QCollection &q, + SparseMatrix &matrix, + const Function &rhs, + Vector &rhs_vector, + const Function * const a = 0); - /** - * Exception - */ - DeclException0 (ExcComponentMismatch); + /** + * Exception + */ + DeclException0 (ExcComponentMismatch); }