Commit 42a70e8d authored by Simon Scholz's avatar Simon Scholz Committed by Bernd Flemisch
Browse files

remove fvgridgeometry deprecation warnings

parent 533c054d
......@@ -49,10 +49,10 @@ class GridAdaptInitializationIndicator
using Element = typename GridView::Traits::template Codim<0>::Entity;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
static constexpr bool isBox = GetPropType<TypeTag, Properties::FVGridGeometry>::discMethod == DiscretizationMethod::box;
static constexpr bool isBox = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethod::box;
public:
......
......@@ -80,7 +80,7 @@ public:
const PartialReassembler* partialReassembler = nullptr)
{
this->asImp_().bindLocalViews();
const auto eIdxGlobal = this->assembler().fvGridGeometry().elementMapper().index(this->element());
const auto eIdxGlobal = this->assembler().gridGeometry().elementMapper().index(this->element());
if (partialReassembler
&& partialReassembler->elementColor(eIdxGlobal) == EntityColor::green)
{
......@@ -113,7 +113,7 @@ public:
}
// set main diagonal entries for the vertex
int vIdx = this->assembler().fvGridGeometry().vertexMapper().index(vertex);
int vIdx = this->assembler().gridGeometry().vertexMapper().index(vertex);
typedef typename JacobianMatrix::block_type BlockType;
BlockType &J = jac[vIdx][vIdx];
......@@ -139,9 +139,9 @@ public:
jac[scvI.dofIndex()][scvI.dofIndex()][eqIdx][pvIdx] = 1.0;
// if a periodic dof has Dirichlet values also apply the same Dirichlet values to the other dof
if (this->assembler().fvGridGeometry().dofOnPeriodicBoundary(scvI.dofIndex()))
if (this->assembler().gridGeometry().dofOnPeriodicBoundary(scvI.dofIndex()))
{
const auto periodicDof = this->assembler().fvGridGeometry().periodicallyMappedDof(scvI.dofIndex());
const auto periodicDof = this->assembler().gridGeometry().periodicallyMappedDof(scvI.dofIndex());
res[periodicDof][eqIdx] = this->curElemVolVars()[scvI].priVars()[pvIdx] - dirichletValues[pvIdx];
const auto end = jac[periodicDof].end();
for (auto it = jac[periodicDof].begin(); it != end; ++it)
......@@ -309,7 +309,7 @@ public:
//////////////////////////////////////////////////////////////////////////////////////////////////
// create the element solution
auto elemSol = elementSolution(element, curSol, fvGeometry.fvGridGeometry());
auto elemSol = elementSolution(element, curSol, fvGeometry.gridGeometry());
// create the vector storing the partial derivatives
ElementResidualVector partialDerivs(element.subEntities(dim));
......@@ -430,7 +430,7 @@ public:
//////////////////////////////////////////////////////////////////////////////////////////////////
// create the element solution
auto elemSol = elementSolution(element, curSol, fvGeometry.fvGridGeometry());
auto elemSol = elementSolution(element, curSol, fvGeometry.gridGeometry());
// create the vector storing the partial derivatives
ElementResidualVector partialDerivs(element.subEntities(dim));
......
......@@ -49,7 +49,7 @@ class BoxLocalResidual : public FVLocalResidual<TypeTag>
using GridView = GetPropType<TypeTag, Properties::GridView>;
using Element = typename GridView::template Codim<0>::Entity;
using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::FVGridGeometry>::LocalView;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
......
......@@ -78,7 +78,7 @@ public:
const PartialReassembler* partialReassembler)
{
this->asImp_().bindLocalViews();
const auto globalI = this->assembler().fvGridGeometry().elementMapper().index(this->element());
const auto globalI = this->assembler().gridGeometry().elementMapper().index(this->element());
if (partialReassembler
&& partialReassembler->elementColor(globalI) == EntityColor::green)
{
......@@ -106,7 +106,7 @@ public:
void assembleResidual(SolutionVector& res)
{
this->asImp_().bindLocalViews();
const auto globalI = this->assembler().fvGridGeometry().elementMapper().index(this->element());
const auto globalI = this->assembler().gridGeometry().elementMapper().index(this->element());
res[globalI] = this->asImp_().evalLocalResidual()[0]; // forward to the internal implementation
}
};
......@@ -137,7 +137,7 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tru
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using Element = typename GetPropType<TypeTag, Properties::GridView>::template Codim<0>::Entity;
using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using FVElementGeometry = typename FVGridGeometry::LocalView;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
......@@ -170,7 +170,7 @@ public:
// get some aliases for convenience
const auto& element = this->element();
const auto& fvGeometry = this->fvGeometry();
const auto& fvGridGeometry = this->assembler().fvGridGeometry();
const auto& fvGridGeometry = this->assembler().gridGeometry();
auto&& curElemVolVars = this->curElemVolVars();
auto&& elemFluxVarsCache = this->elemFluxVarsCache();
......@@ -349,7 +349,7 @@ public:
// get some aliases for convenience
const auto& element = this->element();
const auto& fvGeometry = this->fvGeometry();
const auto& fvGridGeometry = this->assembler().fvGridGeometry();
const auto& fvGridGeometry = this->assembler().gridGeometry();
auto&& curElemVolVars = this->curElemVolVars();
// reference to the element's scv (needed later) and corresponding vol vars
......@@ -452,7 +452,7 @@ public:
const auto& elemFluxVarsCache = this->elemFluxVarsCache();
// get reference to the element's current vol vars
const auto globalI = this->assembler().fvGridGeometry().elementMapper().index(element);
const auto globalI = this->assembler().gridGeometry().elementMapper().index(element);
const auto& scv = fvGeometry.scv(globalI);
const auto& volVars = curElemVolVars[scv];
......@@ -524,7 +524,7 @@ public:
const auto residual = this->evalLocalResidual()[0];
// get reference to the element's current vol vars
const auto globalI = this->assembler().fvGridGeometry().elementMapper().index(this->element());
const auto globalI = this->assembler().gridGeometry().elementMapper().index(this->element());
const auto& scv = this->fvGeometry().scv(globalI);
const auto& volVars = this->curElemVolVars()[scv];
......
......@@ -47,7 +47,7 @@ class CCLocalResidual : public FVLocalResidual<TypeTag>
using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::FVGridGeometry>::LocalView;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
public:
......
......@@ -53,7 +53,7 @@ class FVLocalAssemblerBase
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using SolutionVector = typename Assembler::ResidualType;
using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::FVGridGeometry>::LocalView;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using GridVolumeVariables = GetPropType<TypeTag, Properties::GridVolumeVariables>;
......@@ -76,7 +76,7 @@ public:
: FVLocalAssemblerBase(assembler,
element,
curSol,
localView(assembler.fvGridGeometry()),
localView(assembler.gridGeometry()),
localView(assembler.gridVariables().curGridVolVars()),
localView(assembler.gridVariables().prevGridVolVars()),
localView(assembler.gridVariables().gridFluxVarsCache()),
......
......@@ -48,9 +48,9 @@ class FVLocalResidual
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using Element = typename GridView::template Codim<0>::Entity;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::FVGridGeometry>::LocalView;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
......@@ -423,7 +423,7 @@ public:
//! Compute the derivative of the flux residual
template<class PartialDerivativeMatrices, class T = TypeTag>
std::enable_if_t<GetPropType<T, Properties::FVGridGeometry>::discMethod != DiscretizationMethod::box, void>
std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod != DiscretizationMethod::box, void>
addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
const Problem& problem,
const Element& element,
......@@ -437,7 +437,7 @@ public:
//! Compute the derivative of the flux residual for the box method
template<class JacobianMatrix, class T = TypeTag>
std::enable_if_t<GetPropType<T, Properties::FVGridGeometry>::discMethod == DiscretizationMethod::box, void>
std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethod::box, void>
addFluxDerivatives(JacobianMatrix& A,
const Problem& problem,
const Element& element,
......
......@@ -99,15 +99,15 @@ template<class Assembler>
class PartialReassemblerEngine<Assembler, DiscretizationMethod::box>
{
using Scalar = typename Assembler::Scalar;
using FVGridGeometry = typename Assembler::FVGridGeometry;
using FVGridGeometry = typename Assembler::GridGeometry;
using JacobianMatrix = typename Assembler::JacobianMatrix;
using VertexMapper = typename FVGridGeometry::VertexMapper;
static constexpr int dim = FVGridGeometry::GridView::dimension;
public:
PartialReassemblerEngine(const Assembler& assembler)
: elementColor_(assembler.fvGridGeometry().elementMapper().size(), EntityColor::red)
, vertexColor_(assembler.fvGridGeometry().vertexMapper().size(), EntityColor::red)
: elementColor_(assembler.gridGeometry().elementMapper().size(), EntityColor::red)
, vertexColor_(assembler.gridGeometry().vertexMapper().size(), EntityColor::red)
{}
// returns number of green elements
......@@ -115,7 +115,7 @@ public:
const std::vector<Scalar>& distanceFromLastLinearization,
Scalar threshold)
{
const auto& fvGridGeometry = assembler.fvGridGeometry();
const auto& fvGridGeometry = assembler.gridGeometry();
const auto& gridView = fvGridGeometry.gridView();
const auto& elementMapper = fvGridGeometry.elementMapper();
const auto& vertexMapper = fvGridGeometry.vertexMapper();
......@@ -305,12 +305,12 @@ template<class Assembler>
class PartialReassemblerEngine<Assembler, DiscretizationMethod::cctpfa>
{
using Scalar = typename Assembler::Scalar;
using FVGridGeometry = typename Assembler::FVGridGeometry;
using FVGridGeometry = typename Assembler::GridGeometry;
using JacobianMatrix = typename Assembler::JacobianMatrix;
public:
PartialReassemblerEngine(const Assembler& assembler)
: elementColor_(assembler.fvGridGeometry().elementMapper().size(), EntityColor::red)
: elementColor_(assembler.gridGeometry().elementMapper().size(), EntityColor::red)
{}
// returns number of green elements
......@@ -318,7 +318,7 @@ public:
const std::vector<Scalar>& distanceFromLastLinearization,
Scalar threshold)
{
const auto& fvGridGeometry = assembler.fvGridGeometry();
const auto& fvGridGeometry = assembler.gridGeometry();
const auto& gridView = fvGridGeometry.gridView();
const auto& elementMapper = fvGridGeometry.elementMapper();
......@@ -362,7 +362,7 @@ public:
void resetJacobian(Assembler& assembler) const
{
auto& jacobian = assembler.jacobian();
const auto& connectivityMap = assembler.fvGridGeometry().connectivityMap();
const auto& connectivityMap = assembler.gridGeometry().connectivityMap();
// loop over all dofs
for (unsigned int colIdx = 0; colIdx < jacobian.M(); ++colIdx)
......@@ -423,7 +423,7 @@ template<class Assembler>
class PartialReassembler
{
using Scalar = typename Assembler::Scalar;
using FVGridGeometry = typename Assembler::FVGridGeometry;
using FVGridGeometry = typename Assembler::GridGeometry;
using JacobianMatrix = typename Assembler::JacobianMatrix;
using VertexMapper = typename FVGridGeometry::VertexMapper;
......@@ -440,7 +440,7 @@ public:
: engine_(assembler)
, greenElems_(0)
{
const auto& fvGridGeometry = assembler.fvGridGeometry();
const auto& fvGridGeometry = assembler.gridGeometry();
totalElems_ = fvGridGeometry.elementMapper().size();
totalElems_ = fvGridGeometry.gridView().comm().sum(totalElems_);
}
......
......@@ -47,7 +47,7 @@ class StaggeredLocalResidual
using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::FVGridGeometry>::LocalView;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using CellCenterPrimaryVariables = GetPropType<TypeTag, Properties::CellCenterPrimaryVariables>;
......
......@@ -50,7 +50,7 @@ class FVProblem
{
using Implementation = GetPropType<TypeTag, Properties::Problem>;
using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using FVElementGeometry = typename FVGridGeometry::LocalView;
using GridView = typename FVGridGeometry::GridView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
......
......@@ -119,7 +119,7 @@ public:
// to be overloaded by derived classes
template<class Problem, class FVElementGeometry, class ElementVolumeVariables>
void update(const Problem &problem,
const typename FVElementGeometry::FVGridGeometry::GridView::template Codim<0>::Entity &element,
const typename FVElementGeometry::GridGeometry::GridView::template Codim<0>::Entity &element,
const FVElementGeometry &fvGeometry,
const ElementVolumeVariables &elemVolVars,
const typename FVElementGeometry::SubControlVolume &scv)
......@@ -215,7 +215,7 @@ class SolDependentPointSource : public PointSource<Dune::FieldVector<typename Ge
using SourceValues = GetPropType<TypeTag, Properties::NumEqVector>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::FVGridGeometry>::LocalView;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using Element = typename GridView::template Codim<0>::Entity;
......
......@@ -55,7 +55,7 @@ class StaggeredFVProblem : public FVProblem<TypeTag>
using ElementFaceVariables = typename GridFaceVariables::LocalView;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using FVElementGeometry = typename FVGridGeometry::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
......@@ -167,12 +167,12 @@ public:
template<class SolutionVector>
void applyInitialSolution(SolutionVector& sol) const
{
sol[cellCenterIdx].resize(this->fvGridGeometry().numCellCenterDofs());
sol[faceIdx].resize(this->fvGridGeometry().numFaceDofs());
sol[cellCenterIdx].resize(this->gridGeometry().numCellCenterDofs());
sol[faceIdx].resize(this->gridGeometry().numFaceDofs());
for (const auto& element : elements(this->fvGridGeometry().gridView()))
for (const auto& element : elements(this->gridGeometry().gridView()))
{
auto fvGeometry = localView(this->fvGridGeometry());
auto fvGeometry = localView(this->gridGeometry());
fvGeometry.bindElement(element);
// loop over sub control volumes
......
......@@ -52,7 +52,7 @@ public:
const Element &element,
const FVElementGeometry &fvGeometry)
{
using FVGridGeometry = typename FVElementGeometry::FVGridGeometry;
using FVGridGeometry = typename FVElementGeometry::GridGeometry;
using GridView = typename FVGridGeometry::GridView;
vertexBCTypes_.resize( element.subEntities(GridView::dimension) );
......@@ -66,7 +66,7 @@ public:
int scvIdxLocal = scv.localDofIndex();
vertexBCTypes_[scvIdxLocal].reset();
if (fvGeometry.fvGridGeometry().dofOnBoundary(scv.dofIndex()))
if (fvGeometry.gridGeometry().dofOnBoundary(scv.dofIndex()))
{
vertexBCTypes_[scvIdxLocal] = problem.boundaryTypes(element, scv);
......
......@@ -61,7 +61,7 @@ public:
// Function is called by the BoxLocalJacobian prior to flux calculations on the element.
// We assume the FVGeometries to be bound at this point
template<class FVElementGeometry, class ElementVolumeVariables>
void bind(const typename FVElementGeometry::FVGridGeometry::GridView::template Codim<0>::Entity& element,
void bind(const typename FVElementGeometry::GridGeometry::GridView::template Codim<0>::Entity& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars)
{
......@@ -69,15 +69,15 @@ public:
}
template<class FVElementGeometry, class ElementVolumeVariables>
void bindElement(const typename FVElementGeometry::FVGridGeometry::GridView::template Codim<0>::Entity& element,
void bindElement(const typename FVElementGeometry::GridGeometry::GridView::template Codim<0>::Entity& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars)
{
eIdx_ = fvGeometry.fvGridGeometry().elementMapper().index(element);
eIdx_ = fvGeometry.gridGeometry().elementMapper().index(element);
}
template<class FVElementGeometry, class ElementVolumeVariables>
void bindScvf(const typename FVElementGeometry::FVGridGeometry::GridView::template Codim<0>::Entity& element,
void bindScvf(const typename FVElementGeometry::GridGeometry::GridView::template Codim<0>::Entity& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const typename FVElementGeometry::SubControlVolumeFace& scvf)
......@@ -119,7 +119,7 @@ public:
// Function is called by the BoxLocalJacobian prior to flux calculations on the element.
// We assume the FVGeometries to be bound at this point
template<class FVElementGeometry, class ElementVolumeVariables>
void bind(const typename FVElementGeometry::FVGridGeometry::GridView::template Codim<0>::Entity& element,
void bind(const typename FVElementGeometry::GridGeometry::GridView::template Codim<0>::Entity& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars)
{
......@@ -127,7 +127,7 @@ public:
}
template<class FVElementGeometry, class ElementVolumeVariables>
void bindElement(const typename FVElementGeometry::FVGridGeometry::GridView::template Codim<0>::Entity& element,
void bindElement(const typename FVElementGeometry::GridGeometry::GridView::template Codim<0>::Entity& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars)
{
......@@ -138,7 +138,7 @@ public:
}
template<class FVElementGeometry, class ElementVolumeVariables>
void bindScvf(const typename FVElementGeometry::FVGridGeometry::GridView::template Codim<0>::Entity& element,
void bindScvf(const typename FVElementGeometry::GridGeometry::GridView::template Codim<0>::Entity& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const typename FVElementGeometry::SubControlVolumeFace& scvf)
......
......@@ -37,7 +37,7 @@ namespace Dumux {
template<class FVElementGeometry, class PV>
class BoxElementSolution
{
using FVGridGeometry = typename FVElementGeometry::FVGridGeometry;
using FVGridGeometry = typename FVElementGeometry::GridGeometry;
using GridView = typename FVGridGeometry::GridView;
using Element = typename GridView::template Codim<0>::Entity;
......@@ -128,7 +128,7 @@ auto elementSolution(const Element& element, const SolutionVector& sol, const FV
*/
template<class Element, class ElementVolumeVariables, class FVElementGeometry>
auto elementSolution(const Element& element, const ElementVolumeVariables& elemVolVars, const FVElementGeometry& gg)
-> std::enable_if_t<FVElementGeometry::FVGridGeometry::discMethod == DiscretizationMethod::box,
-> std::enable_if_t<FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::box,
BoxElementSolution<FVElementGeometry,
typename ElementVolumeVariables::VolumeVariables::PrimaryVariables>>
{
......
......@@ -69,7 +69,7 @@ public:
// For compatibility reasons with the case of not storing the vol vars.
// function to be called before assembling an element, preparing the vol vars within the stencil
template<class FVElementGeometry, class SolutionVector>
void bind(const typename FVElementGeometry::FVGridGeometry::GridView::template Codim<0>::Entity& element,
void bind(const typename FVElementGeometry::GridGeometry::GridView::template Codim<0>::Entity& element,
const FVElementGeometry& fvGeometry,
const SolutionVector& sol)
{
......@@ -78,11 +78,11 @@ public:
// function to prepare the vol vars within the element
template<class FVElementGeometry, class SolutionVector>
void bindElement(const typename FVElementGeometry::FVGridGeometry::GridView::template Codim<0>::Entity& element,
void bindElement(const typename FVElementGeometry::GridGeometry::GridView::template Codim<0>::Entity& element,
const FVElementGeometry& fvGeometry,
const SolutionVector& sol)
{
eIdx_ = fvGeometry.fvGridGeometry().elementMapper().index(element);
eIdx_ = fvGeometry.gridGeometry().elementMapper().index(element);
}
//! The global volume variables object we are a restriction of
......@@ -115,7 +115,7 @@ public:
// specialization for box models, simply forwards to the bindElement method
template<class FVElementGeometry, class SolutionVector>
void bind(const typename FVElementGeometry::FVGridGeometry::GridView::template Codim<0>::Entity& element,
void bind(const typename FVElementGeometry::GridGeometry::GridView::template Codim<0>::Entity& element,
const FVElementGeometry& fvGeometry,
const SolutionVector& sol)
{
......@@ -124,12 +124,12 @@ public:
// specialization for box models
template<class FVElementGeometry, class SolutionVector>
void bindElement(const typename FVElementGeometry::FVGridGeometry::GridView::template Codim<0>::Entity& element,
void bindElement(const typename FVElementGeometry::GridGeometry::GridView::template Codim<0>::Entity& element,
const FVElementGeometry& fvGeometry,
const SolutionVector& sol)
{
// get the solution at the dofs of the element
auto elemSol = elementSolution(element, sol, fvGeometry.fvGridGeometry());
auto elemSol = elementSolution(element, sol, fvGeometry.gridGeometry());
// resize volume variables to the required size
volumeVariables_.resize(fvGeometry.numScv());
......
......@@ -46,7 +46,7 @@ public:
// only do something for box
if (discMethod == DiscretizationMethod::box)
{
const auto& fvGridGeometry = problem.fvGridGeometry();
const auto& fvGridGeometry = problem.gridGeometry();
scvBoundaryTypes.resize(fvGridGeometry.vertexMapper().size());
// set all equations to Neumann by default
for (std::size_t vIdx = 0; vIdx < scvBoundaryTypes.size(); vIdx++)
......
......@@ -38,7 +38,7 @@ namespace Dumux {
template<class FVElementGeometry, class PV>
class CCElementSolution
{
using FVGridGeometry = typename FVElementGeometry::FVGridGeometry;
using FVGridGeometry = typename FVElementGeometry::GridGeometry;
using GridView = typename FVGridGeometry::GridView;
using Element = typename GridView::template Codim<0>::Entity;
......@@ -127,8 +127,8 @@ auto elementSolution(const Element& element, const SolutionVector& sol, const FV
*/
template<class Element, class ElementVolumeVariables, class FVElementGeometry>
auto elementSolution(const Element& element, const ElementVolumeVariables& elemVolVars, const FVElementGeometry& gg)
-> std::enable_if_t<FVElementGeometry::FVGridGeometry::discMethod == DiscretizationMethod::cctpfa ||
FVElementGeometry::FVGridGeometry::discMethod == DiscretizationMethod::ccmpfa,
-> std::enable_if_t<FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::cctpfa ||
FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::ccmpfa,
CCElementSolution<FVElementGeometry, typename ElementVolumeVariables::VolumeVariables::PrimaryVariables>>
{
using PrimaryVariables = typename ElementVolumeVariables::VolumeVariables::PrimaryVariables;
......@@ -142,8 +142,8 @@ auto elementSolution(const Element& element, const ElementVolumeVariables& elemV
*/
template<class FVElementGeometry, class PrimaryVariables>
auto elementSolution(PrimaryVariables&& priVars)
-> std::enable_if_t<FVElementGeometry::FVGridGeometry::discMethod == DiscretizationMethod::cctpfa ||
FVElementGeometry::FVGridGeometry::discMethod == DiscretizationMethod::ccmpfa,
-> std::enable_if_t<FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::cctpfa ||
FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::ccmpfa,
CCElementSolution<FVElementGeometry, PrimaryVariables>>
{
return CCElementSolution<FVElementGeometry, PrimaryVariables>(std::move(priVars));
......@@ -156,8 +156,8 @@ auto elementSolution(PrimaryVariables&& priVars)
*/
template<class FVElementGeometry, class PrimaryVariables>
auto elementSolution(const PrimaryVariables& priVars)
-> std::enable_if_t<FVElementGeometry::FVGridGeometry::discMethod == DiscretizationMethod::cctpfa ||
FVElementGeometry::FVGridGeometry::discMethod == DiscretizationMethod::ccmpfa,
-> std::enable_if_t<FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::cctpfa ||
FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::ccmpfa,
CCElementSolution<FVElementGeometry, PrimaryVariables>>
{
return CCElementSolution<FVElementGeometry, PrimaryVariables>(priVars);
......
......@@ -144,14 +144,14 @@ public:
//! Bind the flux var caches for scvfs inside the element only
template<class FVElementGeometry, class ElementVolumeVariables>
void bindElement(const typename FVElementGeometry::FVGridGeometry::GridView::template Codim<0>::Entity& element,
void bindElement(const typename FVElementGeometry::GridGeometry::GridView::template Codim<0>::Entity& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars)
{ DUNE_THROW(Dune::NotImplemented, "Local element binding of the flux variables cache in mpfa schemes"); }
//! Specialization for the global caching being enabled - do nothing here
template<class FVElementGeometry, class ElementVolumeVariables>
void bind(const typename FVElementGeometry::FVGridGeometry::GridView::template Codim<0>::Entity& element,
void bind(const typename FVElementGeometry::GridGeometry::GridView::template Codim<0>::Entity& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars)
{
......@@ -162,7 +162,7 @@ public:
std::size_t numSecondaryIv; numSecondaryIv = 0;
std::size_t numCaches; numCaches = 0;
const auto& fvGridGeometry = fvGeometry.fvGridGeometry();
const auto& fvGridGeometry = fvGeometry.gridGeometry();
const auto& gridIvIndexSets = fvGridGeometry.gridInteractionVolumeIndexSets();
// lambda to check if a scvf was handled already
......@@ -236,7 +236,7 @@ public:
//! Bind the flux var caches for an individual scvf
template<class FVElementGeometry, class ElementVolumeVariables>
void bindScvf(const typename FVElementGeometry::FVGridGeometry::GridView::template Codim<0>::Entity& element,
void bindScvf(const typename FVElementGeometry::GridGeometry::GridView::template Codim<0>::Entity& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const typename FVElementGeometry::SubControlVolumeFace& scvf)
......@@ -244,7 +244,7 @@ public:
//! Specialization for the global caching being enabled - do nothing here
template<class FVElementGeometry, class ElementVolumeVariables>
void update(const typename FVElementGeometry::FVGridGeometry::GridView::template Codim<0>::Entity& element,
void update(const typename FVElementGeometry::GridGeometry::GridView::template Codim<0>::Entity& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars)
{
......@@ -320,7 +320,7 @@ private:
template<class SubControlVolumeFace>
bool isEmbeddedInBoundaryIV_(const SubControlVolumeFace& scvf) const
{
const auto& fvGridGeometry = gridFluxVarsCachePtr_->problem().fvGridGeometry();
const auto& fvGridGeometry = gridFluxVarsCachePtr_->problem().gridGeometry();
const auto& gridIvIndexSets = fvGridGeometry.gridInteractionVolumeIndexSets();
if (fvGridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
return gridIvIndexSets.secondaryIndexSet(scvf).nodalIndexSet().numBoundaryScvfs() > 0;
......@@ -374,7 +374,7 @@ public: