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

Demand the hystereris values if enalbed.

Browse Source
This commit is contained in:
Tor Harald Sandve
2018-02-19 08:47:33 +01:00
parent b89a960a50
commit f90e074947
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ebos/eclwriter.hh
View File

@@ -236,17 +236,18 @@ public:
void restartBegin() void restartBegin()
{ {
bool enableHysteresis = simulator_.problem().materialLawManager()->enableHysteresis();
std::map<std::string, Opm::RestartKey> solution_keys {{"PRESSURE" , Opm::RestartKey(Opm::UnitSystem::measure::pressure)}, std::map<std::string, Opm::RestartKey> solution_keys {{"PRESSURE" , Opm::RestartKey(Opm::UnitSystem::measure::pressure)},
{"SWAT" , Opm::RestartKey(Opm::UnitSystem::measure::identity, FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx))}, {"SWAT" , Opm::RestartKey(Opm::UnitSystem::measure::identity, FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx))},
{"SGAS" , Opm::RestartKey(Opm::UnitSystem::measure::identity, FluidSystem::phaseIsActive(FluidSystem::gasPhaseIdx))}, {"SGAS" , Opm::RestartKey(Opm::UnitSystem::measure::identity, FluidSystem::phaseIsActive(FluidSystem::gasPhaseIdx))},
{"TEMP" , Opm::RestartKey(Opm::UnitSystem::measure::temperature)}, // always required for now {"TEMP" , Opm::RestartKey(Opm::UnitSystem::measure::temperature)}, // always required for now
{"RS" , Opm::RestartKey(Opm::UnitSystem::measure::gas_oil_ratio, FluidSystem::enableDissolvedGas())}, {"RS" , Opm::RestartKey(Opm::UnitSystem::measure::gas_oil_ratio, FluidSystem::enableDissolvedGas())},
{"RV" , Opm::RestartKey(Opm::UnitSystem::measure::oil_gas_ratio, FluidSystem::enableVaporizedOil())}, {"RV" , Opm::RestartKey(Opm::UnitSystem::measure::oil_gas_ratio, FluidSystem::enableVaporizedOil())},
{"SOMAX", {Opm::UnitSystem::measure::identity, false}}, {"SOMAX", {Opm::UnitSystem::measure::identity, simulator_.problem().vapparsActive()}},
{"PCSWM_OW", {Opm::UnitSystem::measure::identity, false}}, {"PCSWM_OW", {Opm::UnitSystem::measure::identity, enableHysteresis}},
{"KRNSW_OW", {Opm::UnitSystem::measure::identity, false}}, {"KRNSW_OW", {Opm::UnitSystem::measure::identity, enableHysteresis}},
{"PCSWM_GO", {Opm::UnitSystem::measure::identity, false}}, {"PCSWM_GO", {Opm::UnitSystem::measure::identity, enableHysteresis}},
{"KRNSW_GO", {Opm::UnitSystem::measure::identity, false}}}; {"KRNSW_GO", {Opm::UnitSystem::measure::identity, enableHysteresis}}};
std::map<std::string, bool> extra_keys { std::map<std::string, bool> extra_keys {
{"OPMEXTRA" , false} {"OPMEXTRA" , false}