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

OutputBlackoilModule: move updateInplaceVolumesSurface to FIPContainer

Browse Source
This commit is contained in:
Arne Morten Kvarving 2025-01-30 16:37:05 +01:00
parent 63042c25ee
commit 3ffd6594f2
3 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
opm/simulators/flow/FIPContainer.cpp
View File

@ -184,6 +184,43 @@ assignGasWater(const unsigned globalDofIdx,
} }
} }
template<class FluidSystem>
void
FIPContainer<FluidSystem>::
assignVolumesSurface(const unsigned globalDofIdx,
const std::array<Scalar, numPhases>& fip)
{
if (FluidSystem::phaseIsActive(oilPhaseIdx) &&
!this->fip_[Inplace::Phase::OIL].empty())
{
this->fip_[Inplace::Phase::OIL][globalDofIdx] = fip[oilPhaseIdx];
}
if (FluidSystem::phaseIsActive(oilPhaseIdx) &&
!this->fip_[Inplace::Phase::OilInLiquidPhase].empty())
{
this->fip_[Inplace::Phase::OilInLiquidPhase][globalDofIdx] = fip[oilPhaseIdx];
}
if (FluidSystem::phaseIsActive(gasPhaseIdx) &&
!this->fip_[Inplace::Phase::GAS].empty())
{
this->fip_[Inplace::Phase::GAS][globalDofIdx] = fip[gasPhaseIdx];
}
if (FluidSystem::phaseIsActive(gasPhaseIdx) &&
!this->fip_[Inplace::Phase::GasInGasPhase].empty())
{
this->fip_[Inplace::Phase::GasInGasPhase][globalDofIdx] = fip[gasPhaseIdx];
}
if (FluidSystem::phaseIsActive(waterPhaseIdx) &&
!this->fip_[Inplace::Phase::WATER].empty())
{
this->fip_[Inplace::Phase::WATER][globalDofIdx] = fip[waterPhaseIdx];
}
}
template<class T> using FS = BlackOilFluidSystem<T,BlackOilDefaultIndexTraits>; template<class T> using FS = BlackOilFluidSystem<T,BlackOilDefaultIndexTraits>;
#define INSTANTIATE_TYPE(T) \ #define INSTANTIATE_TYPE(T) \

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

@ -44,6 +44,7 @@ public:
using FIPMap = std::unordered_map<Inplace::Phase, std::vector<Scalar>>; using FIPMap = std::unordered_map<Inplace::Phase, std::vector<Scalar>>;
static constexpr auto numPhases = FluidSystem::numPhases; static constexpr auto numPhases = FluidSystem::numPhases;
static constexpr auto gasPhaseIdx = FluidSystem::gasPhaseIdx;
static constexpr auto oilPhaseIdx = FluidSystem::oilPhaseIdx; static constexpr auto oilPhaseIdx = FluidSystem::oilPhaseIdx;
static constexpr auto waterPhaseIdx = FluidSystem::waterPhaseIdx; static constexpr auto waterPhaseIdx = FluidSystem::waterPhaseIdx;
@ -77,6 +78,9 @@ public:
const Scalar gasInPlaceWater, const Scalar gasInPlaceWater,
const Scalar waterInPlaceGas); const Scalar waterInPlaceGas);
void assignVolumesSurface(const unsigned globalDofIdx,
const std::array<Scalar, numPhases>& fip);
private: private:
FIPMap& fip_; FIPMap& fip_;
std::size_t bufferSize_ = 0; std::size_t bufferSize_ = 0;

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

@ -1483,7 +1483,7 @@ private:
fip [phaseIdx] = b * fipr[phaseIdx]; fip [phaseIdx] = b * fipr[phaseIdx];
} }
this->updateInplaceVolumesSurface(globalDofIdx, fip); this->fipC_.assignVolumesSurface(globalDofIdx, fip);
this->updateInplaceVolumesReservoir(globalDofIdx, fs, fipr); this->updateInplaceVolumesReservoir(globalDofIdx, fs, fipr);
if (FluidSystem::phaseIsActive(oilPhaseIdx) && if (FluidSystem::phaseIsActive(oilPhaseIdx) &&
@ -1527,41 +1527,6 @@ private:
} }
} }
template <typename FIPArray>
void updateInplaceVolumesSurface(const unsigned globalDofIdx,
const FIPArray& fip)
{
if (FluidSystem::phaseIsActive(oilPhaseIdx) &&
!this->fip_[Inplace::Phase::OIL].empty())
{
this->fip_[Inplace::Phase::OIL][globalDofIdx] = fip[oilPhaseIdx];
}
if (FluidSystem::phaseIsActive(oilPhaseIdx) &&
!this->fip_[Inplace::Phase::OilInLiquidPhase].empty())
{
this->fip_[Inplace::Phase::OilInLiquidPhase][globalDofIdx] = fip[oilPhaseIdx];
}
if (FluidSystem::phaseIsActive(gasPhaseIdx) &&
!this->fip_[Inplace::Phase::GAS].empty())
{
this->fip_[Inplace::Phase::GAS][globalDofIdx] = fip[gasPhaseIdx];
}
if (FluidSystem::phaseIsActive(gasPhaseIdx) &&
!this->fip_[Inplace::Phase::GasInGasPhase].empty())
{
this->fip_[Inplace::Phase::GasInGasPhase][globalDofIdx] = fip[gasPhaseIdx];
}
if (FluidSystem::phaseIsActive(waterPhaseIdx) &&
!this->fip_[Inplace::Phase::WATER].empty())
{
this->fip_[Inplace::Phase::WATER][globalDofIdx] = fip[waterPhaseIdx];
}
}
template <typename FluidState, typename FIPArray> template <typename FluidState, typename FIPArray>
void updateInplaceVolumesReservoir(const unsigned globalDofIdx, void updateInplaceVolumesReservoir(const unsigned globalDofIdx,
const FluidState& fs, const FluidState& fs,