From 29c2575c177ddd849cebc25dd5a28fbc731e451f Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 26 Jan 2000 14:59:54 +0000 Subject: [PATCH] Reflect transition from SparseMatrixStruct to SparsityPattern. git-svn-id: https://svn.dealii.org/trunk@2267 0785d39b-7218-0410-832d-ea1e28bc413d --- .../doc/tutorial/chapter-1.elements/condense.html | 6 +++--- .../chapter-1.elements/matrix_generation.html | 2 +- .../chapter-1.elements/matrix_structure.html | 12 ++++++------ .../doc/tutorial/chapter-3.laplace/code/laplace.h | 2 +- deal.II/doc/tutorial/chapter-3.laplace/laplace.html | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deal.II/doc/tutorial/chapter-1.elements/condense.html b/deal.II/doc/tutorial/chapter-1.elements/condense.html index 0bf8890252..6a379c090b 100644 --- a/deal.II/doc/tutorial/chapter-1.elements/condense.html +++ b/deal.II/doc/tutorial/chapter-1.elements/condense.html @@ -41,7 +41,7 @@ You will have to: Create a global sparsity pattern (as described in the chapter on matrix structure) using void DoFTools::make_sparsity_pattern(const DoFHandler<dim> &, - SparseMatrixStruct &). + SparsityPattern &).
  • Create the constraints on the hanging nodes using @@ -56,7 +56,7 @@ This method is needed because you might wish to implement additional constraints closing the object; therefore you can't have it closed automatically somewhere.
  • Finally, condense the hanging nodes into the matrix structure -using ConstraintMatrix::condense(SparseMatrixStruct &). +using ConstraintMatrix::condense(SparsityPattern &).
  • @@ -74,7 +74,7 @@ function calls needed. Be sure to use them in their appropriate places. #include <dofs/dof_tools.h> const unsigned int dim=2; // Work in two dimensions, could also be three -SparseMatrixStruct sparsity_pattern; +SparsityPattern sparsity_pattern; DoFHandler<dim> dof_handler; ConstraintMatrix hanging_nodes; diff --git a/deal.II/doc/tutorial/chapter-1.elements/matrix_generation.html b/deal.II/doc/tutorial/chapter-1.elements/matrix_generation.html index e1eba1d966..77d035ed65 100644 --- a/deal.II/doc/tutorial/chapter-1.elements/matrix_generation.html +++ b/deal.II/doc/tutorial/chapter-1.elements/matrix_generation.html @@ -94,7 +94,7 @@ appropriate places. This example initializes a sparse square matrix structure. const unsigned int dim=2; // For example -SparseMatrixStruct sparsity_pattern; +SparsityPattern sparsity_pattern; SparseMatrix<double> sparse_matrix; DoFHandler<dim> dof_handler; diff --git a/deal.II/doc/tutorial/chapter-1.elements/matrix_structure.html b/deal.II/doc/tutorial/chapter-1.elements/matrix_structure.html index da4c098e69..3053272e6f 100644 --- a/deal.II/doc/tutorial/chapter-1.elements/matrix_structure.html +++ b/deal.II/doc/tutorial/chapter-1.elements/matrix_structure.html @@ -64,7 +64,7 @@ tell the matrix for which elements to allocate memory.

    The Standard Sparse Matrix

    The deal.II function initializing a standard sparse matrix -structure is void SparseMatrixStruct::reinit(const unsigned int m, const unsigned int n, const unsigned int max_per_row). It takes as its arguments +structure is void SparsityPattern::reinit(const unsigned int m, const unsigned int n, const unsigned int max_per_row). It takes as its arguments the size of the matrix in question and the maximum number of non-zero elements in one row. This first sets up a blank sparsity pattern which, however, has as yet no information which entries are non-zero. @@ -102,8 +102,8 @@ next subsection.

    This matrix structure can then be used to serve as sparsity pattern to one or several matrices using -void SparseMatrix::reinit(const SparseMatrixStruct&sparsity). -We note the distinction that the SparseMatrixStruct only +void SparseMatrix::reinit(const SparsityPattern &sparsity). +We note the distinction that the SparsityPattern only stores the places of the non-zero elements, while the SparseMatrix actually stores the values of these elements. The separation was made since often several matrices are @@ -124,7 +124,7 @@ appropriate places. This example initializes a sparse square matrix structure. const unsigned int dim=2; // For example -SparseMatrixStruct sparsity_pattern; +SparsityPattern sparsity_pattern; DoFHandler<dim> dof_handler; // set up a triangulation, refine it, associate the DoFHandler object @@ -173,7 +173,7 @@ data. The reason for this is the way matrix structures and matrices are generate -The appropriate function is void SparseMatrixStruct::compress(). +The appropriate function is void SparsityPattern::compress().

    @@ -194,7 +194,7 @@ partial differential equations couple to each other, or that the operators have a special structure. For this reason, there are more specialized version of the DoFTools::make_sparsity_pattern and -SparseMatrixStruct::reinit functions, which allow you to +SparsityPattern::reinit functions, which allow you to more flexibly determine the actual number of non-zero elements of all or individual rows. See the documentation of the respective classes for more information. diff --git a/deal.II/doc/tutorial/chapter-3.laplace/code/laplace.h b/deal.II/doc/tutorial/chapter-3.laplace/code/laplace.h index a74f20ac8d..1e93cedfb4 100644 --- a/deal.II/doc/tutorial/chapter-3.laplace/code/laplace.h +++ b/deal.II/doc/tutorial/chapter-3.laplace/code/laplace.h @@ -28,7 +28,7 @@ protected: Triangulation<2> tr; DoFHandler<2> dof; - SparseMatrixStruct matrix_structure; + SparsityPattern matrix_structure; AdvMatrix A; Vector u; diff --git a/deal.II/doc/tutorial/chapter-3.laplace/laplace.html b/deal.II/doc/tutorial/chapter-3.laplace/laplace.html index e0e430e3d3..3761904cc9 100644 --- a/deal.II/doc/tutorial/chapter-3.laplace/laplace.html +++ b/deal.II/doc/tutorial/chapter-3.laplace/laplace.html @@ -27,7 +27,7 @@ class Laplace Triangulation<2> tr; DoFHandler<2> dof; - SparseMatrixStruct matrix_structure; + SparsityPattern matrix_structure; LapMatrix A; ConstraintMatrix hanging_nodes; -- 2.39.5