adjustments for moved eclipse support (now in opm-common)

OPM · Mar 5, 2018 · 29a3083 · 29a3083
1 parent 4da1fe0
commit 29a3083
Show file tree

Hide file tree

Showing 31 changed files with 69 additions and 74 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -95,9 +95,9 @@ add_custom_target(opm-material_prepare)
 
 opm_add_test(test_blackoilfluidstate)
 opm_add_test(test_ConditionalStorage)
-opm_add_test(test_eclblackoilfluidsystem CONDITION OPM_PARSER_FOUND)
-opm_add_test(test_eclblackoilpvt CONDITION OPM_PARSER_FOUND)
-opm_add_test(test_eclmateriallawmanager CONDITION OPM_PARSER_FOUND)
+opm_add_test(test_eclblackoilfluidsystem CONDITION HAVE_ECL_INPUT)
+opm_add_test(test_eclblackoilpvt CONDITION HAVE_ECL_INPUT)
+opm_add_test(test_eclmateriallawmanager CONDITION HAVE_ECL_INPUT)
 opm_add_test(test_fluidmatrixinteractions)
 opm_add_test(test_pengrobinson)
 opm_add_test(test_densead)

diff --git a/debian/control b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev,
                libdune-common-dev, libdune-istl-dev, cmake, bc,
                libecl-dev, git, zlib1g-dev, libtool, doxygen,
                texlive-latex-extra, texlive-latex-recommended, ghostscript,
-               libopm-parser-dev, libboost-iostreams-dev, mpi-default-dev,
+               libboost-iostreams-dev, mpi-default-dev,
                mpi-default-bin
 Standards-Version: 3.9.2
 Section: libs

diff --git a/dune.module b/dune.module
@@ -11,4 +11,4 @@ Maintainer: [email protected]
 MaintainerName: The Open Porous Media Project
 Url: http://opm-project.org
 Depends: dune-common (>= 2.4)
-Suggests: opm-common opm-parser
+Suggests: opm-common
diff --git a/jenkins/build.sh b/jenkins/build.sh
@@ -1,14 +1,12 @@
 #!/bin/bash
 
 declare -a upstreams
-upstreams=(opm-common
-           libecl
-           opm-parser)
+upstreams=(libecl
+           opm-common)
 
 declare -A upstreamRev
-upstreamRev[opm-common]=master
 upstreamRev[libecl]=master
-upstreamRev[opm-parser]=master
+upstreamRev[opm-common]=master
 
 if grep -q "opm-common=" <<< $ghprbCommentBody
 then
@@ -17,14 +15,12 @@ fi
 
 # Downstream revisions
 declare -a downstreams
