OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1488 from joakim-hove/load-THPRES

Browse Source 
Load thpres
This commit is contained in:
Joakim Hove
2018-06-01 11:47:19 +02:00
committed by GitHub
parent 337ca0a3ab dd3fb03286
commit ac85b8a81c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/simulators/thresholdPressures.hpp
+2 -2
View File
@@ -325,7 +325,7 @@ void computeMaxDp(std::map<std::pair<int, int>, double>& maxDp,
{ {
const SimulationConfig& simulationConfig = eclipseState.getSimulationConfig(); const SimulationConfig& simulationConfig = eclipseState.getSimulationConfig();
std::vector<double> thpres_vals; std::vector<double> thpres_vals;
if (simulationConfig.hasThresholdPressure()) { if (simulationConfig.useThresholdPressure()) {
const ThresholdPressure& thresholdPressure = simulationConfig.getThresholdPressure(); const ThresholdPressure& thresholdPressure = simulationConfig.getThresholdPressure();
const auto& eqlnum = eclipseState.get3DProperties().getIntGridProperty("EQLNUM"); const auto& eqlnum = eclipseState.get3DProperties().getIntGridProperty("EQLNUM");
const auto& eqlnumData = eqlnum.getData(); const auto& eqlnumData = eqlnum.getData();
@@ -386,7 +386,7 @@ void computeMaxDp(std::map<std::pair<int, int>, double>& maxDp,
{ {
const SimulationConfig& simulationConfig = eclipseState.getSimulationConfig(); const SimulationConfig& simulationConfig = eclipseState.getSimulationConfig();
std::vector<double> thpres_vals; std::vector<double> thpres_vals;
if (simulationConfig.hasThresholdPressure()) { if (simulationConfig.useThresholdPressure()) {
const ThresholdPressure& thresholdPressure = simulationConfig.getThresholdPressure(); const ThresholdPressure& thresholdPressure = simulationConfig.getThresholdPressure();
const auto& eqlnum = eclipseState.get3DProperties().getIntGridProperty("EQLNUM"); const auto& eqlnum = eclipseState.get3DProperties().getIntGridProperty("EQLNUM");
const auto& eqlnumData = eqlnum.getData(); const auto& eqlnumData = eqlnum.getData();