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

Change to new compositional fluid system

Browse Source
This commit is contained in:
Svenn Tveit 2025-02-05 08:35:18 +01:00
parent 4be8a5c673
commit 20ca154278
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@
#include <opm/material/fluidsystems/BlackOilDefaultIndexTraits.hpp> #include <opm/material/fluidsystems/BlackOilDefaultIndexTraits.hpp>
#include <opm/material/fluidsystems/BlackOilFluidSystem.hpp> #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
#include <opm/material/fluidsystems/GenericOilGasFluidSystem.hpp> #include <opm/material/fluidsystems/GenericOilGasWaterFluidSystem.hpp>
#include <opm/output/data/Solution.hpp> #include <opm/output/data/Solution.hpp>
@ -438,16 +438,27 @@ INSTANTIATE_TYPE(double)
INSTANTIATE_TYPE(float) INSTANTIATE_TYPE(float)
#endif #endif
#define INSTANTIATE_COMP(NUM) \ #define INSTANTIATE_COMP_THREEPHASE(NUM) \
template<class T> using FS##NUM = GenericOilGasFluidSystem<T, NUM>; \ template<class T> using FS##NUM = GenericOilGasWaterFluidSystem<T, NUM, true>; \
template class FIPContainer<FS##NUM<double>>; template class FIPContainer<FS##NUM<double>>;
INSTANTIATE_COMP(0) INSTANTIATE_COMP_THREEPHASE(0)
INSTANTIATE_COMP(2) INSTANTIATE_COMP_THREEPHASE(2)
INSTANTIATE_COMP(3) INSTANTIATE_COMP_THREEPHASE(3)
INSTANTIATE_COMP(4) INSTANTIATE_COMP_THREEPHASE(4)
INSTANTIATE_COMP(5) INSTANTIATE_COMP_THREEPHASE(5)
INSTANTIATE_COMP(6) INSTANTIATE_COMP_THREEPHASE(6)
INSTANTIATE_COMP(7) 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)
} // namespace Opm } // namespace Opm