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 #2470 from akva2/rename_summarynode

Browse Source 
adjust for SummaryNode -> SummaryConfigNode rename
This commit is contained in:
Joakim Hove 2020-03-13 16:53:56 +01:00 committed by GitHub
commit 8b844af07e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebos/ecloutputblackoilmodule.hh
View File

@ -186,7 +186,7 @@ public:
// Initialize block output // Initialize block output
for (const auto& node: summaryConfig) { for (const auto& node: summaryConfig) {
if (node.category() == SummaryNode::Category::Block) { if (node.category() == SummaryConfigNode::Category::Block) {
if (collectToIORank.isGlobalIdxOnThisRank(node.number() - 1)) { if (collectToIORank.isGlobalIdxOnThisRank(node.number() - 1)) {
std::pair<std::string, int> key = std::make_pair(node.keyword(), node.number()); std::pair<std::string, int> key = std::make_pair(node.keyword(), node.number());
blockData_[key] = 0.0; blockData_[key] = 0.0;

12
tests/test_ParallelRestart.cpp
View File

@ -2175,18 +2175,18 @@ BOOST_AUTO_TEST_CASE(BrineDensityTable)
#endif #endif
} }
BOOST_AUTO_TEST_CASE(SummaryNode) BOOST_AUTO_TEST_CASE(SummaryConfigNode)
{ {
#ifdef HAVE_MPI #ifdef HAVE_MPI
auto val1 = Opm::SummaryNode{"test1", Opm::SummaryNode::Category::Region, auto val1 = Opm::SummaryConfigNode{"test1", Opm::SummaryConfigNode::Category::Region,
Opm::Location{"test2", 1}} Opm::Location{"test2", 1}}
.parameterType(Opm::SummaryNode::Type::Pressure) .parameterType(Opm::SummaryConfigNode::Type::Pressure)
.namedEntity("test3") .namedEntity("test3")
.number(2) .number(2)
.isUserDefined(true); .isUserDefined(true);
auto val2 = PackUnpack2(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(SummaryNode) DO_CHECKS(SummaryConfigNode)
#endif #endif
} }
@ -2194,9 +2194,9 @@ BOOST_AUTO_TEST_CASE(SummaryNode)
BOOST_AUTO_TEST_CASE(SummaryConfig) BOOST_AUTO_TEST_CASE(SummaryConfig)
{ {
#ifdef HAVE_MPI #ifdef HAVE_MPI
auto node = Opm::SummaryNode{"test1", Opm::SummaryNode::Category::Region, auto node = Opm::SummaryConfigNode{"test1", Opm::SummaryConfigNode::Category::Region,
Opm::Location{"test2", 1}} Opm::Location{"test2", 1}}
.parameterType(Opm::SummaryNode::Type::Pressure) .parameterType(Opm::SummaryConfigNode::Type::Pressure)
.namedEntity("test3") .namedEntity("test3")
.number(2) .number(2)
.isUserDefined(true); .isUserDefined(true);