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

FIX gas-water restart

Browse Source
This commit is contained in:
Tor Harald Sandve 2024-10-14 10:43:30 +02:00
parent c228f31287
commit 438e40b143
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/simulators/flow/GenericOutputBlackoilModule.cpp
View File

@ -802,9 +802,9 @@ setRestart(const data::Solution& sol,
rswSol_[elemIdx] = sol.data<double>("RSWSOL")[globalDofIndex];
}
assert(!saturation_[oilPhaseIdx].empty());
saturation_[oilPhaseIdx][elemIdx] = so;
if (!saturation_[oilPhaseIdx].empty()) {
saturation_[oilPhaseIdx][elemIdx] = so;
}
auto assign = [elemIdx, globalDofIndex, &sol](const std::string& name,
ScalarBuffer& data)

10
opm/simulators/flow/OutputBlackoilModule.hpp
View File

@ -1146,12 +1146,18 @@ public:
MaterialLaw::capillaryPressures(pc, matParams, fs);
Valgrind::CheckDefined(this->fluidPressure_[elemIdx]);
Valgrind::CheckDefined(pc);
assert(FluidSystem::phaseIsActive(oilPhaseIdx));
const auto& pressure = this->fluidPressure_[elemIdx];
for (unsigned phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx) {
if (!FluidSystem::phaseIsActive(phaseIdx))
continue;
fs.setPressure(phaseIdx, this->fluidPressure_[elemIdx] + (pc[phaseIdx] - pc[oilPhaseIdx]));
if (Indices::oilEnabled)
fs.setPressure(phaseIdx, pressure + (pc[phaseIdx] - pc[oilPhaseIdx]));
else if (Indices::gasEnabled)
fs.setPressure(phaseIdx, pressure + (pc[phaseIdx] - pc[gasPhaseIdx]));
else if (Indices::waterEnabled)
//single (water) phase
fs.setPressure(phaseIdx, pressure);
}
}