Merge from trunk.

git-svn-id: https://svn.dealii.org/branches/branch_paralution@32131 0785d39b-7218-0410-832d-ea1e28bc413d

diff --cc deal.II/cmake/config/CMakeLists.txt
Simple merge

diff --cc deal.II/include/deal.II/base/config.h.in
index 166d1e521bb21f1c0447445ae8fffa18ec23b71e,c0a1eda16ba632e5c5200118d41d884ad2ccd54f..6abed72e5d62a8f68d9b647a0b1120406bb77927
--- 1/deal.II/include/deal.II/base/config.h.in
--- 2/deal.II/include/deal.II/base/config.h.in
+++ b/deal.II/include/deal.II/base/config.h.in
@@@ -494,26 -529,6 +529,16 @@@
  #endif
  
  
- /***************************************
-  * Configured in configure_zlib.cmake: *
-  ***************************************/
- 
- #cmakedefine DEAL_II_WITH_ZLIB
- #ifdef DEAL_II_WITH_ZLIB
- #  define HAVE_LIBZ
- #endif
- 
- 
 +/**********************************************
 + * Configured in configure_paralution.cmake:  *
 + **********************************************/
 +
 +#cmakedefine DEAL_II_WITH_PARALUTION
 +#ifdef DEAL_II_WITH_PARALUTION
 +#  define DEAL_II_USE_PARALUTION
 +#endif
 +
 +
  #include <deal.II/base/numbers.h>
  #include <deal.II/base/types.h>
  

diff --cc deal.II/include/deal.II/lac/trilinos_sparse_matrix.h
Simple merge

diff --cc deal.II/include/deal.II/lac/trilinos_vector_base.h
index 6b8b62533ca13492756f9cd5455a6eccfa84809b,39b9b79991326845a0c8fe756c3cc79273eb07b1..c431680e79f6808907d4d9ae7b2d2820a7449149
--- 1/deal.II/include/deal.II/lac/trilinos_vector_base.h
--- 2/deal.II/include/deal.II/lac/trilinos_vector_base.h
+++ b/deal.II/include/deal.II/lac/trilinos_vector_base.h
@@@ -860,17 -679,13 +679,13 @@@ namespace TrilinosWrapper
                const bool        allow_different_maps = false);
  
      /**
-      * Simple addition of a multiple
-      * of a vector, i.e. <tt>*this +=
-      * a*V</tt>.
 -     * Simple addition of a multiple of a vector, i.e. <tt>*this = a*V</tt>.
++     * Simple addition of a multiple of a vector, i.e. <tt>*this += a*V</tt>.
       */
      void add (const TrilinosScalar  a,
                const VectorBase     &V);
  
      /**
-      * Multiple addition of scaled
-      * vectors, i.e. <tt>*this += a*V +
-      * b*W</tt>.
 -     * Multiple addition of scaled vectors, i.e. <tt>*this = a*V + b*W</tt>.
++     * Multiple addition of scaled vectors, i.e. <tt>*this += a*V + b*W</tt>.
       */
      void add (const TrilinosScalar  a,
                const VectorBase     &V,

diff --cc deal.II/include/deal.II/numerics/vector_tools.templates.h
Simple merge

diff --cc deal.II/source/fe/fe_values.cc
Simple merge

diff --cc deal.II/source/numerics/derivative_approximation.cc
Simple merge

diff --cc deal.II/source/numerics/solution_transfer.cc
Simple merge