Skip to content
Snippets Groups Projects
Commit 1dd0e9e2 authored by Elias Pipping's avatar Elias Pipping
Browse files

[Cleanup] Rename: FrictionPotential{Wrapper -> }

parent 127b792e
No related branches found
No related tags found
No related merge requests found
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#include "frictiondata.hh" #include "frictiondata.hh"
class FrictionPotentialWrapper { class FrictionPotential {
public: public:
virtual ~FrictionPotentialWrapper() {} virtual ~FrictionPotential() {}
double virtual differential(double s) const = 0; double virtual differential(double s) const = 0;
double virtual second_deriv(double x) const = 0; double virtual second_deriv(double x) const = 0;
...@@ -27,7 +27,7 @@ class FrictionPotentialWrapper { ...@@ -27,7 +27,7 @@ class FrictionPotentialWrapper {
void virtual updateAlpha(double) = 0; void virtual updateAlpha(double) = 0;
}; };
class TruncatedRateState : public FrictionPotentialWrapper { class TruncatedRateState : public FrictionPotential {
public: public:
TruncatedRateState(double coefficient, double _normalStress, FrictionData _fd) TruncatedRateState(double coefficient, double _normalStress, FrictionData _fd)
: fd(_fd), weight(coefficient), normalStress(_normalStress) {} : fd(_fd), weight(coefficient), normalStress(_normalStress) {}
...@@ -69,7 +69,7 @@ class TruncatedRateState : public FrictionPotentialWrapper { ...@@ -69,7 +69,7 @@ class TruncatedRateState : public FrictionPotentialWrapper {
double Vmin; double Vmin;
}; };
class TrivialFunction : public FrictionPotentialWrapper { class TrivialFunction : public FrictionPotential {
public: public:
double evaluate(double) const { return 0; } double evaluate(double) const { return 0; }
......
...@@ -17,7 +17,7 @@ template <size_t dimension> class LocalFriction { ...@@ -17,7 +17,7 @@ template <size_t dimension> class LocalFriction {
using VectorType = Dune::FieldVector<double, dimension>; using VectorType = Dune::FieldVector<double, dimension>;
using MatrixType = Dune::FieldMatrix<double, dimension, dimension>; using MatrixType = Dune::FieldMatrix<double, dimension, dimension>;
explicit LocalFriction(std::shared_ptr<FrictionPotentialWrapper> func) explicit LocalFriction(std::shared_ptr<FrictionPotential> func)
: func(func) {} : func(func) {}
double operator()(VectorType const &x) const { double operator()(VectorType const &x) const {
...@@ -106,6 +106,6 @@ template <size_t dimension> class LocalFriction { ...@@ -106,6 +106,6 @@ template <size_t dimension> class LocalFriction {
} }
private: private:
std::shared_ptr<FrictionPotentialWrapper> const func; std::shared_ptr<FrictionPotential> const func;
}; };
#endif #endif
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