From f57c755af4327c8528e65dd5a1bb438258e2ecd5 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Sat, 16 Dec 2017 19:31:09 +0100
Subject: [PATCH] Rename ImplicitSpatialParams to FVSpatialParams
---
dumux/material/spatialparams/implicit.hh | 6 +++---
dumux/material/spatialparams/implicit1p.hh | 4 ++--
dumux/porousmediumflow/2p/model.hh | 2 +-
dumux/porousmediumflow/2p2c/model.hh | 4 ++--
dumux/porousmediumflow/2pnc/model.hh | 2 +-
dumux/porousmediumflow/3p/model.hh | 4 ++--
dumux/porousmediumflow/3p3c/model.hh | 4 ++--
dumux/porousmediumflow/3pwateroil/propertydefaults.hh | 4 ++--
dumux/porousmediumflow/mpnc/implicit/propertydefaults.hh | 4 ++--
dumux/porousmediumflow/richards/model.hh | 4 ++--
dumux/porousmediumflow/richardsnc/model.hh | 4 ++--
dumux/porousmediumflow/tracer/model.hh | 4 ++--
.../embedded/1p2c_richards2c/richardstestspatialparams.hh | 4 ++--
.../embedded/1p2c_richards2c/rootsystemtestspatialparams.hh | 4 ++--
.../mixeddimension/embedded/1p_1p/bloodflowspatialparams.hh | 4 ++--
test/mixeddimension/embedded/1p_1p/tissuespatialparams.hh | 4 ++--
.../embedded/1p_richards/richardstestspatialparams.hh | 4 ++--
.../embedded/1p_richards/rootsystemtestspatialparams.hh | 4 ++--
.../mixeddimension/facet/1p2c_1p2c/fracturespatialparams.hh | 4 ++--
test/mixeddimension/facet/1p2c_1p2c/matrixspatialparams.hh | 4 ++--
test/mixeddimension/facet/1p_1p/fracturespatialparams.hh | 4 ++--
test/mixeddimension/facet/1p_1p/matrixspatialparams.hh | 4 ++--
test/porousmediumflow/1p/implicit/1pnispatialparams.hh | 4 ++--
test/porousmediumflow/1p/implicit/1ptestspatialparams.hh | 4 ++--
.../1p/implicit/compressible/spatialparams.hh | 4 ++--
test/porousmediumflow/1p/implicit/fracturespatialparams.hh | 4 ++--
.../1p/implicit/incompressible/spatialparams.hh | 4 ++--
.../1p/implicit/pointsources/1psingularityspatialparams.hh | 4 ++--
test/porousmediumflow/1p/implicit/tubesspatialparams.hh | 4 ++--
.../porousmediumflow/1pnc/implicit/1pnctestspatialparams.hh | 4 ++--
.../1pncmin/implicit/thermochemspatialparams.hh | 4 ++--
test/porousmediumflow/2p/implicit/fracture/spatialparams.hh | 4 ++--
.../2p/implicit/incompressible/spatialparams.hh | 4 ++--
.../2p1c/implicit/steaminjectionspatialparams.hh | 4 ++--
.../2p2c/implicit/injectionspatialparams.hh | 4 ++--
.../porousmediumflow/2p2c/implicit/waterairspatialparams.hh | 4 ++--
.../porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh | 4 ++--
.../2pncmin/implicit/dissolutionspatialparams.hh | 4 ++--
test/porousmediumflow/3p/implicit/3pnispatialparams.hh | 4 ++--
.../3p/implicit/infiltration3pspatialparams.hh | 4 ++--
.../3p3c/implicit/columnxylolspatialparams.hh | 4 ++--
.../3p3c/implicit/infiltration3p3cspatialparams.hh | 4 ++--
.../porousmediumflow/3p3c/implicit/kuevettespatialparams.hh | 4 ++--
.../3pwateroil/implicit/3pwateroilsagdspatialparams.hh | 4 ++--
.../co2/implicit/heterogeneousspatialparameters.hh | 4 ++--
.../mpnc/implicit/combustionspatialparams.hh | 4 ++--
.../mpnc/implicit/evaporationatmospherespatialparams.hh | 4 ++--
.../mpnc/implicit/forchheimerspatialparams.hh | 4 ++--
.../porousmediumflow/mpnc/implicit/obstaclespatialparams.hh | 4 ++--
.../richards/implicit/richardsanalyticalspatialparams.hh | 4 ++--
.../richards/implicit/richardslensspatialparams.hh | 4 ++--
.../richards/implicit/richardsnispatialparams.hh | 4 ++--
.../richardsnc/implicit/richardswelltracerspatialparams.hh | 4 ++--
.../porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh | 4 ++--
.../tracer/1ptracer/tracertestspatialparams.hh | 4 ++--
.../tracer/constvel/tracertestspatialparams.hh | 4 ++--
56 files changed, 111 insertions(+), 111 deletions(-)
diff --git a/dumux/material/spatialparams/implicit.hh b/dumux/material/spatialparams/implicit.hh
index 2d0c3b0993..61f681c969 100644
--- a/dumux/material/spatialparams/implicit.hh
+++ b/dumux/material/spatialparams/implicit.hh
@@ -41,7 +41,7 @@ namespace Dumux {
* using a fully implicit discretization method.
*/
template<class TypeTag>
-class ImplicitSpatialParams: public ImplicitSpatialParamsOneP<TypeTag>
+class FVSpatialParams: public FVSpatialParamsOneP<TypeTag>
{
using Implementation = typename GET_PROP_TYPE(TypeTag, SpatialParams);
@@ -58,8 +58,8 @@ class ImplicitSpatialParams: public ImplicitSpatialParamsOneP<TypeTag>
using GlobalPosition = Dune::FieldVector<CoordScalar,dimWorld>;
public:
- ImplicitSpatialParams(const Problem& problem)
- : ImplicitSpatialParamsOneP<TypeTag>(problem)
+ FVSpatialParams(const Problem& problem)
+ : FVSpatialParamsOneP<TypeTag>(problem)
{}
/*!
diff --git a/dumux/material/spatialparams/implicit1p.hh b/dumux/material/spatialparams/implicit1p.hh
index 4f18b1dac0..f26aeed98f 100644
--- a/dumux/material/spatialparams/implicit1p.hh
+++ b/dumux/material/spatialparams/implicit1p.hh
@@ -43,7 +43,7 @@ namespace Dumux {
* using a fully implicit discretization method.
*/
template<class TypeTag>
-class ImplicitSpatialParamsOneP
+class FVSpatialParamsOneP
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
@@ -62,7 +62,7 @@ class ImplicitSpatialParamsOneP
using GlobalPosition = Dune::FieldVector<CoordScalar,dimWorld>;
public:
- ImplicitSpatialParamsOneP(const Problem& problem)
+ FVSpatialParamsOneP(const Problem& problem)
: problemPtr_(&problem)
{}
diff --git a/dumux/porousmediumflow/2p/model.hh b/dumux/porousmediumflow/2p/model.hh
index 23a9bc3719..207d575017 100644
--- a/dumux/porousmediumflow/2p/model.hh
+++ b/dumux/porousmediumflow/2p/model.hh
@@ -101,7 +101,7 @@ SET_BOOL_PROP(TwoP, EnableMolecularDiffusion, false); //
SET_BOOL_PROP(TwoP, EnableEnergyBalance, false); //! Isothermal model (non-isothermal type tag is below)
SET_TYPE_PROP(TwoP, LocalResidual, ImmiscibleLocalResidual<TypeTag>); //! Use the immiscible local residual operator for the 2p model
SET_TYPE_PROP(TwoP, VolumeVariables, TwoPVolumeVariables<TypeTag>); //! the VolumeVariables property
-SET_TYPE_PROP(TwoP, SpatialParams, ImplicitSpatialParams<TypeTag>); //! The spatial parameters. Use ImplicitSpatialParams by default.
+SET_TYPE_PROP(TwoP, SpatialParams, FVSpatialParams<TypeTag>); //! The spatial parameters. Use FVSpatialParams by default.
SET_TYPE_PROP(TwoP, VtkOutputFields, TwoPVtkOutputFields<TypeTag>); //! Set the vtk output fields specific to the twop model
SET_TYPE_PROP(TwoP,
diff --git a/dumux/porousmediumflow/2p2c/model.hh b/dumux/porousmediumflow/2p2c/model.hh
index 7ddbb7e605..c9cb39bdea 100644
--- a/dumux/porousmediumflow/2p2c/model.hh
+++ b/dumux/porousmediumflow/2p2c/model.hh
@@ -187,8 +187,8 @@ SET_TYPE_PROP(TwoPTwoC, VolumeVariables, TwoPTwoCVolumeVariables<TypeTag>);
//! Set the indices required by the isothermal 2p2c
SET_TYPE_PROP(TwoPTwoC, Indices, TwoPTwoCIndices<typename GET_PROP_TYPE(TypeTag, FluidSystem), /*PVOffset=*/0>);
-//! Use the ImplicitSpatialParams by default
-SET_TYPE_PROP(TwoPTwoC, SpatialParams, ImplicitSpatialParams<TypeTag>);
+//! Use the FVSpatialParams by default
+SET_TYPE_PROP(TwoPTwoC, SpatialParams, FVSpatialParams<TypeTag>);
//! Use the model after Millington (1961) for the effective diffusivity
SET_TYPE_PROP(TwoPTwoC, EffectiveDiffusivityModel,
diff --git a/dumux/porousmediumflow/2pnc/model.hh b/dumux/porousmediumflow/2pnc/model.hh
index 348d08964f..abc5f4c9d0 100644
--- a/dumux/porousmediumflow/2pnc/model.hh
+++ b/dumux/porousmediumflow/2pnc/model.hh
@@ -120,7 +120,7 @@ SET_TYPE_PROP(TwoPNC, PrimaryVariables, SwitchablePrimaryVariables<TypeTag, int>
SET_TYPE_PROP(TwoPNC, PrimaryVariableSwitch, TwoPNCPrimaryVariableSwitch<TypeTag>); //! The primary variable switch for the 2pnc model
SET_TYPE_PROP(TwoPNC, VolumeVariables, TwoPNCVolumeVariables<TypeTag>); //! the VolumeVariables property
SET_TYPE_PROP(TwoPNC, Indices, TwoPNCIndices <TypeTag, /*PVOffset=*/0>); //! The indices required by the isothermal 2pnc model
-SET_TYPE_PROP(TwoPNC, SpatialParams, ImplicitSpatialParams<TypeTag>); //! Use the ImplicitSpatialParams by default
+SET_TYPE_PROP(TwoPNC, SpatialParams, FVSpatialParams<TypeTag>); //! Use the FVSpatialParams by default
SET_TYPE_PROP(TwoPNC, VtkOutputFields, TwoPNCVtkOutputFields<TypeTag>); //! Set the vtk output fields specific to the TwoPNC model
SET_TYPE_PROP(TwoPNC, LocalResidual, CompositionalLocalResidual<TypeTag>); //! Use the compositional local residual
diff --git a/dumux/porousmediumflow/3p/model.hh b/dumux/porousmediumflow/3p/model.hh
index e5f85a106f..1b1f8ab2bb 100644
--- a/dumux/porousmediumflow/3p/model.hh
+++ b/dumux/porousmediumflow/3p/model.hh
@@ -129,8 +129,8 @@ SET_TYPE_PROP(ThreeP, VolumeVariables, ThreePVolumeVariables<TypeTag>);
SET_TYPE_PROP(ThreeP, Indices, ThreePIndices<TypeTag,/*PVOffset=*/0>);
//! The spatial parameters to be employed.
-//! Use ImplicitSpatialParams by default.
-SET_TYPE_PROP(ThreeP, SpatialParams, ImplicitSpatialParams<TypeTag>);
+//! Use FVSpatialParams by default.
+SET_TYPE_PROP(ThreeP, SpatialParams, FVSpatialParams<TypeTag>);
SET_PROP(ThreeP, FluidState)
{
diff --git a/dumux/porousmediumflow/3p3c/model.hh b/dumux/porousmediumflow/3p3c/model.hh
index 1d819b7c13..65497af249 100644
--- a/dumux/porousmediumflow/3p3c/model.hh
+++ b/dumux/porousmediumflow/3p3c/model.hh
@@ -179,8 +179,8 @@ SET_BOOL_PROP(ThreePThreeC, UseConstraintSolver, false);
SET_TYPE_PROP(ThreePThreeC, Indices, ThreePThreeCIndices<TypeTag, /*PVOffset=*/0>);
//! The spatial parameters to be employed.
-//! Use ImplicitSpatialParams by default.
-SET_TYPE_PROP(ThreePThreeC, SpatialParams, ImplicitSpatialParams<TypeTag>);
+//! Use FVSpatialParams by default.
+SET_TYPE_PROP(ThreePThreeC, SpatialParams, FVSpatialParams<TypeTag>);
//! The model after Millington (1961) is used for the effective diffusivity
SET_PROP(ThreePThreeC, EffectiveDiffusivityModel)
diff --git a/dumux/porousmediumflow/3pwateroil/propertydefaults.hh b/dumux/porousmediumflow/3pwateroil/propertydefaults.hh
index 035d618115..804c938d26 100644
--- a/dumux/porousmediumflow/3pwateroil/propertydefaults.hh
+++ b/dumux/porousmediumflow/3pwateroil/propertydefaults.hh
@@ -101,8 +101,8 @@ SET_SCALAR_PROP(ThreePWaterOilNI, ImplicitMobilityUpwindWeight, 1.0);
SET_BOOL_PROP(ThreePWaterOilNI, UseSimpleModel, true);
//! The spatial parameters to be employed.
-//! Use ImplicitSpatialParams by default.
-SET_TYPE_PROP(ThreePWaterOilNI, SpatialParams, ImplicitSpatialParams<TypeTag>);
+//! Use FVSpatialParams by default.
+SET_TYPE_PROP(ThreePWaterOilNI, SpatialParams, FVSpatialParams<TypeTag>);
//! Use the model after Millington (1961) for the effective diffusivity
SET_TYPE_PROP(ThreePWaterOilNI, EffectiveDiffusivityModel,
diff --git a/dumux/porousmediumflow/mpnc/implicit/propertydefaults.hh b/dumux/porousmediumflow/mpnc/implicit/propertydefaults.hh
index ab195d7079..466cb5b46f 100644
--- a/dumux/porousmediumflow/mpnc/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/mpnc/implicit/propertydefaults.hh
@@ -159,8 +159,8 @@ SET_SCALAR_PROP(MPNC, ImplicitMassUpwindWeight, 1.0);
SET_SCALAR_PROP(MPNC, ImplicitMobilityUpwindWeight, 1.0);
//! The spatial parameters to be employed.
-//! Use ImplicitSpatialParams by default.
-SET_TYPE_PROP(MPNC, SpatialParams, ImplicitSpatialParams<TypeTag>);
+//! Use FVSpatialParams by default.
+SET_TYPE_PROP(MPNC, SpatialParams, FVSpatialParams<TypeTag>);
//! The VTK writer module for common quantities
SET_PROP(MPNC, MPNCVtkCommonModule)
diff --git a/dumux/porousmediumflow/richards/model.hh b/dumux/porousmediumflow/richards/model.hh
index 693b08f70c..01d7e94da9 100644
--- a/dumux/porousmediumflow/richards/model.hh
+++ b/dumux/porousmediumflow/richards/model.hh
@@ -182,8 +182,8 @@ SET_TYPE_PROP(Richards, PrimaryVariableSwitch, ExtendedRichardsPrimaryVariableSw
//SET_BOOL_PROP(Richards, ProblemUsePrimaryVariableSwitch, false);
//! The spatial parameters to be employed.
-//! Use ImplicitSpatialParams by default.
-SET_TYPE_PROP(Richards, SpatialParams, ImplicitSpatialParams<TypeTag>);
+//! Use FVSpatialParams by default.
+SET_TYPE_PROP(Richards, SpatialParams, FVSpatialParams<TypeTag>);
/*!
*\brief The fluid system used by the model.
diff --git a/dumux/porousmediumflow/richardsnc/model.hh b/dumux/porousmediumflow/richardsnc/model.hh
index fc937af4c0..dfea1a76cd 100644
--- a/dumux/porousmediumflow/richardsnc/model.hh
+++ b/dumux/porousmediumflow/richardsnc/model.hh
@@ -123,8 +123,8 @@ SET_TYPE_PROP(RichardsNC, VtkOutputFields, RichardsNCVtkOutputFields<TypeTag>);
//! Set the indices used
SET_TYPE_PROP(RichardsNC, Indices, RichardsNCIndices<TypeTag>);
//! The spatial parameters to be employed.
-//! Use ImplicitSpatialParamsOneP by default.
-SET_TYPE_PROP(RichardsNC, SpatialParams, ImplicitSpatialParamsOneP<TypeTag>);
+//! Use FVSpatialParamsOneP by default.
+SET_TYPE_PROP(RichardsNC, SpatialParams, FVSpatialParamsOneP<TypeTag>);
//! The model after Millington (1961) is used for the effective diffusivity
SET_PROP(RichardsNC, EffectiveDiffusivityModel)
diff --git a/dumux/porousmediumflow/tracer/model.hh b/dumux/porousmediumflow/tracer/model.hh
index f04210f20f..cddd611cc6 100644
--- a/dumux/porousmediumflow/tracer/model.hh
+++ b/dumux/porousmediumflow/tracer/model.hh
@@ -109,8 +109,8 @@ SET_TYPE_PROP(Tracer, AdvectionType, StationaryVelocityField<TypeTag>);
//! Set the indices used by the tracer model
SET_TYPE_PROP(Tracer, Indices, TracerIndices<TypeTag>);
-//! Use ImplicitSpatialParamsOneP by default.
-SET_TYPE_PROP(Tracer, SpatialParams, ImplicitSpatialParamsOneP<TypeTag>);
+//! Use FVSpatialParamsOneP by default.
+SET_TYPE_PROP(Tracer, SpatialParams, FVSpatialParamsOneP<TypeTag>);
//! Use simple model with constant tortuosity as pm diffusivity model
SET_TYPE_PROP(Tracer, EffectiveDiffusivityModel, DiffusivityConstantTortuosity<typename GET_PROP_TYPE(TypeTag, Scalar)>);
diff --git a/test/mixeddimension/embedded/1p2c_richards2c/richardstestspatialparams.hh b/test/mixeddimension/embedded/1p2c_richards2c/richardstestspatialparams.hh
index ef7edda4bc..8ad980e66c 100644
--- a/test/mixeddimension/embedded/1p2c_richards2c/richardstestspatialparams.hh
+++ b/test/mixeddimension/embedded/1p2c_richards2c/richardstestspatialparams.hh
@@ -60,9 +60,9 @@ public:
* \brief The spatial parameters for the RichardsTestProblem
*/
template<class TypeTag>
-class RichardsTestSpatialParams : public ImplicitSpatialParams<TypeTag>
+class RichardsTestSpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
diff --git a/test/mixeddimension/embedded/1p2c_richards2c/rootsystemtestspatialparams.hh b/test/mixeddimension/embedded/1p2c_richards2c/rootsystemtestspatialparams.hh
index 690f4e97be..1048fb802a 100644
--- a/test/mixeddimension/embedded/1p2c_richards2c/rootsystemtestspatialparams.hh
+++ b/test/mixeddimension/embedded/1p2c_richards2c/rootsystemtestspatialparams.hh
@@ -37,9 +37,9 @@ namespace Dumux
* \brief Definition of the spatial parameters for the root system test problem
*/
template<class TypeTag>
-class RootsystemTestSpatialParams: public ImplicitSpatialParamsOneP<TypeTag>
+class RootsystemTestSpatialParams: public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
diff --git a/test/mixeddimension/embedded/1p_1p/bloodflowspatialparams.hh b/test/mixeddimension/embedded/1p_1p/bloodflowspatialparams.hh
index fa255fe545..62aaf90b70 100644
--- a/test/mixeddimension/embedded/1p_1p/bloodflowspatialparams.hh
+++ b/test/mixeddimension/embedded/1p_1p/bloodflowspatialparams.hh
@@ -36,9 +36,9 @@ namespace Dumux
* \brief Definition of the spatial parameters for the blood flow problem
*/
template<class TypeTag>
-class BloodFlowSpatialParams: public ImplicitSpatialParamsOneP<TypeTag>
+class BloodFlowSpatialParams: public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
diff --git a/test/mixeddimension/embedded/1p_1p/tissuespatialparams.hh b/test/mixeddimension/embedded/1p_1p/tissuespatialparams.hh
index d53668551c..c55ce02c7d 100644
--- a/test/mixeddimension/embedded/1p_1p/tissuespatialparams.hh
+++ b/test/mixeddimension/embedded/1p_1p/tissuespatialparams.hh
@@ -36,9 +36,9 @@ namespace Dumux
* \brief Definition of the spatial parameters for the tissue problem
*/
template<class TypeTag>
-class TissueSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class TissueSpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
diff --git a/test/mixeddimension/embedded/1p_richards/richardstestspatialparams.hh b/test/mixeddimension/embedded/1p_richards/richardstestspatialparams.hh
index 663875650c..cc1b889007 100644
--- a/test/mixeddimension/embedded/1p_richards/richardstestspatialparams.hh
+++ b/test/mixeddimension/embedded/1p_richards/richardstestspatialparams.hh
@@ -61,9 +61,9 @@ public:
* \brief The spatial parameters for the RichardsTestProblem
*/
template<class TypeTag>
-class RichardsTestSpatialParams : public ImplicitSpatialParams<TypeTag>
+class RichardsTestSpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
diff --git a/test/mixeddimension/embedded/1p_richards/rootsystemtestspatialparams.hh b/test/mixeddimension/embedded/1p_richards/rootsystemtestspatialparams.hh
index 1bb9adf387..56401d123a 100644
--- a/test/mixeddimension/embedded/1p_richards/rootsystemtestspatialparams.hh
+++ b/test/mixeddimension/embedded/1p_richards/rootsystemtestspatialparams.hh
@@ -37,9 +37,9 @@ namespace Dumux
* \brief Definition of the spatial parameters for the root system test problem
*/
template<class TypeTag>
-class RootsystemTestSpatialParams: public ImplicitSpatialParamsOneP<TypeTag>
+class RootsystemTestSpatialParams: public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
diff --git a/test/mixeddimension/facet/1p2c_1p2c/fracturespatialparams.hh b/test/mixeddimension/facet/1p2c_1p2c/fracturespatialparams.hh
index 41e2f25494..6009ff03ee 100644
--- a/test/mixeddimension/facet/1p2c_1p2c/fracturespatialparams.hh
+++ b/test/mixeddimension/facet/1p2c_1p2c/fracturespatialparams.hh
@@ -36,9 +36,9 @@ namespace Dumux
* \brief The spatial parameters class for the fracture problem
*/
template<class TypeTag>
-class OnePFractureSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class OnePFractureSpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/test/mixeddimension/facet/1p2c_1p2c/matrixspatialparams.hh b/test/mixeddimension/facet/1p2c_1p2c/matrixspatialparams.hh
index e4c0a49d6c..1bd92b009b 100644
--- a/test/mixeddimension/facet/1p2c_1p2c/matrixspatialparams.hh
+++ b/test/mixeddimension/facet/1p2c_1p2c/matrixspatialparams.hh
@@ -36,9 +36,9 @@ namespace Dumux
* \brief The spatial parameters class for the matrix problem
*/
template<class TypeTag>
-class OnePMatrixSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class OnePMatrixSpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/test/mixeddimension/facet/1p_1p/fracturespatialparams.hh b/test/mixeddimension/facet/1p_1p/fracturespatialparams.hh
index 6747b6dfd5..798487ef19 100644
--- a/test/mixeddimension/facet/1p_1p/fracturespatialparams.hh
+++ b/test/mixeddimension/facet/1p_1p/fracturespatialparams.hh
@@ -36,9 +36,9 @@ namespace Dumux
* \brief The spatial parameters class for the fracture problem
*/
template<class TypeTag>
-class OnePFractureSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class OnePFractureSpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/test/mixeddimension/facet/1p_1p/matrixspatialparams.hh b/test/mixeddimension/facet/1p_1p/matrixspatialparams.hh
index 9dca660fd9..9404bb8086 100644
--- a/test/mixeddimension/facet/1p_1p/matrixspatialparams.hh
+++ b/test/mixeddimension/facet/1p_1p/matrixspatialparams.hh
@@ -36,9 +36,9 @@ namespace Dumux
* \brief The spatial parameters class for the matrix problem
*/
template<class TypeTag>
-class OnePMatrixSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class OnePMatrixSpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/test/porousmediumflow/1p/implicit/1pnispatialparams.hh b/test/porousmediumflow/1p/implicit/1pnispatialparams.hh
index dcd8def06a..92cc02d542 100644
--- a/test/porousmediumflow/1p/implicit/1pnispatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/1pnispatialparams.hh
@@ -36,9 +36,9 @@ namespace Dumux
* \brief Definition of the spatial parameters for the 1pni problems.
*/
template<class TypeTag>
-class OnePNISpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class OnePNISpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
diff --git a/test/porousmediumflow/1p/implicit/1ptestspatialparams.hh b/test/porousmediumflow/1p/implicit/1ptestspatialparams.hh
index c8489ccf7f..e7e0124c5c 100644
--- a/test/porousmediumflow/1p/implicit/1ptestspatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/1ptestspatialparams.hh
@@ -49,9 +49,9 @@ NEW_TYPE_TAG(OnePTestSpatialParams);
* 1p box model
*/
template<class TypeTag>
-class OnePTestSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class OnePTestSpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
diff --git a/test/porousmediumflow/1p/implicit/compressible/spatialparams.hh b/test/porousmediumflow/1p/implicit/compressible/spatialparams.hh
index 5339d8f3c2..15506993af 100644
--- a/test/porousmediumflow/1p/implicit/compressible/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/compressible/spatialparams.hh
@@ -29,9 +29,9 @@ namespace Dumux
{
template<class TypeTag>
-class OnePTestSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class OnePTestSpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
diff --git a/test/porousmediumflow/1p/implicit/fracturespatialparams.hh b/test/porousmediumflow/1p/implicit/fracturespatialparams.hh
index 1983b32576..5ae752bf34 100644
--- a/test/porousmediumflow/1p/implicit/fracturespatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/fracturespatialparams.hh
@@ -50,9 +50,9 @@ SET_TYPE_PROP(FractureSpatialParams, SpatialParams, Dumux::FractureSpatialParams
* two-phase fully implicit model
*/
template<class TypeTag>
-class FractureSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class FractureSpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh b/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh
index 5577c27fd3..46561d443a 100644
--- a/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh
@@ -29,9 +29,9 @@ namespace Dumux
{
template<class TypeTag>
-class OnePTestSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class OnePTestSpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
diff --git a/test/porousmediumflow/1p/implicit/pointsources/1psingularityspatialparams.hh b/test/porousmediumflow/1p/implicit/pointsources/1psingularityspatialparams.hh
index ec2fe32672..9d9189339c 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/1psingularityspatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/pointsources/1psingularityspatialparams.hh
@@ -38,9 +38,9 @@ namespace Dumux
* 1p model with point sources
*/
template<class TypeTag>
-class OnePSingularitySpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class OnePSingularitySpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/test/porousmediumflow/1p/implicit/tubesspatialparams.hh b/test/porousmediumflow/1p/implicit/tubesspatialparams.hh
index 4ad9e0eada..4d8c85edb1 100644
--- a/test/porousmediumflow/1p/implicit/tubesspatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/tubesspatialparams.hh
@@ -38,9 +38,9 @@ namespace Dumux
* and a branching point embedded in a three-dimensional world
*/
template<class TypeTag>
-class TubesTestSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class TubesTestSpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/test/porousmediumflow/1pnc/implicit/1pnctestspatialparams.hh b/test/porousmediumflow/1pnc/implicit/1pnctestspatialparams.hh
index f07615368c..ecabdc2b4a 100644
--- a/test/porousmediumflow/1pnc/implicit/1pnctestspatialparams.hh
+++ b/test/porousmediumflow/1pnc/implicit/1pnctestspatialparams.hh
@@ -38,9 +38,9 @@ namespace Dumux
* test problem.
*/
template<class TypeTag>
-class OnePNCTestSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class OnePNCTestSpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
diff --git a/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh b/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh
index ffc5948460..ae938d9098 100644
--- a/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh
+++ b/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh
@@ -55,10 +55,10 @@ SET_TYPE_PROP(ThermoChemSpatialParams, SpatialParams, Dumux::ThermoChemSpatialPa
* problem which uses the isothermal 2p2c box model
*/
template<class TypeTag>
-class ThermoChemSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class ThermoChemSpatialParams : public FVSpatialParamsOneP<TypeTag>
{
using ThisType = ThermoChemSpatialParams<TypeTag>;
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
diff --git a/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh b/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
index 7c74e7e578..0fb5ca37d6 100644
--- a/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
@@ -67,9 +67,9 @@ public:
* two-phase fully implicit model
*/
template<class TypeTag>
-class FractureSpatialParams : public ImplicitSpatialParams<TypeTag>
+class FractureSpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh b/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
index 6ce0becd8a..47656484f0 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
@@ -58,9 +58,9 @@ public:
}
template<class TypeTag>
-class TwoPTestSpatialParams : public ImplicitSpatialParams<TypeTag>
+class TwoPTestSpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
diff --git a/test/porousmediumflow/2p1c/implicit/steaminjectionspatialparams.hh b/test/porousmediumflow/2p1c/implicit/steaminjectionspatialparams.hh
index 48a00ca88b..37a01e5fa8 100644
--- a/test/porousmediumflow/2p1c/implicit/steaminjectionspatialparams.hh
+++ b/test/porousmediumflow/2p1c/implicit/steaminjectionspatialparams.hh
@@ -62,9 +62,9 @@ SET_PROP(InjectionProblemSpatialParams, MaterialLaw)
* \brief Definition of the spatial parameters for various steam injection problems
*/
template<class TypeTag>
-class InjectionProblemSpatialParams : public ImplicitSpatialParams<TypeTag>
+class InjectionProblemSpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh b/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
index 329ae6cb61..16a7eca089 100644
--- a/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
@@ -60,9 +60,9 @@ SET_TYPE_PROP(InjectionSpatialParams,
* fully implicit model.
*/
template<class TypeTag>
-class InjectionSpatialParams : public ImplicitSpatialParams<TypeTag>
+class InjectionSpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh b/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
index 8d0dac358d..46c62b9499 100644
--- a/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
@@ -60,9 +60,9 @@ SET_TYPE_PROP(WaterAirSpatialParams,
* \brief Definition of the spatial parameters for the water-air problem
*/
template<class TypeTag>
-class WaterAirSpatialParams : public ImplicitSpatialParams<TypeTag>
+class WaterAirSpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh b/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
index f5bda20671..285cb2ae70 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
@@ -70,9 +70,9 @@ SET_PROP(FuelCellSpatialParams, MaterialLaw)
* problem which uses the isothermal 2p2c box model
*/
template<class TypeTag>
-class FuelCellSpatialParams : public ImplicitSpatialParams<TypeTag>
+class FuelCellSpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh b/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh
index f920a941c7..74d56db83b 100644
--- a/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh
+++ b/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh
@@ -58,10 +58,10 @@ public:
*
*/
template<class TypeTag>
-class DissolutionSpatialparams : public ImplicitSpatialParams<TypeTag>
+class DissolutionSpatialparams : public FVSpatialParams<TypeTag>
{
using ThisType = DissolutionSpatialparams<TypeTag>;
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
diff --git a/test/porousmediumflow/3p/implicit/3pnispatialparams.hh b/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
index 1c0af5293c..3bdae69b0d 100644
--- a/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
+++ b/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
@@ -67,9 +67,9 @@ SET_PROP(ThreePNISpatialParams, MaterialLaw)
template<class TypeTag>
-class ThreePNISpatialParams : public ImplicitSpatialParams<TypeTag>
+class ThreePNISpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
diff --git a/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh b/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
index c73d014eec..f4810d3566 100644
--- a/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
@@ -68,9 +68,9 @@ SET_PROP(InfiltrationThreePSpatialParams, MaterialLaw)
* \brief Definition of the spatial parameters for the infiltration problem
*/
template<class TypeTag>
-class InfiltrationThreePSpatialParams : public ImplicitSpatialParams<TypeTag>
+class InfiltrationThreePSpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh b/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh
index dec0e465da..aa19b5dc0a 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh
+++ b/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh
@@ -62,9 +62,9 @@ SET_PROP(ColumnSpatialParams, MaterialLaw)
* \brief Definition of the spatial parameters for the column problem
*/
template<class TypeTag>
-class ColumnSpatialParams : public ImplicitSpatialParams<TypeTag>
+class ColumnSpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
enum {
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration3p3cspatialparams.hh b/test/porousmediumflow/3p3c/implicit/infiltration3p3cspatialparams.hh
index 4f09df6ead..cadadbd4c9 100644
--- a/test/porousmediumflow/3p3c/implicit/infiltration3p3cspatialparams.hh
+++ b/test/porousmediumflow/3p3c/implicit/infiltration3p3cspatialparams.hh
@@ -66,9 +66,9 @@ SET_PROP(InfiltrationThreePThreeCSpatialParamsTypeTag, MaterialLaw)
* \brief Definition of the spatial parameters for the infiltration problem
*/
template<class TypeTag>
-class InfiltrationThreePThreeCSpatialParams : public ImplicitSpatialParams<TypeTag>
+class InfiltrationThreePThreeCSpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
diff --git a/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh b/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
index 363ed81161..c2c2e3dd9a 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
+++ b/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
@@ -65,9 +65,9 @@ SET_PROP(KuevetteSpatialParams, MaterialLaw)
* \brief Definition of the spatial parameters for the kuevette problem
*/
template<class TypeTag>
-class KuevetteSpatialParams : public ImplicitSpatialParams<TypeTag>
+class KuevetteSpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
diff --git a/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdspatialparams.hh b/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdspatialparams.hh
index 240439f6cf..6b2703ea61 100644
--- a/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdspatialparams.hh
+++ b/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdspatialparams.hh
@@ -68,9 +68,9 @@ SET_PROP(SagdSpatialParams, MaterialLaw)
* \brief Definition of the spatial parameters for the SAGD problem
*/
template<class TypeTag>
-class SagdSpatialParams : public ImplicitSpatialParams<TypeTag>
+class SagdSpatialParams : public FVSpatialParams<TypeTag>
{
- typedef ImplicitSpatialParams<TypeTag> ParentType;
+ typedef FVSpatialParams<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
diff --git a/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh b/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh
index 850c8c5223..f223e355d1 100644
--- a/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh
+++ b/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh
@@ -69,9 +69,9 @@ public:
* fully implicit model.
*/
template<class TypeTag>
-class HeterogeneousSpatialParams : public ImplicitSpatialParams<TypeTag>
+class HeterogeneousSpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
diff --git a/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh b/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
index 0801f4b1a7..fec8076e34 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
@@ -79,9 +79,9 @@ private:
*
*/
template<class TypeTag>
-class CombustionSpatialParams : public ImplicitSpatialParams<TypeTag>
+class CombustionSpatialParams : public FVSpatialParams<TypeTag>
{
- typedef ImplicitSpatialParams<TypeTag> ParentType;
+ typedef FVSpatialParams<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
index 2765da2893..4e2bd0ee9b 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
@@ -145,9 +145,9 @@ public:
* \brief Definition of the spatial parameters for the evaporation atmosphere Problem (using a "poor man's coupling")
*/
template<class TypeTag>
-class EvaporationAtmosphereSpatialParams : public ImplicitSpatialParams<TypeTag>
+class EvaporationAtmosphereSpatialParams : public FVSpatialParams<TypeTag>
{
- typedef ImplicitSpatialParams<TypeTag> ParentType;
+ typedef FVSpatialParams<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
diff --git a/test/porousmediumflow/mpnc/implicit/forchheimerspatialparams.hh b/test/porousmediumflow/mpnc/implicit/forchheimerspatialparams.hh
index 610c3abf19..dd04c9621b 100644
--- a/test/porousmediumflow/mpnc/implicit/forchheimerspatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/forchheimerspatialparams.hh
@@ -71,9 +71,9 @@ public:
*
*/
template<class TypeTag>
-class ForchheimerSpatialParams : public ImplicitSpatialParams<TypeTag>
+class ForchheimerSpatialParams : public FVSpatialParams<TypeTag>
{
- typedef ImplicitSpatialParams<TypeTag> ParentType;
+ typedef FVSpatialParams<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
diff --git a/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh b/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
index 0f8b7580c2..cf12ac8ea1 100644
--- a/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
@@ -70,9 +70,9 @@ public:
*
*/
template<class TypeTag>
-class ObstacleSpatialParams : public ImplicitSpatialParams<TypeTag>
+class ObstacleSpatialParams : public FVSpatialParams<TypeTag>
{
- typedef ImplicitSpatialParams<TypeTag> ParentType;
+ typedef FVSpatialParams<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
diff --git a/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh b/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
index 13f1289078..4bbcbea4d0 100644
--- a/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
@@ -65,9 +65,9 @@ public:
* \brief The spatial parameters for the RichardsAnalyticalProblem
*/
template<class TypeTag>
-class RichardsAnalyticalSpatialParams : public ImplicitSpatialParams<TypeTag>
+class RichardsAnalyticalSpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
diff --git a/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh b/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
index 94874ad73c..eb9a2cdc73 100644
--- a/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
@@ -64,9 +64,9 @@ public:
* \brief The spatial parameters for the RichardsLensProblem
*/
template<class TypeTag>
-class RichardsLensSpatialParams : public ImplicitSpatialParams<TypeTag>
+class RichardsLensSpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
diff --git a/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh b/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
index a629098500..656660f14c 100644
--- a/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
@@ -68,9 +68,9 @@ public:
template<class TypeTag>
-class RichardsNISpatialParams : public ImplicitSpatialParams<TypeTag>
+class RichardsNISpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
diff --git a/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh b/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh
index 3e02a16c3b..f02f4e5cd6 100644
--- a/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh
+++ b/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh
@@ -63,9 +63,9 @@ SET_PROP(RichardsWellTracerSpatialParams, MaterialLaw)
* \brief The spatial parameters for the RichardsWellTracerProblem
*/
template<class TypeTag>
-class RichardsWellTracerSpatialParams : public ImplicitSpatialParams<TypeTag>
+class RichardsWellTracerSpatialParams : public FVSpatialParams<TypeTag>
{
- using ParentType = ImplicitSpatialParams<TypeTag>;
+ using ParentType = FVSpatialParams<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
diff --git a/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh b/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh
index e905cb048b..d17195316b 100644
--- a/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh
+++ b/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh
@@ -30,9 +30,9 @@ namespace Dumux
{
template<class TypeTag>
-class OnePTestSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class OnePTestSpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
diff --git a/test/porousmediumflow/tracer/1ptracer/tracertestspatialparams.hh b/test/porousmediumflow/tracer/1ptracer/tracertestspatialparams.hh
index 0b254ae3fa..270d645878 100644
--- a/test/porousmediumflow/tracer/1ptracer/tracertestspatialparams.hh
+++ b/test/porousmediumflow/tracer/1ptracer/tracertestspatialparams.hh
@@ -36,9 +36,9 @@ namespace Dumux
* \brief Definition of the spatial parameters for the tracer problem
*/
template<class TypeTag>
-class TracerTestSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class TracerTestSpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
diff --git a/test/porousmediumflow/tracer/constvel/tracertestspatialparams.hh b/test/porousmediumflow/tracer/constvel/tracertestspatialparams.hh
index 978051674d..c53d4a3c61 100644
--- a/test/porousmediumflow/tracer/constvel/tracertestspatialparams.hh
+++ b/test/porousmediumflow/tracer/constvel/tracertestspatialparams.hh
@@ -36,9 +36,9 @@ namespace Dumux
* \brief Definition of the spatial parameters for the tracer problem
*/
template<class TypeTag>
-class TracerTestSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+class TracerTestSpatialParams : public FVSpatialParamsOneP<TypeTag>
{
- using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using ParentType = FVSpatialParamsOneP<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
--
GitLab