From 2181a585958ebc6b776cd2ec68766831e0423785 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Thu, 28 May 2020 21:22:38 +0000
Subject: [PATCH] Merge branch 'fix/add-default-fluxcache-properties' into
'master'
Implement defaults for FluxVariablesCache(Filler) properties for mpfa/tpfa
Closes #867
See merge request dumux-repositories/dumux!2153
(cherry picked from commit d6bb65539e6d5d5d20a794550c5966dfb06794d1)
88016531 [properties][fluxvariables] add defaults for FluxVariablesCache(Filler)
---
dumux/discretization/ccmpfa.hh | 10 ++++++++++
dumux/discretization/cctpfa.hh | 10 ++++++++++
2 files changed, 20 insertions(+)
diff --git a/dumux/discretization/ccmpfa.hh b/dumux/discretization/ccmpfa.hh
index 686dd176dd..bac664a2e4 100644
--- a/dumux/discretization/ccmpfa.hh
+++ b/dumux/discretization/ccmpfa.hh
@@ -33,6 +33,8 @@
#include <dumux/assembly/cclocalresidual.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
+
#include <dumux/discretization/fvproperties.hh>
#include <dumux/discretization/cellcentered/elementsolution.hh>
@@ -162,6 +164,14 @@ struct ElementBoundaryTypes<TypeTag, TTag::CCMpfaModel> { using type = CCElement
//! Set the BaseLocalResidual to CCLocalResidual
template<class TypeTag>
struct BaseLocalResidual<TypeTag, TTag::CCMpfaModel> { using type = CCLocalResidual<TypeTag>; };
+
+//! Set the default for the FluxVariablesCache
+template<class TypeTag>
+struct FluxVariablesCache<TypeTag, TTag::CCMpfaModel> { using type = FluxVariablesCaching::EmptyCache<GetPropType<TypeTag, Properties::Scalar>>; };
+
+//! Set the default for the FluxVariablesCacheFiller
+template<class TypeTag>
+struct FluxVariablesCacheFiller<TypeTag, TTag::CCMpfaModel> { using type = FluxVariablesCaching::EmptyCacheFiller; };
} // namespace Properties
} // namespace Dumux
diff --git a/dumux/discretization/cctpfa.hh b/dumux/discretization/cctpfa.hh
index 825d560b77..37709c03ed 100644
--- a/dumux/discretization/cctpfa.hh
+++ b/dumux/discretization/cctpfa.hh
@@ -33,6 +33,8 @@
#include <dumux/assembly/cclocalresidual.hh>
+#include <dumux/flux/fluxvariablescaching.hh>
+
#include <dumux/discretization/method.hh>
#include <dumux/discretization/fvproperties.hh>
@@ -97,6 +99,14 @@ struct ElementBoundaryTypes<TypeTag, TTag::CCTpfaModel> { using type = CCElement
//! Set the BaseLocalResidual to CCLocalResidual
template<class TypeTag>
struct BaseLocalResidual<TypeTag, TTag::CCTpfaModel> { using type = CCLocalResidual<TypeTag>; };
+
+//! Set the default for the FluxVariablesCache
+template<class TypeTag>
+struct FluxVariablesCache<TypeTag, TTag::CCTpfaModel> { using type = FluxVariablesCaching::EmptyCache<GetPropType<TypeTag, Properties::Scalar>>; };
+
+//! Set the default for the FluxVariablesCacheFiller
+template<class TypeTag>
+struct FluxVariablesCacheFiller<TypeTag, TTag::CCTpfaModel> { using type = FluxVariablesCaching::EmptyCacheFiller; };
} // namespace Properties
} // namespace Dumux
--
GitLab