BlackOilEnergyIntensiveQuantities: properly implement partial specialization

for disabling in energy-less runs
This commit is contained in:
Arne Morten Kvarving committed 2025-06-26 17:25:07 +02:00
1 parent 1f5fb1de9f
commit c8a5bd1cc8
4 files changed
+16 -10

No files matched your search

@@ -32,16 +32,19 @@
namespace Opm {
template <class TypeTag, bool enableEnergyV>
class BlackOilEnergyIntensiveQuantitiesGlobalIndex;
/*!
* \ingroup BlackOil
* \brief Contains the high level supplements required to extend the black oil
* model by energy using global indices.
*/
template <class TypeTag, bool enableEnergyV = getPropValue<TypeTag, Properties::EnableEnergy>()>
class BlackOilEnergyIntensiveQuantitiesGlobalIndex
: public BlackOilEnergyIntensiveQuantities<TypeTag,enableEnergyV>
template <class TypeTag>
class BlackOilEnergyIntensiveQuantitiesGlobalIndex<TypeTag, true>
: public BlackOilEnergyIntensiveQuantities<TypeTag,true>
{
using Parent = BlackOilEnergyIntensiveQuantities<TypeTag, enableEnergyV>;
using Parent = BlackOilEnergyIntensiveQuantities<TypeTag, true>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
@@ -78,7 +78,7 @@ class BlackOilIntensiveQuantitiesGlobalIndex
, public BlackOilPolymerIntensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnablePolymer>()>
, public BlackOilFoamIntensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableFoam>()>
, public BlackOilBrineIntensiveQuantities<TypeTag, getPropValue<TypeTag, Properties::EnableBrine>()>
, public BlackOilEnergyIntensiveQuantitiesGlobalIndex<TypeTag>
, public BlackOilEnergyIntensiveQuantitiesGlobalIndex<TypeTag, getPropValue<TypeTag, Properties::EnableEnergy>()>
, public BlackOilMICPIntensiveQuantities<TypeTag>
, public BlackOilConvectiveMixingIntensiveQuantities<TypeTag>
{
@@ -529,7 +529,7 @@ private:
friend BlackOilSolventIntensiveQuantities<TypeTag, enableSolvent>;
friend BlackOilExtboIntensiveQuantities<TypeTag, enableExtbo>;
friend BlackOilPolymerIntensiveQuantities<TypeTag, enablePolymer>;
friend BlackOilEnergyIntensiveQuantitiesGlobalIndex<TypeTag>;
friend BlackOilEnergyIntensiveQuantitiesGlobalIndex<TypeTag, enableEnergy>;
friend BlackOilFoamIntensiveQuantities<TypeTag, enableFoam>;
friend BlackOilBrineIntensiveQuantities<TypeTag, enableBrine>;
friend BlackOilMICPIntensiveQuantities<TypeTag>;