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

Merge pull request #938 from joakim-hove/gconprod-exceed-action

Browse Source 
GCONPROD: The exceed action should be unconditionally set to RATE
This commit is contained in:
Joakim Hove 2019-08-14 16:30:17 +02:00 committed by GitHub
commit e79b546544
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
View File

@ -1496,7 +1496,14 @@ namespace {
production.water_target = water_target;
production.liquid_target = liquid_target;
production.resv_target = resv_target;
production.exceed_action = exceedAction;
if ((production.cmode == GroupProduction::ORAT) ||
(production.cmode == GroupProduction::WRAT) ||
(production.cmode == GroupProduction::GRAT) ||
(production.cmode == GroupProduction::LRAT))
production.exceed_action = GroupProductionExceedLimit::RATE;
else
production.exceed_action = exceedAction;
production.production_controls = 0;
if (!record.getItem("OIL_TARGET").defaultApplied(0))

36
tests/parser/GroupTests.cpp
View File

@ -259,3 +259,39 @@ BOOST_AUTO_TEST_CASE(Group2Create) {
BOOST_CHECK_THROW(g1.addGroup("G1"), std::logic_error);
BOOST_CHECK_THROW(g2.addWell("W1"), std::logic_error);
}
BOOST_AUTO_TEST_CASE(createDeckWithGCONPROD) {
Opm::Parser parser;
std::string input = R"(
START -- 0
31 AUG 1993 /
SCHEDULE
GRUPTREE
'G1' 'FIELD' /
'G2' 'FIELD' /
/
GCONPROD
'G1' 'ORAT' 10000 3* 'CON' /
'G2' 'RESV' 10000 3* 'CON' /
/)";
auto deck = parser.parseString(input);
EclipseGrid grid(10,10,10);
TableManager table ( deck );
Eclipse3DProperties eclipseProperties ( deck , table, grid);
Runspec runspec (deck );
Opm::Schedule schedule(deck, grid, eclipseProperties, runspec);
SummaryState st;
const auto& group1 = schedule.getGroup2("G1", 0);
const auto& group2 = schedule.getGroup2("G2", 0);
auto ctrl1 = group1.productionControls(st);
auto ctrl2 = group2.productionControls(st);
BOOST_CHECK_EQUAL(ctrl1.exceed_action, GroupProductionExceedLimit::RATE);
BOOST_CHECK_EQUAL(ctrl2.exceed_action, GroupProductionExceedLimit::CON);
}