adjust to removed HAVE_ECL_(IN|OUT)PUT options

CMakeLists_files.cmake

@@ -209,7 +209,16 @@ list (APPEND MAIN_SOURCE_FILES
   opm/simulators/utils/compressPartition.cpp
   opm/simulators/utils/gatherDeferredLogger.cpp
   opm/simulators/utils/readDeck.cpp
+  opm/simulators/utils/satfunc/GasPhaseConsistencyChecks.cpp
+  opm/simulators/utils/satfunc/OilPhaseConsistencyChecks.cpp
+  opm/simulators/utils/satfunc/PhaseCheckBase.cpp
   opm/simulators/utils/satfunc/RelpermDiagnostics.cpp
+  opm/simulators/utils/satfunc/SatfuncConsistencyCheckManager.cpp
+  opm/simulators/utils/satfunc/SatfuncConsistencyChecks.cpp
+  opm/simulators/utils/satfunc/ScaledSatfuncCheckPoint.cpp
+  opm/simulators/utils/satfunc/ThreePointHorizontalConsistencyChecks.cpp
+  opm/simulators/utils/satfunc/UnscaledSatfuncCheckPoint.cpp
+  opm/simulators/utils/satfunc/WaterPhaseConsistencyChecks.cpp
   opm/simulators/wells/ALQState.cpp
   opm/simulators/wells/BlackoilWellModelConstraints.cpp
   opm/simulators/wells/BlackoilWellModelGasLift.cpp
@@ -281,20 +290,6 @@ if (HAVE_AVX2_EXTENSION)
     ${AVX2_SOURCE_FILES})
 endif()
 
