Commit 13f68da4 authored by Dennis Gläser's avatar Dennis Gläser
Browse files

[ŧest][poromech] avoid deprecation warnings from cm

parent ed2dcf38
...@@ -138,11 +138,9 @@ public: ...@@ -138,11 +138,9 @@ public:
Scalar effectiveFluidDensity(const Element& element, Scalar effectiveFluidDensity(const Element& element,
const SubControlVolume& scv) const const SubControlVolume& scv) const
{ {
// get context from coupling manager // get porous medium flow volume variables from coupling manager
// here, we know that the flow problem uses cell-centered finite volumes, const auto pmFlowVolVars = couplingManager().getPMFlowVolVars(element);
// thus, we simply take the volume variables of the element and return the density return pmFlowVolVars.density();
const auto& context = couplingManager().poroMechanicsCouplingContext();
return (*context.pmFlowElemVolVars)[scv.elementIndex()].density();
} }
/*! /*!
...@@ -154,12 +152,9 @@ public: ...@@ -154,12 +152,9 @@ public:
const ElementVolumeVariables& elemVolVars, const ElementVolumeVariables& elemVolVars,
const FluxVarsCache& fluxVarsCache) const const FluxVarsCache& fluxVarsCache) const
{ {
// get context from coupling manager // get porous medium flow volume variables from coupling manager
// here, we know that the flow problem uses cell-centered finite volumes, const auto pmFlowVolVars = couplingManager().getPMFlowVolVars(element);
// thus, we simply take the volume variables of the element and return the pressure return pmFlowVolVars.pressure();
const auto& context = couplingManager().poroMechanicsCouplingContext();
const auto eIdx = this->fvGridGeometry().elementMapper().index(element);
return (*context.pmFlowElemVolVars)[eIdx].pressure();
} }
/*! /*!
......
...@@ -139,16 +139,13 @@ public: ...@@ -139,16 +139,13 @@ public:
*/ */
Scalar effectiveFluidDensity(const Element& element, const SubControlVolume& scv) const Scalar effectiveFluidDensity(const Element& element, const SubControlVolume& scv) const
{ {
// get context from coupling manager // get porous medium flow volume variables from coupling manager
const auto& context = couplingManager().poroMechanicsCouplingContext(); const auto pmFlowVolVars = couplingManager().getPMFlowVolVars(element);
// here, we know that the flow problem uses cell-centered finite volumes, thus, Scalar wPhaseDensity = pmFlowVolVars.density(FluidSystem::phase0Idx);
// we simply take the volume variables of the scv (i.e. element) to obtain fluid properties Scalar nPhaseDensity = pmFlowVolVars.density(FluidSystem::phase1Idx);
const auto& facetVolVars = (*context.pmFlowElemVolVars)[scv.elementIndex()]; Scalar Sw = pmFlowVolVars.saturation(FluidSystem::phase0Idx);
Scalar wPhaseDensity = facetVolVars.density(FluidSystem::phase0Idx); Scalar Sn = pmFlowVolVars.saturation(FluidSystem::phase1Idx);
Scalar nPhaseDensity = facetVolVars.density(FluidSystem::phase1Idx);
Scalar Sw = facetVolVars.saturation(FluidSystem::phase0Idx);
Scalar Sn = facetVolVars.saturation(FluidSystem::phase1Idx);
return (wPhaseDensity * Sw + nPhaseDensity * Sn); return (wPhaseDensity * Sw + nPhaseDensity * Sn);
} }
...@@ -161,17 +158,13 @@ public: ...@@ -161,17 +158,13 @@ public:
const ElementVolumeVariables& elemVolVars, const ElementVolumeVariables& elemVolVars,
const FluxVarsCache& fluxVarsCache) const const FluxVarsCache& fluxVarsCache) const
{ {
// get context from coupling manager // get porous medium flow volume variables from coupling manager
const auto& context = couplingManager().poroMechanicsCouplingContext(); const auto pmFlowVolVars = couplingManager().getPMFlowVolVars(element);
// here, we know that the flow problem uses cell-centered finite volumes, thus, Scalar pw = pmFlowVolVars.pressure(FluidSystem::phase0Idx);
// we simply take the volume variables of the element to obtain fluid properties Scalar pn = pmFlowVolVars.pressure(FluidSystem::phase1Idx);
const auto eIdx = this->fvGridGeometry().elementMapper().index(element); Scalar Sw = pmFlowVolVars.saturation(FluidSystem::phase0Idx);
const auto& facetVolVars = (*context.pmFlowElemVolVars)[eIdx]; Scalar Sn = pmFlowVolVars.saturation(FluidSystem::phase1Idx);
Scalar pw = facetVolVars.pressure(FluidSystem::phase0Idx);
Scalar pn = facetVolVars.pressure(FluidSystem::phase1Idx);
Scalar Sw = facetVolVars.saturation(FluidSystem::phase0Idx);
Scalar Sn = facetVolVars.saturation(FluidSystem::phase1Idx);
return (pw * Sw + pn * Sn); return (pw * Sw + pn * Sn);
} }
......
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