From a5d903cea2028a692957b30f9dab2e4455e8ff79 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Fri, 29 May 2026 00:28:20 +0200
Subject: [PATCH] BlackOilExtboModule: only include where needed

---
 flow/flow_extbo.cpp                           |  1 +
 ...BlackOilIntensiveQuantitiesGlobalIndex.hpp |  2 --
 opm/models/blackoil/blackoilextbomodules.hh   | 23 ++++---------------
 .../blackoil/blackoilintensivequantities.hh   |  1 -
 opm/models/blackoil/blackoillocalresidual.hh  |  1 -
 .../blackoil/blackoillocalresidualtpfa.hh     |  1 -
 opm/models/blackoil/blackoilmodel.hh          |  1 -
 opm/models/blackoil/blackoilmodules.hpp       |  1 +
 .../blackoil/blackoilprimaryvariables.hh      |  1 -
 opm/simulators/wells/StandardWell.hpp         |  1 -
 10 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/flow/flow_extbo.cpp b/flow/flow_extbo.cpp
index 4f871f9c7c..129fea0531 100644
--- a/flow/flow_extbo.cpp
+++ b/flow/flow_extbo.cpp
@@ -24,6 +24,7 @@
 
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
+#include <opm/models/blackoil/blackoilextbomodules.hh>
 
 #include <opm/simulators/flow/Main.hpp>
 #include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
diff --git a/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp b/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
index 14ea2f4c51..a1b759335c 100644
--- a/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
+++ b/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
@@ -43,7 +43,6 @@
 #include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/blackoil/blackoilsolventmodules.hh>
-#include <opm/models/blackoil/blackoilextbomodules.hh>
 #include <opm/models/blackoil/blackoilpolymermodules.hh>
 #include <opm/models/blackoil/blackoilfoammodules.hh>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
@@ -279,7 +278,6 @@ public:
                                                                 SoMax);
                     fluidState_.setRs(min(RsMax, RsSat));
                 }
-
             }
             else if constexpr (compositionSwitchEnabled) {
                 fluidState_.setRs(0.0);
diff --git a/opm/models/blackoil/blackoilextbomodules.hh b/opm/models/blackoil/blackoilextbomodules.hh
index 0c477f298a..53038fc9b9 100644
--- a/opm/models/blackoil/blackoilextbomodules.hh
+++ b/opm/models/blackoil/blackoilextbomodules.hh
@@ -37,6 +37,7 @@
 #include <opm/common/utility/gpuDecorators.hpp>
 
 #include <opm/models/blackoil/blackoilextboparams.hpp>
+#include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilproperties.hh>
 
 #include <opm/models/discretization/common/fvbaseproperties.hh>
@@ -54,9 +55,6 @@
 
 namespace Opm {
 
-template<class TypeTag, bool enableExtboV>
-class BlackOilExtboModule;
-
 /*!
  * \ingroup BlackOil
  * \brief Contains the high level supplements required to extend the black oil
@@ -85,7 +83,8 @@ class BlackOilExtboModule<TypeTag, true>
     static constexpr unsigned numEq = getPropValue<TypeTag, Properties::NumEq>();
     static constexpr unsigned gasPhaseIdx = FluidSystem::gasPhaseIdx;
     static constexpr unsigned oilPhaseIdx = FluidSystem::oilPhaseIdx;
-    static constexpr bool blackoilConserveSurfaceVolume = getPropValue<TypeTag, Properties::BlackoilConserveSurfaceVolume>();
+    static constexpr bool blackoilConserveSurfaceVolume =
+        getPropValue<TypeTag, Properties::BlackoilConserveSurfaceVolume>();
 
 public:
     //! \brief Set parameters.
@@ -359,9 +358,6 @@ template <class TypeTag>
 BlackOilExtboParams<typename BlackOilExtboModule<TypeTag, true>::Scalar>
 BlackOilExtboModule<TypeTag, true>::params_;
 
-template <class TypeTag, bool enableExtboV>
-class BlackOilExtboIntensiveQuantities;
-
 /*!
  * \ingroup BlackOil
  * \class Opm::BlackOilExtboIntensiveQuantities
@@ -559,11 +555,6 @@ protected:
     Scalar zRefDensity_;
 };
 
-template <class TypeTag>
-class BlackOilExtboIntensiveQuantities<TypeTag, false>
-{
-};
-
 /*!
  * \ingroup BlackOil
  * \class Opm::BlackOilExtboExtensiveQuantities
@@ -571,8 +562,8 @@ class BlackOilExtboIntensiveQuantities<TypeTag, false>
  * \brief Provides the solvent specific extensive quantities to the generic black-oil
  *        module's extensive quantities.
  */
-template <class TypeTag, bool enableExtboV = getPropValue<TypeTag, Properties::EnableExtbo>()>
-class BlackOilExtboExtensiveQuantities
+template <class TypeTag>
+class BlackOilExtboExtensiveQuantities<TypeTag, true>
 {
     using Implementation = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
 
@@ -580,10 +571,6 @@ class BlackOilExtboExtensiveQuantities
     { return *static_cast<Implementation*>(this); }
 };
 
-template <class TypeTag>
-class BlackOilExtboExtensiveQuantities<TypeTag, false>
-{
-};
 
 } // namespace Opm
 
diff --git a/opm/models/blackoil/blackoilintensivequantities.hh b/opm/models/blackoil/blackoilintensivequantities.hh
index 50e79abac9..e5f8a0fb93 100644
--- a/opm/models/blackoil/blackoilintensivequantities.hh
+++ b/opm/models/blackoil/blackoilintensivequantities.hh
@@ -39,7 +39,6 @@
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
-#include <opm/models/blackoil/blackoilextbomodules.hh>
 #include <opm/models/blackoil/blackoilfoammodules.hh>
 #include <opm/models/blackoil/blackoilpolymermodules.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
diff --git a/opm/models/blackoil/blackoillocalresidual.hh b/opm/models/blackoil/blackoillocalresidual.hh
index f648075c98..a8f261f499 100644
--- a/opm/models/blackoil/blackoillocalresidual.hh
+++ b/opm/models/blackoil/blackoillocalresidual.hh
@@ -33,7 +33,6 @@
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
-#include <opm/models/blackoil/blackoilextbomodules.hh>
 #include <opm/models/blackoil/blackoilfoammodules.hh>
 #include <opm/models/blackoil/blackoilpolymermodules.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
diff --git a/opm/models/blackoil/blackoillocalresidualtpfa.hh b/opm/models/blackoil/blackoillocalresidualtpfa.hh
index 12138a560d..1db752dedb 100644
--- a/opm/models/blackoil/blackoillocalresidualtpfa.hh
+++ b/opm/models/blackoil/blackoillocalresidualtpfa.hh
@@ -38,7 +38,6 @@
 #include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilconvectivemixingmoduleparam.hpp>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
-#include <opm/models/blackoil/blackoilextbomodules.hh>
 #include <opm/models/blackoil/blackoilfoammodules.hh>
 #include <opm/models/blackoil/blackoilmoduleparams.hh>
 #include <opm/models/blackoil/blackoilpolymermodules.hh>
diff --git a/opm/models/blackoil/blackoilmodel.hh b/opm/models/blackoil/blackoilmodel.hh
index a1ed87d16c..18907f1f2e 100644
--- a/opm/models/blackoil/blackoilmodel.hh
+++ b/opm/models/blackoil/blackoilmodel.hh
@@ -36,7 +36,6 @@
 #include <opm/models/blackoil/blackoilboundaryratevector.hh>
 #include <opm/models/blackoil/blackoildarcyfluxmodule.hh>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
-#include <opm/models/blackoil/blackoilextbomodules.hh>
 #include <opm/models/blackoil/blackoilextensivequantities.hh>
 #include <opm/models/blackoil/blackoilfoammodules.hh>
 #include <opm/models/blackoil/blackoilvariableandequationindices.hh>
diff --git a/opm/models/blackoil/blackoilmodules.hpp b/opm/models/blackoil/blackoilmodules.hpp
index b9ac08069a..09beb12560 100644
--- a/opm/models/blackoil/blackoilmodules.hpp
+++ b/opm/models/blackoil/blackoilmodules.hpp
@@ -45,6 +45,7 @@ DECLARE_MODULE(BlackOilBrine)
 DECLARE_MODULE(BlackOilConvectiveMixing)
 DECLARE_MODULE(BlackOilDiffusion)
 DECLARE_MODULE(BlackOilDispersion)
+DECLARE_MODULE(BlackOilExtbo)
 
 #undef DECLARE_MODULE
 
diff --git a/opm/models/blackoil/blackoilprimaryvariables.hh b/opm/models/blackoil/blackoilprimaryvariables.hh
index 42a6b14919..0a1d9180b5 100644
--- a/opm/models/blackoil/blackoilprimaryvariables.hh
+++ b/opm/models/blackoil/blackoilprimaryvariables.hh
@@ -35,7 +35,6 @@
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
-#include <opm/models/blackoil/blackoilextbomodules.hh>
 #include <opm/models/blackoil/blackoilmeanings.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/blackoil/blackoilsolventmodules.hh>
diff --git a/opm/simulators/wells/StandardWell.hpp b/opm/simulators/wells/StandardWell.hpp
index a60f7d5231..0bbf513a92 100644
--- a/opm/simulators/wells/StandardWell.hpp
+++ b/opm/simulators/wells/StandardWell.hpp
@@ -34,7 +34,6 @@
 
 #include <opm/models/blackoil/blackoilpolymermodules.hh>
 #include <opm/models/blackoil/blackoilsolventmodules.hh>
-#include <opm/models/blackoil/blackoilextbomodules.hh>
 #include <opm/models/blackoil/blackoilfoammodules.hh>
 #include <opm/models/blackoil/blackoilmodules.hpp>