From 161ac5b048f250ea13e7fe21f223d813f7c4fc53 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Fri, 16 Mar 2012 13:33:07 +0100
Subject: [PATCH] Fix definition of RuinaFunction
---
dune/tectonic/nicefunction.hh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dune/tectonic/nicefunction.hh b/dune/tectonic/nicefunction.hh
index 027d8a4b..b34ca7e0 100644
--- a/dune/tectonic/nicefunction.hh
+++ b/dune/tectonic/nicefunction.hh
@@ -35,14 +35,14 @@ class RuinaFunction : public NiceFunction {
RuinaFunction(double coefficient, double a, double mu, double eta,
double normalStress, double b, double state, double L, double h)
: a(a),
- eta_h(eta / h),
+ h(h),
coefficientProduct(coefficient * normalStress),
c(mu + (a - b) * std::log(eta) - b * std::log(L)),
K(b * state) // state is assumed to be logarithmic
{}
void virtual evaluate(double const &x, double &y) const {
- double const arg = eta_h * x;
+ double const arg = x / h;
if (arg == 0) { // TODO: Make this controllable
y = 0;
return;
@@ -50,11 +50,11 @@ class RuinaFunction : public NiceFunction {
double const expstar = arg * std::log(arg) - arg;
y = a * expstar + (c + K) * arg;
- y *= coefficientProduct / eta_h;
+ y *= coefficientProduct * h;
}
double virtual leftDifferential(double x) const {
- double const arg = eta_h * x;
+ double const arg = x / h;
if (arg < 1e-14) // TODO: Make this controllable
return 0;
@@ -82,7 +82,7 @@ class RuinaFunction : public NiceFunction {
private:
double const a;
- double const eta_h;
+ double const h;
double const coefficientProduct;
double const c;
double const K;
--
GitLab