From 1dd0e9e2569f21a0e8ad28bd9a4a0a8a30624457 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sun, 22 Jun 2014 12:07:43 +0200
Subject: [PATCH] [Cleanup] Rename: FrictionPotential{Wrapper -> }
---
dune/tectonic/frictionpotential.hh | 8 ++++----
dune/tectonic/localfriction.hh | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dune/tectonic/frictionpotential.hh b/dune/tectonic/frictionpotential.hh
index 4dbec7e7..272419c0 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 ed96fdd5..d780bf35 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
--
GitLab