OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added dimension to RSVD table; required new "quantity" Rs.

Browse Source
This commit is contained in:
Joakim Hove
2013-12-15 22:31:54 +01:00
parent 9de20014fc
commit 5f9f37e35e
4 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
opm/parser/eclipse/IntegrationTests/ParseRSVD.cpp
View File

@@ -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);
}

22
opm/parser/eclipse/Units/ConversionFactors.hpp
View File

@@ -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
}
}

14
opm/parser/eclipse/Units/UnitSystem.cpp
View File

@@ -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;
}

7
opm/parser/share/keywords/R/RSVD
View File

@@ -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"]}]}