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

H2O: remove too expensive range checks

Browse Source 
when they worked, they were only used in debug mode anyway...
This commit is contained in:
Andreas Lauser
2013-11-03 15:37:17 +01:00
parent 9b5e1f27e6
commit b51bf6d0b1
1 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
opm/material/components/H2O.hpp
View File

@@ -810,22 +810,6 @@ public:
*/
static Scalar liquidThermalConductivity(Scalar temperature, Scalar pressure)
{
#ifndef NDEBUG
// Thermal conductivity of water is empirically fit.
// Evaluating that fitting-function outside the area of
// validity does not make sense.
if ((pressure > 400e6 && ((273.15 < temperature) || (temperature > 398.15)) )
|| (pressure <= 200e6 && ((398.15 < temperature) || (temperature > 523.15)) )
|| (pressure <= 150e6 && ((523.15 < temperature) || (temperature > 673.15)) )
|| (pressure <= 100e6 && ((673.15 < temperature) || (temperature > 1073.15)) ) )
{
OPM_THROW(NumericalProblem,
"Liquid thermal conductivity of H2O for "
<< "T="<<temperature<<" p="<<pressure
<< " is not implemented");
}
#endif
Scalar rho = liquidDensity(temperature, pressure);
return Common::thermalConductivityIAPWS(temperature, rho);
}
@@ -845,21 +829,6 @@ public:
*/
static Scalar gasThermalConductivity(Scalar temperature, Scalar pressure)
{
#ifndef NDEBUG
// Thermal conductivity of water is empirically fit.
// Evaluating that fitting-function outside the area of validity does not make sense.
if ((pressure > 400e6 && ((273.15 < temperature) || (temperature > 398.15)) )
|| (pressure <= 200e6 && ((398.15 < temperature) || (temperature > 523.15)) )
|| (pressure <= 150e6 && ((523.15 < temperature) || (temperature > 673.15)) )
|| (pressure <= 100e6 && ((673.15 < temperature) || (temperature > 1073.15)) ) )
{
OPM_THROW(NumericalProblem,
"Gas thermal conductivity of H2O for "
" T="<<temperature<<" p="<<pressure
<< " is not implemented");
}
#endif
Scalar rho = gasDensity(temperature, pressure);
return Common::thermalConductivityIAPWS(temperature, rho);
}