From d88ac93698d5d8aa713138122cdcac3cb7943ff1 Mon Sep 17 00:00:00 2001 From: Tor Harald Sandve Date: Tue, 15 Oct 2024 10:53:10 +0200 Subject: [PATCH] Add rsw to restart arrays and remove temperature --- opm/simulators/flow/EclWriter.hpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/opm/simulators/flow/EclWriter.hpp b/opm/simulators/flow/EclWriter.hpp index b3bd59200..cf8b980a6 100644 --- a/opm/simulators/flow/EclWriter.hpp +++ b/opm/simulators/flow/EclWriter.hpp @@ -497,19 +497,18 @@ public: const auto gasActive = FluidSystem::phaseIsActive(FluidSystem::gasPhaseIdx); const auto waterActive = FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx); const auto enableSwatinit = simulator_.vanguard().eclState().fieldProps().has_double("SWATINIT"); - const auto opm_rst_file = Parameters::Get(); - const auto read_temp = enableEnergy || (opm_rst_file && enableTemperature); std::vector solutionKeys { {"PRESSURE", UnitSystem::measure::pressure}, {"SWAT", UnitSystem::measure::identity, waterActive}, {"SGAS", UnitSystem::measure::identity, gasActive}, - {"TEMP", UnitSystem::measure::temperature, read_temp}, + {"TEMP", UnitSystem::measure::temperature, enableEnergy}, {"SSOLVENT", UnitSystem::measure::identity, enableSolvent}, {"RS", UnitSystem::measure::gas_oil_ratio, FluidSystem::enableDissolvedGas()}, {"RV", UnitSystem::measure::oil_gas_ratio, FluidSystem::enableVaporizedOil()}, {"RVW", UnitSystem::measure::oil_gas_ratio, FluidSystem::enableVaporizedWater()}, + {"RSW", UnitSystem::measure::gas_oil_ratio, FluidSystem::enableDissolvedGasInWater()}, {"SGMAX", UnitSystem::measure::identity, enableNonWettingHysteresis && oilActive && gasActive}, {"SHMAX", UnitSystem::measure::identity, enableWettingHysteresis && oilActive && gasActive},