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

FIPContainer: take ownership of map

Browse Source
This commit is contained in:
Arne Morten Kvarving 2025-01-31 10:59:42 +01:00
parent 651ecf7223
commit e78ce63b4e
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/simulators/flow/FIPContainer.hpp
View File

@ -54,10 +54,6 @@ public:
static constexpr auto oilPhaseIdx = FluidSystem::oilPhaseIdx; static constexpr auto oilPhaseIdx = FluidSystem::oilPhaseIdx;
static constexpr auto waterPhaseIdx = FluidSystem::waterPhaseIdx; static constexpr auto waterPhaseIdx = FluidSystem::waterPhaseIdx;
// Temporary constructor until we are ready to own the map
explicit FIPContainer(FIPMap& fip)
: fip_(fip) {}
bool allocate(const std::size_t bufferSize, bool allocate(const std::size_t bufferSize,
const SummaryConfig& summaryConfig, const SummaryConfig& summaryConfig,
const bool forceAlloc, const bool forceAlloc,
@ -112,7 +108,7 @@ public:
void outputRestart(data::Solution& sol); void outputRestart(data::Solution& sol);
private: private:
FIPMap& fip_; FIPMap fip_{};
std::size_t bufferSize_ = 0; std::size_t bufferSize_ = 0;
struct OutputRestart struct OutputRestart

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

@ -125,7 +125,6 @@ GenericOutputBlackoilModule(const EclipseState& eclState,
, enableExtbo_(enableExtbo) , enableExtbo_(enableExtbo)
, enableMICP_(enableMICP) , enableMICP_(enableMICP)
, isCompositional_(isCompositional) , isCompositional_(isCompositional)
, fipC_(fip_)
, local_data_valid_(false) , local_data_valid_(false)
{ {
const auto& fp = eclState_.fieldProps(); const auto& fp = eclState_.fieldProps();

1
opm/simulators/flow/GenericOutputBlackoilModule.hpp
View File

@ -438,7 +438,6 @@ protected:
bool enableFlowsn_{false}; bool enableFlowsn_{false};
bool enableFloresn_{false}; bool enableFloresn_{false};
std::unordered_map<Inplace::Phase, ScalarBuffer> fip_;
FIPContainer<FluidSystem> fipC_; FIPContainer<FluidSystem> fipC_;
std::unordered_map<std::string, std::vector<int>> regions_; std::unordered_map<std::string, std::vector<int>> regions_;
std::unordered_map<Inplace::Phase, std::vector<SummaryConfigNode>> regionNodes_; std::unordered_map<Inplace::Phase, std::vector<SummaryConfigNode>> regionNodes_;