Skip to content
Snippets Groups Projects
Commit ac9e0064 authored by Elias Pipping's avatar Elias Pipping
Browse files

[Cleanup]

parent 19b9053d
No related branches found
No related tags found
No related merge requests found
...@@ -26,15 +26,11 @@ class FrictionPotentialWrapper { ...@@ -26,15 +26,11 @@ class FrictionPotentialWrapper {
void virtual updateLogState(double) = 0; void virtual updateLogState(double) = 0;
}; };
// V log(V/V_m) - V + V_m if V >= V_m
// 0 otherwise
class FrictionPotential : public FrictionPotentialWrapper { class FrictionPotential : public FrictionPotentialWrapper {
public: public:
FrictionPotential(double coefficient, FrictionData const &_fd) FrictionPotential(double coefficient, FrictionData const &_fd)
: fd(_fd), weightTimesNormalStress(coefficient * (-fd.normalStress)) {} : fd(_fd), weightTimesNormalStress(coefficient * (-fd.normalStress)) {}
// log(V/V_m) if V >= V_0
// 0 otherwise
double differential(double V) const { double differential(double V) const {
assert(V >= 0.0); assert(V >= 0.0);
if (V <= V_cutoff) if (V <= V_cutoff)
...@@ -43,8 +39,6 @@ class FrictionPotential : public FrictionPotentialWrapper { ...@@ -43,8 +39,6 @@ class FrictionPotential : public FrictionPotentialWrapper {
return weightTimesNormalStress * fd.a * (std::log(V) - logV_m); return weightTimesNormalStress * fd.a * (std::log(V) - logV_m);
} }
// 1/V if V > V_0
// 0 if V < V_0
double second_deriv(double V) const { double second_deriv(double V) const {
assert(V >= 0); assert(V >= 0);
if (V <= V_cutoff) if (V <= V_cutoff)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment