From 127b792e767caded485485e4749a012132426634 Mon Sep 17 00:00:00 2001 From: Elias Pipping <elias.pipping@fu-berlin.de> Date: Sun, 22 Jun 2014 12:50:15 +0200 Subject: [PATCH] [Cleanup] Rename: FrictionPotential -> TruncatedRateState --- dune/tectonic/frictionpotential.hh | 4 ++-- dune/tectonic/globalratestatefriction.hh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dune/tectonic/frictionpotential.hh b/dune/tectonic/frictionpotential.hh index a806aa38..4dbec7e7 100644 --- a/dune/tectonic/frictionpotential.hh +++ b/dune/tectonic/frictionpotential.hh @@ -27,9 +27,9 @@ class FrictionPotentialWrapper { void virtual updateAlpha(double) = 0; }; -class FrictionPotential : public FrictionPotentialWrapper { +class TruncatedRateState : public FrictionPotentialWrapper { public: - FrictionPotential(double coefficient, double _normalStress, FrictionData _fd) + TruncatedRateState(double coefficient, double _normalStress, FrictionData _fd) : fd(_fd), weight(coefficient), normalStress(_normalStress) {} double coefficientOfFriction(double V) const { diff --git a/dune/tectonic/globalratestatefriction.hh b/dune/tectonic/globalratestatefriction.hh index 6fdcfacd..1ec07017 100644 --- a/dune/tectonic/globalratestatefriction.hh +++ b/dune/tectonic/globalratestatefriction.hh @@ -45,7 +45,7 @@ class GlobalRateStateFriction : public GlobalFriction<Matrix, Vector> { restrictions[i] = trivialNonlinearity; continue; } - auto const fp = std::make_shared<FrictionPotential>( + auto const fp = std::make_shared<TruncatedRateState>( weights[i], normalStress[i], frictionInfo(coordinate)); restrictions[i] = std::make_shared<Friction>(fp); } -- GitLab