-downstreams=(opm-output
-             opm-grid
+downstreams=(opm-grid
              ewoms
              opm-simulators
              opm-upscaling)
 
 declare -A downstreamRev
-downstreamRev[opm-output]=master
 downstreamRev[opm-grid]=master
 downstreamRev[ewoms]=master
 downstreamRev[opm-simulators]=master

diff --git a/opm-material-prereqs.cmake b/opm-material-prereqs.cmake
@@ -4,7 +4,7 @@ set (opm-material_CONFIG_VAR
   HAVE_TYPE_TRAITS
   HAVE_VALGRIND
   HAVE_FINAL
-  HAVE_OPM_PARSER
+  HAVE_ECL_INPUT
   )
 
 # dependencies
@@ -15,7 +15,6 @@ set (opm-material_DEPS
   "CXX11Features REQUIRED"
   # prerequisite OPM modules
   "ecl"
-  "opm-parser"
   "opm-common REQUIRED"
   # DUNE dependency
   "dune-common REQUIRED"

diff --git a/opm/material/fluidmatrixinteractions/EclEpsConfig.hpp b/opm/material/fluidmatrixinteractions/EclEpsConfig.hpp
@@ -27,7 +27,7 @@
 #ifndef OPM_ECL_EPS_CONFIG_HPP
 #define OPM_ECL_EPS_CONFIG_HPP
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Deck/DeckItem.hpp>
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
@@ -155,7 +155,7 @@ class EclEpsConfig
     bool enableLeverettScaling() const
     { return enableLeverettScaling_; }
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
     /*!
      * \brief Reads all relevant material parameters form a cell of a parsed ECL deck.
      *

diff --git a/opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp b/opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp
@@ -29,7 +29,7 @@
 
 #include "EclEpsConfig.hpp"
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
@@ -65,7 +65,7 @@ class EclEpsGridProperties
     typedef std::vector<double> DoubleData;
 
 public:
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
     void initFromDeck(const Opm::Deck& /* deck */,
                       const Opm::EclipseState& eclState,
                       bool useImbibition)
@@ -130,7 +130,7 @@ class EclEpsGridProperties
     const DoubleData* permz;
 
 private:
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
     // this method makes sure that a grid property is not created if it is not explicitly
     // mentioned in the deck. (saves memory.)
     void retrieveGridPropertyData_(const DoubleData **data,
@@ -213,7 +213,7 @@ struct EclEpsScalingPointsInfo
                   << "    maxKrog: " << maxKrog << "\n";
     }
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
     /*!
      * \brief Extract the values of the unscaled scaling parameters.
      *
@@ -420,7 +420,7 @@ struct EclEpsScalingPointsInfo
 #endif
 
 private:
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
     void extractUnscaledSgof_(const Opm::SgofTable& sgofTable)
     {
         // minimum gas and oil-in-gas-oil saturation
@@ -645,7 +645,7 @@ struct EclEpsScalingPointsInfo
         maxKrow = sof2Table.getKroColumn().back();
         maxKrog = maxKrow;
     }
-#endif // HAVE_OPM_PARSER
+#endif // HAVE_ECL_INPUT
 
     void extractGridPropertyValue_(Scalar& targetValue,
                                    const std::vector<double>* propData,

diff --git a/opm/material/fluidmatrixinteractions/EclEpsTwoPhaseLawParams.hpp b/opm/material/fluidmatrixinteractions/EclEpsTwoPhaseLawParams.hpp
@@ -30,7 +30,7 @@
 #include "EclEpsConfig.hpp"
 #include "EclEpsScalingPoints.hpp"
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #endif

diff --git a/opm/material/fluidmatrixinteractions/EclHysteresisConfig.hpp b/opm/material/fluidmatrixinteractions/EclHysteresisConfig.hpp
@@ -27,7 +27,7 @@
 #ifndef OPM_ECL_HYSTERESIS_CONFIG_HPP
 #define OPM_ECL_HYSTERESIS_CONFIG_HPP
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
@@ -104,7 +104,7 @@ class EclHysteresisConfig
     int krHysteresisModel() const
     { return krHysteresisModel_; }
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
     /*!
      * \brief Reads all relevant material parameters form a cell of a parsed ECL deck.
      *

diff --git a/opm/material/fluidmatrixinteractions/EclHysteresisTwoPhaseLawParams.hpp b/opm/material/fluidmatrixinteractions/EclHysteresisTwoPhaseLawParams.hpp
@@ -30,7 +30,7 @@
 #include "EclHysteresisConfig.hpp"
 #include "EclEpsScalingPoints.hpp"
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #endif

diff --git a/opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp b/opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp
@@ -24,8 +24,8 @@
  * \file
  * \copydoc Opm::EclMaterialLawManager
  */
-#if ! HAVE_OPM_PARSER
-#error "The opm-parser module is required to use the ECL material manager!"
+#if ! HAVE_ECL_INPUT
+#error "Eclipse input support in opm-common is required to use the ECL material manager!"
 #endif
 
 #ifndef OPM_ECL_MATERIAL_LAW_MANAGER_HPP

diff --git a/opm/material/fluidsystems/BlackOilFluidSystem.hpp b/opm/material/fluidsystems/BlackOilFluidSystem.hpp
@@ -161,7 +161,7 @@ class BlackOil : public BaseFluidSystem<Scalar, BlackOil<Scalar> >
     /****************************************
      * Initialization
      ****************************************/
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
     /*!
      * \brief Initialize the fluid system using an ECL deck object
      */
@@ -233,7 +233,7 @@ class BlackOil : public BaseFluidSystem<Scalar, BlackOil<Scalar> >
 
         initEnd();
     }
-#endif // HAVE_OPM_PARSER
+#endif // HAVE_ECL_INPUT
 
     /*!
      * \brief Begin the initialization of the black oil fluid system.

diff --git a/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp b/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp
@@ -32,7 +32,7 @@
 #include <opm/material/common/Tabulated1DFunction.hpp>
 #include <opm/material/common/Spline.hpp>
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Deck/DeckItem.hpp>
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
@@ -52,7 +52,7 @@ class ConstantCompressibilityOilPvt
     typedef std::vector<std::pair<Scalar, Scalar> > SamplingPoints;
 
 public:
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
     /*!
      * \brief Sets the pressure-dependent oil viscosity and density
      *        using the Eclipse PVCDO keyword.

diff --git a/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp b/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp
@@ -29,7 +29,7 @@
 
 #include <opm/material/common/Tabulated1DFunction.hpp>
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
@@ -51,7 +51,7 @@ class ConstantCompressibilityWaterPvt
     typedef std::vector<std::pair<Scalar, Scalar> > SamplingPoints;
 
 public:
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
     /*!
      * \brief Sets the pressure-dependent water viscosity and density
      *        using a table stemming from the Eclipse PVTW keyword.

diff --git a/opm/material/fluidsystems/blackoilpvt/DeadOilPvt.hpp b/opm/material/fluidsystems/blackoilpvt/DeadOilPvt.hpp
@@ -31,7 +31,7 @@
 #include <opm/material/common/Tabulated1DFunction.hpp>
 #include <opm/material/common/Spline.hpp>
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/PvdoTable.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
@@ -49,7 +49,7 @@ class DeadOilPvt
     typedef std::vector<std::pair<Scalar, Scalar> > SamplingPoints;
 
 public:
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
     /*!
      * \brief Initialize the oil parameters via the data specified by the PVDO ECL keyword.
      */
