OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-18 03:52:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1069 from babrodtk/fix_visc_output

Browse Source 
Updated so that VOIL/VGAS/VWAT are supported keywords
This commit is contained in:
Atgeirr Flø Rasmussen 2017-02-23 15:27:49 +01:00 committed by GitHub
commit 8b8d029d2d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
View File

@ -621,25 +621,31 @@ namespace Opm
/** /**
* Viscosities for water, oil gas * Viscosities for water, oil gas
*/ */
if (rstKeywords["VISC"] > 0) { {
const bool has_vwat = (rstKeywords["VISC"] > 0) || (rstKeywords["VWAT"] > 0);
const bool has_voil = (rstKeywords["VISC"] > 0) || (rstKeywords["VOIL"] > 0);
const bool has_vgas = (rstKeywords["VISC"] > 0) || (rstKeywords["VGAS"] > 0);
rstKeywords["VISC"] = 0; rstKeywords["VISC"] = 0;
if (aqua_active) { if (aqua_active) {
output.insert("WAT_VISC", output.insert("WAT_VISC",
Opm::UnitSystem::measure::viscosity, Opm::UnitSystem::measure::viscosity,
std::move( sd.getCellData("WAT_VISC") ), std::move( sd.getCellData("WAT_VISC") ),
data::TargetType::RESTART_AUXILIARY); data::TargetType::RESTART_AUXILIARY);
rstKeywords["VWAT"] = 0;
} }
if (liquid_active) { if (liquid_active) {
output.insert("OIL_VISC", output.insert("OIL_VISC",
Opm::UnitSystem::measure::viscosity, Opm::UnitSystem::measure::viscosity,
std::move( sd.getCellData("OIL_VISC") ), std::move( sd.getCellData("OIL_VISC") ),
data::TargetType::RESTART_AUXILIARY); data::TargetType::RESTART_AUXILIARY);
rstKeywords["VOIL"] = 0;
} }
if (vapour_active) { if (vapour_active) {
output.insert("GAS_VISC", output.insert("GAS_VISC",
Opm::UnitSystem::measure::viscosity, Opm::UnitSystem::measure::viscosity,
std::move( sd.getCellData("GAS_VISC") ), std::move( sd.getCellData("GAS_VISC") ),
data::TargetType::RESTART_AUXILIARY); data::TargetType::RESTART_AUXILIARY);
rstKeywords["VGAS"] = 0;
} }
} }