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

use compressed field properties setting up explicit initial conditions

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-01-28 10:36:32 +01:00
parent 69959da143
commit d5d32e235c
1 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ebos/eclproblem.hh
View File

@ -2628,9 +2628,6 @@ private:
initialFluidStates_.resize(numDof); initialFluidStates_.resize(numDof);
const auto& cartSize = simulator.vanguard().cartesianDimensions();
size_t numCartesianCells = cartSize[0] * cartSize[1] * cartSize[2];
std::vector<double> waterSaturationData; std::vector<double> waterSaturationData;
std::vector<double> gasSaturationData; std::vector<double> gasSaturationData;
std::vector<double> pressureData; std::vector<double> pressureData;
@ -2639,50 +2636,35 @@ private:
std::vector<double> tempiData; std::vector<double> tempiData;
if (FluidSystem::phaseIsActive(waterPhaseIdx)) if (FluidSystem::phaseIsActive(waterPhaseIdx))
waterSaturationData = fp.get_global_double("SWAT"); waterSaturationData = fp.get_double("SWAT");
else else
waterSaturationData.resize(numCartesianCells); waterSaturationData.resize(numDof);
if (FluidSystem::phaseIsActive(gasPhaseIdx)) if (FluidSystem::phaseIsActive(gasPhaseIdx))
gasSaturationData = fp.get_global_double("SGAS"); gasSaturationData = fp.get_double("SGAS");
else else
gasSaturationData.resize(numCartesianCells); gasSaturationData.resize(numDof);
pressureData = fp.get_global_double("PRESSURE"); pressureData = fp.get_double("PRESSURE");
if (FluidSystem::enableDissolvedGas()) if (FluidSystem::enableDissolvedGas())
rsData = fp.get_global_double("RS"); rsData = fp.get_double("RS");
if (FluidSystem::enableVaporizedOil()) if (FluidSystem::enableVaporizedOil())
rvData = fp.get_global_double("RV"); rvData = fp.get_double("RV");
// initial reservoir temperature // initial reservoir temperature
tempiData = fp.get_global_double("TEMPI"); tempiData = fp.get_double("TEMPI");
// make sure that the size of the data arrays is correct
#ifndef NDEBUG
assert(waterSaturationData.size() == numCartesianCells);
assert(gasSaturationData.size() == numCartesianCells);
assert(pressureData.size() == numCartesianCells);
if (FluidSystem::enableDissolvedGas())
assert(rsData.size() == numCartesianCells);
if (FluidSystem::enableVaporizedOil())
assert(rvData.size() == numCartesianCells);
#endif
// calculate the initial fluid states // calculate the initial fluid states
for (size_t dofIdx = 0; dofIdx < numDof; ++dofIdx) { for (size_t dofIdx = 0; dofIdx < numDof; ++dofIdx) {
auto& dofFluidState = initialFluidStates_[dofIdx]; auto& dofFluidState = initialFluidStates_[dofIdx];
dofFluidState.setPvtRegionIndex(pvtRegionIndex(dofIdx)); dofFluidState.setPvtRegionIndex(pvtRegionIndex(dofIdx));
size_t cartesianDofIdx = vanguard.cartesianIndex(dofIdx);
assert(0 <= cartesianDofIdx);
assert(cartesianDofIdx <= numCartesianCells);
////// //////
// set temperature // set temperature
////// //////
Scalar temperatureLoc = tempiData[cartesianDofIdx]; Scalar temperatureLoc = tempiData[dofIdx];
if (!std::isfinite(temperatureLoc) || temperatureLoc <= 0) if (!std::isfinite(temperatureLoc) || temperatureLoc <= 0)
temperatureLoc = FluidSystem::surfaceTemperature; temperatureLoc = FluidSystem::surfaceTemperature;
dofFluidState.setTemperature(temperatureLoc); dofFluidState.setTemperature(temperatureLoc);
@ -2692,20 +2674,20 @@ private:
////// //////
if (FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx)) if (FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx))
dofFluidState.setSaturation(FluidSystem::waterPhaseIdx, dofFluidState.setSaturation(FluidSystem::waterPhaseIdx,
waterSaturationData[cartesianDofIdx]); waterSaturationData[dofIdx]);
if (FluidSystem::phaseIsActive(FluidSystem::gasPhaseIdx)) if (FluidSystem::phaseIsActive(FluidSystem::gasPhaseIdx))
dofFluidState.setSaturation(FluidSystem::gasPhaseIdx, dofFluidState.setSaturation(FluidSystem::gasPhaseIdx,
gasSaturationData[cartesianDofIdx]); gasSaturationData[dofIdx]);
if (FluidSystem::phaseIsActive(FluidSystem::oilPhaseIdx)) if (FluidSystem::phaseIsActive(FluidSystem::oilPhaseIdx))
dofFluidState.setSaturation(FluidSystem::oilPhaseIdx, dofFluidState.setSaturation(FluidSystem::oilPhaseIdx,
1.0 1.0
- waterSaturationData[cartesianDofIdx] - waterSaturationData[dofIdx]
- gasSaturationData[cartesianDofIdx]); - gasSaturationData[dofIdx]);
////// //////
// set phase pressures // set phase pressures
////// //////
Scalar oilPressure = pressureData[cartesianDofIdx]; Scalar oilPressure = pressureData[dofIdx];
// this assumes that capillary pressures only depend on the phase saturations // this assumes that capillary pressures only depend on the phase saturations
// and possibly on temperature. (this is always the case for ECL problems.) // and possibly on temperature. (this is always the case for ECL problems.)
@ -2722,12 +2704,12 @@ private:
} }
if (FluidSystem::enableDissolvedGas()) if (FluidSystem::enableDissolvedGas())
dofFluidState.setRs(rsData[cartesianDofIdx]); dofFluidState.setRs(rsData[dofIdx]);
else if (Indices::gasEnabled && Indices::oilEnabled) else if (Indices::gasEnabled && Indices::oilEnabled)
dofFluidState.setRs(0.0); dofFluidState.setRs(0.0);
if (FluidSystem::enableVaporizedOil()) if (FluidSystem::enableVaporizedOil())
dofFluidState.setRv(rvData[cartesianDofIdx]); dofFluidState.setRv(rvData[dofIdx]);
else if (Indices::gasEnabled && Indices::oilEnabled) else if (Indices::gasEnabled && Indices::oilEnabled)
dofFluidState.setRv(0.0); dofFluidState.setRv(0.0);