Commit b9a1eb36 authored by Timo Koch's avatar Timo Koch
Browse files

[3p+] Remove support for deprecated materiallawparams interface

parent a925fcb0
......@@ -31,8 +31,6 @@
#include <dumux/porousmediumflow/nonisothermal/volumevariables.hh>
#include <dumux/material/solidstates/updatesolidvolumefractions.hh>
#include <dumux/common/deprecated.hh>
namespace Dumux {
/*!
......@@ -93,15 +91,11 @@ public:
ParentType::update(elemSol, problem, element, scv);
completeFluidState(elemSol, problem, element, scv, fluidState_, solidState_);
// old material law interface is deprecated: Replace this by
// const auto fluidMatrixInteraction = problem.spatialParams().fluidMatrixInteraction(element, scv, elemSol);
// after the release of 3.3, when the deprecated interface is no longer supported
const auto fluidMatrixInteraction = Deprecated::makePcKrSw<3>(Scalar{}, problem.spatialParams(), element, scv, elemSol);
const auto sw = fluidState_.saturation(wPhaseIdx);
const auto sn = fluidState_.saturation(nPhaseIdx);
// mobilities
// mobilities
const auto fluidMatrixInteraction = problem.spatialParams().fluidMatrixInteraction(element, scv, elemSol);
for (int phaseIdx = 0; phaseIdx < ParentType::numFluidPhases(); ++phaseIdx)
{
mobility_[phaseIdx] = fluidMatrixInteraction.kr(phaseIdx, sw, sn)
......@@ -140,10 +134,7 @@ public:
const auto& priVars = elemSol[scv.localDofIndex()];
// old material law interface is deprecated: Replace this by
// const auto fluidMatrixInteraction = problem.spatialParams().fluidMatrixInteraction(element, scv, elemSol);
// after the release of 3.3, when the deprecated interface is no longer supported
const auto fluidMatrixInteraction = Deprecated::makePcKrSw<3>(Scalar{}, problem.spatialParams(), element, scv, elemSol);
const auto fluidMatrixInteraction = problem.spatialParams().fluidMatrixInteraction(element, scv, elemSol);
const Scalar sw = priVars[swIdx];
const Scalar sn = priVars[snIdx];
......
......@@ -37,8 +37,6 @@
#include "primaryvariableswitch.hh"
#include <dumux/common/deprecated.hh>
namespace Dumux {
namespace Detail {
......@@ -188,11 +186,7 @@ public:
// calculate capillary pressures
// old material law interface is deprecated: Replace this by
// const auto fluidMatrixInteraction = problem.spatialParams().fluidMatrixInteraction(element, scv, elemSol);
// after the release of 3.3, when the deprecated interface is no longer supported
const auto fluidMatrixInteraction = Deprecated::makePcKrSw<3>(Scalar{}, problem.spatialParams(), element, scv, elemSol);
const auto fluidMatrixInteraction = problem.spatialParams().fluidMatrixInteraction(element, scv, elemSol);
Scalar pcgw = fluidMatrixInteraction.pcgw(sw_, sn_);
Scalar pcnw = fluidMatrixInteraction.pcnw(sw_, sn_);
Scalar pcgn = fluidMatrixInteraction.pcgn(sw_, sn_);
......
......@@ -42,8 +42,6 @@
#include "primaryvariableswitch.hh"
#include <dumux/common/deprecated.hh>
namespace Dumux {
namespace Detail {
......@@ -184,10 +182,7 @@ public:
fluidState_.setSaturation(gPhaseIdx, sg_);
fluidState_.setSaturation(nPhaseIdx, sn_);
// old material law interface is deprecated: Replace this by
// const auto fluidMatrixInteraction = problem.spatialParams().fluidMatrixInteraction(element, scv, elemSol);
// after the release of 3.3, when the deprecated interface is no longer supported
const auto fluidMatrixInteraction = Deprecated::makePcKrSw<3>(Scalar{}, problem.spatialParams(), element, scv, elemSol);
const auto fluidMatrixInteraction = problem.spatialParams().fluidMatrixInteraction(element, scv, elemSol);
// calculate capillary pressures
const Scalar pcgw = fluidMatrixInteraction.pcgw(sw_, sn_);
......@@ -533,10 +528,7 @@ public:
fluidState_.setSaturation(gPhaseIdx, sg_);
fluidState_.setSaturation(nPhaseIdx, sn_);
// old material law interface is deprecated: Replace this by
// const auto fluidMatrixInteraction = problem.spatialParams().fluidMatrixInteraction(element, scv, elemSol);
// after the release of 3.3, when the deprecated interface is no longer supported
const auto fluidMatrixInteraction = Deprecated::makePcKrSw<3>(Scalar{}, problem.spatialParams(), element, scv, elemSol);
const auto fluidMatrixInteraction = problem.spatialParams().fluidMatrixInteraction(element, scv, elemSol);
// calculate capillary pressures
const Scalar pcgw = fluidMatrixInteraction.pcgw(sw_, sn_);
......@@ -728,11 +720,7 @@ public:
else DUNE_THROW(Dune::InvalidStateException, "phasePresence: " << phasePresence << " is invalid.");
}
// old material law interface is deprecated: Replace this by
// const auto fluidMatrixInteraction = problem.spatialParams().fluidMatrixInteraction(element, scv, elemSol);
// after the release of 3.3, when the deprecated interface is no longer supported
const auto fluidMatrixInteraction = Deprecated::makePcKrSw<3>(Scalar{}, problem.spatialParams(), element, scv, elemSol);
const auto fluidMatrixInteraction = problem.spatialParams().fluidMatrixInteraction(element, scv, elemSol);
for (int phaseIdx = 0; phaseIdx < numPs; ++phaseIdx)
{
// Mobilities
......
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