Revert "Merge branch 'cherry-pick-d6bb6553' into 'releases/3.2'"

This reverts merge request !2157

dumux/discretization/ccmpfa.hh

@@ -33,8 +33,6 @@
 
 #include <dumux/assembly/cclocalresidual.hh>
 
-#include <dumux/flux/fluxvariablescaching.hh>
-
 #include <dumux/discretization/fvproperties.hh>
 
 #include <dumux/discretization/cellcentered/elementsolution.hh>
@@ -164,14 +162,6 @@ 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

@@ -33,8 +33,6 @@
 
 #include <dumux/assembly/cclocalresidual.hh>
 
-#include <dumux/flux/fluxvariablescaching.hh>
-
 #include <dumux/discretization/method.hh>
 #include <dumux/discretization/fvproperties.hh>
 
@@ -99,14 +97,6 @@ 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