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

V0, mu -> V_0, mu_0

parent 0edb2e06
No related branches found
No related tags found
No related merge requests found
...@@ -40,18 +40,18 @@ class NiceFunction { ...@@ -40,18 +40,18 @@ class NiceFunction {
class RuinaFunction : public NiceFunction { class RuinaFunction : public NiceFunction {
public: public:
RuinaFunction(double coefficient, double a, double mu, double V0, RuinaFunction(double coefficient, double a, double mu_0, double V_0,
double normalStress, double b, double state, double L) double normalStress, double b, double state, double L)
: NiceFunction(), : NiceFunction(),
a(a), a(a),
V0(V0), V_0(V_0),
coefficientProduct(coefficient * normalStress), coefficientProduct(coefficient * normalStress),
// state is assumed to be logarithmic // state is assumed to be logarithmic
K(mu + b * (state + std::log(V0 / L))), K(mu_0 + b * (state + std::log(V_0 / L))),
V_m(std::exp(-K / a)) {} V_m(std::exp(-K / a)) {}
double virtual evaluate(double V) const { double virtual evaluate(double V) const {
double const arg = V / V0; double const arg = V / V_0;
if (arg <= V_m) if (arg <= V_m)
return 0; return 0;
...@@ -60,7 +60,7 @@ class RuinaFunction : public NiceFunction { ...@@ -60,7 +60,7 @@ class RuinaFunction : public NiceFunction {
} }
double virtual leftDifferential(double V) const { double virtual leftDifferential(double V) const {
double const arg = V / V0; double const arg = V / V_0;
if (arg <= V_m) if (arg <= V_m)
return 0; return 0;
...@@ -74,8 +74,8 @@ class RuinaFunction : public NiceFunction { ...@@ -74,8 +74,8 @@ class RuinaFunction : public NiceFunction {
double virtual second_deriv(double V) const { double virtual second_deriv(double V) const {
assert(V >= 0); assert(V >= 0);
assert(V0 > 0); assert(V_0 > 0);
double const arg = V / V0; double const arg = V / V_0;
if (arg <= V_m) if (arg <= V_m)
return 0; return 0;
...@@ -84,8 +84,8 @@ class RuinaFunction : public NiceFunction { ...@@ -84,8 +84,8 @@ class RuinaFunction : public NiceFunction {
double virtual regularity(double V) const { double virtual regularity(double V) const {
assert(V >= 0); assert(V >= 0);
assert(V0 > 0); assert(V_0 > 0);
double const arg = V / V0; double const arg = V / V_0;
// TODO: Make this controllable // TODO: Make this controllable
if (std::abs(arg - V_m) < 1e-14) if (std::abs(arg - V_m) < 1e-14)
return std::numeric_limits<double>::infinity(); return std::numeric_limits<double>::infinity();
...@@ -97,7 +97,7 @@ class RuinaFunction : public NiceFunction { ...@@ -97,7 +97,7 @@ class RuinaFunction : public NiceFunction {
private: private:
double const a; double const a;
double const V0; double const V_0;
double const coefficientProduct; double const coefficientProduct;
double const K; double const K;
double const V_m; double const V_m;
......
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