@@ -87,7 +87,7 @@ class DeadOilPvt
 
         initEnd();
     }
-#endif // HAVE_OPM_PARSER
+#endif // HAVE_ECL_INPUT
 
     void setNumRegions(size_t numRegions)
     {

diff --git a/opm/material/fluidsystems/blackoilpvt/DryGasPvt.hpp b/opm/material/fluidsystems/blackoilpvt/DryGasPvt.hpp
@@ -31,7 +31,7 @@
 
 #include <opm/material/common/Tabulated1DFunction.hpp>
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
@@ -54,7 +54,7 @@ class DryGasPvt
     typedef std::vector<std::pair<Scalar, Scalar> > SamplingPoints;
 
 public:
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
     /*!
      * \brief Initialize the parameters for dry gas using an ECL deck.
      *

diff --git a/opm/material/fluidsystems/blackoilpvt/GasPvtMultiplexer.hpp b/opm/material/fluidsystems/blackoilpvt/GasPvtMultiplexer.hpp
@@ -31,7 +31,7 @@
 #include "WetGasPvt.hpp"
 #include "GasPvtThermal.hpp"
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
@@ -109,7 +109,7 @@ class GasPvtMultiplexer
         }
     }
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
     /*!
      * \brief Initialize the parameters for gas using an ECL deck.
      *
@@ -130,7 +130,7 @@ class GasPvtMultiplexer
 
         OPM_GAS_PVT_MULTIPLEXER_CALL(pvtImpl.initFromDeck(deck, eclState));
     }
-#endif // HAVE_OPM_PARSER
+#endif // HAVE_ECL_INPUT
 
     void setApproach(GasPvtApproach gasPvtAppr)
     {

diff --git a/opm/material/fluidsystems/blackoilpvt/GasPvtThermal.hpp b/opm/material/fluidsystems/blackoilpvt/GasPvtThermal.hpp
@@ -34,7 +34,7 @@
 #include <opm/material/common/Tabulated1DFunction.hpp>
 #include <opm/material/common/Spline.hpp>
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp>
@@ -68,7 +68,7 @@ class GasPvtThermal
     ~GasPvtThermal()
     { delete isothermalPvt_; }
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
     /*!
      * \brief Implement the temperature part of the gas PVT properties.
      */
@@ -160,7 +160,7 @@ class GasPvtThermal
             }
         }
     }
-#endif // HAVE_OPM_PARSER
+#endif // HAVE_ECL_INPUT
 
     /*!
      * \brief Set the number of PVT-regions considered by this object.

diff --git a/opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp b/opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp
@@ -33,7 +33,7 @@
 #include <opm/material/common/UniformXTabulated2DFunction.hpp>
 #include <opm/material/common/Tabulated1DFunction.hpp>
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp>
@@ -62,7 +62,7 @@ class LiveOilPvt
         vapPar2_ = 0.0;
     }
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
     /*!
      * \brief Initialize the oil parameters via the data specified by the PVTO ECL keyword.
      */
@@ -232,7 +232,7 @@ class LiveOilPvt
     }
 
 public:
-#endif // HAVE_OPM_PARSER
+#endif // HAVE_ECL_INPUT
 
     void setNumRegions(size_t numRegions)
     {

diff --git a/opm/material/fluidsystems/blackoilpvt/OilPvtMultiplexer.hpp b/opm/material/fluidsystems/blackoilpvt/OilPvtMultiplexer.hpp
@@ -115,7 +115,7 @@ class OilPvtMultiplexer
         }
     }
 
-#if HAVE_OPM_PARSER
+#if HAVE_ECL_INPUT
     /*!
      * \brief Initialize the parameters for water using an ECL deck.
      *
@@ -138,7 +138,7 @@ class OilPvtMultiplexer
 
         OPM_OIL_PVT_MULTIPLEXER_CALL(pvtImpl.initFromDeck(deck, eclState));
     }
-#endif // HAVE_OPM_PARSER
+#endif // HAVE_ECL_INPUT
 
 
     void initEnd()