Make all codes use the same linear interpolation routines.

This commit is contained in:
Atgeirr Flø Rasmussen 2013-03-22 15:28:16 +01:00
parent 8dee94dc0f
commit f8e00d0bc6

View File

@ -70,7 +70,7 @@ namespace Opm
return (1.0 + cpnorm + 0.5*cpnorm*cpnorm);
} else {
// return Opm::linearInterpolation(p_, poromult_, pressure);
return Opm::linearInterpolationExtrap(p_, poromult_, pressure);
return Opm::linearInterpolation(p_, poromult_, pressure);
}
}
@ -81,8 +81,8 @@ namespace Opm
} else {
//const double poromult = Opm::linearInterpolation(p_, poromult_, pressure);
//const double dporomultdp = Opm::linearInterpolationDerivative(p_, poromult_, pressure);
const double poromult = Opm::linearInterpolationExtrap(p_, poromult_, pressure);
const double dporomultdp = Opm::linearInterpolationDerivativeExtrap(p_, poromult_, pressure);
const double poromult = Opm::linearInterpolation(p_, poromult_, pressure);
const double dporomultdp = Opm::linearInterpolationDerivative(p_, poromult_, pressure);
return dporomultdp/poromult;
}