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

Renamed auxillary to auxiliary

Browse Source
This commit is contained in:
babrodtk 2017-02-15 14:47:24 +01:00
parent b358319e63
commit edffbcd3f8
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
View File

@ -576,21 +576,21 @@ namespace Opm
output.insert("1OVERBW", output.insert("1OVERBW",
Opm::UnitSystem::measure::water_inverse_formation_volume_factor, Opm::UnitSystem::measure::water_inverse_formation_volume_factor,
std::move( sd.getCellData("1OVERBW") ), std::move( sd.getCellData("1OVERBW") ),
data::TargetType::RESTART_AUXILLARY); data::TargetType::RESTART_AUXILIARY);
} }
if (liquid_active && rstKeywords["BO"] > 0) { if (liquid_active && rstKeywords["BO"] > 0) {
rstKeywords["BO"] = 0; rstKeywords["BO"] = 0;
output.insert("1OVERBO", output.insert("1OVERBO",
Opm::UnitSystem::measure::oil_inverse_formation_volume_factor, Opm::UnitSystem::measure::oil_inverse_formation_volume_factor,
std::move( sd.getCellData("1OVERBO") ), std::move( sd.getCellData("1OVERBO") ),
data::TargetType::RESTART_AUXILLARY); data::TargetType::RESTART_AUXILIARY);
} }
if (vapour_active && rstKeywords["BG"] > 0) { if (vapour_active && rstKeywords["BG"] > 0) {
rstKeywords["BG"] = 0; rstKeywords["BG"] = 0;
output.insert("1OVERBG", output.insert("1OVERBG",
Opm::UnitSystem::measure::gas_inverse_formation_volume_factor, Opm::UnitSystem::measure::gas_inverse_formation_volume_factor,
std::move( sd.getCellData("1OVERBG") ), std::move( sd.getCellData("1OVERBG") ),
data::TargetType::RESTART_AUXILLARY); data::TargetType::RESTART_AUXILIARY);
} }
/** /**
@ -602,19 +602,19 @@ namespace Opm
output.insert("WAT_DEN", output.insert("WAT_DEN",
Opm::UnitSystem::measure::density, Opm::UnitSystem::measure::density,
std::move( sd.getCellData("WAT_DEN") ), std::move( sd.getCellData("WAT_DEN") ),
data::TargetType::RESTART_AUXILLARY); data::TargetType::RESTART_AUXILIARY);
} }
if (liquid_active) { if (liquid_active) {
output.insert("OIL_DEN", output.insert("OIL_DEN",
Opm::UnitSystem::measure::density, Opm::UnitSystem::measure::density,
std::move( sd.getCellData("OIL_DEN") ), std::move( sd.getCellData("OIL_DEN") ),
data::TargetType::RESTART_AUXILLARY); data::TargetType::RESTART_AUXILIARY);
} }
if (vapour_active) { if (vapour_active) {
output.insert("GAS_DEN", output.insert("GAS_DEN",
Opm::UnitSystem::measure::density, Opm::UnitSystem::measure::density,
std::move( sd.getCellData("GAS_DEN") ), std::move( sd.getCellData("GAS_DEN") ),
data::TargetType::RESTART_AUXILLARY); data::TargetType::RESTART_AUXILIARY);
} }
} }
@ -627,19 +627,19 @@ namespace Opm
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_AUXILLARY); data::TargetType::RESTART_AUXILIARY);
} }
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_AUXILLARY); data::TargetType::RESTART_AUXILIARY);
} }
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_AUXILLARY); data::TargetType::RESTART_AUXILIARY);
} }
} }
@ -653,7 +653,7 @@ namespace Opm
output.insert("WATKR", // WAT_KR ??? output.insert("WATKR", // WAT_KR ???
Opm::UnitSystem::measure::identity, Opm::UnitSystem::measure::identity,
std::move( krWater ), std::move( krWater ),
data::TargetType::RESTART_AUXILLARY); data::TargetType::RESTART_AUXILIARY);
} }
else { else {
if ( log ) if ( log )
@ -670,7 +670,7 @@ namespace Opm
output.insert("OILKR", output.insert("OILKR",
Opm::UnitSystem::measure::identity, Opm::UnitSystem::measure::identity,
std::move( krOil ), std::move( krOil ),
data::TargetType::RESTART_AUXILLARY); data::TargetType::RESTART_AUXILIARY);
} }
else { else {
if ( log ) if ( log )
@ -687,7 +687,7 @@ namespace Opm
output.insert("GASKR", output.insert("GASKR",
Opm::UnitSystem::measure::identity, Opm::UnitSystem::measure::identity,
std::move( krGas ), std::move( krGas ),
data::TargetType::RESTART_AUXILLARY); data::TargetType::RESTART_AUXILIARY);
} }
else { else {
if ( log ) if ( log )
@ -706,14 +706,14 @@ namespace Opm
output.insert("RSSAT", output.insert("RSSAT",
Opm::UnitSystem::measure::gas_oil_ratio, Opm::UnitSystem::measure::gas_oil_ratio,
std::move( sd.getCellData("RSSAT") ), std::move( sd.getCellData("RSSAT") ),
data::TargetType::RESTART_AUXILLARY); data::TargetType::RESTART_AUXILIARY);
} }
if (vapour_active && liquid_active && rstKeywords["RVSAT"] > 0) { if (vapour_active && liquid_active && rstKeywords["RVSAT"] > 0) {
rstKeywords["RVSAT"] = 0; rstKeywords["RVSAT"] = 0;
output.insert("RVSAT", output.insert("RVSAT",
Opm::UnitSystem::measure::oil_gas_ratio, Opm::UnitSystem::measure::oil_gas_ratio,
std::move( sd.getCellData("RVSAT") ), std::move( sd.getCellData("RVSAT") ),
data::TargetType::RESTART_AUXILLARY); data::TargetType::RESTART_AUXILIARY);
} }