From a5e1e6b2b01fe255bed3320f8c5b0f1d7a9bcc5a Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Fri, 20 Jun 2014 11:52:28 +0200
Subject: [PATCH] [Noise] Do not store logrest
---
dune/tectonic/frictionpotential.hh | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/dune/tectonic/frictionpotential.hh b/dune/tectonic/frictionpotential.hh
index 59e7ec53..a806aa38 100644
--- a/dune/tectonic/frictionpotential.hh
+++ b/dune/tectonic/frictionpotential.hh
@@ -33,11 +33,10 @@ class FrictionPotential : public FrictionPotentialWrapper {
: fd(_fd), weight(coefficient), normalStress(_normalStress) {}
double coefficientOfFriction(double V) const {
- assert(V >= 0.0);
if (V <= Vmin)
return 0.0;
- return fd.a * (std::log(V / fd.V0) + logrest);
+ return fd.a * std::log(V / Vmin);
}
double differential(double V) const {
@@ -45,7 +44,6 @@ class FrictionPotential : public FrictionPotentialWrapper {
}
double second_deriv(double V) const {
- assert(V >= 0);
if (V <= Vmin)
return 0;
@@ -53,7 +51,6 @@ class FrictionPotential : public FrictionPotentialWrapper {
}
double regularity(double V) const {
- assert(V >= 0);
if (std::abs(V - Vmin) < 1e-14) // TODO
return std::numeric_limits<double>::infinity();
@@ -61,7 +58,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
}
void updateAlpha(double alpha) {
- logrest = (fd.mu0 + fd.b * alpha) / fd.a;
+ double const logrest = (fd.mu0 + fd.b * alpha) / fd.a;
Vmin = fd.V0 / std::exp(logrest);
}
@@ -69,7 +66,6 @@ class FrictionPotential : public FrictionPotentialWrapper {
FrictionData const fd;
double const weight;
double const normalStress;
- double logrest;
double Vmin;
};
--
GitLab