From 3a9ec835d600df4bc0d88f0f5cb9580b29102e6b Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@math.fu-berlin.de>
Date: Tue, 15 Jul 2014 11:21:29 +0200
Subject: [PATCH] Rename DiscFuncType to VectorType
---
.../transferoperators/mandelobsrestrictor.cc | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dune/solvers/transferoperators/mandelobsrestrictor.cc b/dune/solvers/transferoperators/mandelobsrestrictor.cc
index 37ce6810..bc4137d9 100644
--- a/dune/solvers/transferoperators/mandelobsrestrictor.cc
+++ b/dune/solvers/transferoperators/mandelobsrestrictor.cc
@@ -1,19 +1,19 @@
#include <dune/solvers/transferoperators/compressedmultigridtransfer.hh>
-template <class DiscFuncType>
-void MandelObstacleRestrictor<DiscFuncType>::
-restrict(const std::vector<BoxConstraint<typename DiscFuncType::field_type,blocksize> >&f,
- std::vector<BoxConstraint<typename DiscFuncType::field_type,blocksize> > &t,
+template <class VectorType>
+void MandelObstacleRestrictor<VectorType>::
+restrict(const std::vector<BoxConstraint<field_type, blocksize> >&f,
+ std::vector<BoxConstraint<field_type, blocksize> > &t,
const Dune::BitSetVector<blocksize>& fHasObstacle,
const Dune::BitSetVector<blocksize>& tHasObstacle,
- const MultigridTransfer<DiscFuncType>& transfer,
+ const MultigridTransfer<VectorType>& transfer,
const Dune::BitSetVector<blocksize>& critical)
{
- if (!(dynamic_cast<const CompressedMultigridTransfer<DiscFuncType>*>(&transfer)))
+ if (!(dynamic_cast<const CompressedMultigridTransfer<VectorType>*>(&transfer)))
DUNE_THROW(Dune::NotImplemented, "Implementation assumes transfer to be of type CompressedMultigridTransfer!");
const Dune::BCRSMatrix<Dune::FieldMatrix<field_type, 1, 1> >& transferMat =
- dynamic_cast<const CompressedMultigridTransfer<DiscFuncType>*>(&transfer)->getMatrix();
+ dynamic_cast<const CompressedMultigridTransfer<VectorType>*>(&transfer)->getMatrix();
t.resize(transferMat.M());
for (size_t i=0; i<t.size(); i++)
--
GitLab