diff --git a/opm/parser/eclipse/Units/UnitSystem.cpp b/opm/parser/eclipse/Units/UnitSystem.cpp index 3c67fda92..0778b430a 100644 --- a/opm/parser/eclipse/Units/UnitSystem.cpp +++ b/opm/parser/eclipse/Units/UnitSystem.cpp @@ -60,6 +60,9 @@ namespace { 1, /* gas-oil ratio */ 1, /* oil-gas ratio */ 1, /* water cut */ + 1, /* gas formation volume factor */ + 1, /* oil formation volume factor */ + 1, /* water formation volume factor */ }; static const double from_metric[] = { @@ -83,6 +86,9 @@ namespace { 1, /* gas-oil ratio */ 1, /* oil-gas ratio */ 1, /* water cut */ + 1, /* gas formation volume factor */ + 1, /* oil formation volume factor */ + 1, /* water formation volume factor */ }; static constexpr const char* metric_names[] = { @@ -106,6 +112,9 @@ namespace { "SM3/SM3", "SM3/SM3", "SM3/SM3", + "RM3/SM3", /* gas formation volume factor */ + "RM3/SM3", /* oil formation volume factor */ + "RM3/SM3", /* water formation volume factor */ }; static const double to_field[] = { @@ -129,6 +138,9 @@ namespace { 1, /* gas-oil ratio */ 1, /* oil-gas ratio */ 1, /* water cut */ + 1 / (Field::ReservoirVolume / Field::GasSurfaceVolume), /* gas formation volume factor */ + 1, /* oil formation volume factor */ + 1, /* water formation volume factor */ }; static const double from_field[] = { @@ -152,6 +164,9 @@ namespace { 1, /* gas-oil ratio */ 1, /* oil-gas ratio */ 1, /* water cut */ + Field::ReservoirVolume / Field::GasSurfaceVolume, /* gas formation volume factor */ + 1, /* oil formation volume factor */ + 1, /* water formation volume factor */ }; static constexpr const char* field_names[] = { @@ -175,6 +190,9 @@ namespace { "MSCF/STB", "STB/MSCF", "STB/STB", + "RB/MSCF", /* gas formation volume factor */ + "RB/STB", /* oil formation volume factor */ + "RB/STB", /* water formation volume factor */ }; static const double to_lab[] = { @@ -198,6 +216,9 @@ namespace { 1 / Lab::GasDissolutionFactor, /* gas-oil ratio */ 1 / Lab::OilDissolutionFactor, /* oil-gas ratio */ 1, /* water cut */ + 1, /* gas formation volume factor */ + 1, /* oil formation volume factor */ + 1, /* water formation volume factor */ }; static const double from_lab[] = { @@ -221,6 +242,9 @@ namespace { Lab::GasDissolutionFactor, /* gas-oil ratio */ Lab::OilDissolutionFactor, /* oil-gas ratio */ 1, /* water cut */ + 1, /* gas formation volume factor */ + 1, /* oil formation volume factor */ + 1, /* water formation volume factor */ }; static constexpr const char* lab_names[] = { @@ -244,6 +268,9 @@ namespace { "SCC/SCC", "SCC/SCC", "SCC/SCC", + "RCC/SCC", /* gas formation volume factor */ + "RCC/SCC", /* oil formation volume factor */ + "RCC/SCC", /* water formation volume factor */ }; } diff --git a/opm/parser/eclipse/Units/UnitSystem.hpp b/opm/parser/eclipse/Units/UnitSystem.hpp index e7b17a192..389db7e9f 100644 --- a/opm/parser/eclipse/Units/UnitSystem.hpp +++ b/opm/parser/eclipse/Units/UnitSystem.hpp @@ -57,6 +57,9 @@ namespace Opm { gas_oil_ratio, oil_gas_ratio, water_cut, + gas_formation_volume_factor, + oil_formation_volume_factor, + water_formation_volume_factor, }; UnitSystem(UnitType unit);