From 750e7ac5dd920f5673b1853fd2edd284e3973894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Wed, 6 Jul 2022 10:38:42 +0200
Subject: [PATCH] Clean up and remove unnecessary parts from
 flow_blackoil_tpfa.cpp.

---
 flow/flow_blackoil_tpfa.cpp | 37 +++++--------------------------------
 1 file changed, 5 insertions(+), 32 deletions(-)

diff --git a/flow/flow_blackoil_tpfa.cpp b/flow/flow_blackoil_tpfa.cpp
index d3af19aac..5ec7c4f20 100644
--- a/flow/flow_blackoil_tpfa.cpp
+++ b/flow/flow_blackoil_tpfa.cpp
@@ -25,8 +25,6 @@
 #include <opm/models/blackoil/blackoilintensivequantitiessimple.hh>
 #include <opm/models/discretization/common/smallelementcontext.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
-#include <ebos/eclfluxmoduletpfa.hh>
-#include <ebos/eclproblem.hh>
 
 namespace Opm {
     namespace Properties {
@@ -38,48 +36,23 @@ namespace Opm {
    }
 }
 
-
-
 namespace Opm {
     namespace Properties {
+
         template<class TypeTag>
         struct Linearizer<TypeTag, TTag::EclFlowProblemTPFA> { using type = TpfaLinearizer<TypeTag>; };
-    }
-}
-namespace Opm {
-    namespace Properties {
+
         template<class TypeTag>
         struct LocalResidual<TypeTag, TTag::EclFlowProblemTPFA> { using type = BlackOilLocalResidualTPFA<TypeTag>; };
+
         template<class TypeTag>
         //struct ElementContext<TypeTag, TTag::EclFlowProblemTPFA> { using type = SmallElementContext<TypeTag>; };
         struct ElementContext<TypeTag, TTag::EclFlowProblemTPFA> { using type = FvBaseElementContext<TypeTag>; };
-    }
-}
-namespace Opm{
-    template <class TypeTag>
-    struct EclTransFluxModuleTPFA
-    {
-        typedef EclTransIntensiveQuantities<TypeTag> FluxIntensiveQuantities;
-        typedef EclTransExtensiveQuantitiesTPFA<TypeTag> FluxExtensiveQuantities;
-        typedef EclTransBaseProblem<TypeTag> FluxBaseProblem;
 
-        /// \brief Register all run-time parameters for the flux module.
-        static void registerParameters()
-        { }
-    };
-}
-
-
-namespace Opm {
-    namespace Properties {
-
-        template<class TypeTag>
-        struct FluxModule<TypeTag, TTag::EclFlowProblemTPFA> {
-            using type = EclTransFluxModuleTPFA<TypeTag>;
-        };
         template<class TypeTag>
         struct IntensiveQuantities<TypeTag, TTag::EclFlowProblemTPFA> {
-            using type = BlackOilIntensiveQuantitiesSimple<TypeTag>;
+            //using type = BlackOilIntensiveQuantitiesSimple<TypeTag>;
+            using type = BlackOilIntensiveQuantities<TypeTag>;
         };
 
     }