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

ebos: fix the compilation

Browse Source 
one must use eclProps.getDoubleGridProperty() while the has() method
is called eclProps.hasDeckDoubleGridProperty() (mind the Deck!).
This commit is contained in:
Andreas Lauser 2017-06-14 13:36:37 +02:00
parent 55a5a3a848
commit 89b21eb641
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ebos/eclproblem.hh
View File

@ -1218,24 +1218,24 @@ private:
std::vector<double> waterSaturationData; std::vector<double> waterSaturationData;
if (FluidSystem::phaseIsActive(waterPhaseIdx)) if (FluidSystem::phaseIsActive(waterPhaseIdx))
waterSaturationData = eclProps.getDeckDoubleGridProperty("SWAT").getData(); waterSaturationData = eclProps.getDoubleGridProperty("SWAT").getData();
else else
waterSaturationData.resize(numCartesianCells, 0.0); waterSaturationData.resize(numCartesianCells, 0.0);
std::vector<double> gasSaturationData; std::vector<double> gasSaturationData;
if (FluidSystem::phaseIsActive(gasPhaseIdx)) if (FluidSystem::phaseIsActive(gasPhaseIdx))
gasSaturationData = eclProps.getDeckDoubleGridProperty("SGAS").getData(); gasSaturationData = eclProps.getDoubleGridProperty("SGAS").getData();
else else
gasSaturationData.resize(numCartesianCells, 0.0); gasSaturationData.resize(numCartesianCells, 0.0);
const std::vector<double>& pressureData = const std::vector<double>& pressureData =
gasSaturationData = eclProps.getDeckDoubleGridProperty("PRESSURE").getData(); gasSaturationData = eclProps.getDoubleGridProperty("PRESSURE").getData();
const std::vector<double> *rsData = 0; std::vector<double> rsData;
if (FluidSystem::enableDissolvedGas()) if (FluidSystem::enableDissolvedGas())
rsData = eclProps.getDeckDoubleGridProperty("RS").getData(); rsData = eclProps.getDoubleGridProperty("RS").getData();
const std::vector<double> *rvData = 0; std::vector<double> rvData;
if (FluidSystem::enableVaporizedOil()) if (FluidSystem::enableVaporizedOil())
rvData = eclProps.getDeckDoubleGridProperty("RV").getData(); rvData = eclProps.getDoubleGridProperty("RV").getData();
// initial reservoir temperature // initial reservoir temperature
const std::vector<double>& tempiData = const std::vector<double>& tempiData =
eclState.get3DProperties().getDoubleGridProperty("TEMPI").getData(); eclState.get3DProperties().getDoubleGridProperty("TEMPI").getData();
@ -1246,9 +1246,9 @@ private:
assert(gasSaturationData.size() == numCartesianCells); assert(gasSaturationData.size() == numCartesianCells);
assert(pressureData.size() == numCartesianCells); assert(pressureData.size() == numCartesianCells);
if (FluidSystem::enableDissolvedGas()) if (FluidSystem::enableDissolvedGas())
assert(rsData->size() == numCartesianCells); assert(rsData.size() == numCartesianCells);
if (FluidSystem::enableVaporizedOil()) if (FluidSystem::enableVaporizedOil())
assert(rvData->size() == numCartesianCells); assert(rvData.size() == numCartesianCells);
#endif #endif
// calculate the initial fluid states // calculate the initial fluid states
@ -1311,7 +1311,7 @@ private:
if (FluidSystem::enableDissolvedGas()) { if (FluidSystem::enableDissolvedGas()) {
Scalar RsSat = FluidSystem::saturatedDissolutionFactor(dofFluidState, oilPhaseIdx, pvtRegionIdx); Scalar RsSat = FluidSystem::saturatedDissolutionFactor(dofFluidState, oilPhaseIdx, pvtRegionIdx);
Scalar RsReal = (*rsData)[cartesianDofIdx]; Scalar RsReal = rsData[cartesianDofIdx];
if (RsReal > RsSat) { if (RsReal > RsSat) {
std::array<int, 3> ijk; std::array<int, 3> ijk;
@ -1336,7 +1336,7 @@ private:
if (FluidSystem::enableVaporizedOil()) { if (FluidSystem::enableVaporizedOil()) {
Scalar RvSat = FluidSystem::saturatedDissolutionFactor(dofFluidState, gasPhaseIdx, pvtRegionIdx); Scalar RvSat = FluidSystem::saturatedDissolutionFactor(dofFluidState, gasPhaseIdx, pvtRegionIdx);
Scalar RvReal = (*rvData)[cartesianDofIdx]; Scalar RvReal = rvData[cartesianDofIdx];
if (RvReal > RvSat) { if (RvReal > RvSat) {
std::array<int, 3> ijk; std::array<int, 3> ijk;