diff --git a/dumux/assembly/cclocalassembler.hh b/dumux/assembly/cclocalassembler.hh
index dcbce5fcea9bbc376ab70ea1892261aaeacd2290..697c1a2d97f0d83d0bbd6c2edd7f77dbecce4999 100644
--- a/dumux/assembly/cclocalassembler.hh
+++ b/dumux/assembly/cclocalassembler.hh
@@ -62,7 +62,7 @@ class CCLocalAssembler<TypeTag,
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
- static constexpr bool enableGlobalFluxVarsCache = GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache);
+ static constexpr bool enableGridFluxVarsCache = GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache);
public:
@@ -334,7 +334,7 @@ private:
// update the volume variables and the flux var cache
curVolVars.update(elemSol, problem, element, scv);
- if (enableGlobalFluxVarsCache)
+ if (enableGridFluxVarsCache)
gridVariables.gridFluxVarsCache().updateElement(element, fvGeometry, curElemVolVars);
else
elemFluxVarsCache.update(element, fvGeometry, curElemVolVars);
@@ -396,7 +396,7 @@ private:
// update the volume variables and the flux var cache
curVolVars.update(elemSol, problem, element, scv);
- if (enableGlobalFluxVarsCache)
+ if (enableGridFluxVarsCache)
gridVariables.gridFluxVarsCache().updateElement(element, fvGeometry, curElemVolVars);
else
elemFluxVarsCache.update(element, fvGeometry, curElemVolVars);
diff --git a/dumux/assembly/staggeredlocalassembler.hh b/dumux/assembly/staggeredlocalassembler.hh
index b4b6f037a6ca292783d616a29a8dada4bd602451..98278964dd3f2e52e9d5109905fc01a53e13bd66 100644
--- a/dumux/assembly/staggeredlocalassembler.hh
+++ b/dumux/assembly/staggeredlocalassembler.hh
@@ -83,7 +83,7 @@ class StaggeredLocalAssembler<TypeTag,
using ElementFaceVariables = typename GET_PROP_TYPE(TypeTag, ElementFaceVariables);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- static constexpr bool enableGlobalFluxVarsCache = GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache);
+ static constexpr bool enableGridFluxVarsCache = GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache);
static constexpr auto faceOffset = GET_PROP_VALUE(TypeTag, NumEqCellCenter);
public:
diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh
index 057f8149303523e43f8f6adaf0426986bc72bafd..c2d7c37f552479f8bd97964afdb52b397360e6d0 100644
--- a/dumux/common/properties.hh
+++ b/dumux/common/properties.hh
@@ -96,8 +96,8 @@ NEW_PROP_TAG(EnableGridVolumeVariablesCache); //! If disabled, the volume v
NEW_PROP_TAG(FluxVariables); //! Container storing the different types of flux variables
NEW_PROP_TAG(FluxVariablesCache); //! Stores data associated with flux vars
NEW_PROP_TAG(ElementFluxVariablesCache); //! A local vector of flux variable caches per element
-NEW_PROP_TAG(GlobalFluxVariablesCache); //! The global vector of flux variable containers
-NEW_PROP_TAG(EnableGlobalFluxVariablesCache); //! specifies if data on flux vars should be saved (faster, but more memory consuming)
+NEW_PROP_TAG(GridFluxVariablesCache); //! The global vector of flux variable containers
+NEW_PROP_TAG(EnableGridFluxVariablesCache); //! specifies if data on flux vars should be saved (faster, but more memory consuming)
NEW_PROP_TAG(GridVariables); //! The grid variables object managing variable data on the grid (volvars/fluxvars cache)
/////////////////////////////////////////////////////////////////
diff --git a/dumux/discretization/box/elementfluxvariablescache.hh b/dumux/discretization/box/elementfluxvariablescache.hh
index 9ad1c8f7ec3bb5f74a01c1f29e84a03d5a12534a..7b4c0d11bb51180166d738df20db0e558132cf68 100644
--- a/dumux/discretization/box/elementfluxvariablescache.hh
+++ b/dumux/discretization/box/elementfluxvariablescache.hh
@@ -32,7 +32,7 @@ namespace Dumux
* \ingroup ImplicitModel
* \brief Base class for the flux variables cache vector, we store one cache per face
*/
-template<class TypeTag, bool EnableGlobalFluxVariablesCache>
+template<class TypeTag, bool EnableGridFluxVariablesCache>
class BoxElementFluxVariablesCache
{};
@@ -50,12 +50,12 @@ class BoxElementFluxVariablesCache<TypeTag, true>
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using GlobalFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GlobalFluxVariablesCache);
+ using GridFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GridFluxVariablesCache);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
public:
- BoxElementFluxVariablesCache(const GlobalFluxVariablesCache& global)
- : globalFluxVarsCachePtr_(&global) {}
+ BoxElementFluxVariablesCache(const GridFluxVariablesCache& global)
+ : gridFluxVarsCachePtr_(&global) {}
// Function is called by the BoxLocalJacobian prior to flux calculations on the element.
// We assume the FVGeometries to be bound at this point
@@ -83,14 +83,14 @@ public:
// access operator
const FluxVariablesCache& operator [](const SubControlVolumeFace& scvf) const
- { return globalFluxVarsCache().cache(eIdx_, scvf.index()); }
+ { return gridFluxVarsCache().cache(eIdx_, scvf.index()); }
//! The global object we are a restriction of
- const GlobalFluxVariablesCache& globalFluxVarsCache() const
- { return *globalFluxVarsCachePtr_; }
+ const GridFluxVariablesCache& gridFluxVarsCache() const
+ { return *gridFluxVarsCachePtr_; }
private:
- const GlobalFluxVariablesCache* globalFluxVarsCachePtr_;
+ const GridFluxVariablesCache* gridFluxVarsCachePtr_;
// currently bound element
IndexType eIdx_;
};
@@ -110,11 +110,11 @@ class BoxElementFluxVariablesCache<TypeTag, false>
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using GlobalFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GlobalFluxVariablesCache);
+ using GridFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GridFluxVariablesCache);
public:
- BoxElementFluxVariablesCache(const GlobalFluxVariablesCache& global)
- : globalFluxVarsCachePtr_(&global) {}
+ BoxElementFluxVariablesCache(const GridFluxVariablesCache& global)
+ : gridFluxVarsCachePtr_(&global) {}
// Function is called by the BoxLocalJacobian prior to flux calculations on the element.
// We assume the FVGeometries to be bound at this point
@@ -132,7 +132,7 @@ public:
// temporary resizing of the cache
fluxVarsCache_.resize(fvGeometry.numScvf());
for (auto&& scvf : scvfs(fvGeometry))
- (*this)[scvf].update(globalFluxVarsCache().problem(), element, fvGeometry, elemVolVars, scvf);
+ (*this)[scvf].update(gridFluxVarsCache().problem(), element, fvGeometry, elemVolVars, scvf);
}
void bindScvf(const Element& element,
@@ -141,7 +141,7 @@ public:
const SubControlVolumeFace& scvf)
{
fluxVarsCache_.resize(fvGeometry.numScvf());
- (*this)[scvf].update(globalFluxVarsCache().problem(), element, fvGeometry, elemVolVars, scvf);
+ (*this)[scvf].update(gridFluxVarsCache().problem(), element, fvGeometry, elemVolVars, scvf);
}
// access operator
@@ -153,11 +153,11 @@ public:
{ return fluxVarsCache_[scvf.index()]; }
//! The global object we are a restriction of
- const GlobalFluxVariablesCache& globalFluxVarsCache() const
- { return *globalFluxVarsCachePtr_; }
+ const GridFluxVariablesCache& gridFluxVarsCache() const
+ { return *gridFluxVarsCachePtr_; }
private:
- const GlobalFluxVariablesCache* globalFluxVarsCachePtr_;
+ const GridFluxVariablesCache* gridFluxVarsCachePtr_;
std::vector<FluxVariablesCache> fluxVarsCache_;
};
diff --git a/dumux/discretization/box/globalfluxvariablescache.hh b/dumux/discretization/box/globalfluxvariablescache.hh
index 4961c8dcd632f31077444421f4eca4f1848615e4..63789c84f0a5953e9ddb1ea341c687ecfc19be76 100644
--- a/dumux/discretization/box/globalfluxvariablescache.hh
+++ b/dumux/discretization/box/globalfluxvariablescache.hh
@@ -33,7 +33,7 @@ namespace Dumux
* \brief Base class for the flux variables cache vector, we store one cache per face
*/
template<class TypeTag, bool EnableGridFluxVariablesCache>
-class BoxGlobalFluxVariablesCache
+class BoxGridFluxVariablesCache
{};
/*!
@@ -41,7 +41,7 @@ class BoxGlobalFluxVariablesCache
* \brief Base class for the flux variables cache vector, we store one cache per face
*/
template<class TypeTag>
-class BoxGlobalFluxVariablesCache<TypeTag, true>
+class BoxGridFluxVariablesCache<TypeTag, true>
{
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
@@ -57,7 +57,7 @@ class BoxGlobalFluxVariablesCache<TypeTag, true>
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
public:
- BoxGlobalFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
+ BoxGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
void update(const FVGridGeometry& fvGridGeometry,
const GridVolumeVariables& gridVolVars,
@@ -90,7 +90,7 @@ public:
* The local object is only functional after calling its bind/bindElement method
* This is a free function that will be found by means of ADL
*/
- friend inline ElementFluxVariablesCache localView(const BoxGlobalFluxVariablesCache& global)
+ friend inline ElementFluxVariablesCache localView(const BoxGridFluxVariablesCache& global)
{ return ElementFluxVariablesCache(global); }
const Problem& problem() const
@@ -115,7 +115,7 @@ private:
* \brief Base class for the flux variables cache vector, we store one cache per face
*/
template<class TypeTag>
-class BoxGlobalFluxVariablesCache<TypeTag, false>
+class BoxGridFluxVariablesCache<TypeTag, false>
{
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
@@ -131,7 +131,7 @@ class BoxGlobalFluxVariablesCache<TypeTag, false>
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
public:
- BoxGlobalFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
+ BoxGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
void update(const FVGridGeometry& fvGridGeometry,
const GridVolumeVariables& gridVolVars,
@@ -143,7 +143,7 @@ public:
* The local object is only functional after calling its bind/bindElement method
* This is a free function that will be found by means of ADL
*/
- friend inline ElementFluxVariablesCache localView(const BoxGlobalFluxVariablesCache& global)
+ friend inline ElementFluxVariablesCache localView(const BoxGridFluxVariablesCache& global)
{ return ElementFluxVariablesCache(global); }
const Problem& problem() const
diff --git a/dumux/discretization/box/properties.hh b/dumux/discretization/box/properties.hh
index 3f0e3ad107431290005c7ef6b25f9b77987fcb68..b55a1e2c1fd5c53f21d8a959f92f6291f7d8caa9 100644
--- a/dumux/discretization/box/properties.hh
+++ b/dumux/discretization/box/properties.hh
@@ -168,12 +168,12 @@ SET_TYPE_PROP(BoxModel, ElementVolumeVariables, BoxElementVolumeVariables<TypeTa
GET_PROP_VALUE(TypeTag, EnableGridVolumeVariablesCache)>);
//! The global flux variables cache vector class
-SET_TYPE_PROP(BoxModel, GlobalFluxVariablesCache, BoxGlobalFluxVariablesCache<TypeTag,
- GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
+SET_TYPE_PROP(BoxModel, GridFluxVariablesCache, BoxGridFluxVariablesCache<TypeTag,
+ GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache)>);
//! The local flux variables cache vector class
SET_TYPE_PROP(BoxModel, ElementFluxVariablesCache, BoxElementFluxVariablesCache<TypeTag,
- GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
+ GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache)>);
//! Set the BaseLocalResidual to BoxLocalResidual
SET_TYPE_PROP(BoxModel, BaseLocalResidual, BoxLocalResidual<TypeTag>);
diff --git a/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh b/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh
index 5aadd98bb9744109771f9ee32fae699bcbe9112d..73c3a3e4cfb5ced0437becaf9843e93d3c9ae84d 100644
--- a/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh
@@ -36,7 +36,7 @@ namespace Dumux
* \brief Base class for the local flux variables cache.
* Prepares the cache on all the faces in the stencil.
*/
-template<class TypeTag, bool EnableGlobalFluxVariablesCache>
+template<class TypeTag, bool EnableGridFluxVariablesCache>
class CCMpfaElementFluxVariablesCache;
/*!
@@ -53,12 +53,12 @@ class CCMpfaElementFluxVariablesCache<TypeTag, true>
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
- using GlobalFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GlobalFluxVariablesCache);
+ using GridFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GridFluxVariablesCache);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
public:
- CCMpfaElementFluxVariablesCache(const GlobalFluxVariablesCache& global)
- : globalFluxVarsCachePtr_(&global) {}
+ CCMpfaElementFluxVariablesCache(const GridFluxVariablesCache& global)
+ : gridFluxVarsCachePtr_(&global) {}
// Specialization for the global caching being enabled - do nothing here
void bindElement(const Element& element,
@@ -83,14 +83,14 @@ public:
// access operators in the case of caching
const FluxVariablesCache& operator [](const SubControlVolumeFace& scvf) const
- { return (*globalFluxVarsCachePtr_)[scvf]; }
+ { return (*gridFluxVarsCachePtr_)[scvf]; }
//! The global object we are a restriction of
- const GlobalFluxVariablesCache& globalFluxVarsCache() const
- { return *globalFluxVarsCachePtr_; }
+ const GridFluxVariablesCache& gridFluxVarsCache() const
+ { return *gridFluxVarsCachePtr_; }
private:
- const GlobalFluxVariablesCache* globalFluxVarsCachePtr_;
+ const GridFluxVariablesCache* gridFluxVarsCachePtr_;
};
/*!
@@ -111,7 +111,7 @@ class CCMpfaElementFluxVariablesCache<TypeTag, false>
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
- using GlobalFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GlobalFluxVariablesCache);
+ using GridFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GridFluxVariablesCache);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FluxVariablesCacheFiller = CCMpfaFluxVariablesCacheFiller<TypeTag>;
using MpfaHelper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
@@ -122,8 +122,8 @@ class CCMpfaElementFluxVariablesCache<TypeTag, false>
static constexpr int dim = GridView::dimension;
public:
- CCMpfaElementFluxVariablesCache(const GlobalFluxVariablesCache& global)
- : globalFluxVarsCachePtr_(&global) {}
+ CCMpfaElementFluxVariablesCache(const GridFluxVariablesCache& global)
+ : gridFluxVarsCachePtr_(&global) {}
// This function has to be called prior to flux calculations on the element.
// Prepares the transmissibilities of the scv faces in an element. The FvGeometry is assumed to be bound.
@@ -145,7 +145,7 @@ public:
clear_();
// some references for convenience
- const auto& problem = globalFluxVarsCache().problem();
+ const auto& problem = gridFluxVarsCache().problem();
const auto& fvGridGeometry = fvGeometry.fvGridGeometry();
// the assembly map of the given element
@@ -219,7 +219,7 @@ public:
// update only if transmissibilities are solution-dependent
if (FluxVariablesCacheFiller::isSolDependent)
{
- const auto& problem = globalFluxVarsCache().problem();
+ const auto& problem = gridFluxVarsCache().problem();
const auto& fvGridGeometry = fvGeometry.fvGridGeometry();
const auto& assemblyMapI = fvGridGeometry.connectivityMap()[fvGridGeometry.elementMapper().index(element)];
@@ -266,11 +266,11 @@ public:
{ return fluxVarsCache_[getLocalScvfIdx_(scvfIdx)]; }
//! The global object we are a restriction of
- const GlobalFluxVariablesCache& globalFluxVarsCache() const
- { return *globalFluxVarsCachePtr_; }
+ const GridFluxVariablesCache& gridFluxVarsCache() const
+ { return *gridFluxVarsCachePtr_; }
private:
- const GlobalFluxVariablesCache* globalFluxVarsCachePtr_;
+ const GridFluxVariablesCache* gridFluxVarsCachePtr_;
void clear_()
{
diff --git a/dumux/discretization/cellcentered/mpfa/globalfluxvariablescache.hh b/dumux/discretization/cellcentered/mpfa/globalfluxvariablescache.hh
index e930a936e3043f31e7a229da9da4e4561e5a0ee8..14ea7f6fac1735715cbee78eca4daa283ed56a78 100644
--- a/dumux/discretization/cellcentered/mpfa/globalfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/mpfa/globalfluxvariablescache.hh
@@ -32,8 +32,8 @@ namespace Dumux
* \ingroup ImplicitModel
* \brief Base class for the flux variables cache vector, we store one cache per face
*/
-template<class TypeTag, bool EnableGlobalFluxVariablesCache>
-class CCMpfaGlobalFluxVariablesCache;
+template<class TypeTag, bool EnableGridFluxVariablesCache>
+class CCMpfaGridFluxVariablesCache;
/*!
@@ -41,7 +41,7 @@ class CCMpfaGlobalFluxVariablesCache;
* \brief Spezialization when caching globally
*/
template<class TypeTag>
-class CCMpfaGlobalFluxVariablesCache<TypeTag, true>
+class CCMpfaGridFluxVariablesCache<TypeTag, true>
{
// the flux variables cache filler needs to be friend to fill
// the interaction volumes and data handles
@@ -65,7 +65,7 @@ class CCMpfaGlobalFluxVariablesCache<TypeTag, true>
using FluxVariablesCacheFiller = CCMpfaFluxVariablesCacheFiller<TypeTag>;
public:
- CCMpfaGlobalFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
+ CCMpfaGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
// When global caching is enabled, precompute transmissibilities for all scv faces
void update(const FVGridGeometry& fvGridGeometry,
@@ -163,7 +163,7 @@ public:
* The local object is only functional after calling its bind/bindElement method
* This is a free function that will be found by means of ADL
*/
- friend inline ElementFluxVariablesCache localView(const CCMpfaGlobalFluxVariablesCache& global)
+ friend inline ElementFluxVariablesCache localView(const CCMpfaGridFluxVariablesCache& global)
{ return ElementFluxVariablesCache(global); }
// access operators in the case of caching
@@ -202,7 +202,7 @@ private:
* \brief Spezialization when not using global caching
*/
template<class TypeTag>
-class CCMpfaGlobalFluxVariablesCache<TypeTag, false>
+class CCMpfaGridFluxVariablesCache<TypeTag, false>
{
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
@@ -215,7 +215,7 @@ class CCMpfaGlobalFluxVariablesCache<TypeTag, false>
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
public:
- CCMpfaGlobalFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
+ CCMpfaGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
// When global flux variables caching is disabled, we don't need to update the cache
void update(const FVGridGeometry& fvGridGeometry,
@@ -232,7 +232,7 @@ public:
* The local object is only functional after calling its bind/bindElement method
* This is a free function that will be found by means of ADL
*/
- friend inline ElementFluxVariablesCache localView(const CCMpfaGlobalFluxVariablesCache& global)
+ friend inline ElementFluxVariablesCache localView(const CCMpfaGridFluxVariablesCache& global)
{ return ElementFluxVariablesCache(global); }
const Problem& problem() const
diff --git a/dumux/discretization/cellcentered/mpfa/properties.hh b/dumux/discretization/cellcentered/mpfa/properties.hh
index 322e20caacca93e750f166affa47c559ba5e0c7e..31ab8f8c5c166da535e5957851892ed6cba38196 100644
--- a/dumux/discretization/cellcentered/mpfa/properties.hh
+++ b/dumux/discretization/cellcentered/mpfa/properties.hh
@@ -95,13 +95,13 @@ SET_TYPE_PROP(CCMpfaModel,
//! The global flux variables cache vector class
SET_TYPE_PROP(CCMpfaModel,
- GlobalFluxVariablesCache,
- CCMpfaGlobalFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
+ GridFluxVariablesCache,
+ CCMpfaGridFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache)>);
//! The local flux variables cache vector class
SET_TYPE_PROP(CCMpfaModel,
ElementFluxVariablesCache,
- CCMpfaElementFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
+ CCMpfaElementFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache)>);
//! The global previous volume variables vector class
diff --git a/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh b/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh
index c918d40d2c816dae787f73a1cccef8eca5d787eb..0ab9da19087b930b7fd5f8caa850f52235ea0d95 100644
--- a/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh
@@ -34,7 +34,7 @@ namespace Dumux
* \ingroup ImplicitModel
* \brief Base class for the stencil local flux variables cache
*/
-template<class TypeTag, bool EnableGlobalFluxVariablesCache>
+template<class TypeTag, bool EnableGridFluxVariablesCache>
class CCTpfaElementFluxVariablesCache;
/*!
@@ -51,12 +51,12 @@ class CCTpfaElementFluxVariablesCache<TypeTag, true>
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
- using GlobalFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GlobalFluxVariablesCache);
+ using GridFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GridFluxVariablesCache);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
public:
- CCTpfaElementFluxVariablesCache(const GlobalFluxVariablesCache& global)
- : globalFluxVarsCachePtr_(&global) {}
+ CCTpfaElementFluxVariablesCache(const GridFluxVariablesCache& global)
+ : gridFluxVarsCachePtr_(&global) {}
// Specialization for the global caching being enabled - do nothing here
void bindElement(const Element& element,
@@ -84,14 +84,14 @@ public:
// access operators in the case of caching
const FluxVariablesCache& operator [](const SubControlVolumeFace& scvf) const
- { return globalFluxVarsCache()[scvf]; }
+ { return gridFluxVarsCache()[scvf]; }
//! The global object we are a restriction of
- const GlobalFluxVariablesCache& globalFluxVarsCache() const
- { return *globalFluxVarsCachePtr_; }
+ const GridFluxVariablesCache& gridFluxVarsCache() const
+ { return *gridFluxVarsCachePtr_; }
private:
- const GlobalFluxVariablesCache* globalFluxVarsCachePtr_;
+ const GridFluxVariablesCache* gridFluxVarsCachePtr_;
};
/*!
@@ -108,13 +108,13 @@ class CCTpfaElementFluxVariablesCache<TypeTag, false>
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
- using GlobalFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GlobalFluxVariablesCache);
+ using GridFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GridFluxVariablesCache);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FluxVariablesCacheFiller = CCTpfaFluxVariablesCacheFiller<TypeTag>;
public:
- CCTpfaElementFluxVariablesCache(const GlobalFluxVariablesCache& global)
- : globalFluxVarsCachePtr_(&global) {}
+ CCTpfaElementFluxVariablesCache(const GridFluxVariablesCache& global)
+ : gridFluxVarsCachePtr_(&global) {}
// This function has to be called prior to flux calculations on the element.
// Prepares the transmissibilities of the scv faces in an element. The FvGeometry is assumed to be bound.
@@ -128,7 +128,7 @@ public:
globalScvfIndices_.resize(numScvf);
// instantiate helper class to fill the caches
- FluxVariablesCacheFiller filler(globalFluxVarsCache().problem());
+ FluxVariablesCacheFiller filler(gridFluxVarsCache().problem());
IndexType localScvfIdx = 0;
// fill the containers
@@ -146,7 +146,7 @@ public:
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars)
{
- const auto& problem = globalFluxVarsCache().problem();
+ const auto& problem = gridFluxVarsCache().problem();
const auto& fvGridGeometry = fvGeometry.fvGridGeometry();
const auto globalI = fvGridGeometry.elementMapper().index(element);
const auto& connectivityMapI = fvGridGeometry.connectivityMap()[globalI];
@@ -194,7 +194,7 @@ public:
globalScvfIndices_.resize(1);
// instantiate helper class to fill the caches
- FluxVariablesCacheFiller filler(globalFluxVarsCache().problem());
+ FluxVariablesCacheFiller filler(gridFluxVarsCache().problem());
filler.fill(*this, fluxVarsCache_[0], element, fvGeometry, elemVolVars, scvf, true);
globalScvfIndices_[0] = scvf.index();
@@ -208,7 +208,7 @@ public:
{
if (FluxVariablesCacheFiller::isSolDependent)
{
- const auto& problem = globalFluxVarsCache().problem();
+ const auto& problem = gridFluxVarsCache().problem();
const auto globalI = fvGeometry.fvGridGeometry().elementMapper().index(element);
// instantiate filler class
@@ -237,11 +237,11 @@ public:
{ return fluxVarsCache_[getLocalScvfIdx_(scvf.index())]; }
//! The global object we are a restriction of
- const GlobalFluxVariablesCache& globalFluxVarsCache() const
- { return *globalFluxVarsCachePtr_; }
+ const GridFluxVariablesCache& gridFluxVarsCache() const
+ { return *gridFluxVarsCachePtr_; }
private:
- const GlobalFluxVariablesCache* globalFluxVarsCachePtr_;
+ const GridFluxVariablesCache* gridFluxVarsCachePtr_;
// get index of scvf in the local container
int getLocalScvfIdx_(const int scvfIdx) const
diff --git a/dumux/discretization/cellcentered/tpfa/globalfluxvariablescache.hh b/dumux/discretization/cellcentered/tpfa/globalfluxvariablescache.hh
index 2bf5e2f5eeebc6c2a6e61c2fa38ab3ee35d9d4f2..a0c418b3be9f6be44a34edf675ff5c640ea69908 100644
--- a/dumux/discretization/cellcentered/tpfa/globalfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/tpfa/globalfluxvariablescache.hh
@@ -32,15 +32,15 @@ namespace Dumux
* \ingroup ImplicitModel
* \brief Base class for the flux variables cache vector, we store one cache per face
*/
-template<class TypeTag, bool EnableGlobalFluxVariablesCache>
-class CCTpfaGlobalFluxVariablesCache;
+template<class TypeTag, bool EnableGridFluxVariablesCache>
+class CCTpfaGridFluxVariablesCache;
/*!
* \ingroup ImplicitModel
* \brief Spezialization when caching globally
*/
template<class TypeTag>
-class CCTpfaGlobalFluxVariablesCache<TypeTag, true>
+class CCTpfaGridFluxVariablesCache<TypeTag, true>
{
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
@@ -58,7 +58,7 @@ class CCTpfaGlobalFluxVariablesCache<TypeTag, true>
public:
// The constructor
- CCTpfaGlobalFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
+ CCTpfaGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
// When global caching is enabled, precompute transmissibilities and stencils for all the scv faces
void update(const FVGridGeometry& fvGridGeometry,
@@ -133,7 +133,7 @@ public:
* The local object is only functional after calling its bind/bindElement method
* This is a free function that will be found by means of ADL
*/
- friend inline ElementFluxVariablesCache localView(const CCTpfaGlobalFluxVariablesCache& global)
+ friend inline ElementFluxVariablesCache localView(const CCTpfaGridFluxVariablesCache& global)
{ return ElementFluxVariablesCache(global); }
private:
@@ -148,7 +148,7 @@ private:
* \brief Spezialization when not using global caching
*/
template<class TypeTag>
-class CCTpfaGlobalFluxVariablesCache<TypeTag, false>
+class CCTpfaGridFluxVariablesCache<TypeTag, false>
{
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
@@ -162,7 +162,7 @@ class CCTpfaGlobalFluxVariablesCache<TypeTag, false>
public:
// The constructor
- CCTpfaGlobalFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
+ CCTpfaGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
// When global flux variables caching is disabled, we don't need to update the cache
void update(const FVGridGeometry& fvGridGeometry,
@@ -182,7 +182,7 @@ public:
* The local object is only functional after calling its bind/bindElement method
* This is a free function that will be found by means of ADL
*/
- friend inline ElementFluxVariablesCache localView(const CCTpfaGlobalFluxVariablesCache& global)
+ friend inline ElementFluxVariablesCache localView(const CCTpfaGridFluxVariablesCache& global)
{ return ElementFluxVariablesCache(global); }
private:
diff --git a/dumux/discretization/cellcentered/tpfa/properties.hh b/dumux/discretization/cellcentered/tpfa/properties.hh
index 588112be66ef442e657dae4b3eb4d77801eaf2a2..f49a253f414ebff07fb36a5826d7bef9a48b8d32 100644
--- a/dumux/discretization/cellcentered/tpfa/properties.hh
+++ b/dumux/discretization/cellcentered/tpfa/properties.hh
@@ -69,7 +69,7 @@ SET_PROP(CCTpfaModel, DiscretizationMethod)
SET_TYPE_PROP(CCTpfaModel, FVGridGeometry, CCTpfaFVGridGeometry<TypeTag, GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);
//! The global flux variables cache vector class
-SET_TYPE_PROP(CCTpfaModel, GlobalFluxVariablesCache, CCTpfaGlobalFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
+SET_TYPE_PROP(CCTpfaModel, GridFluxVariablesCache, CCTpfaGridFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache)>);
//! Set the default for the local finite volume geometry
SET_TYPE_PROP(CCTpfaModel, FVElementGeometry, CCTpfaFVElementGeometry<TypeTag, GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);
@@ -78,7 +78,7 @@ SET_TYPE_PROP(CCTpfaModel, FVElementGeometry, CCTpfaFVElementGeometry<TypeTag, G
SET_TYPE_PROP(CCTpfaModel, ElementVolumeVariables, CCTpfaElementVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGridVolumeVariablesCache)>);
//! The local flux variables cache vector class
-SET_TYPE_PROP(CCTpfaModel, ElementFluxVariablesCache, CCTpfaElementFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
+SET_TYPE_PROP(CCTpfaModel, ElementFluxVariablesCache, CCTpfaElementFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache)>);
//! The global current volume variables vector class
SET_TYPE_PROP(CCTpfaModel, GridVolumeVariables, CCGridVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGridVolumeVariablesCache)>);
diff --git a/dumux/discretization/fvgridvariables.hh b/dumux/discretization/fvgridvariables.hh
index 58e98b68f06932856d943f47ded9f4f21d2b7c5b..0f7d69e474d2590972851c6a367b6f8810e26993 100644
--- a/dumux/discretization/fvgridvariables.hh
+++ b/dumux/discretization/fvgridvariables.hh
@@ -38,7 +38,7 @@ class FVGridVariables
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GridVolumeVariables);
- using GridFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GlobalFluxVariablesCache);
+ using GridFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GridFluxVariablesCache);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
public:
diff --git a/dumux/discretization/fvproperties.hh b/dumux/discretization/fvproperties.hh
index 3b2be681c94925d344e0b684261656ccc7f54e56..2fe65eda292af480f0580a4c80c2a9a01898575f 100644
--- a/dumux/discretization/fvproperties.hh
+++ b/dumux/discretization/fvproperties.hh
@@ -55,7 +55,7 @@ SET_BOOL_PROP(FiniteVolumeModel, EnableFVGridGeometryCache, false);
SET_BOOL_PROP(FiniteVolumeModel, EnableGridVolumeVariablesCache, false);
//! disable flux variables data caching by default
-SET_BOOL_PROP(FiniteVolumeModel, EnableGlobalFluxVariablesCache, false);
+SET_BOOL_PROP(FiniteVolumeModel, EnableGridFluxVariablesCache, false);
//! Boundary types at a single degree of freedom
SET_TYPE_PROP(FiniteVolumeModel, BoundaryTypes, BoundaryTypes<GET_PROP_VALUE(TypeTag, NumEq)>);
diff --git a/dumux/discretization/staggered/elementfluxvariablescache.hh b/dumux/discretization/staggered/elementfluxvariablescache.hh
index ec130afada36d4d9290dd29c3b520f17a57efc73..cd3393d1f8a3110f03f85957eed015053da1c571 100644
--- a/dumux/discretization/staggered/elementfluxvariablescache.hh
+++ b/dumux/discretization/staggered/elementfluxvariablescache.hh
@@ -32,7 +32,7 @@ namespace Dumux
* \ingroup ImplicitModel
* \brief Base class for the stencil local flux variables cache
*/
-template<class TypeTag, bool EnableGlobalFluxVariablesCache>
+template<class TypeTag, bool EnableGridFluxVariablesCache>
class StaggeredElementFluxVariablesCache;
/*!
@@ -49,12 +49,12 @@ class StaggeredElementFluxVariablesCache<TypeTag, true>
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
- using GlobalFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GlobalFluxVariablesCache);
+ using GridFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GridFluxVariablesCache);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
public:
- StaggeredElementFluxVariablesCache(const GlobalFluxVariablesCache& global)
- : globalFluxVarsCachePtr_(&global) {}
+ StaggeredElementFluxVariablesCache(const GridFluxVariablesCache& global)
+ : gridFluxVarsCachePtr_(&global) {}
// Specialization for the global caching being enabled - do nothing here
void bindElement(const Element& element,
@@ -74,14 +74,14 @@ public:
// aStaggeredess operators in the case of caching
const FluxVariablesCache& operator [](const SubControlVolumeFace& scvf) const
- { return (*globalFluxVarsCachePtr_)[scvf.index()]; }
+ { return (*gridFluxVarsCachePtr_)[scvf.index()]; }
//! The global object we are a restriction of
- const GlobalFluxVariablesCache& globalFluxVarsCache() const
- { return *globalFluxVarsCachePtr_; }
+ const GridFluxVariablesCache& gridFluxVarsCache() const
+ { return *gridFluxVarsCachePtr_; }
private:
- const GlobalFluxVariablesCache* globalFluxVarsCachePtr_;
+ const GridFluxVariablesCache* gridFluxVarsCachePtr_;
};
/*!
@@ -98,12 +98,12 @@ class StaggeredElementFluxVariablesCache<TypeTag, false>
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
- using GlobalFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GlobalFluxVariablesCache);
+ using GridFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GridFluxVariablesCache);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
public:
- StaggeredElementFluxVariablesCache(const GlobalFluxVariablesCache& global)
- : globalFluxVarsCachePtr_(&global) {}
+ StaggeredElementFluxVariablesCache(const GridFluxVariablesCache& global)
+ : gridFluxVarsCachePtr_(&global) {}
// This function has to be called prior to flux calculations on the element.
// Prepares the transmissibilities of the scv faces in an element. The FvGeometry is assumed to be bound.
@@ -120,7 +120,7 @@ public:
// fill the containers
for (auto&& scvf : scvfs(fvGeometry))
{
- fluxVarsCache_[localScvfIdx].update(globalFluxVarsCache().problem_(), element, fvGeometry, elemVolVars, scvf);
+ fluxVarsCache_[localScvfIdx].update(gridFluxVarsCache().problem_(), element, fvGeometry, elemVolVars, scvf);
globalScvfIndices_[localScvfIdx] = scvf.index();
localScvfIdx++;
}
@@ -132,15 +132,15 @@ public:
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars)
{
- const auto globalI = globalFluxVarsCache().problem_().elementMapper().index(element);
- const auto& neighborStencil = globalFluxVarsCache().problem_().model().stencils(element).neighborStencil();
+ const auto globalI = gridFluxVarsCache().problem_().elementMapper().index(element);
+ const auto& neighborStencil = gridFluxVarsCache().problem_().model().stencils(element).neighborStencil();
const auto numNeighbors = neighborStencil.size();
// find the number of scv faces that need to be prepared
auto numScvf = fvGeometry.numScvf();
for (IndexType localIdxJ = 0; localIdxJ < numNeighbors; ++localIdxJ)
{
- const auto& fluxVarIndicesJ = globalFluxVarsCache().problem_().model().localJacobian().assemblyMap()[globalI][localIdxJ];
+ const auto& fluxVarIndicesJ = gridFluxVarsCache().problem_().model().localJacobian().assemblyMap()[globalI][localIdxJ];
numScvf += fluxVarIndicesJ.size();
}
@@ -150,7 +150,7 @@ public:
IndexType localScvfIdx = 0;
for (auto&& scvf : scvfs(fvGeometry))
{
- fluxVarsCache_[localScvfIdx].update(globalFluxVarsCache().problem_(), element, fvGeometry, elemVolVars, scvf);
+ fluxVarsCache_[localScvfIdx].update(gridFluxVarsCache().problem_(), element, fvGeometry, elemVolVars, scvf);
globalScvfIndices_[localScvfIdx] = scvf.index();
localScvfIdx++;
}
@@ -158,13 +158,13 @@ public:
// add required data on the scv faces in the neighboring elements
for (IndexType localIdxJ = 0; localIdxJ < numNeighbors; ++localIdxJ)
{
- const auto& fluxVarIndicesJ = globalFluxVarsCache().problem_().model().localJacobian().assemblyMap()[globalI][localIdxJ];
+ const auto& fluxVarIndicesJ = gridFluxVarsCache().problem_().model().localJacobian().assemblyMap()[globalI][localIdxJ];
const auto elementJ = fvGeometry.fvGridGeometry().element(neighborStencil[localIdxJ]);
for (auto fluxVarIdx : fluxVarIndicesJ)
{
auto&& scvfJ = fvGeometry.scvf(fluxVarIdx);
- fluxVarsCache_[localScvfIdx].update(globalFluxVarsCache().problem_(), elementJ, fvGeometry, elemVolVars, scvfJ);
+ fluxVarsCache_[localScvfIdx].update(gridFluxVarsCache().problem_(), elementJ, fvGeometry, elemVolVars, scvfJ);
globalScvfIndices_[localScvfIdx] = scvfJ.index();
localScvfIdx++;
}
@@ -179,7 +179,7 @@ public:
fluxVarsCache_.resize(1);
globalScvfIndices_.resize(1);
- fluxVarsCache_[0].update(globalFluxVarsCache().problem_(), element, fvGeometry, elemVolVars, scvf);
+ fluxVarsCache_[0].update(gridFluxVarsCache().problem_(), element, fvGeometry, elemVolVars, scvf);
globalScvfIndices_[0] = scvf.index();
}
@@ -191,11 +191,11 @@ public:
{ return fluxVarsCache_[getLocalScvfIdx_(scvf.index())]; }
//! The global object we are a restriction of
- const GlobalFluxVariablesCache& globalFluxVarsCache() const
- { return *globalFluxVarsCachePtr_; }
+ const GridFluxVariablesCache& gridFluxVarsCache() const
+ { return *gridFluxVarsCachePtr_; }
private:
- const GlobalFluxVariablesCache* globalFluxVarsCachePtr_;
+ const GridFluxVariablesCache* gridFluxVarsCachePtr_;
// get index of scvf in the local container
int getLocalScvfIdx_(const int scvfIdx) const
diff --git a/dumux/discretization/staggered/globalfluxvariablescache.hh b/dumux/discretization/staggered/globalfluxvariablescache.hh
index 1374b427920afb7ae8129ac6ecd6194e0419df7d..cac4b677a71376b9943cecea8677f0b333e84a0d 100644
--- a/dumux/discretization/staggered/globalfluxvariablescache.hh
+++ b/dumux/discretization/staggered/globalfluxvariablescache.hh
@@ -33,15 +33,15 @@ namespace Dumux
* \ingroup ImplicitModel
* \brief Base class for the flux variables cache vector, we store one cache per face
*/
-template<class TypeTag, bool EnableGlobalFluxVariablesCache>
-class StaggeredGlobalFluxVariablesCache;
+template<class TypeTag, bool EnableGridFluxVariablesCache>
+class StaggeredGridFluxVariablesCache;
/*!
* \ingroup ImplicitModel
* \brief Spezialization when caching globally
*/
template<class TypeTag>
-class StaggeredGlobalFluxVariablesCache<TypeTag, true>
+class StaggeredGridFluxVariablesCache<TypeTag, true>
{
// the local class needs access to the problem
friend StaggeredElementFluxVariablesCache<TypeTag, true>;
@@ -56,7 +56,7 @@ class StaggeredGlobalFluxVariablesCache<TypeTag, true>
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
public:
- StaggeredGlobalFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
+ StaggeredGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
// When global caching is enabled, precompute transmissibilities and stencils for all the scv faces
void update(const FVGridGeometry& fvGridGeometry,
@@ -86,7 +86,7 @@ public:
* The local object is only functional after calling its bind/bindElement method
* This is a free function that will be found by means of ADL
*/
- friend inline ElementFluxVariablesCache localView(const StaggeredGlobalFluxVariablesCache& global)
+ friend inline ElementFluxVariablesCache localView(const StaggeredGridFluxVariablesCache& global)
{ return ElementFluxVariablesCache(global); }
const Problem& problem() const
@@ -111,7 +111,7 @@ private:
* \brief Spezialization when not using global caching
*/
template<class TypeTag>
-class StaggeredGlobalFluxVariablesCache<TypeTag, false>
+class StaggeredGridFluxVariablesCache<TypeTag, false>
{
// the local class needs access to the problem
friend StaggeredElementFluxVariablesCache<TypeTag, false>;
@@ -128,7 +128,7 @@ public:
* The local object is only functional after calling its bind/bindElement method
* This is a free function that will be found by means of ADL
*/
- friend inline ElementFluxVariablesCache localView(const StaggeredGlobalFluxVariablesCache& global)
+ friend inline ElementFluxVariablesCache localView(const StaggeredGridFluxVariablesCache& global)
{ return ElementFluxVariablesCache(global); }
private:
diff --git a/dumux/discretization/staggered/gridvariables.hh b/dumux/discretization/staggered/gridvariables.hh
index d046306da961a768c4722d2e06647d0c985656a1..e77dd96a78ec6b7f0b8f57de2cd83eb19b43abac 100644
--- a/dumux/discretization/staggered/gridvariables.hh
+++ b/dumux/discretization/staggered/gridvariables.hh
@@ -41,7 +41,7 @@ class StaggeredGridVariables : public FVGridVariables<TypeTag>
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GridVolumeVariables);
using GridFaceVariables = typename GET_PROP_TYPE(TypeTag, GlobalFaceVars);
- using GridFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GlobalFluxVariablesCache);
+ using GridFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GridFluxVariablesCache);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
public:
diff --git a/dumux/discretization/staggered/properties.hh b/dumux/discretization/staggered/properties.hh
index 28140645bab0f35238092f8ca4da7d914a5c7bcf..cc481aaac3c8d9ef63b594a1a3a9ae5c38b3ff05 100644
--- a/dumux/discretization/staggered/properties.hh
+++ b/dumux/discretization/staggered/properties.hh
@@ -142,10 +142,10 @@ SET_TYPE_PROP(StaggeredModel, GridVolumeVariables, StaggeredGridVolumeVariables<
SET_TYPE_PROP(StaggeredModel, ElementVolumeVariables, StaggeredElementVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGridVolumeVariablesCache)>);
//! The global flux variables cache vector class
-SET_TYPE_PROP(StaggeredModel, GlobalFluxVariablesCache, StaggeredGlobalFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
+SET_TYPE_PROP(StaggeredModel, GridFluxVariablesCache, StaggeredGridFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache)>);
//! The local flux variables cache vector class
-SET_TYPE_PROP(StaggeredModel, ElementFluxVariablesCache, StaggeredElementFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
+SET_TYPE_PROP(StaggeredModel, ElementFluxVariablesCache, StaggeredElementFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache)>);
//! Set the BaseLocalResidual to StaggeredLocalResidual
SET_TYPE_PROP(StaggeredModel, BaseLocalResidual, StaggeredLocalResidual<TypeTag>);
diff --git a/dumux/mixeddimension/facet/mpfa/couplingmanager.hh b/dumux/mixeddimension/facet/mpfa/couplingmanager.hh
index bb2b25c283b9061f46f2c545020107b307e1bea0..e6c415d8060d91cd99b74a36f288cac56798b14f 100644
--- a/dumux/mixeddimension/facet/mpfa/couplingmanager.hh
+++ b/dumux/mixeddimension/facet/mpfa/couplingmanager.hh
@@ -208,7 +208,7 @@ public:
auto bulkElemVolVars = localView(bulkProblem().model().curGridVolVars());
bulkElemVolVars.bind(firstBulkElement, bulkFvGeometry, bulkProblem().model().curSol());
- auto bulkElemFluxVarsCache = localView(bulkProblem().model().globalFluxVarsCache());
+ auto bulkElemFluxVarsCache = localView(bulkProblem().model().gridFluxVarsCache());
bulkElemFluxVarsCache.bind(firstBulkElement, bulkFvGeometry, bulkElemVolVars);
BulkPrimaryVariables flux(0.0);
diff --git a/dumux/mixeddimension/subproblemlocaljacobian.hh b/dumux/mixeddimension/subproblemlocaljacobian.hh
index f0aae51640ec84100f48b49c384a26ba5d79d560..fbb64e6967623c940fb810184918f087b138ec1d 100644
--- a/dumux/mixeddimension/subproblemlocaljacobian.hh
+++ b/dumux/mixeddimension/subproblemlocaljacobian.hh
@@ -150,7 +150,7 @@ public:
auto prevElemVolVars = localView(this->model_().prevGridVolVars());
prevElemVolVars.bindElement(element, fvGeometry, this->model_().prevSol());
- auto elemFluxVarsCache = localView(this->model_().globalFluxVarsCache());
+ auto elemFluxVarsCache = localView(this->model_().gridFluxVarsCache());
elemFluxVarsCache.bind(element, fvGeometry, curElemVolVars);
// check for boundaries on the element
diff --git a/test/freeflow/staggered/angelitestproblem.hh b/test/freeflow/staggered/angelitestproblem.hh
index 9d0b1a1026a89a485a2c80145fdf48a89b18ef5f..816b62c7569cdc567c591f1e19bbf0fe514de6e4 100644
--- a/test/freeflow/staggered/angelitestproblem.hh
+++ b/test/freeflow/staggered/angelitestproblem.hh
@@ -65,7 +65,7 @@ SET_TYPE_PROP(AngeliTestProblem, Problem, Dumux::AngeliTestProblem<TypeTag> );
SET_BOOL_PROP(AngeliTestProblem, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(AngeliTestProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(AngeliTestProblem, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(AngeliTestProblem, EnableGridVolumeVariablesCache, true);
SET_BOOL_PROP(AngeliTestProblem, EnableInertiaTerms, true);
diff --git a/test/freeflow/staggered/channeltestproblem.hh b/test/freeflow/staggered/channeltestproblem.hh
index b77cac324049186b6ee0a394283111ed06440b97..101b184bad620b33156b63bde538362244e9a9f1 100644
--- a/test/freeflow/staggered/channeltestproblem.hh
+++ b/test/freeflow/staggered/channeltestproblem.hh
@@ -72,7 +72,7 @@ SET_TYPE_PROP(ChannelTestProblem, Problem, Dumux::ChannelTestProblem<TypeTag> );
SET_BOOL_PROP(ChannelTestProblem, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(ChannelTestProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(ChannelTestProblem, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(ChannelTestProblem, EnableGridVolumeVariablesCache, true);
diff --git a/test/freeflow/staggered/closedsystemtestproblem.hh b/test/freeflow/staggered/closedsystemtestproblem.hh
index 1d73b7fa4d010ae4975f3ef65670a423b47da175..015564f651af55eebbab6386ac2f45385e034013 100644
--- a/test/freeflow/staggered/closedsystemtestproblem.hh
+++ b/test/freeflow/staggered/closedsystemtestproblem.hh
@@ -63,7 +63,7 @@ SET_TYPE_PROP(ClosedSystemTestProblem, Problem, Dumux::ClosedSystemTestProblem<T
SET_BOOL_PROP(ClosedSystemTestProblem, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(ClosedSystemTestProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(ClosedSystemTestProblem, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(ClosedSystemTestProblem, EnableGridVolumeVariablesCache, true);
}
diff --git a/test/freeflow/staggered/doneatestproblem.hh b/test/freeflow/staggered/doneatestproblem.hh
index 1e1829204754e52d14891cbf38af361270e5a2f7..d01b83681a50f19b6f8085a99449035a5d689ce3 100644
--- a/test/freeflow/staggered/doneatestproblem.hh
+++ b/test/freeflow/staggered/doneatestproblem.hh
@@ -66,7 +66,7 @@ SET_TYPE_PROP(DoneaTestProblem, Problem, Dumux::DoneaTestProblem<TypeTag> );
SET_BOOL_PROP(DoneaTestProblem, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(DoneaTestProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(DoneaTestProblem, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(DoneaTestProblem, EnableGridVolumeVariablesCache, true);
#if ENABLE_NAVIERSTOKES
diff --git a/test/freeflow/staggered/kovasznaytestproblem.hh b/test/freeflow/staggered/kovasznaytestproblem.hh
index ddf4512c483b3ac429e8afbea5255d96cfe0f5cd..49415b0fa1fb7b8bc1d225123502e73ca0127984 100644
--- a/test/freeflow/staggered/kovasznaytestproblem.hh
+++ b/test/freeflow/staggered/kovasznaytestproblem.hh
@@ -67,7 +67,7 @@ SET_TYPE_PROP(KovasznayTestProblem, Problem, Dumux::KovasznayTestProblem<TypeTag
SET_BOOL_PROP(KovasznayTestProblem, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(KovasznayTestProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(KovasznayTestProblem, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(KovasznayTestProblem, EnableGridVolumeVariablesCache, true);
#if ENABLE_NAVIERSTOKES
diff --git a/test/freeflow/staggerednc/channeltestproblem.hh b/test/freeflow/staggerednc/channeltestproblem.hh
index f3541008ad1269f9fdd0d98284e68e94758852da..f7e3d6e0a08955a04d42361819921cc9fe2bd411 100644
--- a/test/freeflow/staggerednc/channeltestproblem.hh
+++ b/test/freeflow/staggerednc/channeltestproblem.hh
@@ -79,7 +79,7 @@ SET_TYPE_PROP(ChannelNCTestProblem, Problem, Dumux::ChannelNCTestProblem<TypeTag
SET_BOOL_PROP(ChannelNCTestProblem, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(ChannelNCTestProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(ChannelNCTestProblem, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(ChannelNCTestProblem, EnableGridVolumeVariablesCache, true);
// Enable gravity
diff --git a/test/freeflow/staggerednc/densityflowproblem.hh b/test/freeflow/staggerednc/densityflowproblem.hh
index be3fe5215959a96b21536aece14c9a29c0d85e42..6d1491b50db05246cfbb68db66dd7c8c2f3395ea 100644
--- a/test/freeflow/staggerednc/densityflowproblem.hh
+++ b/test/freeflow/staggerednc/densityflowproblem.hh
@@ -74,7 +74,7 @@ SET_TYPE_PROP(DensityDrivenFlowProblem, Problem, Dumux::DensityDrivenFlowProblem
SET_BOOL_PROP(DensityDrivenFlowProblem, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(DensityDrivenFlowProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(DensityDrivenFlowProblem, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(DensityDrivenFlowProblem, EnableGridVolumeVariablesCache, true);
SET_BOOL_PROP(DensityDrivenFlowProblem, UseMoles, true);
diff --git a/test/mixeddimension/embedded/1p2c_richards2c/richardstestproblem.hh b/test/mixeddimension/embedded/1p2c_richards2c/richardstestproblem.hh
index 7b38a95db3f8467ece55d79ca604d95ef0e509b1..e7e7cdcaca43e52bdc01f14f34458c9f1286c9b0 100644
--- a/test/mixeddimension/embedded/1p2c_richards2c/richardstestproblem.hh
+++ b/test/mixeddimension/embedded/1p2c_richards2c/richardstestproblem.hh
@@ -55,7 +55,7 @@ SET_TYPE_PROP(RichardsTestProblem, Grid, Dune::UGGrid<3>);
SET_BOOL_PROP(RichardsTestProblem, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(RichardsTestProblem, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(RichardsTestProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(RichardsTestProblem, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(RichardsTestProblem, SolutionDependentAdvection, false);
SET_BOOL_PROP(RichardsTestProblem, SolutionDependentMolecularDiffusion, false);
SET_BOOL_PROP(RichardsTestProblem, SolutionDependentHeatConduction, false);
diff --git a/test/mixeddimension/embedded/1p2c_richards2c/rootsystemtestproblem.hh b/test/mixeddimension/embedded/1p2c_richards2c/rootsystemtestproblem.hh
index b8fefe6bbb4d19bd8d7d37b1166376df26743d66..34c2a914a9f01d6d296c937faeb0d9444bb505a9 100644
--- a/test/mixeddimension/embedded/1p2c_richards2c/rootsystemtestproblem.hh
+++ b/test/mixeddimension/embedded/1p2c_richards2c/rootsystemtestproblem.hh
@@ -62,7 +62,7 @@ SET_TYPE_PROP(RootsystemTestProblem, Grid, Dune::FoamGrid<1, 3>);
SET_BOOL_PROP(RootsystemTestProblem, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(RootsystemTestProblem, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(RootsystemTestProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(RootsystemTestProblem, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(RootsystemTestProblem, SolutionDependentAdvection, false);
SET_BOOL_PROP(RootsystemTestProblem, SolutionDependentMolecularDiffusion, false);
SET_BOOL_PROP(RootsystemTestProblem, SolutionDependentHeatConduction, false);
diff --git a/test/mixeddimension/embedded/1p_1p/tissueproblem.hh b/test/mixeddimension/embedded/1p_1p/tissueproblem.hh
index 0bd604b43bc2254b40638b175ae282eb65dffdc3..452d7445632e0b61a9d2df60ea60b1acc43964a3 100644
--- a/test/mixeddimension/embedded/1p_1p/tissueproblem.hh
+++ b/test/mixeddimension/embedded/1p_1p/tissueproblem.hh
@@ -56,7 +56,7 @@ SET_TYPE_PROP(TissueProblem, Grid, Dune::YaspGrid<3, Dune::EquidistantOffsetCoor
SET_BOOL_PROP(TissueProblem, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(TissueProblem, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(TissueProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(TissueProblem, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(TissueProblem, SolutionDependentAdvection, false);
SET_BOOL_PROP(TissueProblem, SolutionDependentMolecularDiffusion, false);
SET_BOOL_PROP(TissueProblem, SolutionDependentHeatConduction, false);
diff --git a/test/mixeddimension/embedded/1p_richards/richardstestproblem.hh b/test/mixeddimension/embedded/1p_richards/richardstestproblem.hh
index 2b90036def18d3992d22b08438b702e2fdd657f0..3fa42f3195b1dccf99f41aa5806c8a660f671597 100644
--- a/test/mixeddimension/embedded/1p_richards/richardstestproblem.hh
+++ b/test/mixeddimension/embedded/1p_richards/richardstestproblem.hh
@@ -55,7 +55,7 @@ SET_TYPE_PROP(RichardsTestProblem, Grid, Dune::YaspGrid<3, Dune::EquidistantOffs
SET_BOOL_PROP(RichardsTestProblem, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(RichardsTestProblem, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(RichardsTestProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(RichardsTestProblem, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(RichardsTestProblem, SolutionDependentAdvection, false);
SET_BOOL_PROP(RichardsTestProblem, SolutionDependentMolecularDiffusion, false);
SET_BOOL_PROP(RichardsTestProblem, SolutionDependentHeatConduction, false);
diff --git a/test/mixeddimension/embedded/1p_richards/rootsystemtestproblem.hh b/test/mixeddimension/embedded/1p_richards/rootsystemtestproblem.hh
index d7557c652eea622597212b5b2b1c08da72d0fa9b..c25dc8fbb9cf53fab715c31229a0db20e601321d 100644
--- a/test/mixeddimension/embedded/1p_richards/rootsystemtestproblem.hh
+++ b/test/mixeddimension/embedded/1p_richards/rootsystemtestproblem.hh
@@ -61,7 +61,7 @@ SET_TYPE_PROP(RootsystemTestProblem, Grid, Dune::FoamGrid<1, 3>);
SET_BOOL_PROP(RootsystemTestProblem, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(RootsystemTestProblem, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(RootsystemTestProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(RootsystemTestProblem, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(RootsystemTestProblem, SolutionDependentAdvection, false);
SET_BOOL_PROP(RootsystemTestProblem, SolutionDependentMolecularDiffusion, false);
SET_BOOL_PROP(RootsystemTestProblem, SolutionDependentHeatConduction, false);
diff --git a/test/porousmediumflow/1p/implicit/compressible/problem.hh b/test/porousmediumflow/1p/implicit/compressible/problem.hh
index 8928258a6331d1b81f294451ff898888b74433a6..1f79f16befb768c5796c9d38311d9c45d98d25fb 100644
--- a/test/porousmediumflow/1p/implicit/compressible/problem.hh
+++ b/test/porousmediumflow/1p/implicit/compressible/problem.hh
@@ -69,7 +69,7 @@ public:
// Disable caching (for testing purposes)
SET_BOOL_PROP(OnePCompressible, EnableGridVolumeVariablesCache, false);
-SET_BOOL_PROP(OnePCompressible, EnableGlobalFluxVariablesCache, false);
+SET_BOOL_PROP(OnePCompressible, EnableGridFluxVariablesCache, false);
SET_BOOL_PROP(OnePCompressible, EnableFVGridGeometryCache, false);
} // end namespace Properties
diff --git a/test/porousmediumflow/1p/implicit/fractureproblem.hh b/test/porousmediumflow/1p/implicit/fractureproblem.hh
index cd821cc30346b92d05169ed97a2d8db00ec96645..60da969c47084d64e9d5b03d19d25caf5d1f429c 100644
--- a/test/porousmediumflow/1p/implicit/fractureproblem.hh
+++ b/test/porousmediumflow/1p/implicit/fractureproblem.hh
@@ -53,7 +53,7 @@ NEW_TYPE_TAG(FractureCCMpfaProblem, INHERITS_FROM(CCMpfaModel, FractureProblem))
//! Enable caching (more memory, but faster runtime)
SET_BOOL_PROP(FractureProblem, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(FractureProblem, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(FractureProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(FractureProblem, EnableGridFluxVariablesCache, true);
//! The grid type
SET_TYPE_PROP(FractureProblem, Grid, Dune::FoamGrid<2, 3>);
diff --git a/test/porousmediumflow/1p/implicit/incompressible/problem.hh b/test/porousmediumflow/1p/implicit/incompressible/problem.hh
index c9773bf74f9a7c9e070c6ea301b0cfa594566f21..2f75ea9273a4771b902236971862631882735813 100644
--- a/test/porousmediumflow/1p/implicit/incompressible/problem.hh
+++ b/test/porousmediumflow/1p/implicit/incompressible/problem.hh
@@ -71,7 +71,7 @@ SET_PROP(OnePIncompressible, FluidSystem)
// Enable caching
SET_BOOL_PROP(OnePIncompressible, EnableGridVolumeVariablesCache, false);
-SET_BOOL_PROP(OnePIncompressible, EnableGlobalFluxVariablesCache, false);
+SET_BOOL_PROP(OnePIncompressible, EnableGridFluxVariablesCache, false);
SET_BOOL_PROP(OnePIncompressible, EnableFVGridGeometryCache, false);
} // end namespace Properties
diff --git a/test/porousmediumflow/2p/implicit/fracture/problem.hh b/test/porousmediumflow/2p/implicit/fracture/problem.hh
index 97815ec1027b705246367276189e7ab10f6947b4..1fa4e51f9a481b50c2fe03bfaa723affb1afea8c 100644
--- a/test/porousmediumflow/2p/implicit/fracture/problem.hh
+++ b/test/porousmediumflow/2p/implicit/fracture/problem.hh
@@ -70,7 +70,7 @@ SET_PROP(FractureProblem, FluidSystem)
// Use global caching
SET_BOOL_PROP(FractureProblem, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(FractureProblem, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(FractureProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(FractureProblem, EnableGridFluxVariablesCache, true);
// permeablility is solution-independent
SET_BOOL_PROP(FractureProblem, SolutionDependentAdvection, false);
diff --git a/test/porousmediumflow/2p/implicit/incompressible/problem.hh b/test/porousmediumflow/2p/implicit/incompressible/problem.hh
index 61ed3af2c3e075c608459b4249ba9ebcce75b30a..ab4aca4a780b8423b7326435c05a446e5a22a91f 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/problem.hh
+++ b/test/porousmediumflow/2p/implicit/incompressible/problem.hh
@@ -70,7 +70,7 @@ SET_PROP(TwoPIncompressible, FluidSystem)
// Enable caching
SET_BOOL_PROP(TwoPIncompressible, EnableGridVolumeVariablesCache, false);
-SET_BOOL_PROP(TwoPIncompressible, EnableGlobalFluxVariablesCache, false);
+SET_BOOL_PROP(TwoPIncompressible, EnableGridFluxVariablesCache, false);
SET_BOOL_PROP(TwoPIncompressible, EnableFVGridGeometryCache, false);
} // end namespace Properties
diff --git a/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh b/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh
index 1a4af3119cbb98e0681525a14ebf4931a1f612e3..4d124d651c73c26793383ab546159dd465b0259a 100644
--- a/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh
+++ b/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh
@@ -60,7 +60,7 @@ SET_PROP(IncompressibleTestProblem, FluidSystem)
// Enable caching
SET_BOOL_PROP(IncompressibleTestProblem, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(IncompressibleTestProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(IncompressibleTestProblem, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(IncompressibleTestProblem, EnableFVGridGeometryCache, true);
} // end namespace Properties
diff --git a/test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh b/test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh
index ce515fc300cdabaa64d3e4aeebcc0464ebc79033..884c1cfcf5a4d3173af53daec44ff743b27efad7 100644
--- a/test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh
+++ b/test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh
@@ -48,7 +48,7 @@ NEW_TYPE_TAG(TracerTestBoxProblem, INHERITS_FROM(BoxModel, TracerTestProblem));
// enable caching
SET_BOOL_PROP(TracerTestProblem, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(TracerTestProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(TracerTestProblem, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(TracerTestProblem, EnableFVGridGeometryCache, true);
// Set the grid type
diff --git a/test/porousmediumflow/tracer/constvel/tracertestproblem.hh b/test/porousmediumflow/tracer/constvel/tracertestproblem.hh
index 66ca5898f462f466f967ec8cff3da65d8e2167ee..52362865d35314b5bbd429d82c535466f3925d37 100644
--- a/test/porousmediumflow/tracer/constvel/tracertestproblem.hh
+++ b/test/porousmediumflow/tracer/constvel/tracertestproblem.hh
@@ -48,7 +48,7 @@ NEW_TYPE_TAG(TracerTestBox, INHERITS_FROM(BoxModel, TracerTest));
// enable caching
SET_BOOL_PROP(TracerTest, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(TracerTest, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(TracerTest, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(TracerTest, EnableFVGridGeometryCache, true);
// Set the grid type