From 5f9f37e35e4ab01b5b5f446f359db70ae0a5f4eb Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Sun, 15 Dec 2013 22:31:54 +0100 Subject: [PATCH] Added dimension to RSVD table; required new "quantity" Rs. --- .../eclipse/IntegrationTests/ParseRSVD.cpp | 9 ++++---- .../eclipse/Units/ConversionFactors.hpp | 22 ++++++++++--------- opm/parser/eclipse/Units/UnitSystem.cpp | 14 +++++++----- opm/parser/share/keywords/R/RSVD | 7 +++++- 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/opm/parser/eclipse/IntegrationTests/ParseRSVD.cpp b/opm/parser/eclipse/IntegrationTests/ParseRSVD.cpp index aa24519e2..bc9b70e9b 100644 --- a/opm/parser/eclipse/IntegrationTests/ParseRSVD.cpp +++ b/opm/parser/eclipse/IntegrationTests/ParseRSVD.cpp @@ -46,10 +46,9 @@ BOOST_AUTO_TEST_CASE( parse_EQUIL_OK ) { DeckRecordConstPtr rec1 = kw1->getRecord(0); DeckRecordConstPtr rec3 = kw1->getRecord(2); - DeckItemConstPtr item1 = rec1->getItem("table"); - BOOST_CHECK( fabs(item1->getRawDouble(0) - 2382) < 0.001); + DeckItemPtr item1 = rec1->getItem("table"); + BOOST_CHECK( fabs(item1->getSIDouble(0) - 2382) < 0.001); - DeckItemConstPtr item3 = rec3->getItem("table"); - BOOST_CHECK( fabs(item3->getRawDouble(7) - 106.77) < 0.001); - + DeckItemPtr item3 = rec3->getItem("table"); + BOOST_CHECK( fabs(item3->getSIDouble(7) - 106.77) < 0.001); } diff --git a/opm/parser/eclipse/Units/ConversionFactors.hpp b/opm/parser/eclipse/Units/ConversionFactors.hpp index 5f4e0011f..e612972a7 100644 --- a/opm/parser/eclipse/Units/ConversionFactors.hpp +++ b/opm/parser/eclipse/Units/ConversionFactors.hpp @@ -24,19 +24,21 @@ namespace Opm { namespace Metric { - const double Pressure = 100000; - const double Length = 1.0; - const double Time = 86400; - const double Mass = 1.0; - const double Permeability = 9.869233e-10; + const double Pressure = 100000; + const double Length = 1.0; + const double Time = 86400; + const double Mass = 1.0; + const double Permeability = 9.869233e-10; + const double DissolvedGasRaito = 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 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 } } diff --git a/opm/parser/eclipse/Units/UnitSystem.cpp b/opm/parser/eclipse/Units/UnitSystem.cpp index 2abc5fbd2..a034b6441 100644 --- a/opm/parser/eclipse/Units/UnitSystem.cpp +++ b/opm/parser/eclipse/Units/UnitSystem.cpp @@ -141,6 +141,7 @@ namespace Opm { system->addDimension("t" , Metric::Time ); system->addDimension("m" , Metric::Mass ); system->addDimension("K" , Metric::Permeability ); + system->addDimension("Rs", Metric::DissolvedGasRaito ); return system; } @@ -150,12 +151,13 @@ namespace Opm { UnitSystem * UnitSystem::newFIELD() { UnitSystem * system = new UnitSystem("Field"); - system->addDimension("1" , 1.0); - system->addDimension("P" , Field::Pressure ); - system->addDimension("L" , Field::Length); - system->addDimension("t" , Field::Time); - system->addDimension("m" , Field::Mass); - system->addDimension("K" , Field::Permeability ); + system->addDimension("1" , 1.0); + system->addDimension("P" , Field::Pressure ); + system->addDimension("L" , Field::Length); + system->addDimension("t" , Field::Time); + system->addDimension("m" , Field::Mass); + system->addDimension("K" , Field::Permeability ); + system->addDimension("Rs" , Field::DissolvedGasRaito ); return system; } diff --git a/opm/parser/share/keywords/R/RSVD b/opm/parser/share/keywords/R/RSVD index d69acd748..ca90de49b 100644 --- a/opm/parser/share/keywords/R/RSVD +++ b/opm/parser/share/keywords/R/RSVD @@ -1,2 +1,7 @@ {"name" : "RSVD" , "size" : {"keyword" : "EQLDIMS" , "item" : "NTEQUL"}, - "items" : [{"name" : "table" , "value_type" : "FLOAT" , "size_type" : "ALL"}]} + "items" : [{"name" : "table" , + "value_type" : "FLOAT" , + "size_type" : "ALL", + "dimension" : ["L" , "Rs"]}]} + +