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

Updated as needed by new opm-parser functinality

Browse Source
This commit is contained in:
Fredrik Gundersen 2015-08-24 15:37:49 +02:00
parent 484cb0216f
commit f2b75a6a41
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
opm/simulators/thresholdPressures.hpp
View File

@ -49,14 +49,7 @@ namespace Opm
std::vector<double> thresholdPressures(const ParseMode& parseMode ,EclipseStateConstPtr eclipseState, const Grid& grid) std::vector<double> thresholdPressures(const ParseMode& parseMode ,EclipseStateConstPtr eclipseState, const Grid& grid)
{ {
SimulationConfigConstPtr simulationConfig = eclipseState->getSimulationConfig(); SimulationConfigConstPtr simulationConfig = eclipseState->getSimulationConfig();
const std::vector<double>& thresholdPressureTable; const std::vector<std::pair<bool, double>>& thresholdPressureTable = simulationConfig->getThresholdPressureTable();
if(simulationConfig->hasThresholdPressure()){
thresholdPressureTable = simulationConfig->getThresholdPressureTable();
}else{
std::string msg = "Inferring threshold pressure from the initial state is not supported.";
parseMode.handleError( ParseMode::UNSUPPORTED_INITIAL_THPRES , msg );
}
std::vector<double> thpres_vals; std::vector<double> thpres_vals;
if (thresholdPressureTable.size() > 0) { if (thresholdPressureTable.size() > 0) {
@ -79,7 +72,13 @@ namespace Opm
} }
const int eq1 = eqlnumData[gc[c1]] - 1; const int eq1 = eqlnumData[gc[c1]] - 1;
const int eq2 = eqlnumData[gc[c2]] - 1; const int eq2 = eqlnumData[gc[c2]] - 1;
thpres_vals[face] = thresholdPressureTable[eq1 + maxEqlnum*eq2]; std::pair<bool, double> value = thresholdPressureTable[eq1 + maxEqlnum*eq2];
if(value.first){
thpres_vals[face] = value.second;
}else{
std::string msg = "Inferring threshold pressure from the initial state is not supported.";
parseMode.handleError( ParseMode::UNSUPPORTED_INITIAL_THPRES , msg );
}
} }
} }
return thpres_vals; return thpres_vals;