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 #1212 from akva2/fix_after_explicit_ctor

Browse Source 
fixed: constructor has been made explicit
This commit is contained in:
Arne Morten Kvarving 2017-06-09 19:31:49 +02:00 committed by GitHub
commit b0f4960ada
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
View File

@ -413,12 +413,12 @@ namespace Opm
WellState& wellstate,
ExtraData& extra )
{
std::map<std::string, RestartKey> solution_keys {{"PRESSURE" , UnitSystem::measure::pressure},
{"SWAT" , UnitSystem::measure::identity},
{"SGAS" , UnitSystem::measure::identity},
{"TEMP" , UnitSystem::measure::temperature},
{"RS" , UnitSystem::measure::gas_oil_ratio},
{"RV" , UnitSystem::measure::oil_gas_ratio},
std::map<std::string, RestartKey> solution_keys {{"PRESSURE" , RestartKey(UnitSystem::measure::pressure)},
{"SWAT" , RestartKey(UnitSystem::measure::identity)},
{"SGAS" , RestartKey(UnitSystem::measure::identity)},
{"TEMP" , RestartKey(UnitSystem::measure::temperature)},
{"RS" , RestartKey(UnitSystem::measure::gas_oil_ratio)},
{"RV" , RestartKey(UnitSystem::measure::oil_gas_ratio)},
{"SOMAX", {UnitSystem::measure::identity, false}},
{"PCSWM_OW", {UnitSystem::measure::identity, false}},
{"KRNSW_OW", {UnitSystem::measure::identity, false}},
@ -432,7 +432,7 @@ namespace Opm
if (restart_double_si_) {
// Avoid any unit conversions, treat restart input as SI units.
for (auto& elem : solution_keys) {
elem.second = UnitSystem::measure::identity;
elem.second = RestartKey(UnitSystem::measure::identity);
}
}