From c18317784888b3fb535faae43e6e432b74fa0037 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Wed, 29 Nov 2017 14:17:38 +0100
Subject: [PATCH] [box][scv,scvf] Make backwards compatible with dune 2.5
---
dumux/discretization/box/subcontrolvolume.hh | 4 ++++
dumux/discretization/box/subcontrolvolumeface.hh | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/dumux/discretization/box/subcontrolvolume.hh b/dumux/discretization/box/subcontrolvolume.hh
index b29f786ed3..238ec13cb5 100644
--- a/dumux/discretization/box/subcontrolvolume.hh
+++ b/dumux/discretization/box/subcontrolvolume.hh
@@ -83,7 +83,11 @@ public:
// e.g. for integration
Geometry geometry() const
{
+#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
return Geometry(Dune::GeometryTypes::cube(dim), corners_);
+#else
+ return Geometry(Dune::GeometryType(Dune::GeometryType::cube, dim), corners_);
+#endif
}
//! The global index of this scv
diff --git a/dumux/discretization/box/subcontrolvolumeface.hh b/dumux/discretization/box/subcontrolvolumeface.hh
index 77af3b7ec4..fe6066dc60 100644
--- a/dumux/discretization/box/subcontrolvolumeface.hh
+++ b/dumux/discretization/box/subcontrolvolumeface.hh
@@ -154,7 +154,11 @@ public:
//! The geometry of the sub control volume face
Geometry geometry() const
{
+#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
return Geometry(Dune::GeometryTypes::cube(Geometry::mydimension), corners_);
+#else
+ return Geometry(Dune::GeometryType(Dune::GeometryType::cube, Geometry::mydimension), corners_);
+#endif
}
private:
--
GitLab