Skip to content
Snippets Groups Projects
Commit 89533f11 authored by podlesny's avatar podlesny
Browse files

remove regularity checks in truncatedRateState

parent 7d5bcf73
Branches
Tags
No related merge requests found
...@@ -34,7 +34,7 @@ class TruncatedRateState : public FrictionPotential { ...@@ -34,7 +34,7 @@ class TruncatedRateState : public FrictionPotential {
: fd(_fd), weight(_weight), weightedNormalStress(_weightedNormalStress) {} : fd(_fd), weight(_weight), weightedNormalStress(_weightedNormalStress) {}
double coefficientOfFriction(double V) const override { double coefficientOfFriction(double V) const override {
if (V <= Vmin or regularity(V)>10e8) if (V <= Vmin)
return 0.0; return 0.0;
//std::cout << "V: " << V << " Vmin: " << Vmin << std::endl; //std::cout << "V: " << V << " Vmin: " << Vmin << std::endl;
...@@ -49,8 +49,8 @@ class TruncatedRateState : public FrictionPotential { ...@@ -49,8 +49,8 @@ class TruncatedRateState : public FrictionPotential {
double differential(double V) const override { double differential(double V) const override {
//std::cout << "differential: " << weight * fd.C - weightedNormalStress * coefficientOfFriction(V) << std::endl; //std::cout << "differential: " << weight * fd.C - weightedNormalStress * coefficientOfFriction(V) << std::endl;
if (V <= Vmin or regularity(V)>10e8) //if (V <= Vmin or regularity(V)>10e8)
return 0.0; // return 0.0;
return weight * fd.C - weightedNormalStress * coefficientOfFriction(V); return weight * fd.C - weightedNormalStress * coefficientOfFriction(V);
} }
...@@ -74,7 +74,7 @@ class TruncatedRateState : public FrictionPotential { ...@@ -74,7 +74,7 @@ class TruncatedRateState : public FrictionPotential {
} }
double evaluate(double V) const override { double evaluate(double V) const override {
if (V <= Vmin or regularity(V)>10e8) if (V <= Vmin)
return 0.0; return 0.0;
return weight * fd.C * V - weightedNormalStress * fd.a * V * (std::log(V / Vmin) - 1); return weight * fd.C * V - weightedNormalStress * fd.a * V * (std::log(V / Vmin) - 1);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment