mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Merge pull request #5092 from svenn-t/rptrst_porv
Output pore volume in RPTRST
This commit is contained in:
commit
75b0004620
@ -430,6 +430,7 @@ assignToSolution(data::Solution& sol)
|
|||||||
DataEntry{"PPCW", UnitSystem::measure::pressure, ppcw_},
|
DataEntry{"PPCW", UnitSystem::measure::pressure, ppcw_},
|
||||||
DataEntry{"PRESROCC", UnitSystem::measure::pressure, minimumOilPressure_},
|
DataEntry{"PRESROCC", UnitSystem::measure::pressure, minimumOilPressure_},
|
||||||
DataEntry{"PRESSURE", UnitSystem::measure::pressure, fluidPressure_},
|
DataEntry{"PRESSURE", UnitSystem::measure::pressure, fluidPressure_},
|
||||||
|
DataEntry{"RPORV", UnitSystem::measure::volume, rPorV_},
|
||||||
DataEntry{"RS", UnitSystem::measure::gas_oil_ratio, rs_},
|
DataEntry{"RS", UnitSystem::measure::gas_oil_ratio, rs_},
|
||||||
DataEntry{"RSSAT", UnitSystem::measure::gas_oil_ratio, gasDissolutionFactor_},
|
DataEntry{"RSSAT", UnitSystem::measure::gas_oil_ratio, gasDissolutionFactor_},
|
||||||
DataEntry{"RV", UnitSystem::measure::oil_gas_ratio, rv_},
|
DataEntry{"RV", UnitSystem::measure::oil_gas_ratio, rv_},
|
||||||
@ -1079,6 +1080,10 @@ doAllocBuffers(const unsigned bufferSize,
|
|||||||
rstKeywords["BG"] = 0;
|
rstKeywords["BG"] = 0;
|
||||||
invB_[gasPhaseIdx].resize(bufferSize, 0.0);
|
invB_[gasPhaseIdx].resize(bufferSize, 0.0);
|
||||||
}
|
}
|
||||||
|
if (rstKeywords["RPORV"] > 0) {
|
||||||
|
rstKeywords["RPORV"] = 0;
|
||||||
|
rPorV_.resize(bufferSize, 0.0);
|
||||||
|
}
|
||||||
|
|
||||||
enableFlows_ = false;
|
enableFlows_ = false;
|
||||||
enableFlowsn_ = false;
|
enableFlowsn_ = false;
|
||||||
|
@ -396,6 +396,7 @@ protected:
|
|||||||
ScalarBuffer pressureTimesPoreVolume_;
|
ScalarBuffer pressureTimesPoreVolume_;
|
||||||
ScalarBuffer pressureTimesHydrocarbonVolume_;
|
ScalarBuffer pressureTimesHydrocarbonVolume_;
|
||||||
ScalarBuffer dynamicPoreVolume_;
|
ScalarBuffer dynamicPoreVolume_;
|
||||||
|
ScalarBuffer rPorV_;
|
||||||
ScalarBuffer fluidPressure_;
|
ScalarBuffer fluidPressure_;
|
||||||
ScalarBuffer temperature_;
|
ScalarBuffer temperature_;
|
||||||
ScalarBuffer rs_;
|
ScalarBuffer rs_;
|
||||||
|
@ -461,6 +461,11 @@ public:
|
|||||||
this->extboZ_[globalDofIdx] = intQuants.zFraction().value();
|
this->extboZ_[globalDofIdx] = intQuants.zFraction().value();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!this->rPorV_.empty()) {
|
||||||
|
const auto totVolume = elemCtx.simulator().model().dofTotalVolume(globalDofIdx);
|
||||||
|
this->rPorV_[globalDofIdx] = totVolume * intQuants.porosity().value();
|
||||||
|
}
|
||||||
|
|
||||||
if (!this->mFracCo2_.empty()) {
|
if (!this->mFracCo2_.empty()) {
|
||||||
const Scalar stdVolOil = getValue(fs.saturation(oilPhaseIdx)) * getValue(fs.invB(oilPhaseIdx))
|
const Scalar stdVolOil = getValue(fs.saturation(oilPhaseIdx)) * getValue(fs.invB(oilPhaseIdx))
|
||||||
+ getValue(fs.saturation(gasPhaseIdx)) * getValue(fs.invB(gasPhaseIdx)) * getValue(fs.Rv());
|
+ getValue(fs.saturation(gasPhaseIdx)) * getValue(fs.invB(gasPhaseIdx)) * getValue(fs.Rv());
|
||||||
|
Loading…
Reference in New Issue
Block a user