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

OPM-157: Added enum UnitType, using this when creating an UnitSystem instance

Browse Source
This commit is contained in:
chflo
2015-03-05 12:40:40 +01:00
parent c55637019b
commit 439d0ee924
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,12 +31,26 @@
namespace Opm {
UnitSystem::UnitSystem(const std::string& unitSystem) :
m_name( unitSystem )
UnitSystem::UnitSystem(const UnitType unit) :
m_unittype( unit )
{
switch(unit) {
case(UNIT_TYPE_METRIC):
m_name = "Metric";
break;
case(UNIT_TYPE_FIELD):
m_name = "Field";
break;
case(UNIT_TYPE_LAB):
m_name = "Lab";
break;
default:
//do nothing
break;
};
}
bool UnitSystem::hasDimension(const std::string& dimension) const {
return (m_dimensions.find( dimension ) != m_dimensions.end());
}
@@ -75,6 +89,10 @@ namespace Opm {
return m_name;
}
const UnitSystem::UnitType UnitSystem::getType() const {
return m_unittype;
}
std::shared_ptr<const Dimension> UnitSystem::parseFactor(const std::string& dimension) const {
std::vector<std::string> dimensionList;
@@ -145,7 +163,7 @@ namespace Opm {
UnitSystem * UnitSystem::newMETRIC() {
UnitSystem * system = new UnitSystem("Metric");
UnitSystem * system = new UnitSystem(UNIT_TYPE_METRIC);
system->addDimension("1" , 1.0);
system->addDimension("Pressure" , Metric::Pressure );
@@ -172,7 +190,7 @@ namespace Opm {
UnitSystem * UnitSystem::newFIELD() {
UnitSystem * system = new UnitSystem("Field");
UnitSystem * system = new UnitSystem(UNIT_TYPE_FIELD);
system->addDimension("1" , 1.0);
system->addDimension("Pressure", Field::Pressure );

13
opm/parser/eclipse/Units/UnitSystem.hpp
View File

@@ -30,8 +30,16 @@ namespace Opm {
class UnitSystem {
public:
UnitSystem(const std::string& unitSystem);
enum UnitType {
UNIT_TYPE_METRIC = 0,
UNIT_TYPE_FIELD = 1,
UNIT_TYPE_LAB = 2
};
UnitSystem(UnitType unit);
const std::string& getName() const;
const UnitType getType() const;
void addDimension(const std::string& dimension, double SIfactor, double SIoffset = 0.0);
void addDimension(std::shared_ptr<const Dimension> dimension);
@@ -47,7 +55,8 @@ namespace Opm {
private:
std::shared_ptr<const Dimension> parseFactor(const std::string& dimension) const;
const std::string m_name;
std::string m_name;
UnitType m_unittype;
std::map<std::string , std::shared_ptr<const Dimension> > m_dimensions;
};
}