OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Simplify macro calls

Browse Source
This commit is contained in:
Svenn Tveit
2025-02-05 09:27:02 +01:00
parent 20ca154278
commit 21321231a7
2 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
opm/simulators/flow/FIPContainer.cpp
View File

@@ -442,23 +442,20 @@ INSTANTIATE_TYPE(float)
template<class T> using FS##NUM = GenericOilGasWaterFluidSystem<T, NUM, true>; \
template class FIPContainer<FS##NUM<double>>;
INSTANTIATE_COMP_THREEPHASE(0)
INSTANTIATE_COMP_THREEPHASE(2)
INSTANTIATE_COMP_THREEPHASE(3)
INSTANTIATE_COMP_THREEPHASE(4)
INSTANTIATE_COMP_THREEPHASE(5)
INSTANTIATE_COMP_THREEPHASE(6)
INSTANTIATE_COMP_THREEPHASE(7)
#define INSTANTIATE_COMP_TWOPHASE(NUM) \
template<class T> using GFS##NUM = GenericOilGasWaterFluidSystem<T, NUM, false>; \
template class FIPContainer<GFS##NUM<double>>;
INSTANTIATE_COMP_TWOPHASE(2)
INSTANTIATE_COMP_TWOPHASE(3)
INSTANTIATE_COMP_TWOPHASE(4)
INSTANTIATE_COMP_TWOPHASE(5)
INSTANTIATE_COMP_TWOPHASE(6)
INSTANTIATE_COMP_TWOPHASE(7)
#define INSTANTIATE_COMP(NUM) \
INSTANTIATE_COMP_THREEPHASE(NUM) \
INSTANTIATE_COMP_TWOPHASE(NUM)
INSTANTIATE_COMP_THREEPHASE(0) // \Note: to register the parameter ForceDisableFluidInPlaceOutput
INSTANTIATE_COMP(2)
INSTANTIATE_COMP(3)
INSTANTIATE_COMP(4)
INSTANTIATE_COMP(5)
INSTANTIATE_COMP(6)
INSTANTIATE_COMP(7)
} // namespace Opm

25
opm/simulators/flow/GenericOutputBlackoilModule.cpp
View File

@@ -1680,23 +1680,20 @@ INSTANTIATE_TYPE(float)
template<class T> using FS##NUM = GenericOilGasWaterFluidSystem<T, NUM, true>; \
template class GenericOutputBlackoilModule<FS##NUM<double>>;
INSTANTIATE_COMP_THREEPHASE(0) // \Note: to register the parameter ForceDisableFluidInPlaceOutput
INSTANTIATE_COMP_THREEPHASE(2)
INSTANTIATE_COMP_THREEPHASE(3)
INSTANTIATE_COMP_THREEPHASE(4)
INSTANTIATE_COMP_THREEPHASE(5)
INSTANTIATE_COMP_THREEPHASE(6)
INSTANTIATE_COMP_THREEPHASE(7)
#define INSTANTIATE_COMP_TWOPHASE(NUM) \
template<class T> using GFS##NUM = GenericOilGasWaterFluidSystem<T, NUM, false>; \
template class GenericOutputBlackoilModule<GFS##NUM<double>>;
INSTANTIATE_COMP_TWOPHASE(2)
INSTANTIATE_COMP_TWOPHASE(3)
INSTANTIATE_COMP_TWOPHASE(4)
INSTANTIATE_COMP_TWOPHASE(5)
INSTANTIATE_COMP_TWOPHASE(6)
INSTANTIATE_COMP_TWOPHASE(7)
#define INSTANTIATE_COMP(NUM) \
INSTANTIATE_COMP_THREEPHASE(NUM) \
INSTANTIATE_COMP_TWOPHASE(NUM)
INSTANTIATE_COMP_THREEPHASE(0) // \Note: to register the parameter ForceDisableFluidInPlaceOutput
INSTANTIATE_COMP(2)
INSTANTIATE_COMP(3)
INSTANTIATE_COMP(4)
INSTANTIATE_COMP(5)
INSTANTIATE_COMP(6)
INSTANTIATE_COMP(7)
} // namespace Opm