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

Merge pull request #4537 from totto82/vapwat_gaswater

Browse Source 
add vapwat to gaswater simulators and output mol fractions YMFWAT
This commit is contained in:
Bård Skaflestad 2023-03-24 15:15:59 +01:00 committed by GitHub
commit 0fb5093807
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ebos/eclgenericoutputblackoilmodule.cc
View File

@ -842,11 +842,20 @@ assignToSolution(data::Solution& sol)
std::vector<double> mfrac(rsw_.size(), 0.0);
const auto& pvtnum = eclState_.fieldProps().get_int("PVTNUM");
for (size_t i = 0; i < rsw_.size(); ++i) {
mfrac[i] = FluidSystem::convertXoGToxoG(FluidSystem::convertRswToXwG(rsw_[i], pvtnum[i]-1), pvtnum[i]-1);
mfrac[i] = FluidSystem::convertXwGToxwG(FluidSystem::convertRswToXwG(rsw_[i], pvtnum[i]-1), pvtnum[i]-1);
}
sol.insert("XMFCO2", UnitSystem::measure::identity, std::move(mfrac), data::TargetType::RESTART_AUXILIARY);
}
if (eclState_.runspec().co2Storage() && !rvw_.empty()) {
std::vector<double> mfrac(rvw_.size(), 0.0);
const auto& pvtnum = eclState_.fieldProps().get_int("PVTNUM");
for (size_t i = 0; i < rvw_.size(); ++i) {
mfrac[i] = FluidSystem::convertXgWToxgW(FluidSystem::convertRvwToXgW(rvw_[i], pvtnum[i]-1), pvtnum[i]-1);
}
sol.insert("YMFWAT", UnitSystem::measure::identity, std::move(mfrac), data::TargetType::RESTART_AUXILIARY);
}
// Fluid in place
if (this->outputFipRestart_) {
for (const auto& phase : Inplace::phases()) {

5
flow/flow_ebos_gaswater_dissolution.cpp
View File

@ -53,6 +53,11 @@ struct EnableDisgasInWater<TypeTag, TTag::EclFlowGasWaterDissolutionProblem> {
static constexpr bool value = true;
};
template<class TypeTag>
struct EnableEvaporation<TypeTag, TTag::EclFlowGasWaterDissolutionProblem> {
static constexpr bool value = true;
};
//! The indices required by the model
template<class TypeTag>
struct Indices<TypeTag, TTag::EclFlowGasWaterDissolutionProblem>

5
flow/flow_ebos_gaswater_dissolution_diffuse.cpp
View File

@ -53,6 +53,11 @@ struct EnableDisgasInWater<TypeTag, TTag::EclFlowGasWaterDissolutionDiffuseProbl
static constexpr bool value = true;
};
template<class TypeTag>
struct EnableEvaporation<TypeTag, TTag::EclFlowGasWaterDissolutionDiffuseProblem> {
static constexpr bool value = true;
};
//! The indices required by the model
template<class TypeTag>
struct Indices<TypeTag, TTag::EclFlowGasWaterDissolutionDiffuseProblem>