OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-26 07:30:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

BlackOilExtboModule: only include where needed

Browse Source
This commit is contained in:
Arne Morten Kvarving committed 2026-06-04 14:29:32 +02:00
1 parent 48051c723d
commit a5d903cea2
10 files changed
+7 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

flow/flow_extbo.cpp
+1
View File
@@ -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>
flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
-2
View File
@@ -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);
opm/models/blackoil/blackoilextbomodules.hh
+5 -18
View File
@@ -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
opm/models/blackoil/blackoilintensivequantities.hh
-1
View File
@@ -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>
opm/models/blackoil/blackoillocalresidual.hh
-1
View File
@@ -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>
opm/models/blackoil/blackoillocalresidualtpfa.hh
-1
View File
@@ -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>
opm/models/blackoil/blackoilmodel.hh
-1
View File
@@ -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>
opm/models/blackoil/blackoilmodules.hpp
+1
View File
@@ -45,6 +45,7 @@ DECLARE_MODULE(BlackOilBrine)
DECLARE_MODULE(BlackOilConvectiveMixing)
DECLARE_MODULE(BlackOilDiffusion)
DECLARE_MODULE(BlackOilDispersion)
DECLARE_MODULE(BlackOilExtbo)
#undef DECLARE_MODULE
opm/models/blackoil/blackoilprimaryvariables.hh
-1
View File
@@ -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>
opm/simulators/wells/StandardWell.hpp
-1
View File
@@ -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>