OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arne Morten Kvarving
2018-03-05 12:48:09 +01:00
parent 52321e5c04
commit 53b24d482a
25 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/material/fluidmatrixinteractions/EclEpsConfig.hpp
View File

@@ -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 @@ public:
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.
*

12
opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp
View File

@@ -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 @@ public:
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 @@ private:
maxKrow = sof2Table.getKroColumn().back();
maxKrog = maxKrow;
}
#endif // HAVE_OPM_PARSER
#endif // HAVE_ECL_INPUT
void extractGridPropertyValue_(Scalar& targetValue,
const std::vector<double>* propData,

2
opm/material/fluidmatrixinteractions/EclEpsTwoPhaseLawParams.hpp
View File

@@ -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

4
opm/material/fluidmatrixinteractions/EclHysteresisConfig.hpp
View File

@@ -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 @@ public:
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.
*

2
opm/material/fluidmatrixinteractions/EclHysteresisTwoPhaseLawParams.hpp
View File

@@ -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

4
opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp
View File

@@ -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

4
opm/material/fluidsystems/BlackOilFluidSystem.hpp
View File

@@ -161,7 +161,7 @@ public:
/****************************************
* Initialization
****************************************/
#if HAVE_OPM_PARSER
#if HAVE_ECL_INPUT
/*!
* \brief Initialize the fluid system using an ECL deck object
*/
@@ -233,7 +233,7 @@ public:
initEnd();
}
#endif // HAVE_OPM_PARSER
#endif // HAVE_ECL_INPUT
/*!
* \brief Begin the initialization of the black oil fluid system.

4
opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp
View File

@@ -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.

4
opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp
View File

@@ -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.

6
opm/material/fluidsystems/blackoilpvt/DeadOilPvt.hpp
View File

@@ -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 @@ public:
initEnd();
}
#endif // HAVE_OPM_PARSER
#endif // HAVE_ECL_INPUT
void setNumRegions(size_t numRegions)
{

4
opm/material/fluidsystems/blackoilpvt/DryGasPvt.hpp
View File

@@ -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.
*

6
opm/material/fluidsystems/blackoilpvt/GasPvtMultiplexer.hpp
View File

@@ -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 @@ public:
}
}
#if HAVE_OPM_PARSER
#if HAVE_ECL_INPUT
/*!
* \brief Initialize the parameters for gas using an ECL deck.
*
@@ -130,7 +130,7 @@ public:
OPM_GAS_PVT_MULTIPLEXER_CALL(pvtImpl.initFromDeck(deck, eclState));
}
#endif // HAVE_OPM_PARSER
#endif // HAVE_ECL_INPUT
void setApproach(GasPvtApproach gasPvtAppr)
{

6
opm/material/fluidsystems/blackoilpvt/GasPvtThermal.hpp
View File

@@ -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 @@ public:
~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 @@ public:
}
}
}
#endif // HAVE_OPM_PARSER
#endif // HAVE_ECL_INPUT
/*!
* \brief Set the number of PVT-regions considered by this object.

6
opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp
View File

@@ -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 @@ public:
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 @@ private:
}
public:
#endif // HAVE_OPM_PARSER
#endif // HAVE_ECL_INPUT
void setNumRegions(size_t numRegions)
{

4
opm/material/fluidsystems/blackoilpvt/OilPvtMultiplexer.hpp
View File

@@ -115,7 +115,7 @@ public:
}
}
#if HAVE_OPM_PARSER
#if HAVE_ECL_INPUT
/*!
* \brief Initialize the parameters for water using an ECL deck.
*
@@ -138,7 +138,7 @@ public:
OPM_OIL_PVT_MULTIPLEXER_CALL(pvtImpl.initFromDeck(deck, eclState));
}
#endif // HAVE_OPM_PARSER
#endif // HAVE_ECL_INPUT
void initEnd()

6
opm/material/fluidsystems/blackoilpvt/OilPvtThermal.hpp
View File

@@ -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 @@ public:
~OilPvtThermal()
{ delete isothermalPvt_; }
#if HAVE_OPM_PARSER
#if HAVE_ECL_INPUT
/*!
* \brief Implement the temperature part of the oil PVT properties.
*/
@@ -171,7 +171,7 @@ public:
}
}
}
#endif // HAVE_OPM_PARSER
#endif // HAVE_ECL_INPUT
/*!
* \brief Set the number of PVT-regions considered by this object.

4
opm/material/fluidsystems/blackoilpvt/SolventPvt.hpp
View File

@@ -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 SolventPvt
typedef std::vector<std::pair<Scalar, Scalar> > SamplingPoints;
public:
#if HAVE_OPM_PARSER
#if HAVE_ECL_INPUT
/*!
* \brief Initialize the parameters for "solvent gas" using an ECL deck.
*

4
opm/material/fluidsystems/blackoilpvt/WaterPvtMultiplexer.hpp
View File

@@ -84,7 +84,7 @@ public:
}
}
#if HAVE_OPM_PARSER
#if HAVE_ECL_INPUT
/*!
* \brief Initialize the parameters for water using an ECL deck.
*
@@ -103,7 +103,7 @@ public:
OPM_WATER_PVT_MULTIPLEXER_CALL(pvtImpl.initFromDeck(deck, eclState));
}
#endif // HAVE_OPM_PARSER
#endif // HAVE_ECL_INPUT
void initEnd()
{ OPM_WATER_PVT_MULTIPLEXER_CALL(pvtImpl.initEnd()); }

6
opm/material/fluidsystems/blackoilpvt/WaterPvtThermal.hpp
View File

@@ -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 @@ public:
~WaterPvtThermal()
{ delete isothermalPvt_; }
#if HAVE_OPM_PARSER
#if HAVE_ECL_INPUT
/*!
* \brief Implement the temperature part of the water PVT properties.
*/
@@ -157,7 +157,7 @@ public:
}
}
}
#endif // HAVE_OPM_PARSER
#endif // HAVE_ECL_INPUT
/*!
* \brief Set the number of PVT-regions considered by this object.

6
opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp
View File

@@ -32,7 +32,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/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
#endif
@@ -56,7 +56,7 @@ public:
vapPar1_ = 0.0;
}
#if HAVE_OPM_PARSER
#if HAVE_ECL_INPUT
/*!
* \brief Initialize the parameters for wet gas using an ECL deck.
*
@@ -228,7 +228,7 @@ private:
}
public:
#endif // HAVE_OPM_PARSER
#endif // HAVE_ECL_INPUT
void setNumRegions(size_t numRegions)
{

4
opm/material/thermal/EclThermalLawManager.hpp
View File

@@ -24,8 +24,8 @@
* \file
* \copydoc Opm::EclThermalLawManager
*/
#if ! HAVE_OPM_PARSER
#error "The opm-parser module is required to use the ECL thermal law manager!"
#if ! HAVE_ECL_INPUT
#error "Eclipse input support in opm-common is required to use the ECL thermal law manager!"
#endif
#ifndef OPM_ECL_THERMAL_LAW_MANAGER_HPP

