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

move assignment of free tracer concentration into TracerContainer

Browse Source
This commit is contained in:
Arne Morten Kvarving 2025-02-14 09:14:56 +01:00
parent 7386655b65
commit 00fe560720
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/simulators/flow/OutputBlackoilModule.hpp
View File

@ -645,15 +645,11 @@ public:
// tracers
const auto& tracerModel = simulator_.problem().tracerModel();
if (! this->tracerC_.freeConcentrations_.empty()) {
for (int tracerIdx = 0; tracerIdx < tracerModel.numTracers(); ++tracerIdx) {
if (this->tracerC_.freeConcentrations_[tracerIdx].empty()) {
continue;
}
this->tracerC_.freeConcentrations_[tracerIdx][globalDofIdx] =
tracerModel.freeTracerConcentration(tracerIdx, globalDofIdx);
}
}
this->tracerC_.assignFreeConcentrations(globalDofIdx,
[globalDofIdx, &tracerModel](const unsigned tracerIdx)
{ return tracerModel.freeTracerConcentration(tracerIdx,
globalDofIdx); });
if (! this->tracerC_.solConcentrations_.empty()) {
for (int tracerIdx = 0; tracerIdx < tracerModel.numTracers(); ++tracerIdx) {
if (this->tracerC_.solConcentrations_[tracerIdx].empty()) {

15
opm/simulators/flow/TracerContainer.cpp
View File

@ -61,6 +61,21 @@ allocate(const unsigned bufferSize)
}
}
template<class FluidSystem>
void TracerContainer<FluidSystem>::
assignFreeConcentrations(const unsigned globalDofIdx,
const AssignFunction& concentration)
{
std::for_each(freeConcentrations_.begin(), freeConcentrations_.end(),
[globalDofIdx, idx = 0, &concentration](auto& tracer) mutable
{
if (!tracer.empty()) {
tracer[globalDofIdx] = concentration(idx);
}
++idx;
});
}
template<class FluidSystem>
void TracerContainer<FluidSystem>::
outputRestart(data::Solution& sol)

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

@ -26,6 +26,7 @@
#ifndef OPM_TRACER_CONTAINER_HPP
#define OPM_TRACER_CONTAINER_HPP
#include <functional>
#include <vector>
namespace Opm {
@ -46,6 +47,11 @@ public:
void allocate(const unsigned bufferSize);
using AssignFunction = std::function<Scalar(const unsigned)>;
void assignFreeConcentrations(const unsigned globalDofIdx,
const AssignFunction& concentration);
void outputRestart(data::Solution& sol);
const EclipseState& eclState_;