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 extraction of MICP solution into MICPContainer

Browse Source
This commit is contained in:
Arne Morten Kvarving 2025-02-07 09:33:20 +01:00
parent d1e2d81d84
commit 1fefab59d6
3 changed files with 23 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
opm/simulators/flow/FlowProblemBlackoil.hpp
View File

@ -1142,6 +1142,10 @@ protected:
// Initialize mixing controls before trying to set any lastRx valuesx // Initialize mixing controls before trying to set any lastRx valuesx
this->mixControls_.init(numElems, restart_step, eclState.runspec().tabdims().getNumPVTTables()); this->mixControls_.init(numElems, restart_step, eclState.runspec().tabdims().getNumPVTTables());
if constexpr (enableMICP) {
this->micp_ = this->eclWriter_->outputModule().getMICP().getSolution();
}
for (std::size_t elemIdx = 0; elemIdx < numElems; ++elemIdx) { for (std::size_t elemIdx = 0; elemIdx < numElems; ++elemIdx) {
auto& elemFluidState = this->initialFluidStates_[elemIdx]; auto& elemFluidState = this->initialFluidStates_[elemIdx];
elemFluidState.setPvtRegionIndex(pvtRegionIndex(elemIdx)); elemFluidState.setPvtRegionIndex(pvtRegionIndex(elemIdx));
@ -1179,13 +1183,6 @@ protected:
if constexpr (enablePolymer) if constexpr (enablePolymer)
this->polymer_.concentration[elemIdx] = this->eclWriter_->outputModule().getPolymerConcentration(elemIdx); this->polymer_.concentration[elemIdx] = this->eclWriter_->outputModule().getPolymerConcentration(elemIdx);
if constexpr (enableMICP){
this->micp_.microbialConcentration[elemIdx] = this->eclWriter_->outputModule().getMICP().getMicrobialConcentration(elemIdx);
this->micp_.oxygenConcentration[elemIdx] = this->eclWriter_->outputModule().getMICP().getOxygenConcentration(elemIdx);
this->micp_.ureaConcentration[elemIdx] = this->eclWriter_->outputModule().getMICP().getUreaConcentration(elemIdx);
this->micp_.biofilmConcentration[elemIdx] = this->eclWriter_->outputModule().getMICP().getBiofilmConcentration(elemIdx);
this->micp_.calciteConcentration[elemIdx] = this->eclWriter_->outputModule().getMICP().getCalciteConcentration(elemIdx);
}
// if we need to restart for polymer molecular weight simulation, we need to add related here // if we need to restart for polymer molecular weight simulation, we need to add related here
} }

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

@ -27,6 +27,8 @@
#include <opm/output/data/Solution.hpp> #include <opm/output/data/Solution.hpp>
#include <opm/simulators/flow/SolutionContainers.hpp>
#include <algorithm> #include <algorithm>
#include <array> #include <array>
#include <string> #include <string>
@ -63,6 +65,20 @@ assign(const unsigned globalDofIdx,
cCalcite_[globalDofIdx] = calciteConcentration; cCalcite_[globalDofIdx] = calciteConcentration;
} }
template<class Scalar>
MICPSolutionContainer<Scalar>
MICPContainer<Scalar>::
getSolution() const
{
return {
cMicrobes_,
cOxygen_,
cUrea_,
cBiofilm_,
cCalcite_
};
}
template<class Scalar> template<class Scalar>
void MICPContainer<Scalar>:: void MICPContainer<Scalar>::
outputRestart(data::Solution& sol) outputRestart(data::Solution& sol)

43
opm/simulators/flow/MICPContainer.hpp
View File

@ -31,6 +31,7 @@
namespace Opm { namespace Opm {
namespace data { class Solution; } namespace data { class Solution; }
template<class Scalar> class MICPSolutionContainer;
template<class Scalar> template<class Scalar>
class MICPContainer class MICPContainer
@ -47,6 +48,8 @@ public:
const Scalar biofilmConcentration, const Scalar biofilmConcentration,
const Scalar calciteConcentration); const Scalar calciteConcentration);
MICPSolutionContainer<Scalar> getSolution() const;
void outputRestart(data::Solution& sol); void outputRestart(data::Solution& sol);
void readRestart(const unsigned globalDofIdx, void readRestart(const unsigned globalDofIdx,
@ -56,46 +59,6 @@ public:
bool allocated() const bool allocated() const
{ return allocated_; } { return allocated_; }
Scalar getMicrobialConcentration(unsigned elemIdx) const
{
if (cMicrobes_.size() > elemIdx)
return cMicrobes_[elemIdx];
return 0;
}
Scalar getOxygenConcentration(unsigned elemIdx) const
{
if (cOxygen_.size() > elemIdx)
return cOxygen_[elemIdx];
return 0;
}
Scalar getUreaConcentration(unsigned elemIdx) const
{
if (cUrea_.size() > elemIdx)
return cUrea_[elemIdx];
return 0;
}
Scalar getBiofilmConcentration(unsigned elemIdx) const
{
if (cBiofilm_.size() > elemIdx)
return cBiofilm_[elemIdx];
return 0;
}
Scalar getCalciteConcentration(unsigned elemIdx) const
{
if (cCalcite_.size() > elemIdx)
return cCalcite_[elemIdx];
return 0;
}
bool allocated_ = false; bool allocated_ = false;
ScalarBuffer cMicrobes_; ScalarBuffer cMicrobes_;
ScalarBuffer cOxygen_; ScalarBuffer cOxygen_;