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

Made sizeType : SINGLE default

Browse Source
This commit is contained in:
Joakim Hove
2013-09-17 22:27:53 +02:00
parent 9986916ca7
commit 3992a32efc
9 changed files with 79 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
opm/parser/eclipse/Parser/ParserIntItem.cpp
View File

@@ -27,6 +27,10 @@
namespace Opm {
ParserIntItem::ParserIntItem(const std::string& itemName) : ParserItem(itemName) {
m_default = defaultInt();
}
ParserIntItem::ParserIntItem(const std::string& itemName, ParserItemSizeEnum sizeType) : ParserItem(itemName, sizeType) {
m_default = defaultInt();
}
@@ -38,14 +42,17 @@ namespace Opm {
ParserIntItem::ParserIntItem(const Json::JsonObject& jsonConfig) : ParserItem(jsonConfig)
{
if (jsonConfig.has_item("default")) {
m_default = jsonConfig.get_int("default");
m_defaultSet = true;
}
if (jsonConfig.has_item("default"))
setDefault( jsonConfig.get_int("default") );
else
m_default = defaultInt();
}
void ParserIntItem::setDefault(int defaultValue) {
m_default = defaultValue;
m_defaultSet = true;
}
/// Scans the rawRecords data according to the ParserItems definition.
/// returns a DeckItem object.
/// NOTE: data are popped from the rawRecords deque!