Commit 85239547 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

replaced remaining local SpatialParameters typesdefs by SpatialParams

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8845 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent eb62a15c
......@@ -71,7 +71,7 @@ class ThreePThreeCFluxVariables
};
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParameters;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
typedef Dune::FieldVector<Scalar, dim> DimVector;
......@@ -278,7 +278,7 @@ private:
const Element &element,
const ElementVolumeVariables &elemVolVars)
{
const SpatialParameters &spatialParams = problem.spatialParams();
const SpatialParams &spatialParams = problem.spatialParams();
// multiply the pressure potential with the intrinsic
// permeability
DimMatrix K;
......
......@@ -52,8 +52,8 @@ 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, SpatialParams) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
......
......@@ -47,8 +47,8 @@ class FVVelocity2PAdaptive: public FVVelocity2P<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
......
......@@ -81,14 +81,14 @@ public:
: ParentType(timeManager, gridView)
{ }
/*!
* \brief The constructor for a given spatialParameters
* \brief The constructor for given spatialParams
*
* This constructor uses a predefined SpatialParameters object that was created (e.g. in
* This constructor uses a predefined SpatialParams object that was created (e.g. in
* the problem) and does not create one in the base class.
*
* \param timeManager The time manager
* \param gridView The grid view
* \param spatialParams SpatialParameters instantiation
* \param spatialParams SpatialParams instantiation
*/
IMPETProblem2P2C(TimeManager &timeManager, const GridView &gridView, SpatialParams &spatialParams)
: ParentType(timeManager, gridView, spatialParams)
......
......@@ -80,8 +80,8 @@ 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, SpatialParams) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
......
......@@ -73,8 +73,8 @@ 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, SpatialParams) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
......
......@@ -58,8 +58,8 @@ class FVTransport2P2C
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
......
......@@ -58,8 +58,8 @@ 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, SpatialParams) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment