From 5c5f52d02974030699c0e719bd4af4f3fc7c7da1 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Tue, 24 Jun 2025 13:45:57 +0200
Subject: [PATCH] BlackoilSolventIntensiveQuantities: properly implement
 partial specialization

for disabling in solvent-less runs
---
 .../BlackOilIntensiveQuantitiesGlobalIndex.hpp             | 6 +++---
 opm/models/blackoil/blackoilextensivequantities.hh         | 2 +-
 opm/models/blackoil/blackoilintensivequantities.hh         | 4 ++--
 opm/models/blackoil/blackoilsolventmodules.hh              | 7 +++++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp b/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
index a05b5a5dfe..917b5f16b8 100644
--- a/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
+++ b/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
@@ -72,8 +72,8 @@ template <class TypeTag>
 class BlackOilIntensiveQuantitiesGlobalIndex
     : public GetPropType<TypeTag, Properties::DiscIntensiveQuantities>
     , public GetPropType<TypeTag, Properties::FluxModule>::FluxIntensiveQuantities
-    , public BlackOilDiffusionIntensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableDiffusion>() >
-    , public BlackOilSolventIntensiveQuantities<TypeTag>
+    , public BlackOilDiffusionIntensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableDiffusion>()>
+    , public BlackOilSolventIntensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableSolvent>()>
     , public BlackOilExtboIntensiveQuantities<TypeTag>
     , public BlackOilPolymerIntensiveQuantities<TypeTag>
     , public BlackOilFoamIntensiveQuantities<TypeTag>
@@ -526,7 +526,7 @@ public:
     }
 
 private:
-    friend BlackOilSolventIntensiveQuantities<TypeTag>;
+    friend BlackOilSolventIntensiveQuantities<TypeTag, enableSolvent>;
     friend BlackOilExtboIntensiveQuantities<TypeTag>;
     friend BlackOilPolymerIntensiveQuantities<TypeTag>;
     friend BlackOilEnergyIntensiveQuantitiesGlobalIndex<TypeTag>;
diff --git a/opm/models/blackoil/blackoilextensivequantities.hh b/opm/models/blackoil/blackoilextensivequantities.hh
index 70298a8cbe..1c7a76c1ad 100644
--- a/opm/models/blackoil/blackoilextensivequantities.hh
+++ b/opm/models/blackoil/blackoilextensivequantities.hh
@@ -51,7 +51,7 @@ namespace Opm {
 template <class TypeTag>
 class BlackOilExtensiveQuantities
     : public MultiPhaseBaseExtensiveQuantities<TypeTag>
-    , public BlackOilSolventExtensiveQuantities<TypeTag>
+    , public BlackOilSolventExtensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableSolvent>()>
     , public BlackOilPolymerExtensiveQuantities<TypeTag>
     , public BlackOilEnergyExtensiveQuantities<TypeTag>
     , public BlackOilDiffusionExtensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableDiffusion>()>
diff --git a/opm/models/blackoil/blackoilintensivequantities.hh b/opm/models/blackoil/blackoilintensivequantities.hh
index c022511036..8278475f17 100644
--- a/opm/models/blackoil/blackoilintensivequantities.hh
+++ b/opm/models/blackoil/blackoilintensivequantities.hh
@@ -74,7 +74,7 @@ class BlackOilIntensiveQuantities
     , public GetPropType<TypeTag, Properties::FluxModule>::FluxIntensiveQuantities
     , public BlackOilDiffusionIntensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableDiffusion>() >
     , public BlackOilDispersionIntensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableDispersion>() >
-    , public BlackOilSolventIntensiveQuantities<TypeTag>
+    , public BlackOilSolventIntensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableSolvent>()>
     , public BlackOilExtboIntensiveQuantities<TypeTag>
     , public BlackOilPolymerIntensiveQuantities<TypeTag>
     , public BlackOilFoamIntensiveQuantities<TypeTag>
@@ -755,7 +755,7 @@ public:
     }
 
 private:
-    friend BlackOilSolventIntensiveQuantities<TypeTag>;
+    friend BlackOilSolventIntensiveQuantities<TypeTag, enableSolvent>;
     friend BlackOilExtboIntensiveQuantities<TypeTag>;
     friend BlackOilPolymerIntensiveQuantities<TypeTag>;
     friend BlackOilEnergyIntensiveQuantities<TypeTag>;
diff --git a/opm/models/blackoil/blackoilsolventmodules.hh b/opm/models/blackoil/blackoilsolventmodules.hh
index cb096bc8a3..a56822fca7 100644
--- a/opm/models/blackoil/blackoilsolventmodules.hh
+++ b/opm/models/blackoil/blackoilsolventmodules.hh
@@ -522,6 +522,9 @@ template <class TypeTag, bool enableSolventV>
 BlackOilSolventParams<typename BlackOilSolventModule<TypeTag, enableSolventV>::Scalar>
 BlackOilSolventModule<TypeTag, enableSolventV>::params_;
 
+template <class TypeTag, bool enableSolventV>
+class BlackOilSolventIntensiveQuantities;
+
 /*!
  * \ingroup BlackOil
  * \class Opm::BlackOilSolventIntensiveQuantities
@@ -529,8 +532,8 @@ BlackOilSolventModule<TypeTag, enableSolventV>::params_;
  * \brief Provides the volumetric quantities required for the equations needed by the
  *        solvents extension of the black-oil model.
  */
-template <class TypeTag, bool enableSolventV = getPropValue<TypeTag, Properties::EnableSolvent>()>
-class BlackOilSolventIntensiveQuantities
+template <class TypeTag>
+class BlackOilSolventIntensiveQuantities<TypeTag, /*enableSolventV=*/true>
 {
     using Implementation = GetPropType<TypeTag, Properties::IntensiveQuantities>;