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

ECL restart file output: rename 'regionIdx' to 'pvtRegionIdx'

Browse Source
This commit is contained in:
Andreas Lauser 2015-12-31 13:20:41 +01:00
parent 2c8e1da7f3
commit 2f741214d4
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
applications/ebos/ecloutputblackoilmodule.hh
View File

@ -167,11 +167,7 @@ public:
const auto &fs = elemCtx.intensiveQuantities(dofIdx, /*timeIdx=*/0).fluidState(); const auto &fs = elemCtx.intensiveQuantities(dofIdx, /*timeIdx=*/0).fluidState();
typedef typename std::remove_const<typename std::remove_reference<decltype(fs)>::type>::type FluidState; typedef typename std::remove_const<typename std::remove_reference<decltype(fs)>::type>::type FluidState;
unsigned globalDofIdx = elemCtx.globalSpaceIndex(dofIdx, /*timeIdx=*/0); unsigned globalDofIdx = elemCtx.globalSpaceIndex(dofIdx, /*timeIdx=*/0);
unsigned regionIdx = elemCtx.primaryVars(dofIdx, /*timeIdx=*/0).pvtRegionIndex(); unsigned pvtRegionIdx = elemCtx.primaryVars(dofIdx, /*timeIdx=*/0).pvtRegionIndex();
Scalar po = Toolbox::value(fs.pressure(oilPhaseIdx));
Scalar To = Toolbox::value(fs.temperature(oilPhaseIdx));
Scalar XoG = Toolbox::value(fs.massFraction(oilPhaseIdx, gasCompIdx));
Scalar XgO = Toolbox::value(fs.massFraction(gasPhaseIdx, oilCompIdx));
if (saturationsOutput_()) { if (saturationsOutput_()) {
for (unsigned phaseIdx = 0; phaseIdx < numPhases; ++ phaseIdx) { for (unsigned phaseIdx = 0; phaseIdx < numPhases; ++ phaseIdx) {
@ -187,22 +183,22 @@ public:
} }
if (gasDissolutionFactorOutput_()) { if (gasDissolutionFactorOutput_()) {
gasDissolutionFactor_[globalDofIdx] = gasDissolutionFactor_[globalDofIdx] =
FluidSystem::template saturatedDissolutionFactor<FluidState, Scalar>(fs, gasPhaseIdx, regionIdx); FluidSystem::template saturatedDissolutionFactor<FluidState, Scalar>(fs, gasPhaseIdx, pvtRegionIdx);
Valgrind::CheckDefined(gasDissolutionFactor_[globalDofIdx]); Valgrind::CheckDefined(gasDissolutionFactor_[globalDofIdx]);
} }
if (gasFormationVolumeFactorOutput_()) { if (gasFormationVolumeFactorOutput_()) {
gasFormationVolumeFactor_[globalDofIdx] = gasFormationVolumeFactor_[globalDofIdx] =
FluidSystem::template formationVolumeFactor<FluidState, Scalar>(fs, gasPhaseIdx, regionIdx); FluidSystem::template formationVolumeFactor<FluidState, Scalar>(fs, gasPhaseIdx, pvtRegionIdx);
Valgrind::CheckDefined(gasFormationVolumeFactor_[globalDofIdx]); Valgrind::CheckDefined(gasFormationVolumeFactor_[globalDofIdx]);
} }
if (saturatedOilFormationVolumeFactorOutput_()) { if (saturatedOilFormationVolumeFactorOutput_()) {
saturatedOilFormationVolumeFactor_[globalDofIdx] = saturatedOilFormationVolumeFactor_[globalDofIdx] =
FluidSystem::template saturatedFormationVolumeFactor<FluidState, Scalar>(fs, oilPhaseIdx, regionIdx); FluidSystem::template saturatedFormationVolumeFactor<FluidState, Scalar>(fs, oilPhaseIdx, pvtRegionIdx);
Valgrind::CheckDefined(saturatedOilFormationVolumeFactor_[globalDofIdx]); Valgrind::CheckDefined(saturatedOilFormationVolumeFactor_[globalDofIdx]);
} }
if (oilSaturationPressureOutput_()) { if (oilSaturationPressureOutput_()) {
oilSaturationPressure_[globalDofIdx] = oilSaturationPressure_[globalDofIdx] =
FluidSystem::template saturationPressure<FluidState, Scalar>(fs, oilPhaseIdx, regionIdx); FluidSystem::template saturationPressure<FluidState, Scalar>(fs, oilPhaseIdx, pvtRegionIdx);
Valgrind::CheckDefined(oilSaturationPressure_[globalDofIdx]); Valgrind::CheckDefined(oilSaturationPressure_[globalDofIdx]);
} }
} }