Skip to content
Snippets Groups Projects
Commit 6b0f7143 authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'fix/spatialparams' into 'master'

spatial params fixed

See merge request !116
parents 27b03ad9 2f193857
No related branches found
No related tags found
1 merge request!116spatial params fixed
Pipeline #13199 passed
......@@ -51,7 +51,7 @@ class ExerciseFluidsystemSpatialParams
static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using PcKrSwCurve = FluidMatrix::BrooksCoreyDefault<Scalar>;
......@@ -69,7 +69,7 @@ public:
, K_(0)
, KLens_(0)
, pcKrSwCurve_("SpatialParams")
, lensPcKrSwCurve_("Lens.SpatialParams")
, lensPcKrSwCurve_("SpatialParams.Lens")
{
//set main diagonal entries of the permeability tensor to a value
//setting to one value means: isotropic, homogeneous
......@@ -111,10 +111,10 @@ public:
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
{
{
if (isInLens(globalPos))
return makeFluidMatrixInteraction(pcKrSwCurve_);
return makeFluidMatrixInteraction(lensPcKrSwCurve_);
return makeFluidMatrixInteraction(pcKrSwCurve_);
return makeFluidMatrixInteraction(lensPcKrSwCurve_);
}
/*!
......@@ -150,7 +150,7 @@ private:
Dune::FieldMatrix<Scalar, dim, dim> K_;
Dune::FieldMatrix<Scalar, dim, dim> KLens_;
const PcKrSwCurve pcKrSwCurve_;
const PcKrSwCurve lensPcKrSwCurve_;
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment