Merge pull request #953 from andlaus/const_gridproperties

fix the build
This commit is contained in:
Atgeirr Flø Rasmussen
2016-02-19 11:46:32 +01:00

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