From fabc067b5eb0e5bc34dc705c7b29d9619484cba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Fri, 27 Sep 2019 15:53:38 +0200 Subject: [PATCH 1/2] Blackoil Output: Don't Include "eclwriter.hh" The EclWriter class depends on the EclOutputBlackOilModule, not the other way around. This removes a cyclic include. --- ebos/ecloutputblackoilmodule.hh | 2 -- 1 file changed, 2 deletions(-) diff --git a/ebos/ecloutputblackoilmodule.hh b/ebos/ecloutputblackoilmodule.hh index 98c6e6758..274c9bac4 100644 --- a/ebos/ecloutputblackoilmodule.hh +++ b/ebos/ecloutputblackoilmodule.hh @@ -27,8 +27,6 @@ #ifndef EWOMS_ECL_OUTPUT_BLACK_OIL_MODULE_HH #define EWOMS_ECL_OUTPUT_BLACK_OIL_MODULE_HH -#include "eclwriter.hh" - #include #include From d979fb0faefb9ca7f8e57512282c3da281c5aeec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Fri, 27 Sep 2019 15:56:55 +0200 Subject: [PATCH 2/2] Blackoil Output: Chase API Change in SummaryNode Class In particular, the .type() function is renamed to .category(), and it no longer returns a LibECL type. Similarly, the .num() function has been renamed to .number(). --- ebos/ecloutputblackoilmodule.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ebos/ecloutputblackoilmodule.hh b/ebos/ecloutputblackoilmodule.hh index 274c9bac4..8fc3f9a8a 100644 --- a/ebos/ecloutputblackoilmodule.hh +++ b/ebos/ecloutputblackoilmodule.hh @@ -121,9 +121,9 @@ public: // Initialize block output for (const auto& node: summaryConfig) { - if (node.type() == ECL_SMSPEC_BLOCK_VAR) { - if (collectToIORank.isGlobalIdxOnThisRank(node.num() - 1)) { - std::pair key = std::make_pair(node.keyword(), node.num()); + if (node.category() == SummaryNode::Category::Block) { + if (collectToIORank.isGlobalIdxOnThisRank(node.number() - 1)) { + std::pair key = std::make_pair(node.keyword(), node.number()); blockData_[key] = 0.0; } }