From 89533f115e79d558e6279f6aba23089567b3be50 Mon Sep 17 00:00:00 2001
From: podlesny <podlesny@zedat.fu-berlin.de>
Date: Sun, 14 Mar 2021 17:30:24 +0100
Subject: [PATCH] remove regularity checks in truncatedRateState
---
.../data-structures/friction/frictionpotential.hh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dune/tectonic/data-structures/friction/frictionpotential.hh b/dune/tectonic/data-structures/friction/frictionpotential.hh
index 81b47741..a5d3cf72 100644
--- a/dune/tectonic/data-structures/friction/frictionpotential.hh
+++ b/dune/tectonic/data-structures/friction/frictionpotential.hh
@@ -34,7 +34,7 @@ class TruncatedRateState : public FrictionPotential {
: fd(_fd), weight(_weight), weightedNormalStress(_weightedNormalStress) {}
double coefficientOfFriction(double V) const override {
- if (V <= Vmin or regularity(V)>10e8)
+ if (V <= Vmin)
return 0.0;
//std::cout << "V: " << V << " Vmin: " << Vmin << std::endl;
@@ -49,8 +49,8 @@ class TruncatedRateState : public FrictionPotential {
double differential(double V) const override {
//std::cout << "differential: " << weight * fd.C - weightedNormalStress * coefficientOfFriction(V) << std::endl;
- if (V <= Vmin or regularity(V)>10e8)
- return 0.0;
+ //if (V <= Vmin or regularity(V)>10e8)
+ // return 0.0;
return weight * fd.C - weightedNormalStress * coefficientOfFriction(V);
}
@@ -74,7 +74,7 @@ class TruncatedRateState : public FrictionPotential {
}
double evaluate(double V) const override {
- if (V <= Vmin or regularity(V)>10e8)
+ if (V <= Vmin)
return 0.0;
return weight * fd.C * V - weightedNormalStress * fd.a * V * (std::log(V / Vmin) - 1);
--
GitLab