From 9102b2a35272f5156153121d051d8c20aa1cb3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Tue, 23 Jan 2024 11:23:14 +0100 Subject: [PATCH] Use to_string() for WellFailure. New functionality added is local well failure logging for NLDD. --- opm/simulators/flow/BlackoilModelEbosNldd.hpp | 7 +++++++ opm/simulators/flow/ExtraConvergenceOutputThread.cpp | 8 +------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/opm/simulators/flow/BlackoilModelEbosNldd.hpp b/opm/simulators/flow/BlackoilModelEbosNldd.hpp index 24abbe45e..b0ee88d09 100644 --- a/opm/simulators/flow/BlackoilModelEbosNldd.hpp +++ b/opm/simulators/flow/BlackoilModelEbosNldd.hpp @@ -840,6 +840,13 @@ private: if (mb_sum < acceptable_local_mb_sum && cnv_sum < acceptable_local_cnv_sum) { local_report.converged = true; logger.debug(fmt::format("Accepting solution in unconverged domain {} on rank {}.", domain.index, rank_)); + } else { + logger.debug("Unconverged local solution."); + } + } else { + logger.debug("Unconverged local solution with well convergence failures:"); + for (const auto& wf : convrep.wellFailures()) { + logger.debug(to_string(wf)); } } } diff --git a/opm/simulators/flow/ExtraConvergenceOutputThread.cpp b/opm/simulators/flow/ExtraConvergenceOutputThread.cpp index b7667aea9..ed5bfa594 100644 --- a/opm/simulators/flow/ExtraConvergenceOutputThread.cpp +++ b/opm/simulators/flow/ExtraConvergenceOutputThread.cpp @@ -122,13 +122,7 @@ namespace { << (report.wellFailed() ? "FAIL" : "CONV"); if (report.wellFailed()) { for (const auto& wf : report.wellFailures()) { - os << " { " - << wf.wellName() << ' ' << to_string(wf.type()); - if (wf.type() == Opm::ConvergenceReport::WellFailure::Type::MassBalance) { - os << " Severity=" << to_string(wf.severity()) - << " Phase=" << wf.phase(); - } - os << " }"; + os << " " << to_string(wf); } } os << '\n';