-if (HAVE_ECL_INPUT)
-  list (APPEND MAIN_SOURCE_FILES
-    opm/simulators/utils/satfunc/GasPhaseConsistencyChecks.cpp
-    opm/simulators/utils/satfunc/OilPhaseConsistencyChecks.cpp
-    opm/simulators/utils/satfunc/PhaseCheckBase.cpp
-    opm/simulators/utils/satfunc/SatfuncConsistencyCheckManager.cpp
-    opm/simulators/utils/satfunc/SatfuncConsistencyChecks.cpp
-    opm/simulators/utils/satfunc/ScaledSatfuncCheckPoint.cpp
-    opm/simulators/utils/satfunc/ThreePointHorizontalConsistencyChecks.cpp
-    opm/simulators/utils/satfunc/UnscaledSatfuncCheckPoint.cpp
-    opm/simulators/utils/satfunc/WaterPhaseConsistencyChecks.cpp
-  )
-endif()
-
 if (Damaris_FOUND AND MPI_FOUND AND USE_DAMARIS_LIB)
   list (APPEND MAIN_SOURCE_FILES
     opm/simulators/flow/DamarisParameters.cpp
@@ -485,6 +480,7 @@ list (APPEND TEST_SOURCE_FILES
   tests/test_equil.cpp
   tests/test_extractMatrix.cpp
   tests/test_flexiblesolver.cpp
+  tests/test_GasSatfuncConsistencyChecks.cpp
   tests/test_gconsump.cpp
   tests/test_glift1.cpp
   tests/test_graphcoloring.cpp
@@ -495,7 +491,9 @@ list (APPEND TEST_SOURCE_FILES
   tests/test_LogOutputHelper.cpp
   tests/test_milu.cpp
   tests/test_multmatrixtransposed.cpp
+  tests/test_nonnc.cpp
   tests/test_norne_pvt.cpp
+  tests/test_OilSatfuncConsistencyChecks.cpp
   tests/test_outputdir.cpp
   tests/test_parametersystem.cpp
   tests/test_parallel_wbp_sourcevalues.cpp
@@ -510,27 +508,19 @@ list (APPEND TEST_SOURCE_FILES
   tests/test_rftcontainer.cpp
   tests/test_RunningStatistics.cpp
   tests/test_rstconv.cpp
+  tests/test_SatfuncCheckPoint.cpp
+  tests/test_SatfuncConsistencyChecks.cpp
+  tests/test_SatfuncConsistencyChecks_parallel.cpp
+  tests/test_SatfuncConsistencyCheckManager.cpp
   tests/test_stoppedwells.cpp
+  tests/test_ThreePointHorizontalSatfuncConsistencyChecks.cpp
   tests/test_timer.cpp
   tests/test_vfpproperties.cpp
+  tests/test_WaterSatfuncConsistencyChecks.cpp
   tests/test_wellmodel.cpp
   tests/test_wellprodindexcalculator.cpp
   tests/test_wellstate.cpp
-  )
-
-if (HAVE_ECL_INPUT)
-  list(APPEND TEST_SOURCE_FILES
-    tests/test_nonnc.cpp
-    tests/test_GasSatfuncConsistencyChecks.cpp
-    tests/test_OilSatfuncConsistencyChecks.cpp
-    tests/test_SatfuncCheckPoint.cpp
-    tests/test_SatfuncConsistencyCheckManager.cpp
-    tests/test_SatfuncConsistencyChecks.cpp
-    tests/test_SatfuncConsistencyChecks_parallel.cpp
-    tests/test_ThreePointHorizontalSatfuncConsistencyChecks.cpp
-    tests/test_WaterSatfuncConsistencyChecks.cpp
-  )
-endif()
+)
 
 if(MPI_FOUND)
   list(APPEND TEST_SOURCE_FILES tests/test_ghostlastmatrixadapter.cpp
@@ -1148,7 +1138,17 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/utils/ParallelCommunication.hpp
   opm/simulators/utils/ParallelSerialization.hpp
   opm/simulators/utils/readDeck.hpp
+  opm/simulators/utils/satfunc/GasPhaseConsistencyChecks.hpp
+  opm/simulators/utils/satfunc/OilPhaseConsistencyChecks.hpp
+  opm/simulators/utils/satfunc/PhaseCheckBase.hpp
   opm/simulators/utils/satfunc/RelpermDiagnostics.hpp
+  opm/simulators/utils/satfunc/SatfuncCheckPointInterface.hpp
+  opm/simulators/utils/satfunc/SatfuncConsistencyCheckManager.hpp
+  opm/simulators/utils/satfunc/SatfuncConsistencyChecks.hpp
+  opm/simulators/utils/satfunc/ScaledSatfuncCheckPoint.hpp
+  opm/simulators/utils/satfunc/ThreePointHorizontalConsistencyChecks.hpp
+  opm/simulators/utils/satfunc/UnscaledSatfuncCheckPoint.hpp
+  opm/simulators/utils/satfunc/WaterPhaseConsistencyChecks.hpp
   opm/simulators/wells/ALQState.hpp
   opm/simulators/wells/BlackoilWellModel.hpp
   opm/simulators/wells/BlackoilWellModel_impl.hpp
@@ -1272,21 +1272,6 @@ if (USE_GPU_BRIDGE)
   )
 endif()
 
-if (HAVE_ECL_INPUT)
-  list (APPEND PUBLIC_HEADER_FILES
-    opm/simulators/utils/satfunc/GasPhaseConsistencyChecks.hpp
-    opm/simulators/utils/satfunc/OilPhaseConsistencyChecks.hpp
-    opm/simulators/utils/satfunc/PhaseCheckBase.hpp
-    opm/simulators/utils/satfunc/SatfuncCheckPointInterface.hpp
-    opm/simulators/utils/satfunc/SatfuncConsistencyCheckManager.hpp
-    opm/simulators/utils/satfunc/SatfuncConsistencyChecks.hpp
-    opm/simulators/utils/satfunc/ScaledSatfuncCheckPoint.hpp
-    opm/simulators/utils/satfunc/ThreePointHorizontalConsistencyChecks.hpp
-    opm/simulators/utils/satfunc/UnscaledSatfuncCheckPoint.hpp
-    opm/simulators/utils/satfunc/WaterPhaseConsistencyChecks.hpp
-  )
-endif()
-
 if (HAVE_AVX2_EXTENSION)
   list (APPEND PUBLIC_HEADER_FILES
     opm/simulators/linalg/mixed/bslv.h

opm-simulators-prereqs.cmake

@@ -68,10 +68,6 @@ set (opm-simulators_DEPS
   "Damaris 1.9"
   "HDF5"
   "fmt"
-  )
+)
 
 find_package_deps(opm-simulators)
-
-if(NOT HAVE_ECL_INPUT OR NOT HAVE_ECL_OUTPUT)
-  message(FATAL_ERROR "Eclipse input/output support required in opm-common")
-endif()

opm/models/blackoil/blackoilbioeffectsparams.cpp

@@ -24,23 +24,18 @@
 #include <config.h>
 #include <opm/models/blackoil/blackoilbioeffectsparams.hpp>
 
-#if HAVE_ECL_INPUT
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/BiofilmTable.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/DiffMICPTable.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/PcfactTable.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/PermfactTable.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/SimpleTable.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/TableManager.hpp>
-#endif
 
-#include <algorithm>
 #include <stdexcept>
-#include <type_traits>
 
 namespace Opm {
 
-#if HAVE_ECL_INPUT
 template<class Scalar>
 template<bool enableBioeffects , bool enableMICP>
 void BlackOilBioeffectsParams<Scalar>::
@@ -165,7 +160,6 @@ initFromState(const EclipseState& eclState)
         permfactTable_[i].setXYContainers(permfactTable.getPorosityChangeColumn(), permfactTable.getPermeabilityMultiplierColumn());
     }
 }
-#endif
 
 #define INSTANTIATE_TYPE(T)                                                               \
     template struct BlackOilBioeffectsParams<T>;                                                \

opm/models/blackoil/blackoilbioeffectsparams.hpp

@@ -34,18 +34,14 @@
 
 namespace Opm {
 
-#if HAVE_ECL_INPUT
 class EclipseState;
-#endif
 
 //! \brief Struct holding the parameters for the BlackOilBioeffectsModule class.
 template<class Scalar>
 struct BlackOilBioeffectsParams
 {
-#if HAVE_ECL_INPUT
     template<bool enableBioeffects , bool enableMICP>
     void initFromState(const EclipseState& eclState);
-#endif
 
     using TabulatedFunction = Tabulated1DFunction<Scalar>;
 

opm/models/blackoil/blackoilbrineparams.cpp

@@ -24,23 +24,20 @@
 #include <config.h>
 #include <opm/models/blackoil/blackoilbrineparams.hpp>
 
-#if HAVE_ECL_INPUT
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/PvtwsaltTable.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/PcfactTable.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/PermfactTable.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/SaltSolubilityTable.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/TableManager.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/SimpleTable.hpp>
-#endif
 
 #include <cassert>
 #include <cstddef>
 #include <stdexcept>
 
 namespace Opm {
 
-#if HAVE_ECL_INPUT
 template<class Scalar>
 template<bool enableBrine, bool enableSaltPrecipitation>
 void BlackOilBrineParams<Scalar>::
@@ -116,7 +113,6 @@ initFromState(const EclipseState& eclState)
         }
    }
 }
-#endif
 
 #define INSTANTIATE_TYPE(T)                                                                \
     template struct BlackOilBrineParams<T>;                                                \

opm/models/blackoil/blackoilbrineparams.hpp

@@ -34,18 +34,14 @@
 
 namespace Opm {
 
-#if HAVE_ECL_INPUT
 class EclipseState;
-#endif
 
 //! \brief Struct holding the parameters for the BlackoilBrineModule class.
 template<class Scalar>
 struct BlackOilBrineParams
 {
-#if HAVE_ECL_INPUT
     template<bool enableBrine, bool enableSaltPrecipitation>
     void initFromState(const EclipseState& eclState);
-#endif
 
     using TabulatedFunction = Tabulated1DFunction<Scalar>;
 

opm/models/blackoil/blackoilconvectivemixingmodule.hh

@@ -44,11 +44,7 @@
 
 #include <opm/common/utility/gpuistl_if_available.hpp>
 
-#if HAVE_ECL_INPUT
 #include <cstddef>
-#endif
-
-#include <vector>
 
 namespace Opm {
 
@@ -115,14 +111,11 @@ class BlackOilConvectiveMixingModule<TypeTag, /*enableConvectiveMixing=*/false>
     using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
 public:
-
-    #if HAVE_ECL_INPUT
     static void beginEpisode(const EclipseState&,
                              const Schedule&,
                              const int,
                              ConvectiveMixingModuleParam<Scalar>&)
     {}
-    #endif
 
     template <class Context>
     static bool active(const Context&)
@@ -179,7 +172,6 @@ class BlackOilConvectiveMixingModule<TypeTag, /*enableConvectiveMixing=*/true>
     static constexpr unsigned contiEnergyEqIdx = Indices::contiEnergyEqIdx;
 
 public:
-    #if HAVE_ECL_INPUT
     static void beginEpisode(const EclipseState& eclState,
                              const Schedule& schedule,
                              const int episodeIdx,
@@ -201,7 +193,6 @@ public:
             }
         }
     }
-    #endif
 
     template <class CMMParam>
     OPM_HOST_DEVICE static void modifyAvgDensity(Evaluation& rhoAvg,

opm/models/blackoil/blackoildiffusionmodule.hh

@@ -30,13 +30,15 @@
 
 #include <dune/common/fvector.hh>
 
+#include <opm/common/utility/gpuDecorators.hpp>
+
+#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
+
 #include <opm/material/common/Valgrind.hpp>
 
 #include <opm/models/blackoil/blackoilbioeffectsmodules.hh>
 #include <opm/models/discretization/common/fvbaseproperties.hh>
 
-#include <opm/common/utility/gpuDecorators.hpp>
-
 #include <array>
 #include <stdexcept>
 
@@ -63,13 +65,11 @@ class BlackOilDiffusionModule<TypeTag, /*enableDiffusion=*/false>
     using RateVector = GetPropType<TypeTag, Properties::RateVector>;
 
 public:
-    #if HAVE_ECL_INPUT
     /*!
      * \brief Initialize all internal data structures needed by the diffusion module
      */
     static void initFromState(const EclipseState&)
     {}
-    #endif
 
     /*!
      * \brief Register all run-time parameters for the diffusion module.
@@ -120,7 +120,6 @@ class BlackOilDiffusionModule<TypeTag, /*enableDiffusion=*/true>
 public:
     using ExtensiveQuantities = BlackOilDiffusionExtensiveQuantities<TypeTag,true>;
 
-    #if HAVE_ECL_INPUT
     /*!
      * \brief Initialize all internal data structures needed by the diffusion module
      */
@@ -133,7 +132,6 @@ public:
         OPM_THROW(std::runtime_error, "Diffusion module: Calling initFromState not expected on GPU.");
         #endif
     }
-    #endif
 
     /*!
      * \brief Register all run-time parameters for the diffusion module.

opm/models/blackoil/blackoildispersionmodule.hh

@@ -37,10 +37,8 @@
 #include <opm/models/common/multiphasebaseproperties.hh>
 #include <opm/models/discretization/common/fvbaseproperties.hh>
 
-#if HAVE_ECL_INPUT
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
-#endif
 
 #include <array>
 #include <cmath>
@@ -75,10 +73,8 @@ class BlackOilDispersionModule<TypeTag, /*enableDispersion=*/false>
 public:
     using ExtensiveQuantities = BlackOilDispersionExtensiveQuantities<TypeTag,false>;
 
-#if HAVE_ECL_INPUT
     static void initFromState(const EclipseState&)
     {}
-#endif
 
     /*!
      * \brief Adds the dispersive flux to the flux vector over a flux
@@ -134,7 +130,6 @@ class BlackOilDispersionModule<TypeTag, /*enableDispersion=*/true>
 public:
     using ExtensiveQuantities = BlackOilDispersionExtensiveQuantities<TypeTag,true>;
 
-#if HAVE_ECL_INPUT
     static void initFromState(const EclipseState& eclState)
     {
         if (!eclState.getSimulationConfig().rock_config().dispersion()) {
@@ -147,7 +142,6 @@ public:
                             "gas phase is ignored.");
         }
     }
-#endif
 
     /*!
      * \brief Adds the mass flux due to dispersion to the flux vector over the