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

Rebasing

Browse Source
This commit is contained in:
Paul
2023-07-27 14:53:11 +02:00
parent 5a342db5a3
commit f70a0e50e0
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/opm/input/eclipse/Schedule/KeywordHandlers.cpp
View File

@@ -766,6 +766,9 @@ File {} line {}.)", wname, location.keyword, location.filename, location.lineno)
}
void Schedule::handleGRUPNET(HandlerContext& handlerContext) {
// Todo: Currently GRUPNET requires GRUPTREE. In case GRUPTREE is not specified we could assume
// one level of groups, that is, a network hierarchy FIELD-GROUPS-WELLS.
auto network = this->snapshots.back().network.get();
std::vector<Network::Node> nodes;
@@ -774,13 +777,15 @@ File {} line {}.)", wname, location.keyword, location.filename, location.lineno)
const auto& pressure_item = record.getItem<ParserKeywords::GRUPNET::TERMINAL_PRESSURE>();
const int vfp_table = record.getItem<ParserKeywords::GRUPNET::VFP_TABLE>().get<int>(0);
const auto& group = this->snapshots.back().groups.get(name);
auto& group = this->snapshots.back().groups.get(name);
group.updateNetVFPTable(vfp_table);
const auto& parent = group.parent();
if (parent != "")
{
const std::string& downtree_node = name;
const std::string& uptree_node = parent;
if (vfp_table == 0) {
if (vfp_table == 0 && network.has_node(downtree_node) && network.has_node(uptree_node)) {
network.drop_branch(uptree_node, downtree_node);
} else {
const auto alq_eq = Network::Branch::AlqEqfromString(record.getItem<ParserKeywords::GRUPNET::ALQ_SURFACE_DENSITY>().get<std::string>(0));

15
tests/parser/GroupTests.cpp
View File

@@ -183,11 +183,26 @@ WCONPROD
BOOST_AUTO_TEST_CASE(createDeckWithGRUPNET) {
const std::string input = R"(
START -- 0
31 AUG 1993 /
SCHEDULE
GRUPTREE
'MANI-B2' 'FIELD' /
'MANI-B1' 'FIELD' /
'MANI-K1' 'FIELD' /
'B1-DUMMY' 'MANI-K1' /
'MANI-D1' 'FIELD' /
'PROD' 'MANI-D1' /
'MANI-D2' 'MANI-D1' /
'MANI-K2' 'MANI-D1' /
'D2-DUMMY' 'MANI-K2' /
'MANI-E1' 'MANI-K2' /
'MANI-E2' 'MANI-K2' /
/
GRUPNET
'FIELD' 20.000 5* /
'PROD' 20.000 5* /