Skip to content
Snippets Groups Projects
Commit 143406e2 authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

[MatL] PM; Fix typos in variables and fct names.

... and also comments.
parent 0adb8096
No related branches found
No related tags found
No related merge requests found
......@@ -44,7 +44,7 @@ public:
/// Get capillary pressure.
virtual double getCapillaryPressure(const double saturation) const = 0;
/// Get saturation.
virtual double getSaturation(const double capillary_ressure) const = 0;
virtual double getSaturation(const double capillary_pressure) const = 0;
/// Get the derivative of the capillary pressure with respect to saturation
virtual double getdPcdS(const double saturation) const = 0;
......@@ -58,7 +58,7 @@ protected:
const double _saturation_nonwet_r; ///< Residual saturation of nonwetting
///phase (optional).
const double _saturation_max; ///< Maximum saturation.
const double _pc_max; ///< Maximum capillaray pressure
const double _pc_max; ///< Maximum capillary pressure
/** A small number for an offset:
* 1. to set the bound of S, the saturation, such that
......
......@@ -59,7 +59,7 @@ public:
{
const double pc = MathLib::limitValueInInterval(capillary_pressure,
_minor_offset, _pc_max);
return _curve_data->getInversVariable(pc);
return _curve_data->getInverseVariable(pc);
}
/// Get the derivative of the capillary pressure with respect to saturation
......
......@@ -43,7 +43,7 @@ bool PiecewiseLinearMonotonicCurve::isStrongMonotonic() const
});
}
double PiecewiseLinearMonotonicCurve::getInversVariable(const double y) const
double PiecewiseLinearMonotonicCurve::getInverseVariable(const double y) const
{
std::size_t interval_idx = 0;
if (_values_at_supp_pnts.front() < _values_at_supp_pnts.back())
......
......@@ -31,7 +31,7 @@ public:
/// Get variable, x, or abscissa, by a given value \c y, the ordinate.
/// If this curve is not monotonic, this function gives a fatal error.
double getInversVariable(const double y) const;
double getInverseVariable(const double y) const;
private:
/**
......
......@@ -51,7 +51,7 @@ TEST(MathLibCurve, PiecewiseLinearCurveParsing)
{
ASSERT_NEAR(y[i], curve->getValue(x[i]),
std::numeric_limits<double>::epsilon());
ASSERT_NEAR(x[i], curve->getInversVariable(y[i]),
ASSERT_NEAR(x[i], curve->getInverseVariable(y[i]),
std::numeric_limits<double>::epsilon());
}
}
......@@ -82,7 +82,7 @@ TEST(MathLibCurve, MonotonicIncreasePiecewiseLinearCurve)
// Get inverse values and compare them
for (std::size_t i = 0; i < size; ++i)
{
ASSERT_NEAR(x[i], curve.getInversVariable(y[i]),
ASSERT_NEAR(x[i], curve.getInverseVariable(y[i]),
std::numeric_limits<double>::epsilon());
}
}
......@@ -113,7 +113,7 @@ TEST(MathLibCurve, MonotonicDecreasePiecewiseLinearCurve)
// Get inverse values and compare them
for (std::size_t i = 0; i < size; ++i)
{
ASSERT_NEAR(x[i], curve.getInversVariable(y[i]),
ASSERT_NEAR(x[i], curve.getInverseVariable(y[i]),
std::numeric_limits<double>::epsilon());
}
}
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