diff --git a/opm/output/eclipse/Inplace.hpp b/opm/output/eclipse/Inplace.hpp index f0e9cf1636f..89d5aa3575b 100644 --- a/opm/output/eclipse/Inplace.hpp +++ b/opm/output/eclipse/Inplace.hpp @@ -53,6 +53,11 @@ class Inplace { OilResVolume = 13, GasResVolume = 14, SALT = 15, + CO2InWaterPhase = 16, + CO2InGasPhaseInMob = 17, + CO2InGasPhaseMob = 18, + WaterInGasPhase = 19, + WaterInWaterPhase = 20, }; /* diff --git a/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FIELD_PROBE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FIELD_PROBE index 0674a149436..f7704c45502 100644 --- a/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FIELD_PROBE +++ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/F/FIELD_PROBE @@ -123,6 +123,8 @@ "FMWWT", "FEPR", "FEPT", + "FGCDI", + "FGCDM", "FGSPR", "FGSRL", "FGSRU", @@ -133,6 +135,9 @@ "FOSRU", "FOSSP", "FOSTP", + "FWCD", + "FWIPG", + "FWIPL", "FWSPR", "FWSRL", "FWSRU", diff --git a/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REGION_PROBE b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REGION_PROBE index 66783240b1e..bb8b994c1af 100644 --- a/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REGION_PROBE +++ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REGION_PROBE @@ -37,6 +37,8 @@ "RGP", "RPPG", "RGVIS", + "RGCDI", + "RGCDM", "RGDEN", "RGPR", "RGPRF", @@ -55,6 +57,9 @@ "RPPC", "RRPV", "ROPV", + "RWCD", + "RWIPG", + "RWIPL", "RWPV", "RGPV", "RHPV", diff --git a/src/opm/output/eclipse/Inplace.cpp b/src/opm/output/eclipse/Inplace.cpp index cd62e12e56c..ad59595f2d1 100644 --- a/src/opm/output/eclipse/Inplace.cpp +++ b/src/opm/output/eclipse/Inplace.cpp @@ -147,6 +147,11 @@ const std::vector& Inplace::phases() { Inplace::Phase::OilResVolume, Inplace::Phase::GasResVolume, Inplace::Phase::SALT, + Inplace::Phase::CO2InWaterPhase, + Inplace::Phase::CO2InGasPhaseInMob, + Inplace::Phase::CO2InGasPhaseMob, + Inplace::Phase::WaterInGasPhase, + Inplace::Phase::WaterInWaterPhase, }; return phases_; diff --git a/src/opm/output/eclipse/Summary.cpp b/src/opm/output/eclipse/Summary.cpp index c4cc2379268..64e71fa84c8 100644 --- a/src/opm/output/eclipse/Summary.cpp +++ b/src/opm/output/eclipse/Summary.cpp @@ -2230,7 +2230,11 @@ static const std::unordered_map< std::string, Opm::UnitSystem::measure> single_v {"FGIPL" , Opm::UnitSystem::measure::gas_surface_volume }, {"FGIPG" , Opm::UnitSystem::measure::gas_surface_volume }, {"FPR" , Opm::UnitSystem::measure::pressure }, - + {"FGCDI" , Opm::UnitSystem::measure::gas_surface_volume }, + {"FGCDM" , Opm::UnitSystem::measure::gas_surface_volume }, + {"FWCD" , Opm::UnitSystem::measure::gas_surface_volume }, + {"FWIPG" , Opm::UnitSystem::measure::liquid_surface_volume }, + {"FWIPL" , Opm::UnitSystem::measure::liquid_surface_volume }, }; static const std::unordered_map< std::string, Opm::UnitSystem::measure> region_units = { @@ -2243,7 +2247,12 @@ static const std::unordered_map< std::string, Opm::UnitSystem::measure> region_u {"RGIPL" , Opm::UnitSystem::measure::gas_surface_volume }, {"RGIPG" , Opm::UnitSystem::measure::gas_surface_volume }, {"RWIP" , Opm::UnitSystem::measure::liquid_surface_volume }, - {"RRPV" , Opm::UnitSystem::measure::geometric_volume } + {"RRPV" , Opm::UnitSystem::measure::geometric_volume }, + {"RGCDI" , Opm::UnitSystem::measure::liquid_surface_volume }, + {"RGCDM" , Opm::UnitSystem::measure::liquid_surface_volume }, + {"RWCD" , Opm::UnitSystem::measure::gas_surface_volume }, + {"RWIPG" , Opm::UnitSystem::measure::liquid_surface_volume }, + {"RWIPL" , Opm::UnitSystem::measure::liquid_surface_volume } }; static const auto interregion_units =