diff --git a/dumux/geomechanics/elastic/volumevariables.hh b/dumux/geomechanics/elastic/volumevariables.hh index 74b0e72312288aedfdf718ecf62a9c1518b350f6..666c8126bd078fce35af17b3c916fdc8dc3f218d 100644 --- a/dumux/geomechanics/elastic/volumevariables.hh +++ b/dumux/geomechanics/elastic/volumevariables.hh @@ -28,7 +28,6 @@ #include <dune/common/exceptions.hh> -#include <dumux/common/deprecated.hh> #include <dumux/material/solidstates/updatesolidvolumefractions.hh> namespace Dumux { @@ -76,7 +75,7 @@ public: const Scv& scv) { priVars_ = elemSol[scv.localDofIndex()]; - extrusionFactor_ = Deprecated::extrusionFactor(problem, element, scv, elemSol); + extrusionFactor_ = problem.spatialParams().extrusionFactor(element, scv, elemSol); //! set the volume fractions of the solid components updateSolidVolumeFractions(elemSol, problem, element, scv, solidState_, /*numFluidComps=*/0); @@ -127,7 +126,7 @@ private: template< class Problem, class Element, class Scv, class ElemSol, bool enableEB = enableEnergyBalance, typename std::enable_if_t<!enableEB, bool> = 0 > void setSolidTemperature_(const Problem& problem, const Element& element, const Scv& scv, const ElemSol& elemSol) - { solidState_.setTemperature(Deprecated::temperature(problem, element, scv, elemSol)); } + { solidState_.setTemperature(problem.spatialParams().temperature(element, scv, elemSol)); } // data members Scalar extrusionFactor_; diff --git a/dumux/geomechanics/poroelastic/volumevariables.hh b/dumux/geomechanics/poroelastic/volumevariables.hh index 009b32a10cf4775f7ccda91e7345bca9cdd7e8f6..a2e4053d21c72e92d4b60b3953ac0650bf4411c8 100644 --- a/dumux/geomechanics/poroelastic/volumevariables.hh +++ b/dumux/geomechanics/poroelastic/volumevariables.hh @@ -24,7 +24,6 @@ #ifndef DUMUX_POROELASTIC_VOLUME_VARIABLES_HH #define DUMUX_POROELASTIC_VOLUME_VARIABLES_HH -#include <dumux/common/deprecated.hh> #include <dumux/discretization/evalgradients.hh> namespace Dumux { @@ -70,7 +69,7 @@ public: const Scv& scv) { priVars_ = elemSol[scv.localDofIndex()]; - extrusionFactor_ = Deprecated::extrusionFactor(problem, element, scv, elemSol); + extrusionFactor_ = problem.spatialParams().extrusionFactor(element, scv, elemSol); //! set the volume fractions of the solid components updateSolidVolumeFractions_(elemSol, problem, element, scv); @@ -151,7 +150,7 @@ private: template< class Problem, class Element, class Scv, class ElemSol, bool enableEB = enableEnergyBalance, typename std::enable_if_t<!enableEB, bool> = 0 > void setSolidTemperature_(const Problem& problem, const Element& element, const Scv& scv, const ElemSol& elemSol) - { solidState_.setTemperature(Deprecated::temperature(problem, element, scv, elemSol)); } + { solidState_.setTemperature(problem.spatialParams().temperature(element, scv, elemSol)); } // data members Scalar extrusionFactor_;