Merge pull request #952 from akva2/fix_oilkr

fixed: [WAT|OIL|GAS)KR are ratios and thus dimensionless
This commit is contained in:
Atgeirr Flø Rasmussen
2016-11-25 08:00:13 +01:00
committed by GitHub
2 changed files with 6 additions and 6 deletions

View File

@@ -569,7 +569,7 @@ namespace Opm
if (sd.rq[aqua_idx].kr.size() > 0) {
rstKeywords["KRW"] = 0;
output.insert("WATKR",
Opm::UnitSystem::measure::permeability,
Opm::UnitSystem::measure::identity,
adbToDoubleVector(sd.rq[aqua_idx].kr),
data::TargetType::RESTART_AUXILLARY);
}
@@ -585,7 +585,7 @@ namespace Opm
if (sd.rq[liquid_idx].kr.size() > 0) {
rstKeywords["KRO"] = 0;
output.insert("OILKR",
Opm::UnitSystem::measure::permeability,
Opm::UnitSystem::measure::identity,
adbToDoubleVector(sd.rq[liquid_idx].kr),
data::TargetType::RESTART_AUXILLARY);
}
@@ -601,7 +601,7 @@ namespace Opm
if (sd.rq[vapour_idx].kr.size() > 0) {
rstKeywords["KRG"] = 0;
output.insert("GASKR",
Opm::UnitSystem::measure::permeability,
Opm::UnitSystem::measure::identity,
adbToDoubleVector(sd.rq[vapour_idx].kr),
data::TargetType::RESTART_AUXILLARY);
}

View File

@@ -489,21 +489,21 @@ namespace Opm
if (aqua_active && outKeywords["KRW"] > 0) {
outKeywords["KRW"] = 0;
output.insert("WATKR",
Opm::UnitSystem::measure::permeability,
Opm::UnitSystem::measure::identity,
std::move(krWater),
data::TargetType::RESTART_AUXILLARY);
}
if (liquid_active && outKeywords["KRO"] > 0) {
outKeywords["KRO"] = 0;
output.insert("OILKR",
Opm::UnitSystem::measure::permeability,
Opm::UnitSystem::measure::identity,
std::move(krOil),
data::TargetType::RESTART_AUXILLARY);
}
if (vapour_active && outKeywords["KRG"] > 0) {
outKeywords["KRG"] = 0;
output.insert("GASKR",
Opm::UnitSystem::measure::permeability,
Opm::UnitSystem::measure::identity,
std::move(krGas),
data::TargetType::RESTART_AUXILLARY);
}