remove HAVE_OPM_COMMON conditionals

opm/material/common/Exceptions.hpp

@@ -27,9 +27,7 @@
 #ifndef OPM_MATERIAL_EXCEPTIONS_HPP
 #define OPM_MATERIAL_EXCEPTIONS_HPP
 
-#if HAVE_OPM_COMMON
 #include <opm/common/Exceptions.hpp>
-#endif
 
 #include <dune/common/exceptions.hh>
 
@@ -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
     {}
 };
 }

opm/material/common/UniformTabulated2DFunction.hpp

@@ -31,11 +31,7 @@
 #include <opm/material/common/Exceptions.hpp>
 #include <opm/material/common/MathToolbox.hpp>
 
-#if HAVE_OPM_COMMON
 #include <opm/common/OpmLog/OpmLog.hpp>
-#else
-#include <iostream>
-#endif
 
 #include <vector>
 
@@ -212,11 +208,7 @@ public:
             }
             else
             {
-#if HAVE_OPM_COMMON
                 OpmLog::warning("PVT Table evaluation:" + msg + ". Will use extrapolation");
-#else
-                std::cerr << "warning: "<< msg<<std::endl;
-#endif
             }
 
         };

opm/material/components/SimpleHuDuanH2O.hpp

@@ -36,11 +36,7 @@
 #include <opm/material/common/Exceptions.hpp>
 #include <opm/material/common/MathToolbox.hpp>
 
-#if HAVE_OPM_COMMON
 #include <opm/common/OpmLog/OpmLog.hpp>
-#else
-#include <iostream>
-#endif
 
 #include <cmath>
 #include <sstream>
@@ -356,11 +352,7 @@ public:
                 << "(T = " << temperature << ")";
             if(extrapolate)
             {
-#if HAVE_OPM_COMMON
                 OpmLog::warning(oss.str());
-#else
-                std::cerr << "warning: "<< oss.str() <<std::endl;
-#endif
             }
             else
                 throw NumericalIssue(oss.str());
@@ -391,11 +383,7 @@ private:
                 << "pressures below 100MPa. (T = " << T << ", p=" << pressure;
             if(extrapolate)
             {
-#if HAVE_OPM_COMMON
                 OpmLog::warning(oss.str());
-#else
-                std::cerr << "warning: "<< oss.str() <<std::endl;
-#endif
             }
             else
                 throw NumericalIssue(oss.str());

opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp

@@ -42,9 +42,7 @@
 #include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
 #include <opm/material/fluidstates/SimpleModularFluidState.hpp>
 
-#if HAVE_OPM_COMMON
 #include <opm/common/OpmLog/OpmLog.hpp>
-#endif
 
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/TableManager.hpp>
@@ -505,10 +503,8 @@ public:
     {
         MaterialLawParams& mlp = const_cast<MaterialLawParams&>(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;
 

opm/material/fluidsystems/blackoilpvt/DryHumidGasPvt.hpp

@@ -38,9 +38,7 @@
 
 #endif
 
-#if HAVE_OPM_COMMON
 #include <opm/common/OpmLog/OpmLog.hpp>
-#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());
     }
 

opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp

@@ -38,9 +38,7 @@
 #include <opm/input/eclipse/EclipseState/Tables/TableManager.hpp>
 #endif
 
-#if HAVE_OPM_COMMON
 #include <opm/common/OpmLog/OpmLog.hpp>
-#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());
     }
 

opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp

@@ -37,9 +37,7 @@
 #include <opm/input/eclipse/Schedule/OilVaporizationProperties.hpp>
 #endif
 
-#if HAVE_OPM_COMMON
 #include <opm/common/OpmLog/OpmLog.hpp>
-#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());
     }
 

opm/material/fluidsystems/blackoilpvt/WetHumidGasPvt.hpp

@@ -37,9 +37,7 @@
 
 #endif
 
-#if HAVE_OPM_COMMON
 #include <opm/common/OpmLog/OpmLog.hpp>
-#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());
     }