Using optional restart loading instead of extra.

This commit is contained in:
Joakim Hove
2017-04-11 14:42:32 +02:00
parent 39f9d0e397
commit 527c0a9e75
2 changed files with 23 additions and 22 deletions

View File

@@ -407,19 +407,20 @@ namespace Opm
WellState& wellstate,
ExtraData& extra )
{
std::map<std::string, UnitSystem::measure> 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" , 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},
{"SOMAX", {UnitSystem::measure::identity, false}},
{"PCSWM_OW", {UnitSystem::measure::identity, false}},
{"KRNSW_OW", {UnitSystem::measure::identity, false}},
{"PCSWM_GO", {UnitSystem::measure::identity, false}},
{"KRNSW_GO", {UnitSystem::measure::identity, false}}};
std::map<std::string, bool> extra_keys {
{"OPMEXTRA" , false},
{"SOMAX", false},
{"PCSWM_OW", false},
{"KRNSW_OW", false},
{"PCSWM_GO", false},
{"KRNSW_GO", false}
{"OPMEXTRA" , false}
};
if (restart_double_si_) {