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

units: Replace "L" by "Length"

Browse Source
This commit is contained in:
Andreas Lauser
2014-02-07 16:37:54 +01:00
parent 6a97d78cc6
commit 0129a382a8
21 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
opm/parser/eclipse/Deck/tests/DeckDoubleItemTests.cpp
View File

@@ -101,15 +101,15 @@ BOOST_AUTO_TEST_CASE(PushBackMultiple) {
BOOST_AUTO_TEST_CASE(PushBackDimension) {
DeckDoubleItem item("HEI");
std::shared_ptr<Dimension> activeDimension(new Dimension("L" , 100));
std::shared_ptr<Dimension> defaultDimension(new Dimension("L" , 10));
std::shared_ptr<Dimension> activeDimension(new Dimension("Length" , 100));
std::shared_ptr<Dimension> defaultDimension(new Dimension("Length" , 10));
item.push_backDimension( activeDimension , defaultDimension);
}
BOOST_AUTO_TEST_CASE(PushBackDimensionInvalidType) {
DeckIntItem item("HEI");
std::shared_ptr<Dimension> dim(new Dimension("L" , 100));
std::shared_ptr<Dimension> dim(new Dimension("Length" , 100));
BOOST_CHECK_THROW( item.push_backDimension( dim , dim ) , std::invalid_argument );
}
@@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE(GetSIWithoutDimensionThrows) {
BOOST_AUTO_TEST_CASE(GetSISingleDimensionCorrect) {
DeckDoubleItem item("HEI");
std::shared_ptr<Dimension> dim(new Dimension("L" , 100));
std::shared_ptr<Dimension> dim(new Dimension("Length" , 100));
item.push_backMultiple(1 , 100 );
item.push_backDimension( dim , dim );
@@ -139,8 +139,8 @@ BOOST_AUTO_TEST_CASE(GetSISingleDimensionCorrect) {
BOOST_AUTO_TEST_CASE(GetSISingleDefault) {
DeckDoubleItem item("HEI");
std::shared_ptr<Dimension> dim(new Dimension("L" , 1));
std::shared_ptr<Dimension> defaultDim(new Dimension("L" , 100));
std::shared_ptr<Dimension> dim(new Dimension("Length" , 1));
std::shared_ptr<Dimension> defaultDim(new Dimension("Length" , 100));
item.push_backDefault(1 );
item.push_backDimension( dim , defaultDim );
@@ -152,11 +152,11 @@ BOOST_AUTO_TEST_CASE(GetSISingleDefault) {
BOOST_AUTO_TEST_CASE(GetSIMultipleDim) {
DeckDoubleItem item("HEI");
std::shared_ptr<Dimension> dim1(new Dimension("L" , 2));
std::shared_ptr<Dimension> dim2(new Dimension("L" , 4));
std::shared_ptr<Dimension> dim3(new Dimension("L" , 8));
std::shared_ptr<Dimension> dim4(new Dimension("L" ,16));
std::shared_ptr<Dimension> defaultDim(new Dimension("L" , 100));
std::shared_ptr<Dimension> dim1(new Dimension("Length" , 2));
std::shared_ptr<Dimension> dim2(new Dimension("Length" , 4));
std::shared_ptr<Dimension> dim3(new Dimension("Length" , 8));
std::shared_ptr<Dimension> dim4(new Dimension("Length" ,16));
std::shared_ptr<Dimension> defaultDim(new Dimension("Length" , 100));
item.push_backMultiple( 1 , 16 );
item.push_backDimension( dim1 , defaultDim );

4
opm/parser/eclipse/Parser/UnitSystem.cpp
View File

@@ -108,7 +108,7 @@ namespace Opm {
UnitSystem * system = new UnitSystem("Metric");
system->addDimension("1" , 1);
system->addDimension("L" , 1);
system->addDimension("Length" , 1);
system->addDimension("Time" , 86400 );
system->addDimension("m" , 1 );
system->addDimension("P" , 100000 );
@@ -125,7 +125,7 @@ namespace Opm {
UnitSystem * system = new UnitSystem("Field");
system->addDimension("1" , 1);
system->addDimension("L" , 0.3048);
system->addDimension("Length" , 0.3048);
system->addDimension("Time" , 86400 );
system->addDimension("m" , 0.45359237 );
system->addDimension("P" , 6894.76 );

34
opm/parser/eclipse/Parser/tests/ParserItemTests.cpp
View File

@@ -189,8 +189,8 @@ BOOST_AUTO_TEST_CASE(DoubleItem_DimEqual_ReturnsTrue) {
ParserDoubleItem item1("ITEM1", sizeType);
ParserDoubleItem item2("ITEM1", sizeType);
item1.push_backDimension("L*L");
item2.push_backDimension("L*L");
item1.push_backDimension("Length*Length");
item2.push_backDimension("Length*Length");
BOOST_CHECK( item1.equal( item2 ));
}
@@ -199,14 +199,14 @@ BOOST_AUTO_TEST_CASE(DoubleItem_DimEqual_ReturnsTrue) {
BOOST_AUTO_TEST_CASE(DoubleItem_DimDifferent_ReturnsFalse) {
ParserItemSizeEnum sizeType = ALL;
ParserDoubleItem item1("ITEM1", sizeType); // Dim: []
ParserDoubleItem item2("ITEM1", sizeType); // Dim: [L]
ParserDoubleItem item3("ITEM1", sizeType); // Dim: [L ,L]
ParserDoubleItem item2("ITEM1", sizeType); // Dim: [Length]
ParserDoubleItem item3("ITEM1", sizeType); // Dim: [Length ,Length]
ParserDoubleItem item4("ITEM1", sizeType); // Dim: [t]
item2.push_backDimension("L");
item2.push_backDimension("Length");
item3.push_backDimension("L");
item3.push_backDimension("L");
item3.push_backDimension("Length");
item3.push_backDimension("Length");
item4.push_backDimension("Time");
@@ -587,7 +587,7 @@ BOOST_AUTO_TEST_CASE(ParserIntItemGetDimensionThrows) {
ParserIntItem intItem(std::string("SOMEINT"));
BOOST_CHECK_THROW( intItem.getDimension(0) , std::invalid_argument );
BOOST_CHECK_THROW( intItem.push_backDimension("L") , std::invalid_argument );
BOOST_CHECK_THROW( intItem.push_backDimension("Length") , std::invalid_argument );
}
@@ -595,8 +595,8 @@ BOOST_AUTO_TEST_CASE(ParserIntItemGetDimensionThrows) {
BOOST_AUTO_TEST_CASE(ParserDoubleItemAddMultipleDimensionToSIngleSizeThrows) {
ParserDoubleItem doubleItem(std::string("SOMEDOUBLE"));
doubleItem.push_backDimension("L*L");
BOOST_CHECK_THROW( doubleItem.push_backDimension("L*L"), std::invalid_argument);
doubleItem.push_backDimension("Length*Length");
BOOST_CHECK_THROW( doubleItem.push_backDimension("Length*Length"), std::invalid_argument);
}
@@ -604,7 +604,7 @@ BOOST_AUTO_TEST_CASE(ParserDoubleItemWithDimensionHasReturnsCorrect) {
ParserDoubleItem doubleItem(std::string("SOMEDOUBLE"));
BOOST_CHECK_EQUAL( false , doubleItem.hasDimension() );
doubleItem.push_backDimension("L*L");
doubleItem.push_backDimension("Length*Length");
BOOST_CHECK_EQUAL( true , doubleItem.hasDimension() );
}
@@ -615,13 +615,13 @@ BOOST_AUTO_TEST_CASE(ParserDoubleItemGetDimension) {
BOOST_CHECK_THROW( doubleItem.getDimension( 10 ) , std::invalid_argument );
BOOST_CHECK_THROW( doubleItem.getDimension( 0 ) , std::invalid_argument );
doubleItem.push_backDimension("L");
doubleItem.push_backDimension("L*L");
doubleItem.push_backDimension("L*L*L");
doubleItem.push_backDimension("Length");
doubleItem.push_backDimension("Length*Length");
doubleItem.push_backDimension("Length*Length*Length");
BOOST_CHECK_EQUAL( "L" , doubleItem.getDimension(0));
BOOST_CHECK_EQUAL( "L*L" , doubleItem.getDimension(1));
BOOST_CHECK_EQUAL( "L*L*L" , doubleItem.getDimension(2));
BOOST_CHECK_EQUAL( "Length" , doubleItem.getDimension(0));
BOOST_CHECK_EQUAL( "Length*Length" , doubleItem.getDimension(1));
BOOST_CHECK_EQUAL( "Length*Length*Length" , doubleItem.getDimension(2));
BOOST_CHECK_THROW( doubleItem.getDimension( 3 ) , std::invalid_argument );
}

6
opm/parser/eclipse/Parser/tests/ParserKeywordTests.cpp
View File

@@ -465,14 +465,14 @@ BOOST_AUTO_TEST_CASE(ParseKeywordHasDimensionCorrect) {
BOOST_CHECK_EQUAL( false , parserKeyword->hasDimension());
BOOST_CHECK_EQUAL( 0U , itemI->numDimensions() );
item2->push_backDimension("L*L/Time");
item2->push_backDimension("Length*Length/Time");
BOOST_CHECK_EQUAL( true , parserKeyword->hasDimension());
BOOST_CHECK_EQUAL( 1U , item2->numDimensions() );
}
BOOST_AUTO_TEST_CASE(ConstructFromJsonObject_withDimension) {
Json::JsonObject jsonObject("{\"name\": \"BPR\", \"size\" : 100 , \"items\" :[{\"name\":\"ItemX\" , \"size_type\":\"SINGLE\" , \"value_type\" : \"FLOAT\" , \"dimension\" : \"L*L/Time\"}]}");
Json::JsonObject jsonObject("{\"name\": \"BPR\", \"size\" : 100 , \"items\" :[{\"name\":\"ItemX\" , \"size_type\":\"SINGLE\" , \"value_type\" : \"FLOAT\" , \"dimension\" : \"Length*Length/Time\"}]}");
ParserKeyword parserKeyword(jsonObject);
ParserRecordConstPtr record = parserKeyword.getRecord();
ParserItemConstPtr item = record->get("ItemX");
@@ -490,7 +490,7 @@ BOOST_AUTO_TEST_CASE(ConstructFromJsonObject_withDimension) {
BOOST_AUTO_TEST_CASE(ConstructFromJsonObject_withDimensionList) {
Json::JsonObject jsonObject("{\"name\": \"BPR\", \"size\" : 100 , \"items\" :[{\"name\":\"ItemX\" , \"size_type\":\"ALL\" , \"value_type\" : \"FLOAT\" , \"dimension\" : [\"L*L/Time\" , \"t\", \"1\"]}]}");
Json::JsonObject jsonObject("{\"name\": \"BPR\", \"size\" : 100 , \"items\" :[{\"name\":\"ItemX\" , \"size_type\":\"ALL\" , \"value_type\" : \"FLOAT\" , \"dimension\" : [\"Length*Length/Time\" , \"Time\", \"1\"]}]}");
ParserKeyword parserKeyword(jsonObject);
ParserRecordConstPtr record = parserKeyword.getRecord();
ParserItemConstPtr item = record->get("ItemX");

2
opm/parser/eclipse/Parser/tests/ParserRecordTests.cpp
View File

@@ -318,6 +318,6 @@ BOOST_AUTO_TEST_CASE(ParseRecordHasDimensionCorrect) {
parserRecord->addItem( item2 );
BOOST_CHECK_EQUAL( false , parserRecord->hasDimension());
item2->push_backDimension("L*L/Time");
item2->push_backDimension("Length*Length/Time");
BOOST_CHECK_EQUAL( true , parserRecord->hasDimension());
}

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

@@ -137,7 +137,7 @@ namespace Opm {
system->addDimension("1" , 1.0);
system->addDimension("P" , Metric::Pressure );
system->addDimension("L" , Metric::Length);
system->addDimension("Length" , Metric::Length);
system->addDimension("Time" , Metric::Time );
system->addDimension("m" , Metric::Mass );
system->addDimension("K" , Metric::Permeability );
@@ -157,7 +157,7 @@ namespace Opm {
system->addDimension("1" , 1.0);
system->addDimension("P" , Field::Pressure );
system->addDimension("L" , Field::Length);
system->addDimension("Length" , Field::Length);
system->addDimension("Time" , Field::Time);
system->addDimension("m" , Field::Mass);
system->addDimension("K" , Field::Permeability );

48
opm/parser/eclipse/Units/tests/UnitTests.cpp
View File

@@ -30,14 +30,14 @@
using namespace Opm;
BOOST_AUTO_TEST_CASE(CreateDimension) {
Dimension length("L" , 1);
BOOST_CHECK_EQUAL("L" , length.getName());
Dimension length("Length" , 1);
BOOST_CHECK_EQUAL("Length" , length.getName());
BOOST_CHECK_EQUAL(1 , length.getSIScaling());
}
BOOST_AUTO_TEST_CASE(makeComposite) {
std::shared_ptr<Dimension> composite(Dimension::newComposite("L*L*L/Time" , 100));
BOOST_CHECK_EQUAL("L*L*L/Time" , composite->getName());
std::shared_ptr<Dimension> composite(Dimension::newComposite("Length*Length*Length/Time" , 100));
BOOST_CHECK_EQUAL("Length*Length*Length/Time" , composite->getName());
BOOST_CHECK_EQUAL(100 , composite->getSIScaling());
}
@@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE(CreateUnitSystem) {
BOOST_AUTO_TEST_CASE(UnitSystemEmptyHasNone) {
UnitSystem system("Metric");
BOOST_CHECK_EQUAL( false , system.hasDimension("L"));
BOOST_CHECK_EQUAL( false , system.hasDimension("Length"));
BOOST_CHECK_EQUAL( false , system.hasDimension("LXY"));
}
@@ -68,17 +68,17 @@ BOOST_AUTO_TEST_CASE(UnitSystemEmptyHasNone) {
BOOST_AUTO_TEST_CASE(UnitSystemGetMissingDimensionThrows) {
UnitSystem system("Metric");
BOOST_CHECK_THROW( system.getDimension("L") , std::invalid_argument );
BOOST_CHECK_THROW( system.getDimension("Length") , std::invalid_argument );
}
BOOST_AUTO_TEST_CASE(UnitSystemGetNewOK) {
UnitSystem system("Metric");
system.addDimension("L" , 10 );
system.addDimension("Length" , 10 );
system.addDimension("Time" , 100);
BOOST_CHECK_EQUAL( false , system.hasDimension("L*L/Time"));
std::shared_ptr<const Dimension> comp = system.getNewDimension("L*L/Time");
BOOST_CHECK_EQUAL( true , system.hasDimension("L*L/Time"));
BOOST_CHECK_EQUAL( false , system.hasDimension("Length*Length/Time"));
std::shared_ptr<const Dimension> comp = system.getNewDimension("Length*Length/Time");
BOOST_CHECK_EQUAL( true , system.hasDimension("Length*Length/Time"));
BOOST_CHECK_EQUAL(1 , comp->getSIScaling());
}
@@ -87,16 +87,16 @@ BOOST_AUTO_TEST_CASE(UnitSystemGetNewOK) {
BOOST_AUTO_TEST_CASE(UnitSystemAddDimensions) {
UnitSystem system("Metric");
system.addDimension("L" , 1 );
system.addDimension("Length" , 1 );
system.addDimension("Time" , 86400 );
std::shared_ptr<const Dimension> length = system.getDimension("L");
std::shared_ptr<const Dimension> length = system.getDimension("Length");
std::shared_ptr<const Dimension> time = system.getDimension("Time");
BOOST_CHECK_EQUAL(1 , length->getSIScaling());
BOOST_CHECK_EQUAL(86400 , time->getSIScaling());
system.addDimension("L" , 0.3048);
length = system.getDimension("L");
system.addDimension("Length" , 0.3048);
length = system.getDimension("Length");
BOOST_CHECK_EQUAL(0.3048 , length->getSIScaling());
}
@@ -104,13 +104,13 @@ BOOST_AUTO_TEST_CASE(UnitSystemAddDimensions) {
BOOST_AUTO_TEST_CASE(UnitSystemParseInvalidThrows) {
UnitSystem system("Metric");
BOOST_CHECK_THROW( system.parse("//") , std::invalid_argument);
BOOST_CHECK_THROW( system.parse("L * L / Time") , std::invalid_argument);
BOOST_CHECK_THROW( system.parse("Length * Length / Time") , std::invalid_argument);
system.addDimension("L" , 3.00 );
system.addDimension("Length" , 3.00 );
system.addDimension("Time" , 9.0 );
std::shared_ptr<const Dimension> volumePerTime = system.parse("L*L*L/Time");
BOOST_CHECK_EQUAL("L*L*L/Time" , volumePerTime->getName() );
std::shared_ptr<const Dimension> volumePerTime = system.parse("Length*Length*Length/Time");
BOOST_CHECK_EQUAL("Length*Length*Length/Time" , volumePerTime->getName() );
BOOST_CHECK_EQUAL(3.0 , volumePerTime->getSIScaling());
}
@@ -118,7 +118,7 @@ BOOST_AUTO_TEST_CASE(UnitSystemParseInvalidThrows) {
void checkSystemHasRequiredDimensions(std::shared_ptr<const UnitSystem> system) {
BOOST_CHECK( system->hasDimension("1"));
BOOST_CHECK( system->hasDimension("L"));
BOOST_CHECK( system->hasDimension("Length"));
BOOST_CHECK( system->hasDimension("m"));
BOOST_CHECK( system->hasDimension("Time"));
BOOST_CHECK( system->hasDimension("K"));
@@ -131,7 +131,7 @@ BOOST_AUTO_TEST_CASE(CreateMetricSystem) {
std::shared_ptr<UnitSystem> system = std::shared_ptr<UnitSystem>( UnitSystem::newMETRIC() );
checkSystemHasRequiredDimensions( system );
BOOST_CHECK_EQUAL( Metric::Length , system->getDimension("L")->getSIScaling() );
BOOST_CHECK_EQUAL( Metric::Length , system->getDimension("Length")->getSIScaling() );
BOOST_CHECK_EQUAL( Metric::Mass , system->getDimension("m")->getSIScaling() );
BOOST_CHECK_EQUAL( Metric::Time , system->getDimension("Time")->getSIScaling() );
BOOST_CHECK_EQUAL( Metric::Permeability , system->getDimension("K")->getSIScaling() );
@@ -144,7 +144,7 @@ BOOST_AUTO_TEST_CASE(CreateFieldSystem) {
std::shared_ptr<UnitSystem> system = std::shared_ptr<UnitSystem>( UnitSystem::newFIELD() );
checkSystemHasRequiredDimensions( system );
BOOST_CHECK_EQUAL( Field::Length , system->getDimension("L")->getSIScaling() );
BOOST_CHECK_EQUAL( Field::Length , system->getDimension("Length")->getSIScaling() );
BOOST_CHECK_EQUAL( Field::Mass , system->getDimension("m")->getSIScaling() );
BOOST_CHECK_EQUAL( Field::Time , system->getDimension("Time")->getSIScaling() );
BOOST_CHECK_EQUAL( Field::Permeability , system->getDimension("K")->getSIScaling() );
@@ -155,10 +155,10 @@ BOOST_AUTO_TEST_CASE(CreateFieldSystem) {
BOOST_AUTO_TEST_CASE(DimensionEqual) {
Dimension d1("L" , 1);
Dimension d2("L" , 1);
Dimension d1("Length" , 1);
Dimension d2("Length" , 1);
Dimension d3("Time" , 1);
Dimension d4("L" , 2);
Dimension d4("Length" , 2);
BOOST_CHECK_EQUAL( true , d1.equal(d1) );
BOOST_CHECK_EQUAL( true , d1.equal(d2) );

2
opm/parser/share/keywords/C/COMPDAT
View File

@@ -7,7 +7,7 @@
{"name" : "STATE" , "value_type" : "STRING" , "default" : "OPEN"},
{"name" : "SAT_TABLE" , "value_type" : "INT" , "default" : 0},
{"name" : "CF" , "value_type" : "FLOAT", "dimension" : "mu*LiquidVolume/Time*P"},
{"name" : "DIAMETER" , "value_type" : "FLOAT", "dimension" : "L"},
{"name" : "DIAMETER" , "value_type" : "FLOAT", "dimension" : "Length"},
{"name" : "Kh" , "value_type" : "FLOAT", "dimension" : "K" , "default" : -1},
{"name" : "SKIN" , "value_type" : "FLOAT", "dimension" : "1" , "default" : 0},
{"name" : "D_FACTOR" , "value_type" : "FLOAT", "dimension" : "1" },

2
opm/parser/share/keywords/C/COORD
View File

@@ -1 +1 @@
{"name" : "COORD", "data" : {"value_type" : "FLOAT", "dimension" : "L" }}
{"name" : "COORD", "data" : {"value_type" : "FLOAT", "dimension" : "Length" }}

2
opm/parser/share/keywords/D/DEPTHZ
View File

@@ -1,3 +1,3 @@
{"name" : "DEPTHZ" , "data" : {"value_type" : "FLOAT" , "dimension" : "L"},
{"name" : "DEPTHZ" , "data" : {"value_type" : "FLOAT" , "dimension" : "Length"},
"comment" : "DEPTHZ is not documented in the Eclipse manual, but found in the SPE1 case"
}

2
opm/parser/share/keywords/D/DXV
View File

@@ -1 +1 @@
{"name":"DXV", "data" : {"value_type" : "FLOAT", "dimension":"L" }}
{"name":"DXV", "data" : {"value_type" : "FLOAT", "dimension":"Length" }}

2
opm/parser/share/keywords/D/DYV
View File

@@ -1 +1 @@
{"name":"DYV", "data" : {"value_type" : "FLOAT", "dimension":"L" }}
{"name":"DYV", "data" : {"value_type" : "FLOAT", "dimension":"Length" }}

2
opm/parser/share/keywords/D/DZV
View File

@@ -1 +1 @@
{"name":"DZV", "data" : {"value_type" : "FLOAT", "dimension":"L" }}
{"name":"DZV", "data" : {"value_type" : "FLOAT", "dimension":"Length" }}

2
opm/parser/share/keywords/E/ENKRVD
View File

@@ -1,5 +1,5 @@
{"name" : "ENKRVD" , "size" : {"keyword" : "ENDSCALE" , "item" : "NUM_TABLES"},
"items" : [
{"name":"DATA", "value_type":"FLOAT", "size_type" : "ALL" , "dimension" : ["L","1","1","1","1","1","1","1"]}
{"name":"DATA", "value_type":"FLOAT", "size_type" : "ALL" , "dimension" : ["Length","1","1","1","1","1","1","1"]}
]
}

2
opm/parser/share/keywords/E/ENPTVD
View File

@@ -1,5 +1,5 @@
{"name" : "ENPTVD" , "size" : {"keyword" : "ENDSCALE" , "item" : "NUM_TABLES"},
"items" : [
{"name":"DATA", "value_type":"FLOAT", "size_type" : "ALL" , "dimension" : ["L","1","1","1","1","1","1","1","1"]}
{"name":"DATA", "value_type":"FLOAT", "size_type" : "ALL" , "dimension" : ["Length","1","1","1","1","1","1","1","1"]}
]
}

6
opm/parser/share/keywords/E/EQUIL
View File

@@ -1,12 +1,12 @@
{"name" : "EQUIL" , "size" : {"keyword":"EQLDIMS" , "item":"NTEQUL"},
"description": "The EQUIL item is used when equilibrationg the model. The item should consist of one record for each PVT region",
"items" :
[{"name" : "DATUM_DEPTH" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "L"},
[{"name" : "DATUM_DEPTH" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "Length"},
{"name" : "DATUM_PRESSURE" , "value_type" : "FLOAT" , "dimension" : "P"} ,
{"name" : "OWC" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "L",
{"name" : "OWC" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "Length",
"description" : "The OWC item is depth of the OIL Water contact. This should ..."} ,
{"name" : "PC_OWC" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "P"} ,
{"name" : "GOC" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "L"} ,
{"name" : "GOC" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "Length"} ,
{"name" : "PC_GOC" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "P"} ,
{"name" : "BLACK_OIL_INIT" , "value_type" : "INT" , "default" : 0} ,
{"name" : "BLACK_OIL_INIT_WG" , "value_type" : "INT" , "default" : 0} ,

12
opm/parser/share/keywords/M/MAPAXES
View File

@@ -1,7 +1,7 @@
{"name" : "MAPAXES" , "size" : 1 , "items" : [
{"name" : "X1" , "value_type" : "FLOAT", "dimension" : "L" },
{"name" : "Y1" , "value_type" : "FLOAT", "dimension" : "L" },
{"name" : "X2" , "value_type" : "FLOAT", "dimension" : "L" },
{"name" : "Y2" , "value_type" : "FLOAT", "dimension" : "L" },
{"name" : "X3" , "value_type" : "FLOAT", "dimension" : "L" },
{"name" : "Y3" , "value_type" : "FLOAT", "dimension" : "L" }]}
{"name" : "X1" , "value_type" : "FLOAT", "dimension" : "Length" },
{"name" : "Y1" , "value_type" : "FLOAT", "dimension" : "Length" },
{"name" : "X2" , "value_type" : "FLOAT", "dimension" : "Length" },
{"name" : "Y2" , "value_type" : "FLOAT", "dimension" : "Length" },
{"name" : "X3" , "value_type" : "FLOAT", "dimension" : "Length" },
{"name" : "Y3" , "value_type" : "FLOAT", "dimension" : "Length" }]}

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

@@ -2,6 +2,6 @@
"items" : [{"name" : "table" ,
"value_type" : "FLOAT" ,
"size_type" : "ALL",
"dimension" : ["L" , "Rs"]}]}
"dimension" : ["Length" , "Rs"]}]}

2
opm/parser/share/keywords/T/TVDP
View File

@@ -1,2 +1,2 @@
{"name" : "TVDP*" , "size" : {"keyword":"EQLDIMS" , "item":"NTTRVD"}, "items" :
[ {"name" : "table" , "value_type" : "FLOAT" , "size_type" : "ALL" , "dimension" : ["L" , "1/LiquidVolume"]}]}
[ {"name" : "table" , "value_type" : "FLOAT" , "size_type" : "ALL" , "dimension" : ["Length" , "1/LiquidVolume"]}]}

4
opm/parser/share/keywords/W/WELSPECS
View File

@@ -3,9 +3,9 @@
{"name" : "GROUP" , "value_type" : "STRING" },
{"name" : "HEAD_I" , "value_type" : "INT"},
{"name" : "HEAD_J" , "value_type" : "INT"},
{"name" : "REF_DEPTH" , "value_type" : "FLOAT", "dimension" : "L"},
{"name" : "REF_DEPTH" , "value_type" : "FLOAT", "dimension" : "Length"},
{"name" : "PHASE" , "value_type" : "STRING"},
{"name" : "D_RADIUS" , "value_type" : "FLOAT" , "default" : 0, "dimension" : "L"},
{"name" : "D_RADIUS" , "value_type" : "FLOAT" , "default" : 0, "dimension" : "Length"},
{"name" : "INFLOW_EQ" , "value_type" : "STRING" , "default" : "STD"},
{"name" : "AUTO_SHUTIN" , "value_type" : "STRING" , "default" : "SHUT"},
{"name" : "CROSSFLOW" , "value_type" : "STRING" , "default" : "YES"},

2
opm/parser/share/keywords/Z/ZCORN
View File

@@ -1 +1 @@
{"name" : "ZCORN", "data" : {"value_type" : "FLOAT", "dimension" : "L" }}
{"name" : "ZCORN", "data" : {"value_type" : "FLOAT", "dimension" : "Length" }}