From 88685b82aefdf810af4af5b0ba2d721726184ed2 Mon Sep 17 00:00:00 2001 From: Maien Hamed Date: Sat, 27 Jun 2015 21:32:55 +0200 Subject: [PATCH] Added PETSc instantiation and preprocessor checks --- include/deal.II/lac/block_matrix_array.h | 20 ++++++++++---------- source/lac/block_matrix_array.cc | 21 ++++++++++++++++----- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/include/deal.II/lac/block_matrix_array.h b/include/deal.II/lac/block_matrix_array.h index 640d0e9921..74054bdda9 100644 --- a/include/deal.II/lac/block_matrix_array.h +++ b/include/deal.II/lac/block_matrix_array.h @@ -189,8 +189,8 @@ public: /** * Matrix-vector multiplication adding to dst. */ - void vmult_add(BLOCK_VECTOR &dst, - const BLOCK_VECTOR &src) const; + void vmult_add(BLOCK_VECTOR &dst, + const BLOCK_VECTOR &src) const; /** * Transposed matrix-vector multiplication. @@ -461,20 +461,20 @@ public: /** * Make function of base class available. */ - using BlockMatrixArray::print_latex; + using BlockMatrixArray::print_latex; /** * Make function of base class available. */ - using BlockMatrixArray::n_block_rows; + using BlockMatrixArray::n_block_rows; /** * Make function of base class available. */ - using BlockMatrixArray::n_block_cols; - using BlockMatrixArray::clear; - using BlockMatrixArray::Subscriptor::subscribe; - using BlockMatrixArray::Subscriptor::unsubscribe; + using BlockMatrixArray::n_block_cols; + using BlockMatrixArray::clear; + using BlockMatrixArray::Subscriptor::subscribe; + using BlockMatrixArray::Subscriptor::unsubscribe; /** * @addtogroup Exceptions @@ -620,8 +620,8 @@ template inline void BlockTrianglePrecondition::enter (const MATRIX &matrix, - size_type row, size_type col, - number prefix, bool transpose) + size_type row, size_type col, + number prefix, bool transpose) { BlockMatrixArray::enter(matrix, row, col, prefix, transpose); } diff --git a/source/lac/block_matrix_array.cc b/source/lac/block_matrix_array.cc index edfe73058c..af2a0590a1 100644 --- a/source/lac/block_matrix_array.cc +++ b/source/lac/block_matrix_array.cc @@ -98,7 +98,7 @@ BlockMatrixArray::clear () template void BlockMatrixArray::vmult_add (BLOCK_VECTOR &dst, - const BLOCK_VECTOR &src) const + const BLOCK_VECTOR &src) const { GrowingVectorMemory mem; Assert (dst.n_blocks() == block_rows, @@ -129,7 +129,7 @@ BlockMatrixArray::vmult_add (BLOCK_VECTOR &dst, template void BlockMatrixArray::vmult (BLOCK_VECTOR &dst, - const BLOCK_VECTOR &src) const + const BLOCK_VECTOR &src) const { dst = 0.; vmult_add (dst, src); @@ -141,7 +141,7 @@ BlockMatrixArray::vmult (BLOCK_VECTOR &dst, template void BlockMatrixArray::Tvmult_add (BLOCK_VECTOR &dst, - const BLOCK_VECTOR &src) const + const BLOCK_VECTOR &src) const { GrowingVectorMemory mem; Assert (dst.n_blocks() == block_cols, @@ -171,7 +171,7 @@ BlockMatrixArray::Tvmult_add (BLOCK_VECTOR &dst, template void BlockMatrixArray::Tvmult (BLOCK_VECTOR &dst, - const BLOCK_VECTOR &src) const + const BLOCK_VECTOR &src) const { dst = 0.; Tvmult_add (dst, src); @@ -426,7 +426,18 @@ template class BlockMatrixArray; template class BlockTrianglePrecondition; template class BlockTrianglePrecondition; -template class BlockMatrixArray; +#ifdef DEAL_II_WITH_TRILINOS template class BlockMatrixArray; +template class BlockMatrixArray; +template class BlockTrianglePrecondition; +template class BlockTrianglePrecondition; +#endif + +#ifdef DEAL_II_WITH_PETSC +template class BlockMatrixArray; +template class BlockMatrixArray; +template class BlockTrianglePrecondition; +template class BlockTrianglePrecondition; +#endif DEAL_II_NAMESPACE_CLOSE -- 2.39.5