4
tests/test_eclblackoilfluidsystem.cpp
View File

@@ -29,8 +29,8 @@
*/
#include "config.h"
#if !HAVE_OPM_PARSER
#error "The test for the black oil fluid system classes requires the opm-parser module"
#if !HAVE_ECL_INPUT
#error "The test for the black oil fluid system classes requires ecl input support in opm-common"
#endif
#include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>

4
tests/test_eclblackoilpvt.cpp
View File

@@ -29,8 +29,8 @@
*/
#include "config.h"
#if !HAVE_OPM_PARSER
#error "The test for the black oil PVT classes requires the opm-parser module"
#if !HAVE_ECL_INPUT
#error "The test for the black oil PVT classes requires eclipse input support in opm-common"
#endif
#include <opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp>

4
tests/test_eclmateriallawmanager.cpp
View File

@@ -30,8 +30,8 @@
*/
#include "config.h"
#if !HAVE_OPM_PARSER
#error "The test for EclMaterialLawManager requires the opm-parser module"
#if !HAVE_ECL_INPUT
#error "The test for EclMaterialLawManager requires eclipse input support in opm-common"
#endif
#include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>

2
tests/test_fluidsystems.cpp
View File

@@ -71,7 +71,7 @@ void ensureBlackoilApi()
// here we don't want to call these methods at runtime, we just want to make sure
// that they compile
while (false) {
#if HAVE_OPM_PARSER
#if HAVE_ECL_INPUT
Opm::Deck deck;
Opm::EclipseState eclState(deck);
FluidSystem::initFromDeck(deck, eclState);