diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturation.h b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturation.h index ec8111693a8af83320b3ee8d0765ded37bc53bae..249562de4a25450f9a9a567bf78c503891b61420 100644 --- a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturation.h +++ b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturation.h @@ -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 diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturationCurve.h b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturationCurve.h index 02986715e1d4e5f81bf97211751c6ebff94b2373..d8337ddd380659978e5374ed7d0da2e90a774aa2 100644 --- a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturationCurve.h +++ b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturationCurve.h @@ -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 diff --git a/MathLib/Curve/PiecewiseLinearMonotonicCurve.cpp b/MathLib/Curve/PiecewiseLinearMonotonicCurve.cpp index 590d09010f9d7827a19653ed4c5f379067596ef8..bee2a2e4993f7857e43e6db4adc7d8ee74a70ec3 100644 --- a/MathLib/Curve/PiecewiseLinearMonotonicCurve.cpp +++ b/MathLib/Curve/PiecewiseLinearMonotonicCurve.cpp @@ -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()) diff --git a/MathLib/Curve/PiecewiseLinearMonotonicCurve.h b/MathLib/Curve/PiecewiseLinearMonotonicCurve.h index 7dda2cb1d51ac04996ad503304dc62a07e558d31..83a55c3c8e785eb62608388e13343d26c119e097 100644 --- a/MathLib/Curve/PiecewiseLinearMonotonicCurve.h +++ b/MathLib/Curve/PiecewiseLinearMonotonicCurve.h @@ -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: /** diff --git a/Tests/MathLib/TestPiecewiseLinearCurve.cpp b/Tests/MathLib/TestPiecewiseLinearCurve.cpp index 1fb7cb06afd466483274cb1fc5937da1638a7bbc..78a5cbed2b9a5ad6c479d5c05c2597b1b3468ccd 100644 --- a/Tests/MathLib/TestPiecewiseLinearCurve.cpp +++ b/Tests/MathLib/TestPiecewiseLinearCurve.cpp @@ -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()); } }