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

Merge pull request #3178 from joakim-hove/wellstate-internalize-pu

Browse Source 
WellState will internalize PhaseUsage member
This commit is contained in:
Bård Skaflestad
2021-04-27 06:33:18 +02:00
committed by GitHub
parent 266197fd75 a68589eb9a
commit 6cbe5ae8f4
5 changed files with 60 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_wellstatefullyimplicitblackoil.cpp
View File

@@ -122,7 +122,7 @@ namespace {
buildWellState(const Setup& setup, const std::size_t timeStep,
std::vector<Opm::ParallelWellInfo>& pinfos)
{
auto state = Opm::WellStateFullyImplicitBlackoil{setup.pu.num_phases};
auto state = Opm::WellStateFullyImplicitBlackoil{setup.pu};
const auto cpress =
std::vector<double>(setup.grid.c_grid()->number_of_cells,
@@ -145,11 +145,11 @@ namespace {
state.init(cpress, setup.sched,
wells, ppinfos,
timeStep, nullptr, setup.pu, setup.well_perf_data, setup.st,
timeStep, nullptr, setup.well_perf_data, setup.st,
wells.size());
state.initWellStateMSWell(setup.sched.getWells(timeStep),
setup.pu, nullptr);
nullptr);
return state;
}
@@ -275,7 +275,7 @@ BOOST_AUTO_TEST_CASE(Pressure)
setSegPress(wells, wstate);
const auto rpt = wstate.report(setup.pu, setup.grid.c_grid()->global_cell, [](const int){return false;});
const auto rpt = wstate.report(setup.grid.c_grid()->global_cell, [](const int){return false;});
{
const auto& xw = rpt.at("INJE01");
@@ -322,9 +322,9 @@ BOOST_AUTO_TEST_CASE(Rates)
const auto& pu = setup.pu;
setSegRates(wells, pu, wstate);
setSegRates(wells, pu, wstate);
const auto rpt = wstate.report(pu, setup.grid.c_grid()->global_cell, [](const int){return false;});
const auto rpt = wstate.report(setup.grid.c_grid()->global_cell, [](const int){return false;});
const auto wat = pu.phase_used[Opm::BlackoilPhases::Aqua];
const auto oil = pu.phase_used[Opm::BlackoilPhases::Liquid];