OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #206 from andlaus/sort_by_default

Browse Source 
make the "sortInputs" argument of the 1D function tabulation classes default to true
This commit is contained in:
Andreas Lauser 2017-02-24 16:54:33 +01:00 committed by GitHub
commit dd587f10e3
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
opm/material/common/Spline.hpp
View File

@ -142,7 +142,7 @@ public:
const ScalarArrayX& x,
const ScalarArrayY& y,
SplineType splineType = Natural,
bool sortInputs = false)
bool sortInputs = true)
{ this->setXYArrays(nSamples, x, y, splineType, sortInputs); }
/*!
@ -156,7 +156,7 @@ public:
Spline(size_t nSamples,
const PointArray& points,
SplineType splineType = Natural,
bool sortInputs = false)
bool sortInputs = true)
{ this->setArrayOfPoints(nSamples, points, splineType, sortInputs); }
/*!
@ -170,7 +170,7 @@ public:
Spline(const ScalarContainer& x,
const ScalarContainer& y,
SplineType splineType = Natural,
bool sortInputs = false)
bool sortInputs = true)
{ this->setXYContainers(x, y, splineType, sortInputs); }
/*!
@ -182,7 +182,7 @@ public:
template <class PointContainer>
Spline(const PointContainer& points,
SplineType splineType = Natural,
bool sortInputs = false)
bool sortInputs = true)
{ this->setContainerOfPoints(points, splineType, sortInputs); }
/*!
@ -201,7 +201,7 @@ public:
const ScalarArray& y,
Scalar m0,
Scalar m1,
bool sortInputs = false)
bool sortInputs = true)
{ this->setXYArrays(nSamples, x, y, m0, m1, sortInputs); }
/*!
@ -218,7 +218,7 @@ public:
const PointArray& points,
Scalar m0,
Scalar m1,
bool sortInputs = false)
bool sortInputs = true)
{ this->setArrayOfPoints(nSamples, points, m0, m1, sortInputs); }
/*!
@ -235,7 +235,7 @@ public:
const ScalarContainerY& y,
Scalar m0,
Scalar m1,
bool sortInputs = false)
bool sortInputs = true)
{ this->setXYContainers(x, y, m0, m1, sortInputs); }
/*!
@ -250,7 +250,7 @@ public:
Spline(const PointContainer& points,
Scalar m0,
Scalar m1,
bool sortInputs = false)
bool sortInputs = true)
{ this->setContainerOfPoints(points, m0, m1, sortInputs); }
/*!
@ -324,7 +324,7 @@ public:
const ScalarArrayX& x,
const ScalarArrayY& y,
Scalar m0, Scalar m1,
bool sortInputs = false)
bool sortInputs = true)
{
assert(nSamples > 1);
@ -357,7 +357,7 @@ public:
void setXYContainers(const ScalarContainerX& x,
const ScalarContainerY& y,
Scalar m0, Scalar m1,
bool sortInputs = false)
bool sortInputs = true)
{
assert(x.size() == y.size());
assert(x.size() > 1);
@ -392,7 +392,7 @@ public:
const PointArray& points,
Scalar m0,
Scalar m1,
bool sortInputs = false)
bool sortInputs = true)
{
// a spline with no or just one sampling points? what an
// incredible bad idea!
@ -428,7 +428,7 @@ public:
void setContainerOfPoints(const XYContainer& points,
Scalar m0,
Scalar m1,
bool sortInputs = false)
bool sortInputs = true)
{
// a spline with no or just one sampling points? what an
// incredible bad idea!
@ -470,7 +470,7 @@ public:
void setContainerOfTuples(const XYContainer& points,
Scalar m0,
Scalar m1,
bool sortInputs = false)
bool sortInputs = true)
{
// resize internal arrays
setNumSamples_(points.size());
@ -512,7 +512,7 @@ public:
const ScalarArrayX& x,
const ScalarArrayY& y,
SplineType splineType = Natural,
bool sortInputs = false)
bool sortInputs = true)
{
assert(nSamples > 1);
@ -552,7 +552,7 @@ public:
void setXYContainers(const ScalarContainerX& x,
const ScalarContainerY& y,
SplineType splineType = Natural,
bool sortInputs = false)
bool sortInputs = true)
{
assert(x.size() == y.size());
assert(x.size() > 1);
@ -592,7 +592,7 @@ public:
void setArrayOfPoints(size_t nSamples,
const PointArray& points,
SplineType splineType = Natural,
bool sortInputs = false)
bool sortInputs = true)
{
// a spline with no or just one sampling points? what an
// incredible bad idea!
@ -633,7 +633,7 @@ public:
template <class XYContainer>
void setContainerOfPoints(const XYContainer& points,
SplineType splineType = Natural,
bool sortInputs = false)
bool sortInputs = true)
{
// a spline with no or just one sampling points? what an
// incredible bad idea!
@ -679,7 +679,7 @@ public:
template <class XYContainer>
void setContainerOfTuples(const XYContainer& points,
SplineType splineType = Natural,
bool sortInputs = false)
bool sortInputs = true)
{
// resize internal arrays
setNumSamples_(points.size());
@ -796,7 +796,7 @@ public:
* cause a failed assertation.
*/
template <class Evaluation>
Evaluation eval(const Evaluation& x, bool extrapolate=false) const
Evaluation eval(const Evaluation& x, bool extrapolate = false) const
{
assert(extrapolate || applies(x));
@ -831,7 +831,7 @@ public:
* cause a failed assertation.
*/
template <class Evaluation>
Evaluation evalDerivative(const Evaluation& x, bool extrapolate=false) const
Evaluation evalDerivative(const Evaluation& x, bool extrapolate = false) const
{
assert(extrapolate || applies(x));
if (extrapolate) {
@ -857,7 +857,7 @@ public:
* cause a failed assertation.
*/
template <class Evaluation>
Evaluation evalSecondDerivative(const Evaluation& x, bool extrapolate=false) const
Evaluation evalSecondDerivative(const Evaluation& x, bool extrapolate = false) const
{
assert(extrapolate || applies(x));
if (extrapolate)
@ -879,7 +879,7 @@ public:
* cause a failed assertation.
*/
template <class Evaluation>
Evaluation evalThirdDerivative(const Evaluation& x, bool extrapolate=false) const
Evaluation evalThirdDerivative(const Evaluation& x, bool extrapolate = false) const
{
assert(extrapolate || applies(x));
if (extrapolate)
@ -1610,19 +1610,19 @@ protected:
// third derivative of the hermite basis functions
template <class Evaluation>
Scalar h00_prime3_(const Evaluation& /*t*/) const
Scalar h00_prime3_(const Evaluation& t OPM_UNUSED) const
{ return 2*3*2; }
template <class Evaluation>
Scalar h10_prime3_(const Evaluation& /*t*/) const
Scalar h10_prime3_(const Evaluation& t OPM_UNUSED) const
{ return 2*3; }
template <class Evaluation>
Scalar h01_prime3_(const Evaluation& /*t*/) const
Scalar h01_prime3_(const Evaluation& t OPM_UNUSED) const
{ return -2*3*2; }
template <class Evaluation>
Scalar h11_prime3_(const Evaluation& /*t*/) const
Scalar h11_prime3_(const Evaluation& t OPM_UNUSED) const
{ return 2*3; }
// returns the monotonicality of an interval of a spline segment

18
opm/material/common/Tabulated1DFunction.hpp
View File

@ -66,7 +66,7 @@ public:
Tabulated1DFunction(size_t nSamples,
const ScalarArrayX& x,
const ScalarArrayY& y,
bool sortInputs = false)
bool sortInputs = true)
{ this->setXYArrays(nSamples, x, y, sortInputs); }
/*!
@ -80,7 +80,7 @@ public:
template <class ScalarContainer>
Tabulated1DFunction(const ScalarContainer& x,
const ScalarContainer& y,
bool sortInputs = false)
bool sortInputs = true)
{ this->setXYContainers(x, y, sortInputs); }
/*!
@ -91,7 +91,7 @@ public:
*/
template <class PointContainer>
Tabulated1DFunction(const PointContainer& points,
bool sortInputs = false)
bool sortInputs = true)
{ this->setContainerOfTuples(points, sortInputs); }
/*!
@ -103,7 +103,7 @@ public:
void setXYArrays(size_t nSamples,
const ScalarArrayX& x,
const ScalarArrayY& y,
bool sortInputs = false)
bool sortInputs = true)
{
assert(nSamples > 1);
@ -127,7 +127,7 @@ public:
template <class ScalarContainerX, class ScalarContainerY>
void setXYContainers(const ScalarContainerX& x,
const ScalarContainerY& y,
bool sortInputs = false)
bool sortInputs = true)
{
assert(x.size() == y.size());
assert(x.size() > 1);
@ -148,7 +148,7 @@ public:
template <class PointArray>
void setArrayOfPoints(size_t nSamples,
const PointArray& points,
bool sortInputs = false)
bool sortInputs = true)
{
// a linear function with less than two sampling points? what an incredible
// bad idea!
@ -182,7 +182,7 @@ public:
*/
template <class XYContainer>
void setContainerOfTuples(const XYContainer& points,
bool sortInputs = false)
bool sortInputs = true)
{
// a linear function with less than two sampling points? what an incredible
// bad idea!
@ -248,7 +248,7 @@ public:
* failed assertation.
*/
template <class Evaluation>
Evaluation eval(const Evaluation& x, bool extrapolate=false) const
Evaluation eval(const Evaluation& x, bool extrapolate = false) const
{
typedef Opm::MathToolbox<Evaluation> Toolbox;
@ -283,7 +283,7 @@ public:
* cause a failed assertation.
*/
template <class Evaluation>
Evaluation evalDerivative(const Evaluation& x, bool /*extrapolate*/=false) const
Evaluation evalDerivative(const Evaluation& x, bool extrapolate OPM_UNUSED = false) const
{
unsigned segIdx = findSegmentIndex_(x);