From 47981e0efa57df813b4b7745a9da04fb7786642d Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Fri, 19 Jul 2013 14:52:03 +0200
Subject: [PATCH] [Cleanup] Move fd.a out of coefficientProduct
---
dune/tectonic/frictionpotential.hh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dune/tectonic/frictionpotential.hh b/dune/tectonic/frictionpotential.hh
index c3542ff0..bc2b2273 100644
--- a/dune/tectonic/frictionpotential.hh
+++ b/dune/tectonic/frictionpotential.hh
@@ -32,7 +32,7 @@ class FrictionPotentialWrapper {
class FrictionPotential : public FrictionPotentialWrapper {
public:
FrictionPotential(double coefficient, FrictionData const &fd)
- : fd(fd), coefficientProduct(coefficient * fd.a * fd.normalStress) {}
+ : fd(fd), weightTimesNormalStress(coefficient * fd.normalStress) {}
double evaluate(double V) const {
assert(V >= 0);
@@ -40,7 +40,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
return 0;
// V log(V/V_m) - V + V_m
- return coefficientProduct * (V * std::log(V / V_m) - V + V_m);
+ return weightTimesNormalStress * fd.a * (V * std::log(V / V_m) - V + V_m);
}
// log(V/V_m) if V >= V_0
@@ -50,7 +50,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
if (V <= V_m)
return 0;
- return coefficientProduct * std::log(V / V_m);
+ return weightTimesNormalStress * fd.a * std::log(V / V_m);
}
// 1/V if V > V_0
@@ -61,7 +61,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
if (V <= V_m)
return 0;
- return coefficientProduct / V;
+ return weightTimesNormalStress * fd.a / V;
}
double regularity(double V) const {
@@ -83,7 +83,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
private:
FrictionData const &fd;
- double const coefficientProduct;
+ double const weightTimesNormalStress;
double V_m;
};
--
GitLab