From 85239547fecbfc60d0cafb784a4e3e070f936b09 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Mon, 13 Aug 2012 12:35:30 +0000
Subject: [PATCH] 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
---
dumux/boxmodels/3p3c/3p3cfluxvariables.hh | 4 ++--
dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh | 4 ++--
dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh | 4 ++--
dumux/decoupled/2p2c/2p2cproblem.hh | 6 +++---
dumux/decoupled/2p2c/fvpressure2p2c.hh | 4 ++--
dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh | 4 ++--
dumux/decoupled/2p2c/fvtransport2p2c.hh | 4 ++--
dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh | 4 ++--
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/dumux/boxmodels/3p3c/3p3cfluxvariables.hh b/dumux/boxmodels/3p3c/3p3cfluxvariables.hh
index 54c3c79d20..d9008dc05e 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, 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;
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
index 59874f874c..5fdf3dd313 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
@@ -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;
diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
index a3a0766011..57ad0fec4c 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
@@ -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;
diff --git a/dumux/decoupled/2p2c/2p2cproblem.hh b/dumux/decoupled/2p2c/2p2cproblem.hh
index 417dedd831..f20e1582ae 100644
--- a/dumux/decoupled/2p2c/2p2cproblem.hh
+++ b/dumux/decoupled/2p2c/2p2cproblem.hh
@@ -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)
diff --git a/dumux/decoupled/2p2c/fvpressure2p2c.hh b/dumux/decoupled/2p2c/fvpressure2p2c.hh
index 105c1b22f2..8c03597f90 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2c.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2c.hh
@@ -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;
diff --git a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
index 0725de1cb5..d70d7cd571 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
@@ -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;
diff --git a/dumux/decoupled/2p2c/fvtransport2p2c.hh b/dumux/decoupled/2p2c/fvtransport2p2c.hh
index 2fd0ca2085..b97ed8d9b6 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2c.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2c.hh
@@ -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;
diff --git a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
index 0594614478..83f1eab9be 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
@@ -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;
--
GitLab