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

Merge pull request #5979 from akva2/fix_instant

Browse Source 
fix: instantiation of CompositionalContainer
This commit is contained in:
Arne Morten Kvarving
2025-02-13 13:52:37 +01:00
committed by GitHub
parent 363d2eb902 41fbfb3d22
commit ca550d325d
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
opm/simulators/flow/CompositionalContainer.cpp
View File

@@ -23,7 +23,7 @@
#include <config.h> #include <config.h>
#include <opm/simulators/flow/CompositionalContainer.hpp> #include <opm/simulators/flow/CompositionalContainer.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>
@@ -168,11 +168,19 @@ outputRestart(data::Solution& sol,
this->allocated_ = false; this->allocated_ = false;
} }
#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 CompositionalContainer<FS##NUM<double>>; template class CompositionalContainer<FS##NUM<double>>;
INSTANTIATE_COMP(0) #define INSTANTIATE_COMP_TWOPHASE(NUM) \
template<class T> using GFS##NUM = GenericOilGasWaterFluidSystem<T, NUM, false>; \
template class CompositionalContainer<GFS##NUM<double>>;
#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(2)
INSTANTIATE_COMP(3) INSTANTIATE_COMP(3)
INSTANTIATE_COMP(4) INSTANTIATE_COMP(4)