Merge pull request #2 from andlaus/flow_ebos-fix-kr-units

also fix the units of the relperm in SimulatorFullyImplicitBlackoilOutputEbos
This commit is contained in:
Arne Morten Kvarving 2016-11-24 18:19:33 +01:00 committed by GitHub
commit 312491f349

View File

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