From 385f526d77507b07496f6b4d9f67c5b32f5326d0 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 31 Jan 2023 15:18:25 +0100 Subject: [PATCH] fixed: regression from 82d2146c90ce74677bd8f04c745c31cd08b430de missing PRT header --- opm/simulators/flow/FlowMainEbos.hpp | 1 - opm/simulators/flow/Main.cpp | 5 ++++- opm/simulators/flow/Main.hpp | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/opm/simulators/flow/FlowMainEbos.hpp b/opm/simulators/flow/FlowMainEbos.hpp index 5d1c73594..fbf02f65c 100644 --- a/opm/simulators/flow/FlowMainEbos.hpp +++ b/opm/simulators/flow/FlowMainEbos.hpp @@ -343,7 +343,6 @@ namespace Opm } // Print an ASCII-art header to the PRT and DEBUG files. - // \return Whether unkown keywords were seen during parsing. static void printPRTHeader(bool output_cout) { if (output_cout) { diff --git a/opm/simulators/flow/Main.cpp b/opm/simulators/flow/Main.cpp index f635ab0cf..b018c0c79 100644 --- a/opm/simulators/flow/Main.cpp +++ b/opm/simulators/flow/Main.cpp @@ -171,7 +171,8 @@ void Main::readDeck(const std::string& deckFilename, const bool allRanksDbgPrtLog, const bool strictParsing, const int mpiRank, - const int output_param) + const int output_param, + std::function outputPrt) { auto omode = setupLogging(mpiRank, deckFilename, @@ -179,6 +180,8 @@ void Main::readDeck(const std::string& deckFilename, outputMode, outputCout_, "STDOUT_LOGGER", allRanksDbgPrtLog); + outputPrt(outputCout_); + if (outputCout_) { OpmLog::info("Reading deck file '" + deckFilename + "'"); } diff --git a/opm/simulators/flow/Main.hpp b/opm/simulators/flow/Main.hpp index a18a3097d..c9ab80237 100644 --- a/opm/simulators/flow/Main.hpp +++ b/opm/simulators/flow/Main.hpp @@ -68,6 +68,7 @@ #include #include +#include #include #include #include @@ -366,7 +367,8 @@ private: EWOMS_GET_PARAM(PreTypeTag, bool, EnableLoggingFalloutWarning), EWOMS_GET_PARAM(PreTypeTag, bool, EclStrictParsing), mpiRank, - EWOMS_GET_PARAM(PreTypeTag, int, EclOutputInterval)); + EWOMS_GET_PARAM(PreTypeTag, int, EclOutputInterval), + FlowMainEbos::printPRTHeader); setupTime_ = externalSetupTimer.elapsed(); } catch (const std::invalid_argument& e) @@ -609,7 +611,8 @@ private: const bool allRanksDbgPrtLog, const bool strictParsing, const int mpiRank, - const int output_param); + const int output_param, + std::function outputPrt); void setupVanguard();