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

Changed unit system to use more std::shared_ptr instead of instance variables.

Browse Source
This commit is contained in:
Joakim Hove
2013-12-09 17:42:20 +01:00
parent c74a86b3f5
commit ff13036a58
5 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@ namespace Opm {
}
Dimension UnitSystem::parseFactor(const std::string& dimension) const {
std::shared_ptr<Dimension> UnitSystem::parseFactor(const std::string& dimension) const {
std::vector<std::string> dimensionList;
boost::split(dimensionList , dimension , boost::is_any_of("*"));
double SIfactor = 1.0;
@@ -69,12 +69,12 @@ namespace Opm {
Dimension dim = getDimension( *iter );
SIfactor *= dim.getSIScaling();
}
return Dimension::makeComposite( dimension , SIfactor );
return std::shared_ptr<Dimension>(Dimension::newComposite( dimension , SIfactor ));
}
Dimension UnitSystem::parse(const std::string& dimension) const {
std::shared_ptr<Dimension> UnitSystem::parse(const std::string& dimension) const {
bool haveDivisor;
{
size_t divCount = std::count( dimension.begin() , dimension.end() , '/' );
@@ -89,10 +89,10 @@ namespace Opm {
if (haveDivisor) {
std::vector<std::string> parts;
boost::split(parts , dimension , boost::is_any_of("/"));
Dimension dividend = parseFactor( parts[0] );
Dimension divisor = parseFactor( parts[1] );
std::shared_ptr<const Dimension> dividend = parseFactor( parts[0] );
std::shared_ptr<const Dimension> divisor = parseFactor( parts[1] );
return Dimension::makeComposite( dimension , dividend.getSIScaling() / divisor.getSIScaling() );
return std::shared_ptr<Dimension>( Dimension::newComposite( dimension , dividend->getSIScaling() / divisor->getSIScaling() ));
} else {
return parseFactor( dimension );
}