From 800c4ff32ef64cecaad45ec93b7f337d47e1f53b Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Sun, 15 Dec 2013 22:38:57 +0100 Subject: [PATCH] Added dimensions to TVDP* keyword family. --- opm/parser/eclipse/Units/ConversionFactors.hpp | 5 ++++- opm/parser/eclipse/Units/UnitSystem.cpp | 6 +++--- opm/parser/share/keywords/T/TVDP | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/opm/parser/eclipse/Units/ConversionFactors.hpp b/opm/parser/eclipse/Units/ConversionFactors.hpp index e612972a7..204d2373c 100644 --- a/opm/parser/eclipse/Units/ConversionFactors.hpp +++ b/opm/parser/eclipse/Units/ConversionFactors.hpp @@ -30,15 +30,18 @@ namespace Opm { const double Mass = 1.0; const double Permeability = 9.869233e-10; const double DissolvedGasRaito = 1.0; + const double Volume = 1.0; } + namespace Field { const double Pressure = 6894.76; const double Length = 0.3048; const double Time = 86400; const double Mass = 0.45359237; const double Permeability = 9.869233e-10; - const double DissolvedGasRaito = 1.0; // Mscf / stb + const double DissolvedGasRaito = 1.0; // Mscf / stb + const double Volume = 158.987294; // STB } } diff --git a/opm/parser/eclipse/Units/UnitSystem.cpp b/opm/parser/eclipse/Units/UnitSystem.cpp index a034b6441..59080d13b 100644 --- a/opm/parser/eclipse/Units/UnitSystem.cpp +++ b/opm/parser/eclipse/Units/UnitSystem.cpp @@ -141,8 +141,8 @@ namespace Opm { system->addDimension("t" , Metric::Time ); system->addDimension("m" , Metric::Mass ); system->addDimension("K" , Metric::Permeability ); - system->addDimension("Rs", Metric::DissolvedGasRaito ); - + system->addDimension("Rs", Metric::DissolvedGasRaito); + system->addDimension("V" , Metric::Volume ); return system; } @@ -158,7 +158,7 @@ namespace Opm { system->addDimension("m" , Field::Mass); system->addDimension("K" , Field::Permeability ); system->addDimension("Rs" , Field::DissolvedGasRaito ); - + system->addDimension("V" , Field::Volume ); return system; } diff --git a/opm/parser/share/keywords/T/TVDP b/opm/parser/share/keywords/T/TVDP index a8d072db6..1d1d13148 100644 --- a/opm/parser/share/keywords/T/TVDP +++ b/opm/parser/share/keywords/T/TVDP @@ -1,2 +1,2 @@ {"name" : "TVDP*" , "size" : {"keyword":"EQLDIMS" , "item":"NTTRVD"}, "items" : - [ {"name" : "table" , "value_type" : "FLOAT" , "size_type" : "ALL"}]} \ No newline at end of file + [ {"name" : "table" , "value_type" : "FLOAT" , "size_type" : "ALL" , "dimension" : ["L" , "1/V"]}]} \ No newline at end of file