OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-11-02 09:16:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7139 from akva2/solvent_only_where_needed

Browse Source 
BlackOilSolventModule: only include where needed
This commit is contained in:
Arne Morten Kvarving authored and GitHub committed 2026-06-05 15:16:21 +02:00
2 parents e307ec78d9 fde3f7f07a
commit f6c253a3f9
15 files changed
+7 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

flow/flow_gaswater_solvent.cpp
+1
View File
@@ -24,6 +24,7 @@
#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
#include <opm/models/blackoil/blackoildiffusionmodule.hh>
#include <opm/models/blackoil/blackoilsolventmodules.hh>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>
#include <opm/simulators/flow/Main.hpp>
flow/flow_solvent.cpp
+1
View File
@@ -24,6 +24,7 @@
#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
#include <opm/models/blackoil/blackoildiffusionmodule.hh>
#include <opm/models/blackoil/blackoilsolventmodules.hh>
#include <opm/simulators/flow/Main.hpp>
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
flow/flow_solvent_foam.cpp
+1
View File
@@ -25,6 +25,7 @@
#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
#include <opm/models/blackoil/blackoildiffusionmodule.hh>
#include <opm/models/blackoil/blackoilfoammodules.hh>
#include <opm/models/blackoil/blackoilsolventmodules.hh>
#include <opm/simulators/flow/Main.hpp>
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
-1
View File
@@ -42,7 +42,6 @@
#include <opm/models/blackoil/blackoilmodules.hpp>
#include <opm/models/blackoil/blackoilproperties.hh>
#include <opm/models/blackoil/blackoilsolventmodules.hh>
#include <opm/models/blackoil/blackoilenergymodules.hh>
#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
#include <opm/models/common/directionalmobility.hh>
opm/models/blackoil/blackoilextensivequantities.hh
-1
View File
@@ -30,7 +30,6 @@
#include <opm/models/blackoil/blackoilmodules.hpp>
#include <opm/models/blackoil/blackoilenergymodules.hh>
#include <opm/models/blackoil/blackoilsolventmodules.hh>
#include <opm/models/common/multiphasebaseextensivequantities.hh>
namespace Opm {
opm/models/blackoil/blackoilintensivequantities.hh
-1
View File
@@ -40,7 +40,6 @@
#include <opm/models/blackoil/blackoilmodules.hpp>
#include <opm/models/blackoil/blackoilenergymodules.hh>
#include <opm/models/blackoil/blackoilproperties.hh>
#include <opm/models/blackoil/blackoilsolventmodules.hh>
#include <opm/models/common/directionalmobility.hh>
#include <opm/common/ErrorMacros.hpp>
#include <opm/common/utility/gpuDecorators.hpp>
opm/models/blackoil/blackoillocalresidual.hh
-1
View File
@@ -34,7 +34,6 @@
#include <opm/models/blackoil/blackoilmodules.hpp>
#include <opm/models/blackoil/blackoilenergymodules.hh>
#include <opm/models/blackoil/blackoilproperties.hh>
#include <opm/models/blackoil/blackoilsolventmodules.hh>
#include <cassert>
opm/models/blackoil/blackoillocalresidualtpfa.hh
-2
View File
@@ -40,8 +40,6 @@
#include <opm/models/blackoil/blackoilenergymodules.hh>
#include <opm/models/blackoil/blackoilmoduleparams.hh>
#include <opm/models/blackoil/blackoilproperties.hh>
#include <opm/models/blackoil/blackoilsolventmodules.hh>
#include <opm/models/blackoil/blackoilmoduleparams.hh>
#include <opm/common/ErrorMacros.hpp>
#include <opm/common/utility/gpuDecorators.hpp>
opm/models/blackoil/blackoilmodel.hh
-1
View File
@@ -45,7 +45,6 @@
#include <opm/models/blackoil/blackoilproblem.hh>
#include <opm/models/blackoil/blackoilproperties.hh>
#include <opm/models/blackoil/blackoilratevector.hh>
#include <opm/models/blackoil/blackoilsolventmodules.hh>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>
#include <opm/models/common/multiphasebasemodel.hh>
opm/models/blackoil/blackoilmodules.hpp
+1
View File
@@ -54,6 +54,7 @@ DECLARE_MODULE(BlackOilDispersion)
DECLARE_MODULE(BlackOilExtbo)
DECLARE_MODULE(BlackOilFoam)
DECLARE_MODULE(BlackOilPolymer)
DECLARE_MODULE(BlackOilSolvent)
#undef DECLARE_MODULE
opm/models/blackoil/blackoilprimaryvariables.hh
-1
View File
@@ -37,7 +37,6 @@
#include <opm/models/blackoil/blackoilenergymodules.hh>
#include <opm/models/blackoil/blackoilmeanings.hh>
#include <opm/models/blackoil/blackoilproperties.hh>
#include <opm/models/blackoil/blackoilsolventmodules.hh>
#include <opm/models/discretization/common/fvbaseprimaryvariables.hh>
opm/models/blackoil/blackoilratevector.hh
+1 -1
View File
@@ -35,7 +35,7 @@
#include <opm/material/constraintsolvers/NcpFlash.hpp>
#include <opm/models/blackoil/blackoilmodules.hpp>
#include <opm/models/blackoil/blackoilsolventmodules.hh>
#include <opm/models/blackoil/blackoilproperties.hh>
#include <opm/models/common/multiphasebaseproperties.hh>
#include <opm/models/discretization/common/fvbaseproperties.hh>
opm/models/blackoil/blackoilsolventmodules.hh
+1 -26
View File
@@ -37,6 +37,7 @@
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/fluidsystems/blackoilpvt/SolventPvt.hpp>
#include <opm/models/blackoil/blackoilmodules.hpp>
#include <opm/models/blackoil/blackoilproperties.hh>
#include <opm/models/blackoil/blackoilsolventparams.hpp>
@@ -54,15 +55,10 @@
#include <istream>
#include <memory>
#include <ostream>
#include <stdexcept>
#include <string>
namespace Opm {
template <class TypeTag, bool enableSolventV>
class BlackOilSolventModule;
/*!
* \ingroup BlackOil
* \brief Contains the high level supplements required to extend the black oil
@@ -525,14 +521,6 @@ template <class TypeTag>
BlackOilSolventParams<typename BlackOilSolventModule<TypeTag, true>::Scalar>
BlackOilSolventModule<TypeTag, true>::params_;
template <class TypeTag>
class BlackOilSolventModule<TypeTag, false>
{
};
template <class TypeTag, bool enableSolventV>
class BlackOilSolventIntensiveQuantities;
/*!
* \ingroup BlackOil
* \class Opm::BlackOilSolventIntensiveQuantities
@@ -1129,14 +1117,6 @@ protected:
Scalar solventRefDensity_;
};
template <class TypeTag>
class BlackOilSolventIntensiveQuantities<TypeTag, false>
{
};
template <class TypeTag, bool enableSolventV>
class BlackOilSolventExtensiveQuantities;
/*!
* \ingroup BlackOil
* \class Opm::BlackOilSolventExtensiveQuantities
@@ -1378,11 +1358,6 @@ private:
unsigned solventDownstreamDofIdx_;
};
template <class TypeTag>
class BlackOilSolventExtensiveQuantities<TypeTag, false>
{
};
} // namespace Opm
#endif
opm/simulators/flow/NewTranFluxModule.hpp
+1 -1
View File
@@ -126,13 +126,13 @@ class NewTranExtensiveQuantities
enum { dimWorld = GridView::dimensionworld };
enum { gasPhaseIdx = FluidSystem::gasPhaseIdx };
enum { numPhases = FluidSystem::numPhases };
static constexpr bool enableSolvent = getPropValue<TypeTag, Properties::EnableSolvent>();
static constexpr bool enableConvectiveMixing = getPropValue<TypeTag, Properties::EnableConvectiveMixing>();
static constexpr bool enableExtbo = getPropValue<TypeTag, Properties::EnableExtbo>();
static constexpr bool enableEnergy =
getPropValue<TypeTag, Properties::EnergyModuleType>() == EnergyModules::FullyImplicitThermal;
static constexpr bool enablePolymer = getPropValue<TypeTag, Properties::EnablePolymer>();
static constexpr bool enableSolvent = getPropValue<TypeTag, Properties::EnableSolvent>();
using Toolbox = MathToolbox<Evaluation>;
using DimVector = Dune::FieldVector<Scalar, dimWorld>;
opm/simulators/wells/StandardWell.hpp
-1
View File
@@ -32,7 +32,6 @@
#include <opm/simulators/wells/WellProdIndexCalculator.hpp>
#include <opm/simulators/wells/ParallelWellInfo.hpp>
#include <opm/models/blackoil/blackoilsolventmodules.hh>
#include <opm/models/blackoil/blackoilmodules.hpp>
#include <opm/material/densead/Evaluation.hpp>