OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add data::GroupValues member to RestartValue

Browse Source
This commit is contained in:
Joakim Hove
2020-07-04 10:06:03 +02:00
parent 30a4f2b34b
commit b9b1e734cb
5 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/simulators/utils/ParallelRestart.cpp
+2 -1
View File
@@ -826,7 +826,8 @@ RestartValue loadParallelRestart(const EclipseIO* eclIO, Action::State& actionSt
#if HAVE_MPI
data::Solution sol;
data::Wells wells;
RestartValue restartValues(sol, wells);
data::GroupValues groups;
RestartValue restartValues(sol, wells, groups);
if (eclIO)
{
opm/simulators/wells/BlackoilWellModel.hpp
+1
View File
@@ -403,6 +403,7 @@ namespace Opm {
// convert well data from opm-common to well state from opm-core
void wellsToState( const data::Wells& wells,
const data::GroupValues& groups,
const PhaseUsage& phases,
const bool handle_ms_well,
WellStateFullyImplicitBlackoil& state ) const;
opm/simulators/wells/BlackoilWellModel_impl.hpp
+2 -1
View File
@@ -545,7 +545,7 @@ namespace Opm {
const size_t numCells = Opm::UgGridHelpers::numCells(grid());
const bool handle_ms_well = (param_.use_multisegment_well_ && anyMSWellOpenLocal());
well_state_.resize(wells_ecl_, schedule(), handle_ms_well, numCells, phaseUsage, well_perf_data_, summaryState, globalNumWells); // Resize for restart step
wellsToState(restartValues.wells, phaseUsage, handle_ms_well, well_state_);
wellsToState(restartValues.wells, restartValues.groups, phaseUsage, handle_ms_well, well_state_);
}
previous_well_state_ = well_state_;
@@ -1597,6 +1597,7 @@ namespace Opm {
void
BlackoilWellModel<TypeTag>::
wellsToState( const data::Wells& wells,
const data::GroupValues& groups,
const PhaseUsage& phases,
const bool handle_ms_well,
WellStateFullyImplicitBlackoil& state) const