From d628dfb120f9e4454e68cd3617afbc0bbc5e32c0 Mon Sep 17 00:00:00 2001
From: Christian Engwer <christi@dune-project.org>
Date: Sun, 9 Apr 2017 00:35:46 +0200
Subject: [PATCH] [amg,bugfix] fix template arguments for
MatrixHierarchy::coarsenVector
if the AMG had a non-standard allocator, the template parameters didn't
match, as the hierarchy was assumend to use the default allocator.
---
dune/istl/paamg/hierarchy.hh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dune/istl/paamg/hierarchy.hh b/dune/istl/paamg/hierarchy.hh
index e0b5db86b..f3dec8cfa 100644
--- a/dune/istl/paamg/hierarchy.hh
+++ b/dune/istl/paamg/hierarchy.hh
@@ -378,8 +378,8 @@ namespace Dune
* @brief Coarsen the vector hierarchy according to the matrix hierarchy.
* @param hierarchy The vector hierarchy to coarsen.
*/
- template<class V, class TA>
- void coarsenVector(Hierarchy<BlockVector<V,TA> >& hierarchy) const;
+ template<class V, class BA, class TA>
+ void coarsenVector(Hierarchy<BlockVector<V,BA>, TA>& hierarchy) const;
/**
* @brief Coarsen the smoother hierarchy according to the matrix hierarchy.
@@ -1106,8 +1106,8 @@ namespace Dune
}
template<class M, class IS, class A>
- template<class V, class TA>
- void MatrixHierarchy<M,IS,A>::coarsenVector(Hierarchy<BlockVector<V,TA> >& hierarchy) const
+ template<class V, class BA, class TA>
+ void MatrixHierarchy<M,IS,A>::coarsenVector(Hierarchy<BlockVector<V,BA>, TA>& hierarchy) const
{
assert(hierarchy.levels()==1);
typedef typename ParallelMatrixHierarchy::ConstIterator Iterator;
--
GitLab