From 947895c27f83304378cd6636bfa1cfc37b40d0ab Mon Sep 17 00:00:00 2001 From: Vegard Kippe Date: Mon, 23 Jun 2025 15:24:38 +0200 Subject: [PATCH] Also set debug level in OpmLog and avoid test failures in DeferredLoggger --- opm/simulators/flow/Main.hpp | 5 +++++ opm/simulators/utils/DeferredLogger.cpp | 5 +++-- opm/simulators/utils/DeferredLogger.hpp | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/opm/simulators/flow/Main.hpp b/opm/simulators/flow/Main.hpp index 5fca4c4045..e54abc297d 100644 --- a/opm/simulators/flow/Main.hpp +++ b/opm/simulators/flow/Main.hpp @@ -32,6 +32,8 @@ #include #include +#include + #if HAVE_DUNE_FEM #include #else @@ -212,6 +214,9 @@ protected: exitCode = (status > 0) ? status : EXIT_SUCCESS; return false; // Whether to run the simulator } + const int debug_level = Parameters::Get(); + OpmLog::setDebugLevel(debug_level); + DeferredLogger::setGlobalDebugLevel(debug_level); std::string deckFilename; std::string outputDir; diff --git a/opm/simulators/utils/DeferredLogger.cpp b/opm/simulators/utils/DeferredLogger.cpp index dd427a0520..7e0d4309fa 100644 --- a/opm/simulators/utils/DeferredLogger.cpp +++ b/opm/simulators/utils/DeferredLogger.cpp @@ -20,12 +20,13 @@ #include #include #include -#include namespace Opm { + int DeferredLogger::global_debug_level_ = 0; + DeferredLogger::DeferredLogger() - : debug_level_(Parameters::Get()) + : debug_level_(global_debug_level_) {} diff --git a/opm/simulators/utils/DeferredLogger.hpp b/opm/simulators/utils/DeferredLogger.hpp index 013e8bd9d4..6f18d5af61 100644 --- a/opm/simulators/utils/DeferredLogger.hpp +++ b/opm/simulators/utils/DeferredLogger.hpp @@ -83,6 +83,9 @@ enum ExcEnum { int getDebugLevel() const { return this->debug_level_; } void setDebugLevel(const int level) { this->debug_level_ = level; } + static int getGlobalDebugLevel() { return global_debug_level_; } + static void setGlobalDebugLevel(const int level) { global_debug_level_ = level; } + /// Log all messages to the OpmLog backends, /// and clear the message container. @@ -94,6 +97,7 @@ enum ExcEnum { private: std::vector messages_; int debug_level_ {0}; + static int global_debug_level_; friend DeferredLogger gatherDeferredLogger(const DeferredLogger& local_deferredlogger, Parallel::Communication mpi_communicator); };