Commit 5fc87fa6 authored by Markus Wolff's avatar Markus Wolff
Browse files

new naming in decoupled 1p and 2p

   - mainly change of S/spatialParameters into S/spatialParams
   - (reviewed by Melanie)



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8133 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 4eb37198
......@@ -63,6 +63,7 @@ NEW_TYPE_TAG(DecoupledOneP, INHERITS_FROM(DecoupledModel));
//////////////////////////////////////////////////////////////////
NEW_PROP_TAG( SpatialParameters ); //!< The type of the spatial parameters object
NEW_PROP_TAG( SpatialParams ); //!< The type of the spatial parameters object
NEW_PROP_TAG( EnableGravity); //!< Returns whether gravity is considered in the problem
NEW_PROP_TAG( Fluid ); //!< The fluid for one-phase models
NEW_PROP_TAG( Indices ); //!< Set of indices for the one-phase model
......@@ -100,6 +101,9 @@ SET_TYPE_PROP(DecoupledOneP, Variables, VariableClass<TypeTag>);
//! Set standart CellData of immiscible one-phase models as default
SET_TYPE_PROP(DecoupledOneP, CellData, CellData1P<TypeTag>);
//! DEPRECATED SpatialParameters property
SET_TYPE_PROP(DecoupledOneP, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
}
}
#endif
......@@ -61,7 +61,7 @@ class DiffusionProblem1P: public OneModelProblem<TypeTag>
// material properties
typedef typename GET_PROP_TYPE(TypeTag, Fluid) Fluid;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
......@@ -82,7 +82,7 @@ public:
DiffusionProblem1P(TimeManager &timeManager, const GridView &gridView)
: ParentType(timeManager, gridView), gravity_(0)
{
spatialParameters_ = new SpatialParameters(gridView);
spatialParams_ = new SpatialParams(gridView);
newSpatialParams_ = true;
gravity_ = 0;
if (GET_PARAM(TypeTag, bool, EnableGravity))
......@@ -93,10 +93,10 @@ public:
*
* \param timeManager the time manager
* \param gridView The grid view
* \param spatialParameters SpatialParameters instantiation
* \param spatialParams SpatialParams instantiation
*/
DiffusionProblem1P(TimeManager &timeManager, const GridView &gridView, SpatialParameters &spatialParameters)
: ParentType(timeManager, gridView), gravity_(0), spatialParameters_(&spatialParameters)
DiffusionProblem1P(TimeManager &timeManager, const GridView &gridView, SpatialParams &spatialParams)
: ParentType(timeManager, gridView), gravity_(0), spatialParams_(&spatialParams)
{
newSpatialParams_ = false;
gravity_ = 0;
......@@ -111,7 +111,7 @@ public:
DiffusionProblem1P(const GridView &gridView)
: ParentType(gridView, false), gravity_(0)
{
spatialParameters_ = new SpatialParameters(gridView);
spatialParams_ = new SpatialParams(gridView);
newSpatialParams_ = true;
gravity_ = 0;
if (GET_PARAM(TypeTag, bool, EnableGravity))
......@@ -121,10 +121,10 @@ public:
* \brief The constructor
*
* \param gridView The grid view
* \param spatialParameters SpatialParameters instantiation
* \param spatialParams SpatialParams instantiation
*/
DiffusionProblem1P(const GridView &gridView, SpatialParameters &spatialParameters)
: ParentType(gridView, false), gravity_(0), spatialParameters_(&spatialParameters)
DiffusionProblem1P(const GridView &gridView, SpatialParams &spatialParams)
: ParentType(gridView, false), gravity_(0), spatialParams_(&spatialParams)
{
newSpatialParams_ = false;
gravity_ = 0;
......@@ -136,7 +136,7 @@ public:
{
if (newSpatialParams_)
{
delete spatialParameters_;
delete spatialParams_;
}
}
......@@ -229,19 +229,27 @@ public:
/*!
* \brief Returns the spatial parameters object.
*/
SpatialParameters &spatialParameters()
SpatialParams &spatialParams()
{
return *spatialParameters_;
return *spatialParams_;
}
DUMUX_DEPRECATED_MSG("use spatialParams() method instead")
SpatialParams &spatialParameters()
{ return *spatialParams_; }
/*!
* \brief Returns the spatial parameters object.
*/
const SpatialParameters &spatialParameters() const
const SpatialParams &spatialParams() const
{
return *spatialParameters_;
return *spatialParams_;
}
DUMUX_DEPRECATED_MSG("use spatialParams() method instead")
const SpatialParams &spatialParameters() const
{ return *spatialParams_; }
// \}
private:
......@@ -256,7 +264,7 @@ private:
GlobalPosition gravity_;
// fluids and material properties
SpatialParameters* spatialParameters_;
SpatialParams* spatialParams_;
bool newSpatialParams_;
};
......
......@@ -65,7 +65,7 @@ template<class TypeTag> class FVPressure1P: public FVPressure<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename GET_PROP_TYPE(TypeTag, Fluid) Fluid;
......@@ -98,7 +98,7 @@ template<class TypeTag> class FVPressure1P: public FVPressure<TypeTag>
typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar, dim, dim> FieldMatrix;
typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
public:
......@@ -271,10 +271,10 @@ void FVPressure1P<TypeTag>::getFlux(Dune::FieldVector<Scalar, 2>& entry, const I
Scalar dist = distVec.two_norm();
// compute vectorized permeabilities
FieldMatrix meanPermeability(0);
DimMatrix meanPermeability(0);
problem_.spatialParameters().meanK(meanPermeability, problem_.spatialParameters().intrinsicPermeability(*elementI),
problem_.spatialParameters().intrinsicPermeability(*elementJ));
problem_.spatialParams().meanK(meanPermeability, problem_.spatialParams().intrinsicPermeability(*elementI),
problem_.spatialParams().intrinsicPermeability(*elementJ));
Dune::FieldVector<Scalar, dim> permeability(0);
meanPermeability.mv(unitOuterNormal, permeability);
......@@ -331,10 +331,10 @@ const Intersection& intersection, const CellData& cellData, const bool first)
//permeability vector at boundary
// compute vectorized permeabilities
FieldMatrix meanPermeability(0);
DimMatrix meanPermeability(0);
problem_.spatialParameters().meanK(meanPermeability,
problem_.spatialParameters().intrinsicPermeability(*element));
problem_.spatialParams().meanK(meanPermeability,
problem_.spatialParams().intrinsicPermeability(*element));
Dune::FieldVector<Scalar, dim> permeability(0);
meanPermeability.mv(unitOuterNormal, permeability);
......
......@@ -55,7 +55,7 @@ class FVVelocity1P
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename GET_PROP_TYPE(TypeTag, Fluid) Fluid;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
......@@ -80,7 +80,7 @@ typedef typename GridView::IntersectionIterator IntersectionIterator;
};
typedef Dune::FieldVector<Scalar,dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar,dim,dim> FieldMatrix;
typedef Dune::FieldMatrix<Scalar,dim,dim> DimMatrix;
public:
//! Constructs a FVVelocity1P object
......@@ -150,8 +150,8 @@ public:
0);
// get the transposed Jacobian of the element mapping
const FieldMatrix& jacobianInv = eIt->geometry().jacobianInverseTransposed(localPos);
FieldMatrix jacobianT(jacobianInv);
const DimMatrix& jacobianInv = eIt->geometry().jacobianInverseTransposed(localPos);
DimMatrix jacobianT(jacobianInv);
jacobianT.invert();
// calculate the element velocity by the Piola transformation
......@@ -208,10 +208,10 @@ void FVVelocity1P<TypeTag>::calculateVelocity(const Intersection& intersection,
Scalar dist = distVec.two_norm();
// compute vectorized permeabilities
FieldMatrix meanPermeability(0);
DimMatrix meanPermeability(0);
problem_.spatialParameters().meanK(meanPermeability, problem_.spatialParameters().intrinsicPermeability(*elementI),
problem_.spatialParameters().intrinsicPermeability(*elementJ));
problem_.spatialParams().meanK(meanPermeability, problem_.spatialParams().intrinsicPermeability(*elementI),
problem_.spatialParams().intrinsicPermeability(*elementJ));
Dune::FieldVector < Scalar, dim > permeability(0);
meanPermeability.mv(unitOuterNormal, permeability);
......@@ -286,9 +286,9 @@ void FVVelocity1P<TypeTag>::calculateVelocityOnBoundary(const Intersection& inte
//permeability vector at boundary
// compute vectorized permeabilities
FieldMatrix meanPermeability(0);
DimMatrix meanPermeability(0);
problem_.spatialParameters().meanK(meanPermeability, problem_.spatialParameters().intrinsicPermeability(*element));
problem_.spatialParams().meanK(meanPermeability, problem_.spatialParams().intrinsicPermeability(*element));
//multiply with normal vector at the boundary
Dune::FieldVector < Scalar, dim > permeability(0);
......
......@@ -54,8 +54,8 @@ private:
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
typedef Dune::FieldVector<Scalar, dim> FieldVector;
typedef Dune::FieldVector<FieldVector, 2 * dim> VelocityVector;
typedef Dune::FieldVector<Scalar, dim> DimVector;
typedef Dune::FieldVector<DimVector, 2 * dim> VelocityVector;
VelocityVector velocity_;
Scalar potential_[2 * dim];
......@@ -68,7 +68,7 @@ public:
{
for (int face = 0; face < 2*dim; face++)
{
velocity_[face] = FieldVector(0.0);
velocity_[face] = DimVector(0.0);
potential_[face] = 0.0;
velocityMarker_[face] = false;
}
......@@ -82,7 +82,7 @@ public:
*
* \param indexInInside Index of the cell-cell interface in this cell
*/
const FieldVector& velocity(int indexInInside)
const DimVector& velocity(int indexInInside)
{
return velocity_[indexInInside];
}
......@@ -90,7 +90,7 @@ public:
*
* \param indexInInside Index of the cell-cell interface in this cell
*/
const FieldVector& velocity(int indexInInside) const
const DimVector& velocity(int indexInInside) const
{
return velocity_[indexInInside];
}
......@@ -99,7 +99,7 @@ public:
* \param indexInInside Index of the cell-cell interface in this cell
* \param velocity Velocity vector which is stored
*/
void setVelocity(int indexInInside, FieldVector& velocity)
void setVelocity(int indexInInside, DimVector& velocity)
{
velocity_[indexInInside] = velocity;
}
......
......@@ -132,7 +132,7 @@ typedef DecoupledTwoPIndices<GET_PROP_VALUE(TypeTag, Formulation), 0> type;
};
//! \cond \private
// keep only for compatibility with box models
//! DEPRECATED TwoPIndices property
SET_TYPE_PROP(DecoupledTwoP, TwoPIndices, typename GET_PROP_TYPE(TypeTag, Indices));
//! \endcond
......@@ -173,12 +173,7 @@ public:
typedef IsothermalImmiscibleFluidState<Scalar, FluidSystem> type;
};
//! DEPRECATED SpatialParameters property
#warning Please use SpatialParams instead of SpatialParameters
//TODO: next line enables old Models using SpatialParameters to work
// with base class impesproblem2p. If models are adapted,
// l180 should be replaced by l181 to deprecate old problems using SpatialParameters.
SET_TYPE_PROP(DecoupledTwoP, SpatialParams, typename GET_PROP_TYPE(TypeTag, SpatialParameters));
//SET_TYPE_PROP(DecoupledTwoP, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
SET_TYPE_PROP(DecoupledTwoP, SpatialParameters, typename GET_PROP_TYPE(TypeTag, SpatialParams));
/*!
* \brief Set the property for the material parameters by extracting
......
......@@ -57,7 +57,7 @@ class DiffusionProblem2P: public OneModelProblem<TypeTag>
// material properties
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
......@@ -82,7 +82,7 @@ public:
DiffusionProblem2P(TimeManager &timeManager, const GridView &gridView)
: ParentType(timeManager, gridView), gravity_(0)
{
spatialParameters_ = new SpatialParameters(gridView);
spatialParams_ = new SpatialParams(gridView);
newSpatialParams_ = true;
gravity_ = 0;
if (GET_PARAM(TypeTag, bool, EnableGravity))
......@@ -93,10 +93,10 @@ public:
*
* \param timeManager the time manager
* \param gridView The grid view
* \param spatialParameters SpatialParameters instantiation
* \param spatialParams SpatialParams instantiation
*/
DiffusionProblem2P(TimeManager &timeManager, const GridView &gridView, SpatialParameters &spatialParameters)
: ParentType(timeManager, gridView), gravity_(0), spatialParameters_(&spatialParameters)
DiffusionProblem2P(TimeManager &timeManager, const GridView &gridView, SpatialParams &spatialParams)
: ParentType(timeManager, gridView), gravity_(0), spatialParams_(&spatialParams)
{
newSpatialParams_ = false;
gravity_ = 0;
......@@ -112,7 +112,7 @@ public:
DiffusionProblem2P(const GridView &gridView)
: ParentType(gridView, false), gravity_(0)
{
spatialParameters_ = new SpatialParameters(gridView);
spatialParams_ = new SpatialParams(gridView);
newSpatialParams_ = true;
gravity_ = 0;
if (GET_PARAM(TypeTag, bool, EnableGravity))
......@@ -122,10 +122,10 @@ public:
* \brief Constructs a DiffusionProblem2P object
*
* \param gridView The grid view
* \param spatialParameters SpatialParameters instantiation
* \param spatialParams SpatialParams instantiation
*/
DiffusionProblem2P(const GridView &gridView, SpatialParameters &spatialParameters)
: ParentType(gridView, false), gravity_(0), spatialParameters_(&spatialParameters)
DiffusionProblem2P(const GridView &gridView, SpatialParams &spatialParams)
: ParentType(gridView, false), gravity_(0), spatialParams_(&spatialParams)
{
newSpatialParams_ = false;
gravity_ = 0;
......@@ -138,7 +138,7 @@ public:
{
if (newSpatialParams_)
{
delete spatialParameters_;
delete spatialParams_;
}
}
......@@ -223,19 +223,29 @@ public:
/*!
* \brief Returns the spatial parameters object.
*/
SpatialParameters &spatialParameters()
SpatialParams &spatialParams()
{
return *spatialParameters_;
return *spatialParams_;
}
DUMUX_DEPRECATED_MSG("use spatialParams() method instead")
SpatialParams &spatialParameters()
{ return *spatialParams_; }
/*!
* \brief Returns the spatial parameters object.
*/
const SpatialParameters &spatialParameters() const
const SpatialParams &spatialParams() const
{
return *spatialParameters_;
return *spatialParams_;
}
DUMUX_DEPRECATED_MSG("use spatialParams() method instead")
const SpatialParams &spatialParameters() const
{ return *spatialParams_; }
// \}
private:
......@@ -250,7 +260,7 @@ private:
GlobalPosition gravity_;
// fluids and material properties
SpatialParameters* spatialParameters_;
SpatialParams* spatialParams_;
bool newSpatialParams_;
};
......
......@@ -95,8 +95,8 @@ template<class TypeTag> class FVPressure2P: public FVPressure<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 SpatialParameters::MaterialLaw MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
......@@ -137,7 +137,7 @@ template<class TypeTag> class FVPressure2P: public FVPressure<TypeTag>
typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar, dim, dim> FieldMatrix;
typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
protected:
//! \cond \private
......@@ -494,7 +494,7 @@ void FVPressure2P<TypeTag>::getStorage(EntryType& entry, const Element& element
// cell volume, assume linear map here
Scalar volume = element.geometry().volume();
Scalar porosity = problem_.spatialParameters().porosity(element);
Scalar porosity = problem_.spatialParams().porosity(element);
switch (saturationType_)
{
......@@ -592,10 +592,10 @@ void FVPressure2P<TypeTag>::getFlux(EntryType& entry, const Intersection& inters
Scalar dist = distVec.two_norm();
// compute vectorized permeabilities
FieldMatrix meanPermeability(0);
DimMatrix meanPermeability(0);
problem_.spatialParameters().meanK(meanPermeability, problem_.spatialParameters().intrinsicPermeability(*elementI),
problem_.spatialParameters().intrinsicPermeability(*elementJ));
problem_.spatialParams().meanK(meanPermeability, problem_.spatialParams().intrinsicPermeability(*elementI),
problem_.spatialParams().intrinsicPermeability(*elementJ));
Dune::FieldVector<Scalar, dim> permeability(0);
meanPermeability.mv(unitOuterNormal, permeability);
......@@ -743,10 +743,10 @@ const Intersection& intersection, const CellData& cellData, const bool first)
//permeability vector at boundary
// compute vectorized permeabilities
FieldMatrix meanPermeability(0);
DimMatrix meanPermeability(0);
problem_.spatialParameters().meanK(meanPermeability,
problem_.spatialParameters().intrinsicPermeability(*element));
problem_.spatialParams().meanK(meanPermeability,
problem_.spatialParams().intrinsicPermeability(*element));
Dune::FieldVector<Scalar, dim> permeability(0);
meanPermeability.mv(unitOuterNormal, permeability);
......@@ -783,7 +783,7 @@ const Intersection& intersection, const CellData& cellData, const bool first)
Scalar pressBound = boundValues[pressureIdx];
//calculate consitutive relations depending on the kind of saturation used
Scalar pcBound = MaterialLaw::pC(problem_.spatialParameters().materialLawParams(*element), satW);
Scalar pcBound = MaterialLaw::pC(problem_.spatialParams().materialLawParams(*element), satW);
//determine phase pressures from primary pressure variable
Scalar pressW = 0;
......@@ -829,9 +829,9 @@ const Intersection& intersection, const CellData& cellData, const bool first)
rhoMeanNW = 0.5 * (cellData.density(nPhaseIdx) + densityNWBound);
}
Scalar lambdaWBound = MaterialLaw::krw(problem_.spatialParameters().materialLawParams(*element), satW)
Scalar lambdaWBound = MaterialLaw::krw(problem_.spatialParams().materialLawParams(*element), satW)
/ viscosityWBound;
Scalar lambdaNWBound = MaterialLaw::krn(problem_.spatialParameters().materialLawParams(*element), satW)
Scalar lambdaNWBound = MaterialLaw::krn(problem_.spatialParams().materialLawParams(*element), satW)
/ viscosityNWBound;
Scalar fractionalWBound = lambdaWBound / (lambdaWBound + lambdaNWBound);
......@@ -981,7 +981,7 @@ void FVPressure2P<TypeTag>::updateMaterialLaws()
Scalar satW = cellData.saturation(wPhaseIdx);
Scalar pc = MaterialLaw::pC(problem_.spatialParameters().materialLawParams(*eIt), satW);
Scalar pc = MaterialLaw::pC(problem_.spatialParams().materialLawParams(*eIt), satW);
//determine phase pressures from primary pressure variable
Scalar pressW = 0;
......@@ -1036,8 +1036,8 @@ void FVPressure2P<TypeTag>::updateMaterialLaws()
}
// initialize mobilities
Scalar mobilityW = MaterialLaw::krw(problem_.spatialParameters().materialLawParams(*eIt), satW) / viscosity_[wPhaseIdx];
Scalar mobilityNW = MaterialLaw::krn(problem_.spatialParameters().materialLawParams(*eIt), satW) / viscosity_[nPhaseIdx];
Scalar mobilityW = MaterialLaw::krw(problem_.spatialParams().materialLawParams(*eIt), satW) / viscosity_[wPhaseIdx];
Scalar mobilityNW = MaterialLaw::krn(problem_.spatialParams().materialLawParams(*eIt), satW) / viscosity_[nPhaseIdx];
if (compressibility_)
{
......
......@@ -290,12 +290,12 @@ void FVPressure2PAdaptive<TypeTag>::getFlux(EntryType& entry, const Intersection
FieldMatrix permeabilityJ(0);
FieldMatrix permeabilityK(0);
problem_.spatialParameters().meanK(permeabilityI,
problem_.spatialParameters().intrinsicPermeability(*elementI));
problem_.spatialParameters().meanK(permeabilityJ,
problem_.spatialParameters().intrinsicPermeability(*elementJ));
problem_.spatialParameters().meanK(permeabilityK,
problem_.spatialParameters().intrinsicPermeability(*elementK));
problem_.spatialParams().meanK(permeabilityI,
problem_.spatialParams().intrinsicPermeability(*elementI));
problem_.spatialParams().meanK(permeabilityJ,
problem_.spatialParams().intrinsicPermeability(*elementJ));
problem_.spatialParams().meanK(permeabilityK,
problem_.spatialParams().intrinsicPermeability(*elementK));
// Calculate permeablity component normal to interface
Scalar kI, kJ, kK, kMean, ng;
......
......@@ -61,8 +61,8 @@ class FVVelocity2P
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 SpatialParameters::MaterialLaw MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename SpatialParams::MaterialLaw MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
......@@ -108,7 +108,7 @@ class FVVelocity2P
};
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar, dim, dim> FieldMatrix;
typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
public:
/*! \brief Constructs a FVVelocity2P object
......@@ -208,8 +208,8 @@ public:
ReferenceElementContainer::general(eIt->geometry().type()).position(0, 0);
// get the transposed Jacobian of the element mapping
const FieldMatrix& jacobianInv = eIt->geometry().jacobianInverseTransposed(localPos);
FieldMatrix jacobianT(jacobianInv);
const DimMatrix& jacobianInv = eIt->geometry().jacobianInverseTransposed(localPos);
DimMatrix jacobianT(jacobianInv);
jacobianT.invert();
// calculate the element velocity by the Piola transformation
......@@ -320,10 +320,10 @@ void FVVelocity2P<TypeTag>::calculateVelocity(const Intersection& intersection,
Scalar dist = distVec.two_norm();
// compute vectorized permeabilities
FieldMatrix meanPermeability(0);
DimMatrix meanPermeability(0);
problem_.spatialParameters().meanK(meanPermeability, problem_.spatialParameters().intrinsicPermeability(*elementI),
problem_.spatialParameters().intrinsicPermeability(*elementJ));
problem_.spatialParams().meanK(meanPermeability, problem_.spatialParams().intrinsicPermeability(*elementI),
problem_.spatialParams().intrinsicPermeability(*elementJ));
Dune::FieldVector < Scalar, dim > permeability(0);
meanPermeability.mv(unitOuterNormal, permeability);
......@@ -493,9 +493,9 @@ void FVVelocity2P<TypeTag>::calculateVelocityOnBoundary(const Intersection& inte
//permeability vector at boundary
// compute vectorized permeabilities
FieldMatrix meanPermeability(0);
DimMatrix meanPermeability(0);
problem_.spatialParameters().meanK(meanPermeability, problem_.spatialParameters().intrinsicPermeability(*element));
problem_.spatialParams().meanK(meanPermeability, problem_.spatialParams().intrinsicPermeability(*element));
Dune::FieldVector < Scalar, dim > permeability(0);
meanPermeability.mv(unitOuterNormal, permeability);
......@@ -528,7 +528,7 @@ void FVVelocity2P<TypeTag>::calculateVelocityOnBoundary(const Intersection& inte
}
Scalar pressBound = boundValues[pressureIdx];
Scalar pcBound = MaterialLaw::pC(problem_.spatialParameters().materialLawParams(*element), satW);
Scalar pcBound = MaterialLaw::pC(problem_.spatialParams().materialLawParams(*element), satW);
//determine phase pressures from primary pressure variable
Scalar pressWBound = 0;
......@@ -572,9 +572,9 @@ void FVVelocity2P<TypeTag>::calculateVelocityOnBoundary(const Intersection& inte
viscosityNWBound = FluidSystem::viscosity(fluidState, nPhaseIdx) / densityNWBound;
}
Scalar lambdaWBound = MaterialLaw::krw(problem_.spatialParameters().materialLawParams(*element), satW)
Scalar lambdaWBound = MaterialLaw::krw(problem_.spatialParams().materialLawParams(*element), satW)
/ viscosityWBound;
Scalar lambdaNWBound = MaterialLaw::krn(problem_.spatialParameters().materialLawParams(*element), satW)
Scalar lambdaNWBound = MaterialLaw::krn(problem_.spatialParams().materialLawParams(*element), satW)
/ viscosityNWBound;
Scalar potentialW = 0;
......
......@@ -245,12 +245,12 @@ void FVVelocity2PAdaptive<TypeTag>::calculateVelocity(const Intersection& inters
FieldMatrix permeabilityJ(0);
FieldMatrix permeabilityK(0);
problem_.spatialParameters().meanK(permeabilityI,
problem_.spatialParameters().intrinsicPermeability(*elementI));
problem_.spatialParameters().meanK(permeabilityJ,
problem_.spatialParameters().intrinsicPermeability(*elementJ));
problem_.spatialParameters().meanK(permeabilityK,
problem_.spatialParameters().intrinsicPermeability(*elementK));