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

Remove name property from UnitSystem dimension

Browse Source
This commit is contained in:
Joakim Hove
2020-03-04 20:45:56 +01:00
parent f8c250be34
commit 874c734628
7 changed files with 24 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/parser/DeckTests.cpp
View File

@@ -295,7 +295,7 @@ BOOST_AUTO_TEST_CASE(GetSIWithoutDimensionThrows) {
}
BOOST_AUTO_TEST_CASE(GetSISingleDimensionCorrect) {
Dimension dim{ "Length" , 100 };
Dimension dim{ 100 };
DeckItem item( "HEI", double(), { dim }, { dim } );
item.push_back(1.0 , 100 );
@@ -305,8 +305,8 @@ BOOST_AUTO_TEST_CASE(GetSISingleDimensionCorrect) {
}
BOOST_AUTO_TEST_CASE(GetSISingleDefault) {
Dimension dim{ "Length" , 1 };
Dimension defaultDim{ "Length" , 100 };
Dimension dim{ 1 };
Dimension defaultDim{ 100 };
DeckItem item( "HEI", double() , {dim}, {defaultDim});
item.push_backDefault( 1.0 );
@@ -315,11 +315,11 @@ BOOST_AUTO_TEST_CASE(GetSISingleDefault) {
}
BOOST_AUTO_TEST_CASE(GetSIMultipleDim) {
Dimension dim1{ "Length" , 2 };
Dimension dim2{ "Length" , 4 };
Dimension dim3{ "Length" , 8 };
Dimension dim4{ "Length" ,16 };
Dimension defaultDim{ "Length" , 100 };
Dimension dim1{ 2 };
Dimension dim2{ 4 };
Dimension dim3{ 8 };
Dimension dim4{ 16 };
Dimension defaultDim{ 100 };
DeckItem item( "HEI", double(), {dim1, dim2, dim3, dim4}, {defaultDim, defaultDim, defaultDim, defaultDim} );
item.push_back( 1.0, 16 );

2
tests/parser/UDQTests.cpp
View File

@@ -1248,7 +1248,7 @@ BOOST_AUTO_TEST_CASE(UDA_VALUE) {
BOOST_AUTO_TEST_CASE(UDA_VALUE_DIM) {
UDAValue value0(1);
Dimension dim("DUMMY", 10);
Dimension dim(10);
UDAValue value1(1, dim);
BOOST_CHECK_EQUAL( value0.get<double>(), 1);

24
tests/parser/UnitTests.cpp
View File

@@ -37,28 +37,16 @@ BOOST_AUTO_TEST_CASE(DefDim) {
}
BOOST_AUTO_TEST_CASE(CreateDimension) {
Dimension length("Length" , 1);
BOOST_CHECK_EQUAL("Length" , length.getName());
Dimension length(1);
BOOST_CHECK_EQUAL(1 , length.getSIScaling());
}
BOOST_AUTO_TEST_CASE(makeComposite) {
auto composite = Dimension::newComposite("Length*Length*Length/Time" , 100);
BOOST_CHECK_EQUAL("Length*Length*Length/Time" , composite.getName());
BOOST_CHECK_EQUAL(100 , composite.getSIScaling());
}
BOOST_AUTO_TEST_CASE(CreateDimensionInvalidNameThrows) {
BOOST_CHECK_THROW(Dimension(" " , 1) , std::invalid_argument);
BOOST_CHECK_THROW(Dimension(".LX" , 1) , std::invalid_argument);
BOOST_CHECK_THROW(Dimension("*" , 1) , std::invalid_argument);
BOOST_CHECK_THROW(Dimension("/" , 1) , std::invalid_argument);
BOOST_CHECK_THROW(Dimension("2" , 1) , std::invalid_argument);
BOOST_CHECK_NO_THROW(Dimension("1" , 1));
}
BOOST_AUTO_TEST_CASE(CreateUnitSystem) {
UnitSystem system(UnitSystem::UnitType::UNIT_TYPE_METRIC);
BOOST_CHECK_EQUAL("Metric" , system.getName());
@@ -112,7 +100,6 @@ BOOST_AUTO_TEST_CASE(UnitSystemParseInvalidThrows) {
system.addDimension("Time" , 9.0 );
auto volumePerTime = system.parse( "Length*Length*Length/Time" );
BOOST_CHECK_EQUAL("Length*Length*Length/Time" , volumePerTime.getName() );
BOOST_CHECK_EQUAL(3.0 , volumePerTime.getSIScaling());
}
@@ -123,6 +110,7 @@ static void checkSystemHasRequiredDimensions( const UnitSystem& system) {
BOOST_CHECK( system.hasDimension("Length"));
BOOST_CHECK( system.hasDimension("Mass"));
BOOST_CHECK( system.hasDimension("Time"));
BOOST_CHECK( system.hasDimension("Permeability"));
BOOST_CHECK( system.hasDimension("Pressure"));
BOOST_CHECK( system.hasDimension("Temperature"));
@@ -174,14 +162,12 @@ BOOST_AUTO_TEST_CASE(CreateInputSystem) {
BOOST_AUTO_TEST_CASE(DimensionEqual) {
Dimension d1("Length" , 1);
Dimension d2("Length" , 1);
Dimension d3("Time" , 1);
Dimension d4("Length" , 2);
Dimension d1(1);
Dimension d2(1);
Dimension d4(2);
BOOST_CHECK_EQUAL( true , d1.equal(d1) );
BOOST_CHECK_EQUAL( true , d1.equal(d2) );
BOOST_CHECK_EQUAL( false , d1.equal(d3) );
BOOST_CHECK_EQUAL( false , d1.equal(d4) );
}