From 91417af2c26049c0d8432541d967d2d33ebafa8f Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Wed, 17 Jan 2018 16:30:08 +0100
Subject: [PATCH] [material] Extract FVElementGeometry type from grid geometry
---
dumux/material/chemistry/electrochemistry/electrochemistry.hh | 2 +-
.../mineralization/effectivesoliddensity.hh | 2 +-
.../mineralization/effectivesolidheatcapacity.hh | 2 +-
.../fluidmatrixinteractions/permeabilitykozenycarman.hh | 2 +-
dumux/material/fluidmatrixinteractions/porosityprecipitation.hh | 2 +-
dumux/material/fluidmatrixinteractions/porosityreactivebed.hh | 2 +-
dumux/material/spatialparams/fv.hh | 2 +-
dumux/material/spatialparams/fv1p.hh | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dumux/material/chemistry/electrochemistry/electrochemistry.hh b/dumux/material/chemistry/electrochemistry/electrochemistry.hh
index 7c0d7a0bfe..f15df6e9a5 100644
--- a/dumux/material/chemistry/electrochemistry/electrochemistry.hh
+++ b/dumux/material/chemistry/electrochemistry/electrochemistry.hh
@@ -56,7 +56,7 @@ class ElectroChemistry
using SourceValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using Constant = Constants<Scalar>;
diff --git a/dumux/material/fluidmatrixinteractions/mineralization/effectivesoliddensity.hh b/dumux/material/fluidmatrixinteractions/mineralization/effectivesoliddensity.hh
index 742cc04e19..075f5475a1 100644
--- a/dumux/material/fluidmatrixinteractions/mineralization/effectivesoliddensity.hh
+++ b/dumux/material/fluidmatrixinteractions/mineralization/effectivesoliddensity.hh
@@ -41,7 +41,7 @@ class EffectiveSolidDensity
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using SpatialParams = typename GET_PROP_TYPE(TypeTag, SpatialParams);
using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
static const int dim = GridView::dimension;
diff --git a/dumux/material/fluidmatrixinteractions/mineralization/effectivesolidheatcapacity.hh b/dumux/material/fluidmatrixinteractions/mineralization/effectivesolidheatcapacity.hh
index c7570d840b..04a97bbc26 100644
--- a/dumux/material/fluidmatrixinteractions/mineralization/effectivesolidheatcapacity.hh
+++ b/dumux/material/fluidmatrixinteractions/mineralization/effectivesolidheatcapacity.hh
@@ -41,7 +41,7 @@ class EffectiveSolidHeatCapacity
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using SpatialParams = typename GET_PROP_TYPE(TypeTag, SpatialParams);
using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
static const int dim = GridView::dimension;
diff --git a/dumux/material/fluidmatrixinteractions/permeabilitykozenycarman.hh b/dumux/material/fluidmatrixinteractions/permeabilitykozenycarman.hh
index 01c69535dc..2e6842c304 100644
--- a/dumux/material/fluidmatrixinteractions/permeabilitykozenycarman.hh
+++ b/dumux/material/fluidmatrixinteractions/permeabilitykozenycarman.hh
@@ -44,7 +44,7 @@ class PermeabilityKozenyCarman
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using SpatialParams = typename GET_PROP_TYPE(TypeTag, SpatialParams);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
diff --git a/dumux/material/fluidmatrixinteractions/porosityprecipitation.hh b/dumux/material/fluidmatrixinteractions/porosityprecipitation.hh
index be51e0d59e..27edea92b9 100644
--- a/dumux/material/fluidmatrixinteractions/porosityprecipitation.hh
+++ b/dumux/material/fluidmatrixinteractions/porosityprecipitation.hh
@@ -41,7 +41,7 @@ class PorosityPrecipitation
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using SpatialParams = typename GET_PROP_TYPE(TypeTag, SpatialParams);
using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
static const int dim = GridView::dimension;
diff --git a/dumux/material/fluidmatrixinteractions/porosityreactivebed.hh b/dumux/material/fluidmatrixinteractions/porosityreactivebed.hh
index 2f4bed0123..5f9b7db827 100644
--- a/dumux/material/fluidmatrixinteractions/porosityreactivebed.hh
+++ b/dumux/material/fluidmatrixinteractions/porosityreactivebed.hh
@@ -41,7 +41,7 @@ class PorosityReactiveBed
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using SpatialParams = typename GET_PROP_TYPE(TypeTag, SpatialParams);
using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
static const int dim = GridView::dimension;
diff --git a/dumux/material/spatialparams/fv.hh b/dumux/material/spatialparams/fv.hh
index c65983fcf6..d9974381dc 100644
--- a/dumux/material/spatialparams/fv.hh
+++ b/dumux/material/spatialparams/fv.hh
@@ -41,7 +41,7 @@ class FVSpatialParams: public FVSpatialParamsOneP<TypeTag>
{
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using MaterialLawParams = typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params;
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
diff --git a/dumux/material/spatialparams/fv1p.hh b/dumux/material/spatialparams/fv1p.hh
index fbed6d7cd7..0aa896b9fe 100644
--- a/dumux/material/spatialparams/fv1p.hh
+++ b/dumux/material/spatialparams/fv1p.hh
@@ -46,7 +46,7 @@ class FVSpatialParamsOneP
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Implementation = typename GET_PROP_TYPE(TypeTag, SpatialParams);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
--
GitLab