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 output registration in FlowsContainer

Browse Source
This commit is contained in:
Arne Morten Kvarving 2025-02-14 10:35:29 +01:00
parent 1104851af2
commit 19de6751ca
1 changed files with 36 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
opm/simulators/flow/FlowsContainer.cpp
View File

@ -38,17 +38,18 @@
namespace { namespace {
template<class Scalar> template<class Scalar>
using DataEntry = std::tuple<std::string, Opm::UnitSystem::measure, std::vector<Scalar>&>; using DataEntry = std::tuple<std::string,
Opm::UnitSystem::measure,
std::array<std::vector<Scalar>,6>&>;
template<int idx, class Array, class Scalar> template<int idx, class Array, class Scalar>
void addEntry(std::vector<DataEntry<Scalar>>& container, void addEntry(std::vector<DataEntry<Scalar>>& container,
const std::string& name, const std::string& name,
Opm::UnitSystem::measure measure, Opm::UnitSystem::measure measure,
Array& flowArray, Array& flowArray)
const unsigned faceId)
{ {
if constexpr (idx >= 0) { // Only add if index is valid if constexpr (idx >= 0) { // Only add if index is valid
container.emplace_back(name, measure, flowArray[idx][faceId]); container.emplace_back(name, measure, flowArray[idx]);
} }
} }
@ -261,67 +262,43 @@ template<class FluidSystem>
void FlowsContainer<FluidSystem>:: void FlowsContainer<FluidSystem>::
outputRestart(data::Solution& sol) outputRestart(data::Solution& sol)
{ {
auto doInsert = [&sol](DataEntry<Scalar>& entry, auto doInsert = [&sol](ScalarBuffer& value,
const data::TargetType target) const std::string& name,
UnitSystem::measure measure)
{ {
if (!std::get<2>(entry).empty()) { if (!value.empty()) {
sol.insert(std::get<std::string>(entry), sol.insert(name, measure, std::move(value),
std::get<UnitSystem::measure>(entry), data::TargetType::RESTART_SOLUTION);
std::move(std::get<2>(entry)),
target);
} }
}; };
using Dir = FaceDir::DirEnum; using Dir = FaceDir::DirEnum;
std::vector<DataEntry<Scalar>> floresSolutionVector; std::vector<DataEntry<Scalar>> entries;
addEntry<gasCompIdx>(floresSolutionVector, "FLRGASI+", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::XPlus)); addEntry<gasCompIdx> (entries, "FLRGAS", UnitSystem::measure::rate, flores_);
addEntry<gasCompIdx>(floresSolutionVector, "FLRGASJ+", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::YPlus)); addEntry<oilCompIdx> (entries, "FLROIL", UnitSystem::measure::rate, flores_);
addEntry<gasCompIdx>(floresSolutionVector, "FLRGASK+", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::ZPlus)); addEntry<waterCompIdx>(entries, "FLRWAT", UnitSystem::measure::rate, flores_);
addEntry<gasCompIdx>(floresSolutionVector, "FLRGASI-", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::XMinus)); addEntry<gasCompIdx> (entries, "FLOGAS", UnitSystem::measure::gas_surface_rate, flows_);
addEntry<gasCompIdx>(floresSolutionVector, "FLRGASJ-", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::YMinus)); addEntry<oilCompIdx> (entries, "FLOOIL", UnitSystem::measure::liquid_surface_rate, flows_);
addEntry<gasCompIdx>(floresSolutionVector, "FLRGASK-", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::ZMinus)); addEntry<waterCompIdx>(entries, "FLOWAT", UnitSystem::measure::liquid_surface_rate, flows_);
addEntry<oilCompIdx>(floresSolutionVector, "FLROILI+", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::XPlus));
addEntry<oilCompIdx>(floresSolutionVector, "FLROILJ+", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::YPlus));
addEntry<oilCompIdx>(floresSolutionVector, "FLROILK+", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::ZPlus));
addEntry<oilCompIdx>(floresSolutionVector, "FLROILI-", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::XMinus));
addEntry<oilCompIdx>(floresSolutionVector, "FLROILJ-", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::YMinus));
addEntry<oilCompIdx>(floresSolutionVector, "FLROILK-", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::ZMinus));
addEntry<waterCompIdx>(floresSolutionVector, "FLRWATI+", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::XPlus));
addEntry<waterCompIdx>(floresSolutionVector, "FLRWATJ+", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::YPlus));
addEntry<waterCompIdx>(floresSolutionVector, "FLRWATK+", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::ZPlus));
addEntry<waterCompIdx>(floresSolutionVector, "FLRWATI-", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::XMinus));
addEntry<waterCompIdx>(floresSolutionVector, "FLRWATJ-", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::YMinus));
addEntry<waterCompIdx>(floresSolutionVector, "FLRWATK-", UnitSystem::measure::rate, flores_, FaceDir::ToIntersectionIndex(Dir::ZMinus));
std::vector<DataEntry<Scalar>> flowsSolutionVector; std::for_each(entries.begin(), entries.end(),
addEntry<gasCompIdx>(flowsSolutionVector, "FLOGASI+", UnitSystem::measure::gas_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::XPlus)); [&doInsert](auto& array)
addEntry<gasCompIdx>(flowsSolutionVector, "FLOGASJ+", UnitSystem::measure::gas_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::YPlus)); {
addEntry<gasCompIdx>(flowsSolutionVector, "FLOGASK+", UnitSystem::measure::gas_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::ZPlus)); static const auto dirs = std::array{
addEntry<oilCompIdx>(flowsSolutionVector, "FLOOILI+", UnitSystem::measure::liquid_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::XPlus)); std::pair{FaceDir::ToIntersectionIndex(Dir::XMinus), "I-"},
addEntry<oilCompIdx>(flowsSolutionVector, "FLOOILJ+", UnitSystem::measure::liquid_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::YPlus)); std::pair{FaceDir::ToIntersectionIndex(Dir::XPlus), "I+"},
addEntry<oilCompIdx>(flowsSolutionVector, "FLOOILK+", UnitSystem::measure::liquid_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::ZPlus)); std::pair{FaceDir::ToIntersectionIndex(Dir::YMinus), "J-"},
addEntry<waterCompIdx>(flowsSolutionVector, "FLOWATI+", UnitSystem::measure::liquid_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::XPlus)); std::pair{FaceDir::ToIntersectionIndex(Dir::YPlus), "J+"},
addEntry<waterCompIdx>(flowsSolutionVector, "FLOWATJ+", UnitSystem::measure::liquid_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::YPlus)); std::pair{FaceDir::ToIntersectionIndex(Dir::ZMinus), "K-"},
addEntry<waterCompIdx>(flowsSolutionVector, "FLOWATK+", UnitSystem::measure::liquid_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::ZPlus)); std::pair{FaceDir::ToIntersectionIndex(Dir::ZPlus), "K+"},
addEntry<gasCompIdx>(flowsSolutionVector, "FLOGASI-", UnitSystem::measure::gas_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::XMinus)); };
addEntry<gasCompIdx>(flowsSolutionVector, "FLOGASJ-", UnitSystem::measure::gas_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::YMinus)); const auto& name = std::get<0>(array);
addEntry<gasCompIdx>(flowsSolutionVector, "FLOGASK-", UnitSystem::measure::gas_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::ZMinus)); const auto& measure = std::get<1>(array);
addEntry<oilCompIdx>(flowsSolutionVector, "FLOOILI-", UnitSystem::measure::liquid_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::XMinus)); auto& value = std::get<2>(array);
addEntry<oilCompIdx>(flowsSolutionVector, "FLOOILJ-", UnitSystem::measure::liquid_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::YMinus)); for (const auto& [index, postfix] : dirs) {
addEntry<oilCompIdx>(flowsSolutionVector, "FLOOILK-", UnitSystem::measure::liquid_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::ZMinus)); doInsert(value[index], name + postfix, measure);
addEntry<waterCompIdx>(flowsSolutionVector, "FLOWATI-", UnitSystem::measure::liquid_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::XMinus)); }
addEntry<waterCompIdx>(flowsSolutionVector, "FLOWATJ-", UnitSystem::measure::liquid_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::YMinus)); });
addEntry<waterCompIdx>(flowsSolutionVector, "FLOWATK-", UnitSystem::measure::liquid_surface_rate, flows_, FaceDir::ToIntersectionIndex(Dir::ZMinus));
std::for_each(floresSolutionVector.begin(), floresSolutionVector.end(),
[doInsert](auto& array)
{ doInsert(array, data::TargetType::RESTART_SOLUTION); });
if (this->enableFlows_) {
std::for_each(flowsSolutionVector.begin(), flowsSolutionVector.end(),
[doInsert](auto& array)
{ doInsert(array, data::TargetType::RESTART_SOLUTION); });
}
} }
template<class T> using FS = BlackOilFluidSystem<T,BlackOilDefaultIndexTraits>; template<class T> using FS = BlackOilFluidSystem<T,BlackOilDefaultIndexTraits>;