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

units: Replace "P" by "Pressure"

Browse Source
This commit is contained in:
Andreas Lauser
2014-02-07 16:38:33 +01:00
parent 0129a382a8
commit 19d89d44cd
17 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,7 +136,7 @@ namespace Opm {
UnitSystem * system = new UnitSystem("Metric");
system->addDimension("1" , 1.0);
system->addDimension("P" , Metric::Pressure );
system->addDimension("Pressure" , Metric::Pressure );
system->addDimension("Length" , Metric::Length);
system->addDimension("Time" , Metric::Time );
system->addDimension("m" , Metric::Mass );
@@ -156,7 +156,7 @@ namespace Opm {
UnitSystem * system = new UnitSystem("Field");
system->addDimension("1" , 1.0);
system->addDimension("P" , Field::Pressure );
system->addDimension("Pressure" , Field::Pressure );
system->addDimension("Length" , Field::Length);
system->addDimension("Time" , Field::Time);
system->addDimension("m" , Field::Mass);

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

@@ -122,7 +122,7 @@ void checkSystemHasRequiredDimensions(std::shared_ptr<const UnitSystem> system)
BOOST_CHECK( system->hasDimension("m"));
BOOST_CHECK( system->hasDimension("Time"));
BOOST_CHECK( system->hasDimension("K"));
BOOST_CHECK( system->hasDimension("P"));
BOOST_CHECK( system->hasDimension("Pressure"));
}
@@ -135,7 +135,7 @@ BOOST_AUTO_TEST_CASE(CreateMetricSystem) {
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() );
BOOST_CHECK_EQUAL( Metric::Pressure , system->getDimension("P")->getSIScaling() );
BOOST_CHECK_EQUAL( Metric::Pressure , system->getDimension("Pressure")->getSIScaling() );
}
@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE(CreateFieldSystem) {
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() );
BOOST_CHECK_EQUAL( Field::Pressure , system->getDimension("P")->getSIScaling() );
BOOST_CHECK_EQUAL( Field::Pressure , system->getDimension("Pressure")->getSIScaling() );
}