Merge branch 'fix/add-default-fluxcache-properties' into 'master'

Implement defaults for FluxVariablesCache(Filler) properties for mpfa/tpfa

Closes #867

See merge request !2153

dumux/discretization/ccmpfa.hh

@@ -32,6 +32,8 @@
 
 #include <dumux/assembly/cclocalresidual.hh>
 
+#include <dumux/flux/fluxvariablescaching.hh>
+
 #include <dumux/discretization/fvproperties.hh>
 
 #include <dumux/discretization/cellcentered/elementsolution.hh>
@@ -157,6 +159,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
 

dumux/discretization/cctpfa.hh

@@ -31,6 +31,8 @@
 
 #include <dumux/assembly/cclocalresidual.hh>
 
+#include <dumux/flux/fluxvariablescaching.hh>
+
 #include <dumux/discretization/method.hh>
 #include <dumux/discretization/fvproperties.hh>
 
@@ -93,6 +95,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