From 8dcb37570beb2ee6177d5fd2a10c39f24f1c852b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= <Bard.Skaflestad@sintef.no>
Date: Fri, 16 Dec 2022 14:49:28 +0100
Subject: [PATCH] Rename Convergence Output Option

This commit renames the previously introduced command line option
ExtraConvergenceOutput (--extra-convergence-output) into the more
descriptive

    OutputExtraConvergenceInfo (--output-extra-convergence-info)

Suggested by: [at]OPMUSER
---
 opm/simulators/flow/FlowMainEbos.hpp                   |  4 ++--
 .../flow/SimulatorFullyImplicitBlackoilEbos.hpp        | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/opm/simulators/flow/FlowMainEbos.hpp b/opm/simulators/flow/FlowMainEbos.hpp
index dbdaa8a4c..b867c4fb6 100644
--- a/opm/simulators/flow/FlowMainEbos.hpp
+++ b/opm/simulators/flow/FlowMainEbos.hpp
@@ -594,8 +594,8 @@ namespace Opm
             OpmLog::info(ss.str());
 
             const auto extraConvOutput = ConvergenceOutputConfiguration {
-                EWOMS_GET_PARAM(TypeTag, std::string, ExtraConvergenceOutput),
-                R"(ExtraConvergenceOutput (--extra-convergence-output))"
+                EWOMS_GET_PARAM(TypeTag, std::string, OutputExtraConvergenceInfo),
+                R"(OutputExtraConvergenceInfo (--output-extra-convergence-info))"
             };
 
             if (extraConvOutput.want(ConvergenceOutputConfiguration::Option::Steps)) {
diff --git a/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp b/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
index 0f89eee1a..0e86911a1 100644
--- a/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
+++ b/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
@@ -58,7 +58,7 @@ struct EnableTuning {
 };
 
 template <class TypeTag, class MyTypeTag>
-struct ExtraConvergenceOutput
+struct OutputExtraConvergenceInfo
 {
     using type = UndefinedProperty;
 };
@@ -77,7 +77,7 @@ struct EnableTuning<TypeTag, TTag::EclFlowProblem> {
 };
 
 template <class TypeTag>
-struct ExtraConvergenceOutput<TypeTag, TTag::EclFlowProblem>
+struct OutputExtraConvergenceInfo<TypeTag, TTag::EclFlowProblem>
 {
     static constexpr auto* value = "none";
 };
@@ -150,8 +150,8 @@ public:
             this->terminalOutput_ = EWOMS_GET_PARAM(TypeTag, bool, EnableTerminalOutput);
 
             this->startConvergenceOutputThread(EWOMS_GET_PARAM(TypeTag, std::string,
-                                                               ExtraConvergenceOutput),
-                                               R"(ExtraConvergenceOutput (--extra-convergence-output))");
+                                                               OutputExtraConvergenceInfo),
+                                               R"(OutputExtraConvergenceInfo (--output-extra-convergence-info))");
         }
     }
 
@@ -173,7 +173,7 @@ public:
                              "Use adaptive time stepping between report steps");
         EWOMS_REGISTER_PARAM(TypeTag, bool, EnableTuning,
                              "Honor some aspects of the TUNING keyword.");
-        EWOMS_REGISTER_PARAM(TypeTag, std::string, ExtraConvergenceOutput,
+        EWOMS_REGISTER_PARAM(TypeTag, std::string, OutputExtraConvergenceInfo,
                              "Provide additional convergence output "
                              "files for diagnostic purposes. "
                              "\"none\" gives no extra output and "