From 432bebb32833dc67cb4320759ebb43fc9eceb5f0 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 18 Oct 2019 09:26:34 +0200 Subject: [PATCH] remove conditionals HAVE_ECL_INPUT and HAVE_ECL_OUTPUT --- opm-models-prereqs.cmake | 2 -- opm/models/blackoil/blackoilfoammodules.hh | 4 ---- opm/models/blackoil/blackoilpolymermodules.hh | 4 ---- opm/models/blackoil/blackoilsolventmodules.hh | 4 ---- 4 files changed, 14 deletions(-) diff --git a/opm-models-prereqs.cmake b/opm-models-prereqs.cmake index d696113c09..a7099e13f0 100644 --- a/opm-models-prereqs.cmake +++ b/opm-models-prereqs.cmake @@ -13,8 +13,6 @@ set (opm-models_CONFIG_VAR HAVE_DUNE_ISTL HAVE_DUNE_ALUGRID HAVE_DUNE_FEM - HAVE_ECL_INPUT - HAVE_ECL_OUTPUT DUNE_AVOID_CAPABILITIES_IS_PARALLEL_DEPRECATION_WARNING ) diff --git a/opm/models/blackoil/blackoilfoammodules.hh b/opm/models/blackoil/blackoilfoammodules.hh index 29de2aa770..f975651585 100644 --- a/opm/models/blackoil/blackoilfoammodules.hh +++ b/opm/models/blackoil/blackoilfoammodules.hh @@ -35,12 +35,10 @@ #include //#include -#if HAVE_ECL_INPUT #include #include #include #include -#endif #include #include @@ -111,7 +109,6 @@ public: Scalar ep_dry = 0.0; // FOAMFSW }; -#if HAVE_ECL_INPUT /*! * \brief Initialize all internal data structures needed by the foam module */ @@ -203,7 +200,6 @@ public: gasMobilityMultiplierTable_[pvtReg].setXYContainers(conc, mobMult); } } -#endif /*! * \brief Specify the number of saturation regions. diff --git a/opm/models/blackoil/blackoilpolymermodules.hh b/opm/models/blackoil/blackoilpolymermodules.hh index 145a684d7a..ca676a27ad 100644 --- a/opm/models/blackoil/blackoilpolymermodules.hh +++ b/opm/models/blackoil/blackoilpolymermodules.hh @@ -35,7 +35,6 @@ #include #include -#if HAVE_ECL_INPUT #include #include #include @@ -43,7 +42,6 @@ #include #include #include -#endif #include #include @@ -111,7 +109,6 @@ public: Scalar kappa; }; -#if HAVE_ECL_INPUT /*! * \brief Initialize all internal data structures needed by the polymer module */ @@ -364,7 +361,6 @@ public: } } } -#endif /*! * \brief Specify the number of satuation regions. diff --git a/opm/models/blackoil/blackoilsolventmodules.hh b/opm/models/blackoil/blackoilsolventmodules.hh index 573ed6b9d0..8f0e73037e 100644 --- a/opm/models/blackoil/blackoilsolventmodules.hh +++ b/opm/models/blackoil/blackoilsolventmodules.hh @@ -35,7 +35,6 @@ #include #include -#if HAVE_ECL_INPUT #include #include #include @@ -46,7 +45,6 @@ #include #include #include -#endif #include #include @@ -92,7 +90,6 @@ class BlackOilSolventModule public: -#if HAVE_ECL_INPUT /*! * \brief Initialize all internal data structures needed by the solvent module */ @@ -347,7 +344,6 @@ public: } } } -#endif /*! * \brief Specify the number of satuation regions.