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 #1917 from GitPaean/fixing_warnings_

Browse Source 
more fixing for the tests
This commit is contained in:
Atgeirr Flø Rasmussen 2019-06-26 14:35:00 +02:00 committed by GitHub
commit 766afa4602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/core/wells/WellsGroup.cpp
View File

@ -1490,6 +1490,7 @@ namespace Opm
case Phase::POLYMER: OPM_THROW(std::invalid_argument, "Polymer injector is not supported."); case Phase::POLYMER: OPM_THROW(std::invalid_argument, "Polymer injector is not supported.");
case Phase::ENERGY: OPM_THROW(std::invalid_argument, "Energy injector is not supported."); case Phase::ENERGY: OPM_THROW(std::invalid_argument, "Energy injector is not supported.");
case Phase::POLYMW: OPM_THROW(std::invalid_argument, "PolyMW injector is not supported."); case Phase::POLYMW: OPM_THROW(std::invalid_argument, "PolyMW injector is not supported.");
case Phase::FOAM: OPM_THROW(std::invalid_argument, "Foam injector is not supported.");
} }
OPM_THROW(std::logic_error, "Invalid state." ); OPM_THROW(std::logic_error, "Invalid state." );
} }

6
tests/test_wellstatefullyimplicitblackoil.cpp
View File

@ -86,7 +86,6 @@ namespace {
void setSegPress(const std::vector<Opm::Well2>& wells, void setSegPress(const std::vector<Opm::Well2>& wells,
const std::size_t tstep,
Opm::WellStateFullyImplicitBlackoil& wstate) Opm::WellStateFullyImplicitBlackoil& wstate)
{ {
const auto nWell = wells.size(); const auto nWell = wells.size();
@ -119,7 +118,6 @@ namespace {
void setSegRates(const std::vector<Opm::Well2>& wells, void setSegRates(const std::vector<Opm::Well2>& wells,
const std::size_t tstep,
const Opm::PhaseUsage& pu, const Opm::PhaseUsage& pu,
Opm::WellStateFullyImplicitBlackoil& wstate) Opm::WellStateFullyImplicitBlackoil& wstate)
{ {
@ -203,7 +201,7 @@ BOOST_AUTO_TEST_CASE(Pressure)
const auto& wells = setup.sched.getWells2(tstep); const auto& wells = setup.sched.getWells2(tstep);
const auto prod01_first = wells[0].name() == "PROD01"; const auto prod01_first = wells[0].name() == "PROD01";
setSegPress(wells, tstep, wstate); setSegPress(wells, wstate);
const auto rpt = wstate.report(setup.pu, setup.grid.c_grid()->global_cell); const auto rpt = wstate.report(setup.pu, setup.grid.c_grid()->global_cell);
@ -249,7 +247,7 @@ BOOST_AUTO_TEST_CASE(Rates)
const auto& pu = setup.pu; const auto& pu = setup.pu;
setSegRates(wells, tstep, pu, wstate); setSegRates(wells, pu, wstate);
const auto rpt = wstate.report(pu, setup.grid.c_grid()->global_cell); const auto rpt = wstate.report(pu, setup.grid.c_grid()->global_cell);