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

spline: use evalDerivative_() instead of evalDerivative() if the segment index is known

Browse Source 
thanks to @bska for catching this!
This commit is contained in:
Andreas Lauser 2013-09-26 13:28:13 +02:00
parent d1bd0f24e4
commit fc6503d2e7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/core/utility/Spline.hpp
View File

@ -798,12 +798,12 @@ public:
// handle extrapolation
if (extrapolate) {
if (x < xMin()) {
Scalar m = evalDerivative(xMin(), /*segmentIdx=*/0);
Scalar m = evalDerivative_(xMin(), /*segmentIdx=*/0);
Scalar y0 = y_(0);
return y0 + m*(x - xMin());
}
else if (x > xMax()) {
Scalar m = evalDerivative(xMax(), /*segmentIdx=*/numSamples()-2);
Scalar m = evalDerivative_(xMax(), /*segmentIdx=*/numSamples()-2);
Scalar y0 = y_(numSamples() - 1);
return y0 + m*(x - xMax());
}
@ -829,9 +829,9 @@ public:
assert(extrapolate || applies(x));
if (extrapolate) {
if (x < xMin())
evalDerivative_(xMin(), 0);
evalDerivative_(xMin(), /*segmentIdx=*/0);
else if (x > xMax())
evalDerivative_(xMax(), numSamples() - 2);
evalDerivative_(xMax(), /*segmentIdx=*/numSamples() - 2);
}
return evalDerivative_(x, segmentIdx_(x));
@ -922,7 +922,7 @@ public:
int r = 3;
if (x0 < xMin()) {
assert(extrapolate);
Scalar m = evalDerivative(xMin(), /*segmentIdx=*/0);
Scalar m = evalDerivative_(xMin(), /*segmentIdx=*/0);
if (m != 0)
r = (m < 0)?-1:1;
};
@ -962,7 +962,7 @@ public:
else if (x1 > xMax()) {
assert(extrapolate);
Scalar m = evalDerivative(xMax(), /*segmentIdx=*/numSamples() - 2);
Scalar m = evalDerivative_(xMax(), /*segmentIdx=*/numSamples() - 2);
if (m != 0) {
int tmp = (m < 0)?-1:1;