From f90e074947975ca094bc659bde5a2b51bd230497 Mon Sep 17 00:00:00 2001 From: Tor Harald Sandve Date: Mon, 19 Feb 2018 08:47:33 +0100 Subject: [PATCH] Demand the hystereris values if enalbed. --- ebos/eclwriter.hh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ebos/eclwriter.hh b/ebos/eclwriter.hh index 6bc12bfce..50e4265ad 100644 --- a/ebos/eclwriter.hh +++ b/ebos/eclwriter.hh @@ -236,17 +236,18 @@ public: void restartBegin() { + bool enableHysteresis = simulator_.problem().materialLawManager()->enableHysteresis(); std::map solution_keys {{"PRESSURE" , Opm::RestartKey(Opm::UnitSystem::measure::pressure)}, {"SWAT" , Opm::RestartKey(Opm::UnitSystem::measure::identity, FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx))}, {"SGAS" , Opm::RestartKey(Opm::UnitSystem::measure::identity, FluidSystem::phaseIsActive(FluidSystem::gasPhaseIdx))}, {"TEMP" , Opm::RestartKey(Opm::UnitSystem::measure::temperature)}, // always required for now {"RS" , Opm::RestartKey(Opm::UnitSystem::measure::gas_oil_ratio, FluidSystem::enableDissolvedGas())}, {"RV" , Opm::RestartKey(Opm::UnitSystem::measure::oil_gas_ratio, FluidSystem::enableVaporizedOil())}, - {"SOMAX", {Opm::UnitSystem::measure::identity, false}}, - {"PCSWM_OW", {Opm::UnitSystem::measure::identity, false}}, - {"KRNSW_OW", {Opm::UnitSystem::measure::identity, false}}, - {"PCSWM_GO", {Opm::UnitSystem::measure::identity, false}}, - {"KRNSW_GO", {Opm::UnitSystem::measure::identity, false}}}; + {"SOMAX", {Opm::UnitSystem::measure::identity, simulator_.problem().vapparsActive()}}, + {"PCSWM_OW", {Opm::UnitSystem::measure::identity, enableHysteresis}}, + {"KRNSW_OW", {Opm::UnitSystem::measure::identity, enableHysteresis}}, + {"PCSWM_GO", {Opm::UnitSystem::measure::identity, enableHysteresis}}, + {"KRNSW_GO", {Opm::UnitSystem::measure::identity, enableHysteresis}}}; std::map extra_keys { {"OPMEXTRA" , false}