mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
move assignment of porevolume fip values into FIPContainer
This commit is contained in:
@@ -297,6 +297,15 @@ assignOilGasDistribution(const unsigned globalDofIdx,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<class FluidSystem>
|
||||||
|
void
|
||||||
|
FIPContainer<FluidSystem>::
|
||||||
|
assignPoreVolume(const unsigned globalDofIdx,
|
||||||
|
const Scalar value)
|
||||||
|
{
|
||||||
|
this->fip_[Inplace::Phase::PoreVolume][globalDofIdx] = value;
|
||||||
|
}
|
||||||
|
|
||||||
template<class T> using FS = BlackOilFluidSystem<T,BlackOilDefaultIndexTraits>;
|
template<class T> using FS = BlackOilFluidSystem<T,BlackOilDefaultIndexTraits>;
|
||||||
|
|
||||||
#define INSTANTIATE_TYPE(T) \
|
#define INSTANTIATE_TYPE(T) \
|
||||||
|
|||||||
@@ -86,6 +86,9 @@ public:
|
|||||||
const Scalar gasInPlaceLiquid,
|
const Scalar gasInPlaceLiquid,
|
||||||
const Scalar oilInPlaceGas);
|
const Scalar oilInPlaceGas);
|
||||||
|
|
||||||
|
void assignPoreVolume(const unsigned globalDofIdx,
|
||||||
|
const Scalar value);
|
||||||
|
|
||||||
void assignVolumesSurface(const unsigned globalDofIdx,
|
void assignVolumesSurface(const unsigned globalDofIdx,
|
||||||
const std::array<Scalar, numPhases>& fip);
|
const std::array<Scalar, numPhases>& fip);
|
||||||
|
|
||||||
|
|||||||
@@ -1427,8 +1427,8 @@ private:
|
|||||||
const auto hydrocarbon = this->hydroCarbonFraction(fs);
|
const auto hydrocarbon = this->hydroCarbonFraction(fs);
|
||||||
|
|
||||||
if (! this->hydrocarbonPoreVolume_.empty()) {
|
if (! this->hydrocarbonPoreVolume_.empty()) {
|
||||||
this->fip_[Inplace::Phase::PoreVolume][globalDofIdx] =
|
this->fipC_.assignPoreVolume(globalDofIdx,
|
||||||
totVolume * intQuants.referencePorosity();
|
totVolume * intQuants.referencePorosity());
|
||||||
|
|
||||||
this->dynamicPoreVolume_[globalDofIdx] = pv;
|
this->dynamicPoreVolume_[globalDofIdx] = pv;
|
||||||
this->hydrocarbonPoreVolume_[globalDofIdx] = pv * hydrocarbon;
|
this->hydrocarbonPoreVolume_[globalDofIdx] = pv * hydrocarbon;
|
||||||
|
|||||||
Reference in New Issue
Block a user