diff --git a/opm/material/common/Exceptions.hpp b/opm/material/common/Exceptions.hpp index f29f9c50b..77722a4f8 100644 --- a/opm/material/common/Exceptions.hpp +++ b/opm/material/common/Exceptions.hpp @@ -27,9 +27,7 @@ #ifndef OPM_MATERIAL_EXCEPTIONS_HPP #define OPM_MATERIAL_EXCEPTIONS_HPP -#if HAVE_OPM_COMMON #include -#endif #include @@ -38,19 +36,11 @@ // the opm-material specific exception classes namespace Opm { class NumericalIssue -#if HAVE_OPM_COMMON : public NumericalProblem -#else - : public std::runtime_error -#endif { public: explicit NumericalIssue(const std::string &message) -#if HAVE_OPM_COMMON : NumericalProblem(message) -#else - : std::runtime_error(message) -#endif {} }; } diff --git a/opm/material/common/UniformTabulated2DFunction.hpp b/opm/material/common/UniformTabulated2DFunction.hpp index 9aacaccdc..ab8e5fab4 100644 --- a/opm/material/common/UniformTabulated2DFunction.hpp +++ b/opm/material/common/UniformTabulated2DFunction.hpp @@ -31,11 +31,7 @@ #include #include -#if HAVE_OPM_COMMON #include -#else -#include -#endif #include @@ -212,11 +208,7 @@ public: } else { -#if HAVE_OPM_COMMON OpmLog::warning("PVT Table evaluation:" + msg + ". Will use extrapolation"); -#else - std::cerr << "warning: "<< msg< #include -#if HAVE_OPM_COMMON #include -#else -#include -#endif #include #include @@ -356,11 +352,7 @@ public: << "(T = " << temperature << ")"; if(extrapolate) { -#if HAVE_OPM_COMMON OpmLog::warning(oss.str()); -#else - std::cerr << "warning: "<< oss.str() < #include -#if HAVE_OPM_COMMON #include -#endif #include #include @@ -505,10 +503,8 @@ public: { MaterialLawParams& mlp = const_cast(materialLawParams_[elemIdx]); -#if HAVE_OPM_COMMON if (enableHysteresis()) OpmLog::warning("Warning: Using non-default satnum regions for connection is not tested in combination with hysteresis"); -#endif // Currently we don't support COMPIMP. I.e. use the same table lookup for the hysteresis curves. // unsigned impRegionIdx = satRegionIdx; diff --git a/opm/material/fluidsystems/blackoilpvt/DryHumidGasPvt.hpp b/opm/material/fluidsystems/blackoilpvt/DryHumidGasPvt.hpp index 7879e9be2..fac1eec1a 100644 --- a/opm/material/fluidsystems/blackoilpvt/DryHumidGasPvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/DryHumidGasPvt.hpp @@ -38,9 +38,7 @@ #endif -#if HAVE_OPM_COMMON #include -#endif namespace Opm { @@ -597,9 +595,7 @@ public: errlog << "Finding saturation pressure did not converge:" << " pSat = " << pSat << ", Rw = " << Rw; -#if HAVE_OPM_COMMON OpmLog::debug("Wet gas saturation pressure", errlog.str()); -#endif throw NumericalIssue(errlog.str()); } diff --git a/opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp b/opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp index d56b99b95..6f22c9053 100644 --- a/opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp @@ -38,9 +38,7 @@ #include #endif -#if HAVE_OPM_COMMON #include -#endif namespace Opm { /*! @@ -595,9 +593,7 @@ public: errlog << "Finding saturation pressure did not converge:" << " pSat = " << pSat << ", Rs = " << Rs; -#if HAVE_OPM_COMMON OpmLog::debug("Live oil saturation pressure", errlog.str()); -#endif throw NumericalIssue(errlog.str()); } diff --git a/opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp b/opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp index 1912acdd7..3f1038a3a 100644 --- a/opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp @@ -37,9 +37,7 @@ #include #endif -#if HAVE_OPM_COMMON #include -#endif namespace Opm { @@ -645,9 +643,7 @@ public: errlog << "Finding saturation pressure did not converge:" << " pSat = " << pSat << ", Rv = " << Rv; -#if HAVE_OPM_COMMON OpmLog::debug("Wet gas saturation pressure", errlog.str()); -#endif throw NumericalIssue(errlog.str()); } diff --git a/opm/material/fluidsystems/blackoilpvt/WetHumidGasPvt.hpp b/opm/material/fluidsystems/blackoilpvt/WetHumidGasPvt.hpp index a1d6e2b7d..b3aa15f5e 100644 --- a/opm/material/fluidsystems/blackoilpvt/WetHumidGasPvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/WetHumidGasPvt.hpp @@ -37,9 +37,7 @@ #endif -#if HAVE_OPM_COMMON #include -#endif namespace Opm { @@ -796,9 +794,7 @@ public: errlog << "Finding saturation pressure did not converge:" << " pSat = " << pSat << ", Rw = " << Rw; -#if HAVE_OPM_COMMON OpmLog::debug("Wet gas saturation pressure", errlog.str()); -#endif throw NumericalIssue(errlog.str()); }