From 62b119170d4c0e15678f662abf07109e3ec009a3 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Sun, 22 Nov 2020 10:32:31 +0100 Subject: [PATCH] Pass Inplace argument to Summary::eval() --- ebos/ecloutputblackoilmodule.hh | 6 ++++-- ebos/eclwriter.hh | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ebos/ecloutputblackoilmodule.hh b/ebos/ecloutputblackoilmodule.hh index c9d571420..72fcbb666 100644 --- a/ebos/ecloutputblackoilmodule.hh +++ b/ebos/ecloutputblackoilmodule.hh @@ -1307,11 +1307,11 @@ public: // write Fluid In Place to output log - void outputFipLog(std::map& miscSummaryData, std::map>& regionData, const bool substep) + Opm::Inplace outputFipLog(std::map& miscSummaryData, std::map>& regionData, const bool substep) { auto inplace = this->accumulateRegionSums(); if (!isIORank_()) - return; + return inplace; updateSummaryRegionValues(inplace, miscSummaryData, @@ -1319,6 +1319,8 @@ public: if (!substep) outputFipLogImpl(inplace); + + return inplace; } diff --git a/ebos/eclwriter.hh b/ebos/eclwriter.hh index 038e11f7e..05c9a0f1b 100644 --- a/ebos/eclwriter.hh +++ b/ebos/eclwriter.hh @@ -282,7 +282,7 @@ public: std::map miscSummaryData; std::map> regionData; - eclOutputModule_.outputFipLog(miscSummaryData, regionData, isSubStep); + auto inplace = eclOutputModule_.outputFipLog(miscSummaryData, regionData, isSubStep); bool forceDisableProdOutput = false; bool forceDisableInjOutput = false; @@ -323,6 +323,7 @@ public: groupAndNetworkData, miscSummaryData, eclOutputModule_.initialInplace(), + inplace, regionData, blockData, aquiferData);