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

ECL problem: Use Cartesian element indices for more fields from the deck

Browse Source 
probably there are still a few missing...
This commit is contained in:
Andreas Lauser 2014-07-07 12:45:15 +02:00
parent 87316b2cdc
commit 566c813820
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
examples/problems/eclproblem.hh
View File

@ -613,8 +613,12 @@ private:
void readInitialCondition_()
{
size_t numDof = this->model().numDof();
const auto deck = this->simulator().gridManager().deck();
const auto &grid = this->simulator().gridManager().grid();
size_t numDof = this->model().numDof();
const auto &cartSize = grid.logicalCartesianSize();
size_t numCartesianCells = cartSize[0] * cartSize[1] * cartSize[2];
initialFluidStates_.resize(numDof);
@ -634,16 +638,23 @@ private:
deck->getKeyword("SGAS")->getSIDoubleData();
const std::vector<double> &pressureData =
deck->getKeyword("PRESSURE")->getSIDoubleData();
const std::vector<double> &rsData =
deck->getKeyword("RS")->getSIDoubleData();
// make sure that the size of the data arrays is correct
assert(waterSaturationData.size() == numDof);
assert(gasSaturationData.size() == numDof);
assert(pressureData.size() == numDof);
assert(waterSaturationData.size() == numCartesianCells);
assert(gasSaturationData.size() == numCartesianCells);
assert(pressureData.size() == numCartesianCells);
assert(rsData.size() == numCartesianCells);
// calculate the initial fluid states
for (size_t dofIdx = 0; dofIdx < numDof; ++dofIdx) {
auto &dofFluidState = initialFluidStates_[dofIdx];
size_t cartesianDofIdx = grid.globalCell()[dofIdx];
assert(0 <= cartesianDofIdx);
assert(cartesianDofIdx <= numCartesianCells);
//////
// set temperatures
//////
@ -653,18 +664,18 @@ private:
// set saturations
//////
dofFluidState.setSaturation(FluidSystem::waterPhaseIdx,
waterSaturationData[dofIdx]);
waterSaturationData[cartesianDofIdx]);
dofFluidState.setSaturation(FluidSystem::gasPhaseIdx,
gasSaturationData[dofIdx]);
gasSaturationData[cartesianDofIdx]);
dofFluidState.setSaturation(FluidSystem::oilPhaseIdx,
1
- waterSaturationData[dofIdx]
- gasSaturationData[dofIdx]);
- waterSaturationData[cartesianDofIdx]
- gasSaturationData[cartesianDofIdx]);
//////
// set pressures
//////
Scalar oilPressure = pressureData[dofIdx];
Scalar oilPressure = pressureData[cartesianDofIdx];
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx) {
dofFluidState.setPressure(phaseIdx, oilPressure);
}