OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #709 from bska/restart_msw_fix

Browse Source 
RSEG: Index Results by Segment Number
This commit is contained in:
Atgeirr Flø Rasmussen 2019-04-05 10:49:20 +02:00 committed by GitHub
commit 55057540e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/opm/output/eclipse/LoadRestart.cpp
View File

@ -37,6 +37,7 @@
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp> #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/WellSegments.hpp>
#include <opm/parser/eclipse/EclipseState/Runspec.hpp> #include <opm/parser/eclipse/EclipseState/Runspec.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp>
@ -897,7 +898,7 @@ namespace {
} }
void restoreSegmentQuantities(const std::size_t mswID, void restoreSegmentQuantities(const std::size_t mswID,
const std::size_t numSeg, const Opm::WellSegments& segSet,
const Opm::UnitSystem& usys, const Opm::UnitSystem& usys,
const Opm::Phases& phases, const Opm::Phases& phases,
const SegmentVectors& segData, const SegmentVectors& segData,
@ -913,16 +914,16 @@ namespace {
const auto gas = phases.active(Opm::Phase::GAS); const auto gas = phases.active(Opm::Phase::GAS);
const auto wat = phases.active(Opm::Phase::WATER); const auto wat = phases.active(Opm::Phase::WATER);
const auto numSeg = static_cast<std::size_t>(segSet.size());
// Renormalisation constant for gas okay in non-field unit systems. // Renormalisation constant for gas okay in non-field unit systems.
// A bit more questionable for field units. // A bit more questionable for field units.
const auto watRenormalisation = 10.0; const auto watRenormalisation = 10.0;
const auto gasRenormalisation = 1000.0; const auto gasRenormalisation = 1000.0;
for (auto segID = 0*numSeg; segID < numSeg; ++segID) { for (auto segID = 0*numSeg; segID < numSeg; ++segID) {
const auto iseg = segData.iseg(mswID, segID); const auto segNumber = segSet[segID].segmentNumber(); // One-based
const auto rseg = segData.rseg(mswID, segID); const auto rseg = segData.rseg(mswID, segNumber - 1);
const auto segNumber = iseg[VI::ISeg::index::SegNo]; // One-based
auto& segment = xw.segments[segNumber]; auto& segment = xw.segments[segNumber];
@ -1016,8 +1017,12 @@ namespace {
const auto mswID = iwel[VI::IWell::index::MsWID]; // One-based const auto mswID = iwel[VI::IWell::index::MsWID]; // One-based
const auto numSeg = iwel[VI::IWell::index::NWseg]; const auto numSeg = iwel[VI::IWell::index::NWseg];
if ((mswID > 0) && (numSeg > 0)) { const auto& segSet = well.getWellSegments(sim_step);
restoreSegmentQuantities(mswID - 1, numSeg, usys,
if ((mswID > 0) && (numSeg > 0) &&
(segSet.size() == numSeg))
{
restoreSegmentQuantities(mswID - 1, segSet, usys,
phases, segData, xw); phases, segData, xw);
} }
} }