From: turcksin Date: Tue, 12 Mar 2013 15:03:19 +0000 (+0000) Subject: Merge from mainline. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=525bc439bca63c613c6a3262a29d6f4c1bec5ae8;p=dealii-svn.git Merge from mainline. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28870 0785d39b-7218-0410-832d-ea1e28bc413d --- 525bc439bca63c613c6a3262a29d6f4c1bec5ae8 diff --cc deal.II/source/lac/trilinos_sparse_matrix.cc index d92784cee3,29030f6e47..0dc763db30 --- a/deal.II/source/lac/trilinos_sparse_matrix.cc +++ b/deal.II/source/lac/trilinos_sparse_matrix.cc @@@ -1392,20 -1379,26 +1392,25 @@@ namespace TrilinosWrapper - std::size_t + SparseMatrix::size_type SparseMatrix::memory_consumption () const { - unsigned int static_memory = sizeof(this) + sizeof (*matrix) + size_type static_memory = sizeof(this) + sizeof (*matrix) + sizeof(*matrix->Graph().DataPtr()); - return ((sizeof(TrilinosScalar)+sizeof(int))*matrix->NumMyNonzeros() + - sizeof(int)*local_size() + - static_memory); + return ((sizeof(TrilinosScalar)+sizeof(TrilinosWrapper::types::int_type))* + matrix->NumMyNonzeros() + sizeof(int)*local_size() + static_memory); } + } + + // explicit instantiations + #include "trilinos_sparse_matrix.inst" - - // explicit instantiations - // + + // TODO: put these instantiations into generic file + namespace TrilinosWrappers + { template void SparseMatrix::reinit (const dealii::SparsityPattern &); template void