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

[Noise] Get rid of logVmin

parent 0b8d45b9
No related branches found
No related tags found
No related merge requests found
...@@ -37,7 +37,7 @@ class FrictionPotential : public FrictionPotentialWrapper { ...@@ -37,7 +37,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
if (V <= Vmin) if (V <= Vmin)
return 0.0; return 0.0;
return fd.a * (std::log(V) - logVmin); return fd.a * (std::log(V / fd.V0) + logrest);
} }
double differential(double V) const { double differential(double V) const {
...@@ -61,17 +61,15 @@ class FrictionPotential : public FrictionPotentialWrapper { ...@@ -61,17 +61,15 @@ class FrictionPotential : public FrictionPotentialWrapper {
} }
void updateLogState(double logState) { void updateLogState(double logState) {
double const tmp = logrest = (fd.mu0 + fd.b * (logState + std::log(fd.V0 / fd.L))) / fd.a;
(fd.mu0 + fd.b * (logState + std::log(fd.V0 / fd.L))) / fd.a; Vmin = fd.V0 / std::exp(logrest);
logVmin = std::log(fd.V0) - tmp;
Vmin = fd.V0 / std::exp(tmp);
} }
private: private:
FrictionData const fd; FrictionData const fd;
double const weight; double const weight;
double const normalStress; double const normalStress;
double logVmin; double logrest;
double Vmin; double Vmin;
}; };
......
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