Commit 7cd5d094 authored by Bernd Flemisch's avatar Bernd Flemisch Committed by Katharina Heck
Browse files

[cleanup] replace local names `FVGridGeometry` by `GridGeometry`

parent c3b9b2ea
......@@ -49,7 +49,7 @@ class GridAdaptInitializationIndicator
using Element = typename GridView::Traits::template Codim<0>::Entity;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
static constexpr bool isBox = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethod::box;
......@@ -70,7 +70,7 @@ public:
* \param gridVariables The secondary variables on the grid
*/
GridAdaptInitializationIndicator(std::shared_ptr<const Problem> problem,
std::shared_ptr<const FVGridGeometry> fvGridGeometry,
std::shared_ptr<const GridGeometry> fvGridGeometry,
std::shared_ptr<const GridVariables> gridVariables)
: problem_(problem)
, fvGridGeometry_(fvGridGeometry)
......@@ -281,7 +281,7 @@ public:
private:
std::shared_ptr<const Problem> problem_; //!< The problem to be solved
std::shared_ptr<const FVGridGeometry> fvGridGeometry_; //!< The finite volume grid geometry
std::shared_ptr<const GridGeometry> fvGridGeometry_; //!< The finite volume grid geometry
std::shared_ptr<const GridVariables> gridVariables_; //!< The secondary variables on the grid
std::vector<bool> indicatorVector_; //!< Indicator for BCs/sources
......
......@@ -137,8 +137,8 @@ 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::GridGeometry>;
using FVElementGeometry = typename FVGridGeometry::LocalView;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using FVElementGeometry = typename GridGeometry::LocalView;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
......@@ -146,7 +146,7 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tru
enum { dim = GetPropType<TypeTag, Properties::GridView>::dimension };
using FluxStencil = Dumux::FluxStencil<FVElementGeometry>;
static constexpr int maxElementStencilSize = FVGridGeometry::maxElementStencilSize;
static constexpr int maxElementStencilSize = GridGeometry::maxElementStencilSize;
static constexpr bool enableGridFluxVarsCache = getPropValue<TypeTag, Properties::EnableGridFluxVariablesCache>();
public:
......
......@@ -50,7 +50,7 @@ class FVLocalResidual
using Element = typename GridView::template Codim<0>::Entity;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
......@@ -94,7 +94,7 @@ public:
*/
ElementResidualVector evalStorage(const Problem& problem,
const Element &element,
const FVGridGeometry& fvGridGeometry,
const GridGeometry& fvGridGeometry,
const GridVariables& gridVariables,
const SolutionVector& sol) const
{
......
......@@ -99,10 +99,10 @@ template<class Assembler>
class PartialReassemblerEngine<Assembler, DiscretizationMethod::box>
{
using Scalar = typename Assembler::Scalar;
using FVGridGeometry = typename Assembler::GridGeometry;
using GridGeometry = typename Assembler::GridGeometry;
using JacobianMatrix = typename Assembler::JacobianMatrix;
using VertexMapper = typename FVGridGeometry::VertexMapper;
static constexpr int dim = FVGridGeometry::GridView::dimension;
using VertexMapper = typename GridGeometry::VertexMapper;
static constexpr int dim = GridGeometry::GridView::dimension;
public:
PartialReassemblerEngine(const Assembler& assembler)
......@@ -305,7 +305,7 @@ template<class Assembler>
class PartialReassemblerEngine<Assembler, DiscretizationMethod::cctpfa>
{
using Scalar = typename Assembler::Scalar;
using FVGridGeometry = typename Assembler::GridGeometry;
using GridGeometry = typename Assembler::GridGeometry;
using JacobianMatrix = typename Assembler::JacobianMatrix;
public:
......@@ -423,11 +423,11 @@ template<class Assembler>
class PartialReassembler
{
using Scalar = typename Assembler::Scalar;
using FVGridGeometry = typename Assembler::GridGeometry;
using GridGeometry = typename Assembler::GridGeometry;
using JacobianMatrix = typename Assembler::JacobianMatrix;
using VertexMapper = typename FVGridGeometry::VertexMapper;
using VertexMapper = typename GridGeometry::VertexMapper;
static constexpr DiscretizationMethod discMethod = FVGridGeometry::discMethod;
static constexpr DiscretizationMethod discMethod = GridGeometry::discMethod;
using Engine = PartialReassemblerEngine<Assembler, discMethod>;
public:
......
......@@ -276,12 +276,12 @@ class BoundingBoxTreePointSourceHelper
{
public:
//! calculate a DOF index to point source map from given vector of point sources
template<class FVGridGeometry, class PointSource, class PointSourceMap>
static void computePointSourceMap(const FVGridGeometry& fvGridGeometry,
template<class GridGeometry, class PointSource, class PointSourceMap>
static void computePointSourceMap(const GridGeometry& fvGridGeometry,
std::vector<PointSource>& sources,
PointSourceMap& pointSourceMap)
{
constexpr bool isBox = FVGridGeometry::discMethod == DiscretizationMethod::box;
constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
const auto& boundingBoxTree = fvGridGeometry.boundingBoxTree();
......
......@@ -55,8 +55,8 @@ class StaggeredFVProblem : public FVProblem<TypeTag>
using ElementFaceVariables = typename GridFaceVariables::LocalView;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using FVElementGeometry = typename FVGridGeometry::LocalView;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using FVElementGeometry = typename GridGeometry::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
......@@ -64,8 +64,8 @@ class StaggeredFVProblem : public FVProblem<TypeTag>
using CoordScalar = typename GridView::ctype;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
static constexpr auto cellCenterIdx = FVGridGeometry::cellCenterIdx();
static constexpr auto faceIdx = FVGridGeometry::faceIdx();
static constexpr auto cellCenterIdx = GridGeometry::cellCenterIdx();
static constexpr auto faceIdx = GridGeometry::faceIdx();
static constexpr auto numEqCellCenter = getPropValue<TypeTag, Properties::NumEqCellCenter>();
static constexpr auto numEqFace = getPropValue<TypeTag, Properties::NumEqFace>();
......@@ -76,7 +76,7 @@ public:
* \param fvGridGeometry The finite volume grid geometry
* \param paramGroup The parameter group in which to look for runtime parameters first (default is "")
*/
StaggeredFVProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry, const std::string& paramGroup = "")
StaggeredFVProblem(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup = "")
: ParentType(fvGridGeometry, paramGroup)
{ }
......
......@@ -52,8 +52,8 @@ public:
const Element &element,
const FVElementGeometry &fvGeometry)
{
using FVGridGeometry = typename FVElementGeometry::GridGeometry;
using GridView = typename FVGridGeometry::GridView;
using GridGeometry = typename FVElementGeometry::GridGeometry;
using GridView = typename GridGeometry::GridView;
vertexBCTypes_.resize( element.subEntities(GridView::dimension) );
......
......@@ -37,8 +37,8 @@ namespace Dumux {
template<class FVElementGeometry, class PV>
class BoxElementSolution
{
using FVGridGeometry = typename FVElementGeometry::GridGeometry;
using GridView = typename FVGridGeometry::GridView;
using GridGeometry = typename FVElementGeometry::GridGeometry;
using GridView = typename GridGeometry::GridView;
using Element = typename GridView::template Codim<0>::Entity;
public:
......@@ -51,7 +51,7 @@ public:
//! Constructor with element and solution and grid geometry
template<class SolutionVector>
BoxElementSolution(const Element& element, const SolutionVector& sol,
const FVGridGeometry& fvGridGeometry)
const GridGeometry& fvGridGeometry)
{
update(element, sol, fvGridGeometry);
}
......@@ -70,7 +70,7 @@ public:
//! extract the element solution from the solution vector using a mapper
template<class SolutionVector>
void update(const Element& element, const SolutionVector& sol,
const FVGridGeometry& fvGridGeometry)
const GridGeometry& fvGridGeometry)
{
const auto numVert = element.subEntities(GridView::dimension);
priVars_.resize(numVert);
......@@ -111,15 +111,15 @@ private:
* \ingroup BoxDiscretization
* \brief Make an element solution for box schemes
*/
template<class Element, class SolutionVector, class FVGridGeometry>
auto elementSolution(const Element& element, const SolutionVector& sol, const FVGridGeometry& gg)
-> std::enable_if_t<FVGridGeometry::discMethod == DiscretizationMethod::box,
BoxElementSolution<typename FVGridGeometry::LocalView,
template<class Element, class SolutionVector, class GridGeometry>
auto elementSolution(const Element& element, const SolutionVector& sol, const GridGeometry& gg)
-> std::enable_if_t<GridGeometry::discMethod == DiscretizationMethod::box,
BoxElementSolution<typename GridGeometry::LocalView,
std::decay_t<decltype(std::declval<SolutionVector>()[0])>>
>
{
using PrimaryVariables = std::decay_t<decltype(std::declval<SolutionVector>()[0])>;
return BoxElementSolution<typename FVGridGeometry::LocalView, PrimaryVariables>(element, sol, gg);
return BoxElementSolution<typename GridGeometry::LocalView, PrimaryVariables>(element, sol, gg);
}
/*!
......
......@@ -35,15 +35,15 @@ namespace Dumux {
* For the box scheme, this class does not contain any physics-/process-dependent
* data. It solely stores disretization-/grid-related data.
*/
template< class Scalar, class FVGridGeometry >
template< class Scalar, class GridGeometry >
class BoxFluxVariablesCache
{
using GridView = typename FVGridGeometry::GridView;
using GridView = typename GridGeometry::GridView;
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using FVElementGeometry = typename FVGridGeometry::LocalView;
using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace;
using FVElementGeometry = typename GridGeometry::LocalView;
using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace;
static const int dim = GridView::dimension;
static const int dimWorld = GridView::dimensionworld;
......
......@@ -56,8 +56,8 @@ struct BoxDefaultGridGeometryTraits
using SubControlVolume = BoxSubControlVolume<GridView>;
using SubControlVolumeFace = BoxSubControlVolumeFace<GridView>;
template<class FVGridGeometry, bool enableCache>
using LocalView = BoxFVElementGeometry<FVGridGeometry, enableCache>;
template<class GridGeometry, bool enableCache>
using LocalView = BoxFVElementGeometry<GridGeometry, enableCache>;
};
/*!
......
......@@ -78,8 +78,8 @@ public:
BoxGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
template<class FVGridGeometry, class GridVolumeVariables, class SolutionVector>
void update(const FVGridGeometry& fvGridGeometry,
template<class GridGeometry, class GridVolumeVariables, class SolutionVector>
void update(const GridGeometry& fvGridGeometry,
const GridVolumeVariables& gridVolVars,
const SolutionVector& sol,
bool forceUpdate = false)
......@@ -144,8 +144,8 @@ public:
BoxGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
template<class FVGridGeometry, class GridVolumeVariables, class SolutionVector>
void update(const FVGridGeometry& fvGridGeometry,
template<class GridGeometry, class GridVolumeVariables, class SolutionVector>
void update(const GridGeometry& fvGridGeometry,
const GridVolumeVariables& gridVolVars,
const SolutionVector& sol,
bool forceUpdate = false) {}
......
......@@ -74,8 +74,8 @@ public:
BoxGridVolumeVariables(const Problem& problem) : problemPtr_(&problem) {}
template<class FVGridGeometry, class SolutionVector>
void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol)
template<class GridGeometry, class SolutionVector>
void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol)
{
volumeVariables_.resize(fvGridGeometry.gridView().size(0));
for (const auto& element : elements(fvGridGeometry.gridView()))
......@@ -139,8 +139,8 @@ public:
BoxGridVolumeVariables(const Problem& problem) : problemPtr_(&problem) {}
template<class FVGridGeometry, class SolutionVector>
void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol) {}
template<class GridGeometry, class SolutionVector>
void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol) {}
const Problem& problem() const
{ return *problemPtr_;}
......
......@@ -48,14 +48,14 @@ namespace Dumux {
* to compute these fluxes. The same holds for scvfs in the cells J, i.e. we need only those
* scvfs in the cells J in which the cell I is in the stencil.
*/
template<class FVGridGeometry>
template<class GridGeometry>
class CCSimpleConnectivityMap
{
using FVElementGeometry = typename FVGridGeometry::LocalView;
using GridView = typename FVGridGeometry::GridView;
using FVElementGeometry = typename GridGeometry::LocalView;
using GridView = typename GridGeometry::GridView;
using GridIndexType = typename IndexTraits<GridView>::GridIndex;
using FluxStencil = Dumux::FluxStencil<FVElementGeometry>;
static constexpr int maxElemStencilSize = FVGridGeometry::maxElementStencilSize;
static constexpr int maxElemStencilSize = GridGeometry::maxElementStencilSize;
struct DataJ
{
......@@ -75,7 +75,7 @@ public:
*
* \param fvGridGeometry The grid's finite volume geometry.
*/
void update(const FVGridGeometry& fvGridGeometry)
void update(const GridGeometry& fvGridGeometry)
{
map_.clear();
map_.resize(fvGridGeometry.gridView().size(0));
......@@ -115,7 +115,7 @@ public:
if (dataJForI.size() > maxElemStencilSize - 1)
DUNE_THROW(Dune::InvalidStateException, "Maximum admissible stencil size (" << maxElemStencilSize-1
<< ") is surpassed (" << dataJForI.size() << "). "
<< "Please adjust the FVGridGeometry traits accordingly!");
<< "Please adjust the GridGeometry traits accordingly!");
dataJForI.push_back(std::make_pair(globalI, DataJ({globalJ, {scvf.index()}, {}})));
}
......
......@@ -38,8 +38,8 @@ namespace Dumux {
template<class FVElementGeometry, class PV>
class CCElementSolution
{
using FVGridGeometry = typename FVElementGeometry::GridGeometry;
using GridView = typename FVGridGeometry::GridView;
using GridGeometry = typename FVElementGeometry::GridGeometry;
using GridView = typename GridGeometry::GridView;
using Element = typename GridView::template Codim<0>::Entity;
public:
......@@ -52,7 +52,7 @@ public:
//! Constructor with element, solution vector and grid geometry
template<class SolutionVector>
CCElementSolution(const Element& element, const SolutionVector& sol,
const FVGridGeometry& fvGridGeometry)
const GridGeometry& fvGridGeometry)
: CCElementSolution(sol[fvGridGeometry.elementMapper().index(element)])
{}
......@@ -76,7 +76,7 @@ public:
//! extract the element solution from the solution vector using a mapper
template<class SolutionVector>
void update(const Element& element, const SolutionVector& sol,
const FVGridGeometry& fvGridGeometry)
const GridGeometry& fvGridGeometry)
{
priVars_ = sol[fvGridGeometry.elementMapper().index(element)];
}
......@@ -109,16 +109,16 @@ private:
* \ingroup CCDiscretization
* \brief Make an element solution for cell-centered schemes
*/
template<class Element, class SolutionVector, class FVGridGeometry>
auto elementSolution(const Element& element, const SolutionVector& sol, const FVGridGeometry& gg)
-> std::enable_if_t<FVGridGeometry::discMethod == DiscretizationMethod::cctpfa ||
FVGridGeometry::discMethod == DiscretizationMethod::ccmpfa,
CCElementSolution<typename FVGridGeometry::LocalView,
template<class Element, class SolutionVector, class GridGeometry>
auto elementSolution(const Element& element, const SolutionVector& sol, const GridGeometry& gg)
-> std::enable_if_t<GridGeometry::discMethod == DiscretizationMethod::cctpfa ||
GridGeometry::discMethod == DiscretizationMethod::ccmpfa,
CCElementSolution<typename GridGeometry::LocalView,
std::decay_t<decltype(std::declval<SolutionVector>()[0])>>
>
{
using PrimaryVariables = std::decay_t<decltype(std::declval<SolutionVector>()[0])>;
return CCElementSolution<typename FVGridGeometry::LocalView, PrimaryVariables>(element, sol, gg);
return CCElementSolution<typename GridGeometry::LocalView, PrimaryVariables>(element, sol, gg);
}
/*!
......
......@@ -64,8 +64,8 @@ public:
CCGridVolumeVariables(const Problem& problem) : problemPtr_(&problem) {}
template<class FVGridGeometry, class SolutionVector>
void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol)
template<class GridGeometry, class SolutionVector>
void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol)
{
const auto numScv = fvGridGeometry.numScv();
volumeVariables_.resize(numScv);
......@@ -136,8 +136,8 @@ public:
CCGridVolumeVariables(const Problem& problem) : problemPtr_(&problem) {}
template<class FVGridGeometry, class SolutionVector>
void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol) {}
template<class GridGeometry, class SolutionVector>
void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol) {}
//! The problem we are solving
const Problem& problem() const
......
......@@ -33,12 +33,12 @@
namespace Dumux {
//! Forward declaration of method specific implementation of the assembly map
template<class FVGridGeometry, MpfaMethods method>
template<class GridGeometry, MpfaMethods method>
class CCMpfaConnectivityMap;
//! The o-method can use the simple (symmetric) assembly map
template<class FVGridGeometry>
class CCMpfaConnectivityMap<FVGridGeometry, MpfaMethods::oMethod> : public CCSimpleConnectivityMap<FVGridGeometry> {};
template<class GridGeometry>
class CCMpfaConnectivityMap<GridGeometry, MpfaMethods::oMethod> : public CCSimpleConnectivityMap<GridGeometry> {};
} // end namespace Dumux
#endif
......@@ -56,7 +56,7 @@ struct CCMpfaFVGridGeometryTraits : public DefaultMapperTraits<GV>
//! We assume simplex grids where stencils can get quite large but the size is unknown
static constexpr int maxElementStencilSize = int(GV::dimension) == 3 ? 150 :
(int(GV::dimension)<int(GV::dimensionworld) ? 45 : 20);
//! type definitions depending on the FVGridGeometry itself
//! type definitions depending on the GridGeometry itself
template< class FVGridGeom >
using MpfaHelper = CCMpfaHelper< FVGridGeom >;
template< class FVGridGeom >
......
......@@ -124,8 +124,8 @@ public:
{}
//! When global caching is enabled, precompute transmissibilities for all scv faces
template<class FVGridGeometry, class GridVolumeVariables, class SolutionVector>
void update(const FVGridGeometry& fvGridGeometry,
template<class GridGeometry, class GridVolumeVariables, class SolutionVector>
void update(const GridGeometry& fvGridGeometry,
const GridVolumeVariables& gridVolVars,
const SolutionVector& sol,
bool forceUpdate = false)
......@@ -254,8 +254,8 @@ public:
private:
//! returns true if an scvf is contained in an interaction volume that touches the boundary
template<class SubControlVolumeFace, class FVGridGeometry>
bool isEmbeddedInBoundaryIV_(const SubControlVolumeFace& scvf, const FVGridGeometry& fvGridGeometry) const
template<class SubControlVolumeFace, class GridGeometry>
bool isEmbeddedInBoundaryIV_(const SubControlVolumeFace& scvf, const GridGeometry& fvGridGeometry) const
{
const auto& gridIvIndexSets = fvGridGeometry.gridInteractionVolumeIndexSets();
if (fvGridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
......@@ -322,8 +322,8 @@ public:
CCMpfaGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
//! When global flux variables caching is disabled, we don't need to update the cache
template<class FVGridGeometry, class GridVolumeVariables, class SolutionVector>
void update(const FVGridGeometry& fvGridGeometry,
template<class GridGeometry, class GridVolumeVariables, class SolutionVector>
void update(const GridGeometry& fvGridGeometry,
const GridVolumeVariables& gridVolVars,
const SolutionVector& sol,
bool forceUpdate = false) {}
......
......@@ -47,7 +47,7 @@ class CCMpfaGridInteractionVolumeIndexSets
using SecondaryIVIndexSet = typename SI::Traits::IndexSet;
public:
using FVGridGeometry = FVG;
using GridGeometry = FVG;
using PrimaryInteractionVolume = PI;
using SecondaryInteractionVolume = SI;
......@@ -60,7 +60,7 @@ public:
* \param fvGridGeometry The finite volume geometry on the grid view
* \param dualGridIdSet The index sets of the dual grid on the grid view
*/
void update(FVGridGeometry& fvGridGeometry, DualGridIndexSet&& dualGridIdSet)
void update(GridGeometry& fvGridGeometry, DualGridIndexSet&& dualGridIdSet)
{
dualGridIndexSet_ = std::make_unique<DualGridIndexSet>(std::move(dualGridIdSet));
......
......@@ -39,23 +39,23 @@ namespace Dumux {
* \ingroup CCMpfaDiscretization
* \brief Dimension-specific helper class to get data required for mpfa scheme.
*/
template<class FVGridGeometry, int dim, int dimWorld>
template<class GridGeometry, int dim, int dimWorld>
class MpfaDimensionHelper;
/*!
* \ingroup CCMpfaDiscretization
* \brief Dimension-specific mpfa helper class for dim == 2 & dimWorld == 2
*/
template<class FVGridGeometry>
class MpfaDimensionHelper<FVGridGeometry, /*dim*/2, /*dimWorld*/2>
template<class GridGeometry>
class MpfaDimensionHelper<GridGeometry, /*dim*/2, /*dimWorld*/2>
{
using GridView = typename FVGridGeometry::GridView;
using GridView = typename GridGeometry::GridView;
using CoordScalar = typename GridView::ctype;
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace;
using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace;
using ScvfCornerVector = typename SubControlVolumeFace::Traits::CornerStorage;
// Container to store the positions of intersections required for scvf
......@@ -199,11 +199,11 @@ public:
* \brief Dimension-specific mpfa helper class for dim == 2 & dimWorld == 2.
* Reuses some functionality of the specialization for dim = dimWorld = 2
*/
template<class FVGridGeometry>
class MpfaDimensionHelper<FVGridGeometry, /*dim*/2, /*dimWorld*/3>
: public MpfaDimensionHelper<FVGridGeometry, 2, 2>
template<class GridGeometry>
class MpfaDimensionHelper<GridGeometry, /*dim*/2, /*dimWorld*/3>
: public MpfaDimensionHelper<GridGeometry, 2, 2>
{
using GridView = typename FVGridGeometry::GridView;
using GridView = typename GridGeometry::GridView;
using CoordScalar = typename GridView::ctype;
public:
......@@ -260,14 +260,14 @@ public:
* \brief Dimension-specific mpfa helper class for dim == 3 & dimWorld == 3.
*
*/
template<class FVGridGeometry>
class MpfaDimensionHelper<FVGridGeometry, /*dim*/3, /*dimWorld*/3>
template<class GridGeometry>
class MpfaDimensionHelper<GridGeometry, /*dim*/3, /*dimWorld*/3>
{
using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace;
using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace;
using ScvfCornerVector = typename SubControlVolumeFace::Traits::CornerStorage;
// Be picky about the dimensions
using GridView = typename FVGridGeometry::GridView;
using GridView = typename GridGeometry::GridView;
using Element = typename GridView::template Codim<0>::Entity;
using CoordScalar = typename GridView::ctype;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
......@@ -498,22 +498,22 @@ public:
* \ingroup CCMpfaDiscretization
* \brief Helper class to get the required information on an interaction volume.
*
* \tparam FVGridGeometry The finite volume grid geometry
* \tparam GridGeometry The finite volume grid geometry
*/
template<class FVGridGeometry>
class CCMpfaHelper : public MpfaDimensionHelper<FVGridGeometry,
FVGridGeometry::GridView::dimension,
FVGridGeometry::GridView::dimensionworld>
template<class GridGeometry>
class CCMpfaHelper : public MpfaDimensionHelper<GridGeometry,
GridGeometry::GridView::dimension,
GridGeometry::GridView::dimensionworld>
{
using PrimaryInteractionVolume = typename FVGridGeometry::GridIVIndexSets::PrimaryInteractionVolume;
using SecondaryInteractionVolume = typename FVGridGeometry::GridIVIndexSets::SecondaryInteractionVolume;
using PrimaryInteractionVolume = typename GridGeometry::GridIVIndexSets::PrimaryInteractionVolume;
using SecondaryInteractionVolume = typename GridGeometry::GridIVIndexSets::SecondaryInteractionVolume;
using VertexMapper = typename FVGridGeometry::VertexMapper;
using FVElementGeometry = typename FVGridGeometry::LocalView;
using VertexMapper = typename GridGeometry::VertexMapper;
using FVElementGeometry = typename GridGeometry::LocalView;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using ScvfCornerVector = typename SubControlVolumeFace::Traits::CornerStorage;
using GridView = typename FVGridGeometry::GridView;
using GridView = typename GridGeometry::GridView;
static constexpr int dim = GridView::dimension;
using Element = typename GridView::template Codim<0>::Entity;
......