From 6c79ce1e65c14ef9d15f51c719b342f3a4e8bae5 Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 5 May 1999 14:16:32 +0000 Subject: [PATCH] Undo Guido's attempt to include the ILU into the sparse matrix. git-svn-id: https://svn.dealii.org/trunk@1278 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/include/lac/sparse_matrix.h | 41 ------------------- .../lac/include/lac/sparse_matrix.templates.h | 11 +---- 2 files changed, 2 insertions(+), 50 deletions(-) diff --git a/deal.II/lac/include/lac/sparse_matrix.h b/deal.II/lac/include/lac/sparse_matrix.h index 8c7da6c984..06ff1a3bb7 100644 --- a/deal.II/lac/include/lac/sparse_matrix.h +++ b/deal.II/lac/include/lac/sparse_matrix.h @@ -615,35 +615,6 @@ class SparseMatrix : public Subscriptor template SparseMatrix & copy_from (const SparseMatrix &source); - /** - * Generate ILU. - * The matrix entries will contain the - * incomplete LU-factorization of - * the matrix #source#. Having a matrix - * #source# and a matrix structure object - * #struct#, the code for generating - * an ILU factorization reads - * \begin{verbatim} - * SparseMatrix ilu(struct); - * ilu.ILU(source); - * \end{verbatim} - * - * If additional side diagonals are - * needed (ILU(n)-algorithm), you have to - * construct a second matrix structure: - * \begin{verbatim} - * SparseMatrixStruct ilustruct(struct,n); - * SparseMatrix ilu(ilustruct); - * ilu.ILU(source); - * \end{verbatim} - * - * After generating the ILU-decomposition, - * it can be applied to a vector by - * #backward_forward#. - */ - template - SparseMatrix & ILU (const SparseMatrix &source); - /** * Add #matrix# scaled by #factor# to this * matrix. The function throws an error @@ -734,13 +705,6 @@ class SparseMatrix : public Subscriptor template void Tvmult (Vector& dst, const Vector& src) const; - /** - * Do backward-forward solution of a - * previously generated ILU. - */ - template - void backward_forward (Vector& v); - /** * Return the norm of the vector $v$ with * respect to the norm induced by this @@ -914,17 +878,12 @@ class SparseMatrix : public Subscriptor /** * Exception */ - DeclException0 (ExcNoILU); - /** - * Exception - */ DeclException0 (ExcInvalidConstructorCall); private: SmartPointer cols; number* val; unsigned int max_len; - bool is_ilu; // make all other sparse matrices diff --git a/deal.II/lac/include/lac/sparse_matrix.templates.h b/deal.II/lac/include/lac/sparse_matrix.templates.h index c20d302938..a2342846fd 100644 --- a/deal.II/lac/include/lac/sparse_matrix.templates.h +++ b/deal.II/lac/include/lac/sparse_matrix.templates.h @@ -21,8 +21,7 @@ template SparseMatrix::SparseMatrix () : cols(0), val(0), - max_len(0), - is_ilu(false) + max_len(0) {}; @@ -44,8 +43,7 @@ template SparseMatrix::SparseMatrix (const SparseMatrixStruct &c) : cols(&c), val(0), - max_len(0), - is_ilu(false) + max_len(0) { reinit(); }; @@ -84,8 +82,6 @@ SparseMatrix::reinit () if (val) fill_n (&val[0], cols->vec_len, 0); - - is_ilu = false; } @@ -108,7 +104,6 @@ SparseMatrix::clear () if (val) delete[] val; val = 0; max_len = 0; - is_ilu = false; }; @@ -147,7 +142,6 @@ SparseMatrix::copy_from (const SparseMatrix &matrix) copy (&matrix.val[0], &matrix.val[cols->vec_len], &val[0]); - is_ilu = false; return *this; }; @@ -169,7 +163,6 @@ SparseMatrix::add_scaled (const number factor, while (val_ptr != end_ptr) *val_ptr++ += factor * *matrix_ptr++; - is_ilu = false; }; -- 2.39.5