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

MechContainer: data should be moved into solution container

Browse Source
This commit is contained in:
Arne Morten Kvarving 2025-02-07 12:06:55 +01:00
parent 3b95a1ecca
commit d6ba124e41
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
opm/simulators/flow/MechContainer.cpp
View File

@ -139,23 +139,23 @@ assignStress(const unsigned globalDofIdx,
template<class Scalar>
void MechContainer<Scalar>::
outputRestart(data::Solution& sol) const
outputRestart(data::Solution& sol)
{
if (!allocated_) {
return;
}
using DataEntry = std::tuple<std::string,
UnitSystem::measure,
std::variant<const std::vector<Scalar>*,
const std::array<std::vector<Scalar>,3>*,
const VoigtArray<Scalar>*>>;
std::variant<std::vector<Scalar>*,
std::array<std::vector<Scalar>,3>*,
VoigtArray<Scalar>*>>;
auto doInsert = [&sol](const std::string& name,
const UnitSystem::measure& measure,
const std::vector<Scalar>& entry)
std::vector<Scalar>& entry)
{
if (!entry.empty()) {
sol.insert(name, measure, entry, data::TargetType::RESTART_OPM_EXTENDED);
sol.insert(name, measure, std::move(entry), data::TargetType::RESTART_OPM_EXTENDED);
}
};
@ -172,25 +172,25 @@ outputRestart(data::Solution& sol) const
};
std::for_each(solutionVectors.begin(), solutionVectors.end(),
[&doInsert](const auto& array)
[&doInsert](auto& array)
{
std::visit(VisitorOverloadSet{
[&array, &doInsert](const std::vector<Scalar>* v)
[&array, &doInsert](std::vector<Scalar>* v)
{
doInsert(std::get<0>(array), std::get<1>(array), *v);
},
[&array, &doInsert](const std::array<std::vector<Scalar>,3>* V)
[&array, &doInsert](std::array<std::vector<Scalar>,3>* V)
{
const auto& v = *V;
auto& v = *V;
const auto& name = std::get<0>(array);
const auto& measure = std::get<1>(array);
doInsert(name + "X", measure, v[0]);
doInsert(name + "Y", measure, v[1]);
doInsert(name + "Z", measure, v[2]);
},
[&array, &doInsert](const VoigtArray<Scalar>* V)
[&array, &doInsert](VoigtArray<Scalar>* V)
{
const auto& v = *V;
auto& v = *V;
const auto& name = std::get<0>(array);
const auto& measure = std::get<1>(array);
doInsert(name + "XX", measure, v[VoigtIndex::XX]);
@ -203,6 +203,8 @@ outputRestart(data::Solution& sol) const
}, std::get<2>(array));
}
);
allocated_ = false;
}
template class MechContainer<double>;

2
opm/simulators/flow/MechContainer.hpp
View File

@ -72,7 +72,7 @@ public:
void assignStress(const unsigned globalDofIdx,
const Dune::FieldVector<Scalar,6>& stress);
void outputRestart(data::Solution& sol) const;
void outputRestart(data::Solution& sol);
bool allocated() const
{ return allocated_; }