From 4d9bd066a313417d67c495fea7c35dcbdfea01c4 Mon Sep 17 00:00:00 2001 From: babrodtk Date: Tue, 6 Sep 2016 14:17:46 +0200 Subject: [PATCH] Added inverse formation volume factors --- opm/parser/eclipse/Units/UnitSystem.cpp | 27 +++++++++++++++++++++++++ opm/parser/eclipse/Units/UnitSystem.hpp | 3 +++ 2 files changed, 30 insertions(+) diff --git a/opm/parser/eclipse/Units/UnitSystem.cpp b/opm/parser/eclipse/Units/UnitSystem.cpp index 0778b430a..da3d61d26 100644 --- a/opm/parser/eclipse/Units/UnitSystem.cpp +++ b/opm/parser/eclipse/Units/UnitSystem.cpp @@ -63,6 +63,9 @@ namespace { 1, /* gas formation volume factor */ 1, /* oil formation volume factor */ 1, /* water formation volume factor */ + 1, /* gas inverse formation volume factor */ + 1, /* oil inverse formation volume factor */ + 1, /* water inverse formation volume factor */ }; static const double from_metric[] = { @@ -89,6 +92,9 @@ namespace { 1, /* gas formation volume factor */ 1, /* oil formation volume factor */ 1, /* water formation volume factor */ + 1, /* gas inverse formation volume factor */ + 1, /* oil inverse formation volume factor */ + 1, /* water inverse formation volume factor */ }; static constexpr const char* metric_names[] = { @@ -115,6 +121,9 @@ namespace { "RM3/SM3", /* gas formation volume factor */ "RM3/SM3", /* oil formation volume factor */ "RM3/SM3", /* water formation volume factor */ + "SM3/RM3", /* gas inverse formation volume factor */ + "SM3/RM3", /* oil inverse formation volume factor */ + "SM3/RM3", /* water inverse formation volume factor */ }; static const double to_field[] = { @@ -141,6 +150,9 @@ namespace { 1 / (Field::ReservoirVolume / Field::GasSurfaceVolume), /* gas formation volume factor */ 1, /* oil formation volume factor */ 1, /* water formation volume factor */ + 1 / (Field::GasSurfaceVolume / Field::ReservoirVolume), /* gas inverse formation volume factor */ + 1, /* oil inverse formation volume factor */ + 1, /* water inverse formation volume factor */ }; static const double from_field[] = { @@ -167,6 +179,9 @@ namespace { Field::ReservoirVolume / Field::GasSurfaceVolume, /* gas formation volume factor */ 1, /* oil formation volume factor */ 1, /* water formation volume factor */ + Field::GasSurfaceVolume / Field::ReservoirVolume, /* gas inverse formation volume factor */ + 1, /* oil inverse formation volume factor */ + 1, /* water inverse formation volume factor */ }; static constexpr const char* field_names[] = { @@ -193,6 +208,9 @@ namespace { "RB/MSCF", /* gas formation volume factor */ "RB/STB", /* oil formation volume factor */ "RB/STB", /* water formation volume factor */ + "MSCF/RB", /* gas inverse formation volume factor */ + "STB/RB", /* oil inverse formation volume factor */ + "STB/RB", /* water inverse formation volume factor */ }; static const double to_lab[] = { @@ -219,6 +237,9 @@ namespace { 1, /* gas formation volume factor */ 1, /* oil formation volume factor */ 1, /* water formation volume factor */ + 1, /* gas inverse formation volume factor */ + 1, /* oil inverse formation volume factor */ + 1, /* water inverse formation volume factor */ }; static const double from_lab[] = { @@ -245,6 +266,9 @@ namespace { 1, /* gas formation volume factor */ 1, /* oil formation volume factor */ 1, /* water formation volume factor */ + 1, /* gas inverse formation volume factor */ + 1, /* oil inverse formation volume factor */ + 1, /* water inverse formation volume factor */ }; static constexpr const char* lab_names[] = { @@ -271,6 +295,9 @@ namespace { "RCC/SCC", /* gas formation volume factor */ "RCC/SCC", /* oil formation volume factor */ "RCC/SCC", /* water formation volume factor */ + "SCC/RCC", /* gas formation volume factor */ + "SCC/RCC", /* oil inverse formation volume factor */ + "SCC/RCC", /* water inverse formation volume factor */ }; } diff --git a/opm/parser/eclipse/Units/UnitSystem.hpp b/opm/parser/eclipse/Units/UnitSystem.hpp index 389db7e9f..1521a1953 100644 --- a/opm/parser/eclipse/Units/UnitSystem.hpp +++ b/opm/parser/eclipse/Units/UnitSystem.hpp @@ -60,6 +60,9 @@ namespace Opm { gas_formation_volume_factor, oil_formation_volume_factor, water_formation_volume_factor, + gas_inverse_formation_volume_factor, + oil_inverse_formation_volume_factor, + water_inverse_formation_volume_factor, }; UnitSystem(UnitType unit);