]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Merge from mainline.
authorBruno Turcksin <bruno.turcksin@gmail.com>
Tue, 12 Mar 2013 15:03:19 +0000 (15:03 +0000)
committerBruno Turcksin <bruno.turcksin@gmail.com>
Tue, 12 Mar 2013 15:03:19 +0000 (15:03 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28870 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/include/deal.II/matrix_free/fe_evaluation.h
deal.II/source/fe/fe_tools.cc
deal.II/source/fe/fe_tools.inst.in
deal.II/source/lac/lapack_full_matrix.cc
deal.II/source/lac/trilinos_sparse_matrix.cc

Simple merge
Simple merge
index d92784cee39b65def31fef9e748d7860ecaa69e4,29030f6e47a829181a452c3b99585eb601d964d8..0dc763db304a39ea1f1f81b985e26a01ac637557
@@@ -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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.