Commit 17c1a980 authored by Dennis Gläser's avatar Dennis Gläser
Browse files

rename GlobalFluxVariablesCache -> GridFluxVariablesCache

This commit affects all properties and member variables
parent ed97cdf0
......@@ -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);
......
......@@ -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:
......
......@@ -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)
/////////////////////////////////////////////////////////////////
......
......@@ -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_;
};
......
......@@ -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
......
......@@ -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>);
......
......@@ -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_()
{
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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:
......
......@@ -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)>);
......
......@@ -38,7 +38,7 @@ class FVGridVariables
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);