From 7fcc7ca622fb6ea28e00ef09634ca948730717e0 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Thu, 26 Mar 2015 15:44:49 +0100
Subject: [PATCH] [Cleanup] Rename: TrivialFunction -> ZeroFunction
---
dune/tectonic/frictionpotential.hh | 2 +-
dune/tectonic/globalratestatefriction.hh | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dune/tectonic/frictionpotential.hh b/dune/tectonic/frictionpotential.hh
index de2d1dc5..89f29e51 100644
--- a/dune/tectonic/frictionpotential.hh
+++ b/dune/tectonic/frictionpotential.hh
@@ -102,7 +102,7 @@ class RegularisedRateState : public FrictionPotential {
double Vmin;
};
-class TrivialFunction : public FrictionPotential {
+class ZeroFunction : public FrictionPotential {
public:
double evaluate(double) const { return 0; }
diff --git a/dune/tectonic/globalratestatefriction.hh b/dune/tectonic/globalratestatefriction.hh
index a43619c1..3edfe081 100644
--- a/dune/tectonic/globalratestatefriction.hh
+++ b/dune/tectonic/globalratestatefriction.hh
@@ -29,8 +29,8 @@ class GlobalRateStateFriction : public GlobalFriction<Matrix, Vector> {
ScalarVector const &weights,
ScalarVector const &weightedNormalStress)
: restrictions(weightedNormalStress.size()) {
- auto trivialNonlinearity =
- std::make_shared<Friction>(std::make_shared<TrivialFunction>());
+ auto zeroNonlinearity =
+ std::make_shared<Friction>(std::make_shared<ZeroFunction>());
Dune::MultipleCodimMultipleGeomTypeMapper<
GridView, Dune::MCMGVertexLayout> const vertexMapper(gridView);
@@ -39,7 +39,7 @@ class GlobalRateStateFriction : public GlobalFriction<Matrix, Vector> {
auto const i = vertexMapper.index(*it);
auto const coordinate = it->geometry().corner(0);
if (not frictionalBoundary.containsVertex(i)) {
- restrictions[i] = trivialNonlinearity;
+ restrictions[i] = zeroNonlinearity;
continue;
}
auto const fp = std::make_shared<ScalarFriction>(
--
GitLab