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

units: replace "t" with "Time"

Browse Source 
this makes things more explicit and more readable
This commit is contained in:
Andreas Lauser
2014-02-11 12:45:41 +01:00
parent 44f310bfbf
commit 6a97d78cc6
13 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/parser/eclipse/Parser/UnitSystem.cpp
+2 -2
View File
@@ -109,7 +109,7 @@ namespace Opm {
system->addDimension("1" , 1);
system->addDimension("L" , 1);
system->addDimension("t" , 86400 );
system->addDimension("Time" , 86400 );
system->addDimension("m" , 1 );
system->addDimension("P" , 100000 );
system->addDimension("K" , 9.869233e-10 );
@@ -126,7 +126,7 @@ namespace Opm {
system->addDimension("1" , 1);
system->addDimension("L" , 0.3048);
system->addDimension("t" , 86400 );
system->addDimension("Time" , 86400 );
system->addDimension("m" , 0.45359237 );
system->addDimension("P" , 6894.76 );
system->addDimension("K" , 9.869233e-10 );
opm/parser/eclipse/Parser/tests/ParserItemTests.cpp
+1 -1
View File
@@ -208,7 +208,7 @@ BOOST_AUTO_TEST_CASE(DoubleItem_DimDifferent_ReturnsFalse) {
item3.push_backDimension("L");
item3.push_backDimension("L");
item4.push_backDimension("t");
item4.push_backDimension("Time");
BOOST_CHECK_EQUAL(false , item1.equal( item2 ));
BOOST_CHECK_EQUAL(false , item2.equal( item3 ));
opm/parser/eclipse/Parser/tests/ParserKeywordTests.cpp
+3 -3
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/t");
item2->push_backDimension("L*L/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/t\"}]}");
Json::JsonObject jsonObject("{\"name\": \"BPR\", \"size\" : 100 , \"items\" :[{\"name\":\"ItemX\" , \"size_type\":\"SINGLE\" , \"value_type\" : \"FLOAT\" , \"dimension\" : \"L*L/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/t\" , \"t\", \"1\"]}]}");
Json::JsonObject jsonObject("{\"name\": \"BPR\", \"size\" : 100 , \"items\" :[{\"name\":\"ItemX\" , \"size_type\":\"ALL\" , \"value_type\" : \"FLOAT\" , \"dimension\" : [\"L*L/Time\" , \"t\", \"1\"]}]}");
ParserKeyword parserKeyword(jsonObject);
ParserRecordConstPtr record = parserKeyword.getRecord();
ParserItemConstPtr item = record->get("ItemX");
opm/parser/eclipse/Parser/tests/ParserRecordTests.cpp
+1 -1
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/t");
item2->push_backDimension("L*L/Time");
BOOST_CHECK_EQUAL( true , parserRecord->hasDimension());
}
opm/parser/eclipse/Units/UnitSystem.cpp
+2 -2
View File
@@ -138,7 +138,7 @@ namespace Opm {
system->addDimension("1" , 1.0);
system->addDimension("P" , Metric::Pressure );
system->addDimension("L" , Metric::Length);
system->addDimension("t" , Metric::Time );
system->addDimension("Time" , Metric::Time );
system->addDimension("m" , Metric::Mass );
system->addDimension("K" , Metric::Permeability );
system->addDimension("Rs" , Metric::DissolvedGasRatio);
@@ -158,7 +158,7 @@ namespace Opm {
system->addDimension("1" , 1.0);
system->addDimension("P" , Field::Pressure );
system->addDimension("L" , Field::Length);
system->addDimension("t" , Field::Time);
system->addDimension("Time" , Field::Time);
system->addDimension("m" , Field::Mass);
system->addDimension("K" , Field::Permeability );
system->addDimension("Rs" , Field::DissolvedGasRatio );
opm/parser/eclipse/Units/tests/UnitTests.cpp
+16 -16
View File
@@ -36,8 +36,8 @@ BOOST_AUTO_TEST_CASE(CreateDimension) {
}
BOOST_AUTO_TEST_CASE(makeComposite) {
std::shared_ptr<Dimension> composite(Dimension::newComposite("L*L*L/t" , 100));
BOOST_CHECK_EQUAL("L*L*L/t" , composite->getName());
std::shared_ptr<Dimension> composite(Dimension::newComposite("L*L*L/Time" , 100));
BOOST_CHECK_EQUAL("L*L*L/Time" , composite->getName());
BOOST_CHECK_EQUAL(100 , composite->getSIScaling());
}
@@ -74,11 +74,11 @@ BOOST_AUTO_TEST_CASE(UnitSystemGetMissingDimensionThrows) {
BOOST_AUTO_TEST_CASE(UnitSystemGetNewOK) {
UnitSystem system("Metric");
system.addDimension("L" , 10 );
system.addDimension("t" , 100);
system.addDimension("Time" , 100);
BOOST_CHECK_EQUAL( false , system.hasDimension("L*L/t"));
std::shared_ptr<const Dimension> comp = system.getNewDimension("L*L/t");
BOOST_CHECK_EQUAL( true , system.hasDimension("L*L/t"));
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(1 , comp->getSIScaling());
}
@@ -88,10 +88,10 @@ BOOST_AUTO_TEST_CASE(UnitSystemGetNewOK) {
BOOST_AUTO_TEST_CASE(UnitSystemAddDimensions) {
UnitSystem system("Metric");
system.addDimension("L" , 1 );
system.addDimension("t" , 86400 );
system.addDimension("Time" , 86400 );
std::shared_ptr<const Dimension> length = system.getDimension("L");
std::shared_ptr<const Dimension> time = system.getDimension("t");
std::shared_ptr<const Dimension> time = system.getDimension("Time");
BOOST_CHECK_EQUAL(1 , length->getSIScaling());
BOOST_CHECK_EQUAL(86400 , time->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 / t") , std::invalid_argument);
BOOST_CHECK_THROW( system.parse("L * L / Time") , std::invalid_argument);
system.addDimension("L" , 3.00 );
system.addDimension("t" , 9.0 );
system.addDimension("Time" , 9.0 );
std::shared_ptr<const Dimension> volumePerTime = system.parse("L*L*L/t");
BOOST_CHECK_EQUAL("L*L*L/t" , volumePerTime->getName() );
std::shared_ptr<const Dimension> volumePerTime = system.parse("L*L*L/Time");
BOOST_CHECK_EQUAL("L*L*L/Time" , volumePerTime->getName() );
BOOST_CHECK_EQUAL(3.0 , volumePerTime->getSIScaling());
}
@@ -120,7 +120,7 @@ void checkSystemHasRequiredDimensions(std::shared_ptr<const UnitSystem> system)
BOOST_CHECK( system->hasDimension("1"));
BOOST_CHECK( system->hasDimension("L"));
BOOST_CHECK( system->hasDimension("m"));
BOOST_CHECK( system->hasDimension("t"));
BOOST_CHECK( system->hasDimension("Time"));
BOOST_CHECK( system->hasDimension("K"));
BOOST_CHECK( system->hasDimension("P"));
}
@@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE(CreateMetricSystem) {
BOOST_CHECK_EQUAL( Metric::Length , system->getDimension("L")->getSIScaling() );
BOOST_CHECK_EQUAL( Metric::Mass , system->getDimension("m")->getSIScaling() );
BOOST_CHECK_EQUAL( Metric::Time , system->getDimension("t")->getSIScaling() );
BOOST_CHECK_EQUAL( Metric::Time , system->getDimension("Time")->getSIScaling() );
BOOST_CHECK_EQUAL( Metric::Permeability , system->getDimension("K")->getSIScaling() );
BOOST_CHECK_EQUAL( Metric::Pressure , system->getDimension("P")->getSIScaling() );
}
@@ -146,7 +146,7 @@ BOOST_AUTO_TEST_CASE(CreateFieldSystem) {
BOOST_CHECK_EQUAL( Field::Length , system->getDimension("L")->getSIScaling() );
BOOST_CHECK_EQUAL( Field::Mass , system->getDimension("m")->getSIScaling() );
BOOST_CHECK_EQUAL( Field::Time , system->getDimension("t")->getSIScaling() );
BOOST_CHECK_EQUAL( Field::Time , system->getDimension("Time")->getSIScaling() );
BOOST_CHECK_EQUAL( Field::Permeability , system->getDimension("K")->getSIScaling() );
BOOST_CHECK_EQUAL( Field::Pressure , system->getDimension("P")->getSIScaling() );
}
@@ -157,7 +157,7 @@ BOOST_AUTO_TEST_CASE(CreateFieldSystem) {
BOOST_AUTO_TEST_CASE(DimensionEqual) {
Dimension d1("L" , 1);
Dimension d2("L" , 1);
Dimension d3("t" , 1);
Dimension d3("Time" , 1);
Dimension d4("L" , 2);
BOOST_CHECK_EQUAL( true , d1.equal(d1) );
opm/parser/share/keywords/C/COMPDAT
+1 -1
View File
@@ -6,7 +6,7 @@
{"name" : "K2" , "value_type" : "INT" },
{"name" : "STATE" , "value_type" : "STRING" , "default" : "OPEN"},
{"name" : "SAT_TABLE" , "value_type" : "INT" , "default" : 0},
{"name" : "CF" , "value_type" : "FLOAT", "dimension" : "mu*LiquidVolume/t*P"},
{"name" : "CF" , "value_type" : "FLOAT", "dimension" : "mu*LiquidVolume/Time*P"},
{"name" : "DIAMETER" , "value_type" : "FLOAT", "dimension" : "L"},
{"name" : "Kh" , "value_type" : "FLOAT", "dimension" : "K" , "default" : -1},
{"name" : "SKIN" , "value_type" : "FLOAT", "dimension" : "1" , "default" : 0},
opm/parser/share/keywords/G/GCONINJE
+3 -3
View File
@@ -2,8 +2,8 @@
{"name" : "GROUP" , "value_type" : "STRING" },
{"name" : "PHASE" , "value_type" : "STRING"},
{"name" : "CONTROL_MODE" , "value_type" : "STRING" , "default" : "NONE"},
{"name" : "SURFACE_TARGET" , "value_type" : "FLOAT" , "default" : 0 , "dimension" : "GasVolume/t"},
{"name" : "RESV_TARGET" , "value_type" : "FLOAT" , "default" : 0 , "dimension" : "GasVolume/t"},
{"name" : "SURFACE_TARGET" , "value_type" : "FLOAT" , "default" : 0 , "dimension" : "GasVolume/Time"},
{"name" : "RESV_TARGET" , "value_type" : "FLOAT" , "default" : 0 , "dimension" : "GasVolume/Time"},
{"name" : "REINJ_TARGET" , "value_type" : "FLOAT" , "default" : 0, "dimension":"1"},
{"name" : "VOIDAGE_TARGET" , "value_type" : "FLOAT" , "default" : 0, "dimension":"1"},
{"name" : "FREE" , "value_type" : "STRING" , "default" : "YES"},
@@ -11,5 +11,5 @@
{"name" : "GUIDE_DEF" , "value_type" : "STRING"},
{"name" : "REINJECT_GROUP" , "value_type" : "STRING"},
{"name" : "VOIDAGE_GROUP" , "value_type" : "STRING"},
{"name" : "WETGAS_TARGET", "value_type" : "FLOAT" , "dimension" : "GasVolume/t"}
{"name" : "WETGAS_TARGET", "value_type" : "FLOAT" , "dimension" : "GasVolume/Time"}
]}
opm/parser/share/keywords/G/GCONPROD
+4 -4
View File
@@ -1,10 +1,10 @@
{"name" : "GCONPROD" , "items" : [
{"name" : "GROUP" , "value_type" : "STRING" },
{"name" : "CONTROL_MODE" , "value_type" : "STRING" , "default" : "NONE"},
{"name" : "OIL_TARGET" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
{"name" : "WATER_TARGET" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
{"name" : "GAS_TARGET" , "value_type" : "FLOAT" , "dimension" : "GasVolume/t"},
{"name" : "LIQUID_TARGET" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
{"name" : "OIL_TARGET" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/Time"},
{"name" : "WATER_TARGET" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/Time"},
{"name" : "GAS_TARGET" , "value_type" : "FLOAT" , "dimension" : "GasVolume/Time"},
{"name" : "LIQUID_TARGET" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/Time"},
{"name" : "EXCEED_PROC" , "value_type" : "STRING" , "default" : "NONE"},
{"name" : "RESPOND_TO_PARENT" , "value_type" : "STRING" , "default" : "YES"},
{"name" : "GUIDE_RATE" , "value_type" : "FLOAT"},
opm/parser/share/keywords/W/WCONHIST
+4 -4
View File
@@ -2,11 +2,11 @@
[{"name" : "WELL" , "value_type" : "STRING"},
{"name" : "STATUS" , "value_type" : "STRING" , "default" : "OPEN"},
{"name" : "CMODE" , "value_type" : "STRING"},
{"name" : "ORAT" , "value_type" : "FLOAT", "default" : 0.0, "dimension" : "LiquidVolume/t"},
{"name" : "WRAT" , "value_type" : "FLOAT" , "default" : 0.0, "dimension" : "LiquidVolume/t"},
{"name" : "GRAT" , "value_type" : "FLOAT" , "default" : 0.0, "dimension" : "GasVolume/t"},
{"name" : "ORAT" , "value_type" : "FLOAT", "default" : 0.0, "dimension" : "LiquidVolume/Time"},
{"name" : "WRAT" , "value_type" : "FLOAT" , "default" : 0.0, "dimension" : "LiquidVolume/Time"},
{"name" : "GRAT" , "value_type" : "FLOAT" , "default" : 0.0, "dimension" : "GasVolume/Time"},
{"name" : "VFPTable" , "value_type" : "INT" , "default" : 0.0 , "comment":"The default is a state variable"},
{"name" : "Lift" , "value_type" : "FLOAT" , "default" : 0.0 , "comment":"The default is a state variable"},
{"name" : "THP" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "P"},
{"name" : "BHP" , "value_type" : "FLOAT" , "default" : 0.0 ,"dimension" : "P"},
{"name" : "NGLRAT" , "value_type" : "FLOAT" , "default" : 0.0 ,"dimension" : "LiquidVolume/t"}]}
{"name" : "NGLRAT" , "value_type" : "FLOAT" , "default" : 0.0 ,"dimension" : "LiquidVolume/Time"}]}
opm/parser/share/keywords/W/WCONINJE
+2 -2
View File
@@ -3,8 +3,8 @@
{"name" : "TYPE" , "value_type" : "STRING" },
{"name" : "STATUS" , "value_type" : "STRING" , "default" : "OPEN"},
{"name" : "CMODE" , "value_type" : "STRING" },
{"name" : "RATE" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
{"name" : "RESV" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
{"name" : "RATE" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/Time"},
{"name" : "RESV" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/Time"},
{"name" : "BHP" , "value_type" : "FLOAT" , "dimension" : "P" , "default" : 6891},
{"name" : "THP" , "value_type" : "FLOAT" , "dimension" : "P"},
{"name" : "VFP_TABLE" , "value_type" : "INT" , "default" : 0},
opm/parser/share/keywords/W/WCONINJH
+1 -1
View File
@@ -2,7 +2,7 @@
{"name" : "WELL" , "value_type" : "STRING" },
{"name" : "TYPE" , "value_type" : "STRING" },
{"name" : "STATUS" , "value_type" : "STRING" , "default" : "OPEN"},
{"name" : "RATE" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
{"name" : "RATE" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/Time"},
{"name" : "BHP" , "value_type" : "FLOAT" , "dimension" : "P"},
{"name" : "THP" , "value_type" : "FLOAT" , "dimension" : "P"},
{"name" : "VFP_TABLE" , "value_type" : "INT" , "default" : 0},
opm/parser/share/keywords/W/WCONPROD
+5 -5
View File
@@ -2,11 +2,11 @@
[{"name" : "WELL" , "value_type" : "STRING"},
{"name" : "STATUS" , "value_type" : "STRING" , "default" : "OPEN"},
{"name" : "CMODE" , "value_type" : "STRING"},
{"name" : "ORAT" , "value_type" : "FLOAT", "default" : 0.0 , "dimension" : "LiquidVolume/t"},
{"name" : "WRAT" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "LiquidVolume/t"},
{"name" : "GRAT" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "GasVolume/t"},
{"name" : "LRAT" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "LiquidVolume/t"},
{"name" : "RESV" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "LiquidVolume/t"},
{"name" : "ORAT" , "value_type" : "FLOAT", "default" : 0.0 , "dimension" : "LiquidVolume/Time"},
{"name" : "WRAT" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "LiquidVolume/Time"},
{"name" : "GRAT" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "GasVolume/Time"},
{"name" : "LRAT" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "LiquidVolume/Time"},
{"name" : "RESV" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "LiquidVolume/Time"},
{"name" : "BHP" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "P"},
{"name" : "THP" , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "P"},
{"name" : "VFPTable" , "value_type" : "INT" , "default" : 0.0 , "comment":"The default is a state variable"},