Skip to content
Snippets Groups Projects
Commit 1bfbe216 authored by Timo Koch's avatar Timo Koch Committed by Kilian Weishaupt
Browse files

[disc] Get flux cache filler from property (set in model)

parent c9a98df5
No related branches found
No related tags found
1 merge request!1555Improve flux variables cache filler handling
Hide whitespace changes
Inline Side-by-side
dumux/discretization/ccmpfa.hh
+ 1
− 2
View file @ 1bfbe216
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include <dumux/discretization/cellcentered/mpfa/gridvolumevariables.hh> #include <dumux/discretization/cellcentered/mpfa/gridvolumevariables.hh>
#include <dumux/discretization/cellcentered/mpfa/gridfluxvariablescache.hh> #include <dumux/discretization/cellcentered/mpfa/gridfluxvariablescache.hh>
#include <dumux/discretization/cellcentered/mpfa/interactionvolumedatahandle.hh> #include <dumux/discretization/cellcentered/mpfa/interactionvolumedatahandle.hh>
#include <dumux/discretization/cellcentered/mpfa/fluxvariablescachefiller.hh>
#include <dumux/discretization/cellcentered/mpfa/dualgridindexset.hh> #include <dumux/discretization/cellcentered/mpfa/dualgridindexset.hh>
#include <dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh> #include <dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh>
...@@ -131,7 +130,7 @@ private: ...@@ -131,7 +130,7 @@ private:
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridFluxVariablesCache>(); static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridFluxVariablesCache>();
using Problem = GetPropType<TypeTag, Properties::Problem>; using Problem = GetPropType<TypeTag, Properties::Problem>;
using FluxVariablesCache = GetPropType<TypeTag, Properties::FluxVariablesCache>; using FluxVariablesCache = GetPropType<TypeTag, Properties::FluxVariablesCache>;
using FluxVariablesCacheFiller = CCMpfaFluxVariablesCacheFiller<TypeTag>; using FluxVariablesCacheFiller = GetPropType<TypeTag, Properties::FluxVariablesCacheFiller>;
using PrimaryInteractionVolume = GetPropType<TypeTag, Properties::PrimaryInteractionVolume>; using PrimaryInteractionVolume = GetPropType<TypeTag, Properties::PrimaryInteractionVolume>;
using SecondaryInteractionVolume = GetPropType<TypeTag, Properties::SecondaryInteractionVolume>; using SecondaryInteractionVolume = GetPropType<TypeTag, Properties::SecondaryInteractionVolume>;
......
dumux/discretization/cctpfa.hh
+ 1
− 2
View file @ 1bfbe216
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include <dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh> #include <dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh>
#include <dumux/discretization/cellcentered/tpfa/gridvolumevariables.hh> #include <dumux/discretization/cellcentered/tpfa/gridvolumevariables.hh>
#include <dumux/discretization/cellcentered/tpfa/gridfluxvariablescache.hh> #include <dumux/discretization/cellcentered/tpfa/gridfluxvariablescache.hh>
#include <dumux/discretization/cellcentered/tpfa/fluxvariablescachefiller.hh>
#include <dumux/discretization/cellcentered/tpfa/subcontrolvolumeface.hh> #include <dumux/discretization/cellcentered/tpfa/subcontrolvolumeface.hh>
namespace Dumux { namespace Dumux {
...@@ -82,7 +81,7 @@ private: ...@@ -82,7 +81,7 @@ private:
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridFluxVariablesCache>(); static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridFluxVariablesCache>();
using Problem = GetPropType<TypeTag, Properties::Problem>; using Problem = GetPropType<TypeTag, Properties::Problem>;
using FluxVariablesCache = GetPropType<TypeTag, Properties::FluxVariablesCache>; using FluxVariablesCache = GetPropType<TypeTag, Properties::FluxVariablesCache>;
using FluxVariablesCacheFiller = CCTpfaFluxVariablesCacheFiller<TypeTag>; using FluxVariablesCacheFiller = GetPropType<TypeTag, Properties::FluxVariablesCacheFiller>;
public: public:
using type = CCTpfaGridFluxVariablesCache<Problem, FluxVariablesCache, FluxVariablesCacheFiller, enableCache>; using type = CCTpfaGridFluxVariablesCache<Problem, FluxVariablesCache, FluxVariablesCacheFiller, enableCache>;
}; };
......
dumux/discretization/staggered.hh
+ 1
− 1
View file @ 1bfbe216
...@@ -83,7 +83,7 @@ struct GridFluxVariablesCache<TypeTag, TTag::StaggeredModel> ...@@ -83,7 +83,7 @@ struct GridFluxVariablesCache<TypeTag, TTag::StaggeredModel>
private: private:
using Problem = GetPropType<TypeTag, Properties::Problem>; using Problem = GetPropType<TypeTag, Properties::Problem>;
using FluxVariablesCache = GetPropType<TypeTag, Properties::FluxVariablesCache>; using FluxVariablesCache = GetPropType<TypeTag, Properties::FluxVariablesCache>;
using FluxVariablesCacheFiller = FluxVariablesCaching::EmptyCacheFiller; using FluxVariablesCacheFiller = GetPropType<TypeTag, Properties::FluxVariablesCacheFiller>;
static constexpr auto enableCache = getPropValue<TypeTag, Properties::EnableGridFluxVariablesCache>(); static constexpr auto enableCache = getPropValue<TypeTag, Properties::EnableGridFluxVariablesCache>();
static constexpr auto upwindSchemeOrder = getPropValue<TypeTag, Properties::UpwindSchemeOrder>(); static constexpr auto upwindSchemeOrder = getPropValue<TypeTag, Properties::UpwindSchemeOrder>();
public: public:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment