diff --git a/dumux/boxmodels/3p3c/3p3cfluxvariables.hh b/dumux/boxmodels/3p3c/3p3cfluxvariables.hh index 70e8357fd9cfef1c41b9886da6fd8fbc4cba1eac..54c3c79d202f226c60b2f471ab34774af0125b15 100644 --- a/dumux/boxmodels/3p3c/3p3cfluxvariables.hh +++ b/dumux/boxmodels/3p3c/3p3cfluxvariables.hh @@ -71,7 +71,7 @@ class ThreePThreeCFluxVariables }; typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry; - typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters; + typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParameters; typedef typename FVElementGeometry::SubControlVolumeFace SCVFace; typedef Dune::FieldVector<Scalar, dim> DimVector; diff --git a/dumux/boxmodels/richards/richardsfluxvariables.hh b/dumux/boxmodels/richards/richardsfluxvariables.hh index ade4af287e756ab5039cb0411d8fca7b41fd986c..301d66837cec3743466c9f805f7b0e53925c5942 100644 --- a/dumux/boxmodels/richards/richardsfluxvariables.hh +++ b/dumux/boxmodels/richards/richardsfluxvariables.hh @@ -49,7 +49,7 @@ class RichardsFluxVariables : public BoxDarcyFluxVariables<TypeTag> { typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem; typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables; - typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParams; + typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams; typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices; enum { diff --git a/dumux/boxmodels/richards/richardsnewtoncontroller.hh b/dumux/boxmodels/richards/richardsnewtoncontroller.hh index f16ad334864c7184edb312671ae1bf948d64be55..61f47e4f976ad9d9fa1a6235f08b0f60f24c853f 100644 --- a/dumux/boxmodels/richards/richardsnewtoncontroller.hh +++ b/dumux/boxmodels/richards/richardsnewtoncontroller.hh @@ -46,7 +46,7 @@ class RichardsNewtonController : public NewtonController<TypeTag> typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector; - typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParams; + typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams; typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry; typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw; typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams; diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh index 5335b9c0a0f8c47365524b8156fb414e164da963..59874f874c49c48aac9adcc0720ede1e9f3b60c1 100644 --- a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh +++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh @@ -52,7 +52,7 @@ template<class TypeTag> class FVPressure2PAdaptive: public FVPressure2P<TypeTag> typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem; - typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters; + typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParameters; typedef typename SpatialParameters::MaterialLaw MaterialLaw; typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices; diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh index 93312c189c9c74e9246c8801f4fb66b1adbc9cbf..a3a0766011e672685b24362d0d2f49f496277e2e 100644 --- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh +++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh @@ -47,7 +47,7 @@ class FVVelocity2PAdaptive: public FVVelocity2P<TypeTag> typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem; - typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters; + typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParameters; typedef typename SpatialParameters::MaterialLaw MaterialLaw; typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices; diff --git a/dumux/decoupled/2p2c/fvpressure2p2c.hh b/dumux/decoupled/2p2c/fvpressure2p2c.hh index 954bb72e1560c4961c3befbb4a374a8574e1e3b6..105c1b22f2c29a3d5ddd3c91cd64ea38df1ca963 100644 --- a/dumux/decoupled/2p2c/fvpressure2p2c.hh +++ b/dumux/decoupled/2p2c/fvpressure2p2c.hh @@ -80,7 +80,7 @@ template<class TypeTag> class FVPressure2P2C typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes; typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem; - typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters; + typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParameters; typedef typename SpatialParameters::MaterialLaw MaterialLaw; typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices; diff --git a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh index 9dbbaef99461a17504a69c5525b23fc9b9fb62ae..0725de1cb5056b8843356b19c911d8b7ce129d29 100644 --- a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh +++ b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh @@ -73,7 +73,7 @@ class FVPressure2P2CMultiPhysics : public FVPressure2P2C<TypeTag> typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes; typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem; - typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters; + typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParameters; typedef typename SpatialParameters::MaterialLaw MaterialLaw; typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices; diff --git a/dumux/decoupled/2p2c/fvpressurecompositional.hh b/dumux/decoupled/2p2c/fvpressurecompositional.hh index 4f24b9cea61bfa960b2412a34ff828418472b3bb..bb0826849ad6cf052b2bca333ad690d3027886b7 100644 --- a/dumux/decoupled/2p2c/fvpressurecompositional.hh +++ b/dumux/decoupled/2p2c/fvpressurecompositional.hh @@ -78,7 +78,7 @@ template<class TypeTag> class FVPressureCompositional typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState; ///@cond 0 - typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters)::MaterialLaw MaterialLaw; + typedef typename GET_PROP_TYPE(TypeTag, SpatialParams)::MaterialLaw MaterialLaw; ///@endcond typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData; diff --git a/dumux/decoupled/2p2c/fvtransport2p2c.hh b/dumux/decoupled/2p2c/fvtransport2p2c.hh index 4d330c821a1ff0c4dbf863e32dd4e5dd596b6eb7..2fd0ca2085bc1452f0a63eb7936da12ddd852538 100644 --- a/dumux/decoupled/2p2c/fvtransport2p2c.hh +++ b/dumux/decoupled/2p2c/fvtransport2p2c.hh @@ -58,7 +58,7 @@ class FVTransport2P2C typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem; - typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters; + typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParameters; typedef typename SpatialParameters::MaterialLaw MaterialLaw; typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices; diff --git a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh index 51c7818a8a6f0e92e2ba10c612d0d080ed3261dc..059461447812a8bbe19c8190ae468a62742209bd 100644 --- a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh +++ b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh @@ -58,7 +58,7 @@ class FVTransport2P2CMultiPhysics : public FVTransport2P2C<TypeTag> typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem; - typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters; + typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParameters; typedef typename SpatialParameters::MaterialLaw MaterialLaw; typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;