Skip to content
Snippets Groups Projects
Commit 63a7b214 authored by IvBu's avatar IvBu Committed by Timo Koch
Browse files

Remove deprecated call to extrusionFactor and temperature.

parent e45f3ee2
No related branches found
No related tags found
1 merge request!3170Cleanup/deprecated
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <dune/common/exceptions.hh> #include <dune/common/exceptions.hh>
#include <dumux/common/deprecated.hh>
#include <dumux/material/solidstates/updatesolidvolumefractions.hh> #include <dumux/material/solidstates/updatesolidvolumefractions.hh>
namespace Dumux { namespace Dumux {
...@@ -76,7 +75,7 @@ public: ...@@ -76,7 +75,7 @@ public:
const Scv& scv) const Scv& scv)
{ {
priVars_ = elemSol[scv.localDofIndex()]; 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 //! set the volume fractions of the solid components
updateSolidVolumeFractions(elemSol, problem, element, scv, solidState_, /*numFluidComps=*/0); updateSolidVolumeFractions(elemSol, problem, element, scv, solidState_, /*numFluidComps=*/0);
...@@ -127,7 +126,7 @@ private: ...@@ -127,7 +126,7 @@ private:
template< class Problem, class Element, class Scv, class ElemSol, template< class Problem, class Element, class Scv, class ElemSol,
bool enableEB = enableEnergyBalance, typename std::enable_if_t<!enableEB, bool> = 0 > 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) 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 // data members
Scalar extrusionFactor_; Scalar extrusionFactor_;
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#ifndef DUMUX_POROELASTIC_VOLUME_VARIABLES_HH #ifndef DUMUX_POROELASTIC_VOLUME_VARIABLES_HH
#define DUMUX_POROELASTIC_VOLUME_VARIABLES_HH #define DUMUX_POROELASTIC_VOLUME_VARIABLES_HH
#include <dumux/common/deprecated.hh>
#include <dumux/discretization/evalgradients.hh> #include <dumux/discretization/evalgradients.hh>
namespace Dumux { namespace Dumux {
...@@ -70,7 +69,7 @@ public: ...@@ -70,7 +69,7 @@ public:
const Scv& scv) const Scv& scv)
{ {
priVars_ = elemSol[scv.localDofIndex()]; 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 //! set the volume fractions of the solid components
updateSolidVolumeFractions_(elemSol, problem, element, scv); updateSolidVolumeFractions_(elemSol, problem, element, scv);
...@@ -151,7 +150,7 @@ private: ...@@ -151,7 +150,7 @@ private:
template< class Problem, class Element, class Scv, class ElemSol, template< class Problem, class Element, class Scv, class ElemSol,
bool enableEB = enableEnergyBalance, typename std::enable_if_t<!enableEB, bool> = 0 > 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) 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 // data members
Scalar extrusionFactor_; Scalar extrusionFactor_;
......
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