From 72be136529651cc7cf8fb15fd4f3cc850b8fd6ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Tue, 12 Oct 2021 08:40:31 +0200
Subject: [PATCH] Stop using EclWellManager in test_equil.cc.

---
 tests/test_equil.cc | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/tests/test_equil.cc b/tests/test_equil.cc
index 9148e9936..e626bbff5 100644
--- a/tests/test_equil.cc
+++ b/tests/test_equil.cc
@@ -26,9 +26,11 @@
 
 #include <ebos/equil/equilibrationhelpers.hh>
 #include <ebos/eclproblem.hh>
-#include <ebos/eclwellmanager.hh>
 #include <opm/models/utils/start.hh>
 
+#include <opm/simulators/wells/BlackoilWellModel.hpp>
+#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp>
+
 #include <opm/grid/UnstructuredGrid.h>
 #include <opm/grid/GridManager.hpp>
 
@@ -64,16 +66,23 @@
 
 
 namespace Opm::Properties {
+
+template<class TypeTag>
+struct EnableTerminalOutput<TypeTag, TTag::EclBaseProblem> {
+    static constexpr bool value = true;
+};
+
 namespace TTag {
 
+
 struct TestEquilTypeTag {
-    using InheritsFrom = std::tuple<EclBaseProblem, BlackOilModel>;
+    using InheritsFrom = std::tuple<FlowModelParameters, EclBaseProblem, BlackOilModel>;
 };
 }
 
 template<class TypeTag>
 struct EclWellModel<TypeTag, TTag::TestEquilTypeTag> {
-    using type = EclWellManager<TypeTag>;
+    using type = BlackoilWellModel<TypeTag>;
 };
 
 } // namespace Opm::Properties
@@ -199,15 +208,20 @@ namespace {
 
 struct EquilFixture {
     EquilFixture() {
-    int argc = boost::unit_test::framework::master_test_suite().argc;
-    char** argv = boost::unit_test::framework::master_test_suite().argv;
+        int argc = boost::unit_test::framework::master_test_suite().argc;
+        char** argv = boost::unit_test::framework::master_test_suite().argv;
 #if HAVE_DUNE_FEM
-    Dune::Fem::MPIManager::initialize(argc, argv);
+        Dune::Fem::MPIManager::initialize(argc, argv);
 #else
-    Dune::MPIHelper::instance(argc, argv);
+        Dune::MPIHelper::instance(argc, argv);
 #endif
         Opm::EclGenericVanguard::setCommunication(std::make_unique<Opm::Parallel::Communication>());
         using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
+        Opm::BlackoilModelParametersEbos<TypeTag>::registerParameters();
+        Opm::Parameters::registerParam<TypeTag, bool>("EnableTerminalOutput",
+                                                      "EnableTerminalOutput",
+                                                      Opm::getPropValue<TypeTag, Opm::Properties::EnableTerminalOutput>(),
+                                                      "Dummy added for the well model to compile.");
         Opm::registerAllParameters_<TypeTag>();
     }
 };