diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh index 53c72d7ecea3635793b4ba318b2315d480db49da..31e1ecbea580f0dfa0122200bfe1ec2c08a9ab1b 100644 --- a/dumux/material/components/tabulatedcomponent.hh +++ b/dumux/material/components/tabulatedcomponent.hh @@ -546,7 +546,8 @@ private: alphaP1 -= iP1; alphaP2 -= iP2; -#ifndef NDEBUG + +#if 0 && !defined NDEBUG if(!(0 <= alphaT && alphaT <= 1.0)) DUNE_THROW(NumericalProblem, "Temperature out of range: " << "T=" << T << " range: [" << tempMin_ << ", " << tempMax_ << "]"); @@ -585,7 +586,7 @@ private: alphaP1 -= iP1; alphaP2 -= iP2; -#ifndef NDEBUG +#if 0 && !defined NDEBUG if(!(0 <= alphaT && alphaT <= 1.0)) DUNE_THROW(NumericalProblem, "Temperature out of range: " << "T=" << T << " range: [" << tempMin_ << ", " << tempMax_ << "]"); @@ -692,26 +693,26 @@ private: // returns the minimum tabulized liquid pressure at a given // temperature index static Scalar minLiquidPressure_(int tempIdx) - { return pressMin_; } - // { return std::max<Scalar>(pressMin_, vaporPressure_[tempIdx] / 1.1); } + // { return pressMin_; } + { return std::max<Scalar>(pressMin_, vaporPressure_[tempIdx] / 1.1); } // returns the maximum tabulized liquid pressure at a given // temperature index static Scalar maxLiquidPressure_(int tempIdx) - { return pressMax_; } -// { return std::max<Scalar>(pressMax_, vaporPressure_[tempIdx] * 1.1); } + // { return pressMax_; } + { return std::max<Scalar>(pressMax_, vaporPressure_[tempIdx] * 1.1); } // returns the minumum tabulized gas pressure at a given // temperature index static Scalar minGasPressure_(int tempIdx) - { return pressMin_; } -// { return std::min<Scalar>(pressMin_, vaporPressure_[tempIdx] / 1.1 ); } + // { return pressMin_; } + { return std::min<Scalar>(pressMin_, vaporPressure_[tempIdx] / 1.1 ); } // returns the maximum tabulized gas pressure at a given // temperature index static Scalar maxGasPressure_(int tempIdx) - { return pressMax_; } -// { return std::min<Scalar>(pressMax_, vaporPressure_[tempIdx] * 1.1); } + // { return pressMax_; } + { return std::min<Scalar>(pressMax_, vaporPressure_[tempIdx] * 1.1); } // returns the minimum tabulized liquid density at a given diff --git a/test/boxmodels/MpNc/obstacleproblem.hh b/test/boxmodels/MpNc/obstacleproblem.hh index 1a4968eb0d2799389d4f47b9f0ec3d1587b32b04..bb76421d3a4aff227d390cd78c1732d977def747 100644 --- a/test/boxmodels/MpNc/obstacleproblem.hh +++ b/test/boxmodels/MpNc/obstacleproblem.hh @@ -186,8 +186,8 @@ public: Scalar Tmax = temperature_ + 1.0; int nT = 3; - Scalar pmin = 0.0; - Scalar pmax = 1e6; + Scalar pmin = 1.0e5 * 0.75; + Scalar pmax = 2.0e5 * 1.25; int np = 1000; FluidSystem::init(Tmin, Tmax, nT, pmin, pmax, np);