diff --git a/dune/tectonic/frictionpotential.hh b/dune/tectonic/frictionpotential.hh index 4dbec7e7127d02733ff5b3ec2edfa1addc63ce8e..272419c0fbdb189cf230c2125bf51aad45d158af 100644 --- a/dune/tectonic/frictionpotential.hh +++ b/dune/tectonic/frictionpotential.hh @@ -11,9 +11,9 @@ #include "frictiondata.hh" -class FrictionPotentialWrapper { +class FrictionPotential { public: - virtual ~FrictionPotentialWrapper() {} + virtual ~FrictionPotential() {} double virtual differential(double s) const = 0; double virtual second_deriv(double x) const = 0; @@ -27,7 +27,7 @@ class FrictionPotentialWrapper { void virtual updateAlpha(double) = 0; }; -class TruncatedRateState : public FrictionPotentialWrapper { +class TruncatedRateState : public FrictionPotential { public: TruncatedRateState(double coefficient, double _normalStress, FrictionData _fd) : fd(_fd), weight(coefficient), normalStress(_normalStress) {} @@ -69,7 +69,7 @@ class TruncatedRateState : public FrictionPotentialWrapper { double Vmin; }; -class TrivialFunction : public FrictionPotentialWrapper { +class TrivialFunction : public FrictionPotential { public: double evaluate(double) const { return 0; } diff --git a/dune/tectonic/localfriction.hh b/dune/tectonic/localfriction.hh index ed96fdd5000aa8b7fd1a49065854ac1201678644..d780bf354352be5a945bb39d35d48a197efb6b2b 100644 --- a/dune/tectonic/localfriction.hh +++ b/dune/tectonic/localfriction.hh @@ -17,7 +17,7 @@ template <size_t dimension> class LocalFriction { using VectorType = Dune::FieldVector<double, dimension>; using MatrixType = Dune::FieldMatrix<double, dimension, dimension>; - explicit LocalFriction(std::shared_ptr<FrictionPotentialWrapper> func) + explicit LocalFriction(std::shared_ptr<FrictionPotential> func) : func(func) {} double operator()(VectorType const &x) const { @@ -106,6 +106,6 @@ template <size_t dimension> class LocalFriction { } private: - std::shared_ptr<FrictionPotentialWrapper> const func; + std::shared_ptr<FrictionPotential> const func; }; #endif