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

fix the build

Browse Source 
it broke because EclipseState::get*GridProperty() now returns a
pointer to a constant object.
This commit is contained in:
Andreas Lauser 2016-02-15 14:59:52 +01:00
parent 279799ee80
commit 8f0d81db2f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/core/utility/CompressedPropertyAccess.hpp
View File

@ -205,13 +205,13 @@ namespace Opm {
* \return Data values for property \c kw. * \return Data values for property \c kw.
*/ */
template <class PropertyContainer> template <class PropertyContainer>
static std::shared_ptr< GridProperty<double> > static std::shared_ptr<const GridProperty<double> >
value(PropertyContainer& ecl, value(PropertyContainer& ecl,
const std::string& kw); const std::string& kw);
}; };
template <class PropertyContainer> template <class PropertyContainer>
std::shared_ptr< GridProperty<double> > std::shared_ptr<const GridProperty<double> >
GetProperty<double>::value(PropertyContainer& ecl, GetProperty<double>::value(PropertyContainer& ecl,
const std::string& kw) const std::string& kw)
{ {
@ -245,18 +245,18 @@ namespace Opm {
* an empty \code shared_ptr<> \endcode if not. * an empty \code shared_ptr<> \endcode if not.
*/ */
template <class PropertyContainer> template <class PropertyContainer>
static std::shared_ptr< GridProperty<T> > static std::shared_ptr<const GridProperty<T> >
value(PropertyContainer& ecl, value(PropertyContainer& ecl,
const std::string& kw); const std::string& kw);
}; };
template <typename T> template <typename T>
template <class PropertyContainer> template <class PropertyContainer>
std::shared_ptr< GridProperty<T> > std::shared_ptr<const GridProperty<T> >
EclipsePropertyArray<T>::value(PropertyContainer& ecl, EclipsePropertyArray<T>::value(PropertyContainer& ecl,
const std::string& kw) const std::string& kw)
{ {
std::shared_ptr< GridProperty<T> > x; std::shared_ptr<const GridProperty<T> > x;
if (EclPropImpl::HasProperty<T>::p(ecl, kw)) { if (EclPropImpl::HasProperty<T>::p(ecl, kw)) {
x = EclPropImpl::GetProperty<T>::value(ecl, kw); x = EclPropImpl::GetProperty<T>::value(ecl, kw);
@ -349,7 +349,7 @@ namespace Opm {
* *
* Null if data not defined. * Null if data not defined.
*/ */
std::shared_ptr< GridProperty<T> > x_; std::shared_ptr<const GridProperty<T> > x_;
/** /**
* Fall-back data element value if data not defined. * Fall-back data element value if data not defined.

6
opm/core/utility/thresholdPressures.hpp
View File

@ -55,7 +55,7 @@ void computeMaxDp(std::map<std::pair<int, int>, double>& maxDp,
const PhaseUsage& pu = props.phaseUsage(); const PhaseUsage& pu = props.phaseUsage();
std::shared_ptr<GridProperty<int>> eqlnum = eclipseState->getIntGridProperty("EQLNUM"); std::shared_ptr<const GridProperty<int>> eqlnum = eclipseState->getIntGridProperty("EQLNUM");
const auto& eqlnumData = eqlnum->getData(); const auto& eqlnumData = eqlnum->getData();
const int numPhases = initialState.numPhases(); const int numPhases = initialState.numPhases();
@ -324,7 +324,7 @@ void computeMaxDp(std::map<std::pair<int, int>, double>& maxDp,
std::vector<double> thpres_vals; std::vector<double> thpres_vals;
if (simulationConfig->hasThresholdPressure()) { if (simulationConfig->hasThresholdPressure()) {
std::shared_ptr<const ThresholdPressure> thresholdPressure = simulationConfig->getThresholdPressure(); std::shared_ptr<const ThresholdPressure> thresholdPressure = simulationConfig->getThresholdPressure();
std::shared_ptr<GridProperty<int>> eqlnum = eclipseState->getIntGridProperty("EQLNUM"); std::shared_ptr<const GridProperty<int>> eqlnum = eclipseState->getIntGridProperty("EQLNUM");
const auto& eqlnumData = eqlnum->getData(); const auto& eqlnumData = eqlnum->getData();
// Set threshold pressure values for each cell face. // Set threshold pressure values for each cell face.
@ -382,7 +382,7 @@ void computeMaxDp(std::map<std::pair<int, int>, double>& maxDp,
std::vector<double> thpres_vals; std::vector<double> thpres_vals;
if (simulationConfig->hasThresholdPressure()) { if (simulationConfig->hasThresholdPressure()) {
std::shared_ptr<const ThresholdPressure> thresholdPressure = simulationConfig->getThresholdPressure(); std::shared_ptr<const ThresholdPressure> thresholdPressure = simulationConfig->getThresholdPressure();
std::shared_ptr<GridProperty<int>> eqlnum = eclipseState->getIntGridProperty("EQLNUM"); std::shared_ptr<const GridProperty<int>> eqlnum = eclipseState->getIntGridProperty("EQLNUM");
auto eqlnumData = eqlnum->getData(); auto eqlnumData = eqlnum->getData();
// Set values for each NNC // Set values for each NNC