From 24992ad69bb7e71bf8c272ead47b89298bbdbeb7 Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@math.fu-berlin.de>
Date: Tue, 15 Jul 2014 11:20:33 +0200
Subject: [PATCH] Adjust include guard to Dune standards and rename
DiscFuncType to VectorType
---
.../transferoperators/mandelobsrestrictor.hh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dune/solvers/transferoperators/mandelobsrestrictor.hh b/dune/solvers/transferoperators/mandelobsrestrictor.hh
index e5da0a9d..44d6ccc2 100644
--- a/dune/solvers/transferoperators/mandelobsrestrictor.hh
+++ b/dune/solvers/transferoperators/mandelobsrestrictor.hh
@@ -1,17 +1,17 @@
-#ifndef MANDEL_OBSTACLE_RESTRICTOR_HH
-#define MANDEL_OBSTACLE_RESTRICTOR_HH
+#ifndef DUNE_SOLVERS_TRANSFEROPERATORS_MANDEL_OBSTACLE_RESTRICTOR_HH
+#define DUNE_SOLVERS_TRANSFEROPERATORS_MANDEL_OBSTACLE_RESTRICTOR_HH
#include <dune/common/bitsetvector.hh>
#include <dune/solvers/transferoperators/obstaclerestrictor.hh>
#include <dune/solvers/transferoperators/multigridtransfer.hh>
#include <dune/solvers/common/boxconstraint.hh>
-template <class DiscFuncType>
-class MandelObstacleRestrictor : public ObstacleRestrictor<DiscFuncType>
+template <class VectorType>
+class MandelObstacleRestrictor : public ObstacleRestrictor<VectorType>
{
- typedef typename DiscFuncType::field_type field_type;
+ typedef typename VectorType::field_type field_type;
- enum {blocksize = DiscFuncType::block_type::dimension};
+ enum {blocksize = VectorType::block_type::dimension};
public:
@@ -19,7 +19,7 @@ public:
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);
};
--
GitLab