From 533c054d1be4fd1a477f7e0f20b9f280162b7447 Mon Sep 17 00:00:00 2001
From: Simon Scholz <simon.scholz@iws.uni-stuttgart.de>
Date: Wed, 28 Aug 2019 16:48:57 +0200
Subject: [PATCH] deprecate FVGridGeometry property and use GridGeometry
---
dumux/assembly/fvassembler.hh | 2 +-
dumux/common/properties.hh | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dumux/assembly/fvassembler.hh b/dumux/assembly/fvassembler.hh
index 10765e8b96..09f77129a3 100644
--- a/dumux/assembly/fvassembler.hh
+++ b/dumux/assembly/fvassembler.hh
@@ -96,7 +96,7 @@ public:
*/
[[deprecated("Please use constructor taking the previous solution instead. Will be removed after release 3.2!")]]
FVAssembler(std::shared_ptr<const Problem> problem,
- std::shared_ptr<const FVGridGeometry> fvGridGeometry,
+ std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<GridVariables> gridVariables,
std::shared_ptr<const TimeLoop> timeLoop)
: problem_(problem)
diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh
index a61b16a2c0..db26f13e76 100644
--- a/dumux/common/properties.hh
+++ b/dumux/common/properties.hh
@@ -127,6 +127,9 @@ template<class TypeTag, class MyTypeTag>
struct GridGeometry { using type = GetPropType<TypeTag, Properties::FVGridGeometry>; }; //!< The type of the global finite volume geometry
#pragma GCC diagnostic pop
+template<class TypeTag, class MyTypeTag>
+struct GridGeometry { using type = GetPropType<TypeTag, Properties::FVGridGeometry>; }; //!< The type of the global finite volume geometry
+
template<class TypeTag, class MyTypeTag>
struct EnableFVGridGeometryCache { using type = UndefinedProperty; }; //!< specifies if geometric data is saved (faster, but more memory consuming)
--
GitLab