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

Added parsing support for float (i.e. double) items

Browse Source
This commit is contained in:
Joakim Hove 2013-08-01 09:31:27 +02:00
parent 797125463c
commit 15c4874ee0
3 changed files with 110 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
opm/parser/eclipse/Parser/ParserDoubleItem.cpp
View File

@ -17,8 +17,85 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "ParserIntItem.hpp"
#include <opm/json/JsonObject.hpp>
#include <opm/parser/eclipse/Parser/ParserItem.hpp>
#include <opm/parser/eclipse/Parser/ParserDoubleItem.hpp>
#include <opm/parser/eclipse/Parser/ParserEnums.hpp>
#include <opm/parser/eclipse/RawDeck/RawRecord.hpp>
#include <opm/parser/eclipse/Deck/DeckDoubleItem.hpp>
namespace Opm {
ParserDoubleItem::ParserDoubleItem(const std::string& itemName, ParserItemSizeEnum sizeType) : ParserItem(itemName, sizeType) {
m_default = defaultDouble();
}
ParserDoubleItem::ParserDoubleItem(const std::string& itemName, ParserItemSizeEnum sizeType, int defaultValue) : ParserItem(itemName, sizeType) {
m_default = defaultValue;
}
ParserDoubleItem::ParserDoubleItem( const Json::JsonObject& jsonConfig) : ParserItem(jsonConfig) {
if (jsonConfig.has_item("default"))
m_default = jsonConfig.get_double("default");
else
m_default = defaultInt();
}
DeckItemConstPtr ParserDoubleItem::scan(size_t expectedItems, RawRecordPtr rawRecord) const {
return scan__(expectedItems, false, rawRecord);
}
DeckItemConstPtr ParserDoubleItem::scan(RawRecordPtr rawRecord) const {
if (sizeType() == SINGLE)
return scan(1U, rawRecord);
else if (sizeType() == ALL)
return scan__(0, true, rawRecord);
else
throw std::invalid_argument("Unsupported size type, only support SINGLE and ALL. Use scan( numTokens , rawRecord) instead ");
}
/// Scans the rawRecords data according to the ParserItems definition.
/// returns a DeckItem object.
/// NOTE: data are popped from the rawRecords deque!
DeckItemConstPtr ParserDoubleItem::scan__(size_t expectedItems, bool scanAll, RawRecordPtr rawRecord) const {
if (sizeType() == SINGLE && expectedItems > 1) {
throw std::invalid_argument("Can only ask for one item when sizeType == SINGLE");
}
{
DeckDoubleItemPtr deckItem(new DeckDoubleItem(name()));
if ((expectedItems > 0) || scanAll) {
bool defaultActive;
std::vector<double> doublesPreparedForDeckItem = readFromRawRecord(rawRecord, scanAll, expectedItems, m_default, defaultActive);
if (scanAll)
deckItem->push_back(doublesPreparedForDeckItem);
else if (doublesPreparedForDeckItem.size() >= expectedItems) {
deckItem->push_back(doublesPreparedForDeckItem, expectedItems);
if (doublesPreparedForDeckItem.size() > expectedItems)
pushBackToRecord(rawRecord, doublesPreparedForDeckItem, expectedItems, defaultActive);
} else {
std::string preparedDoubles = boost::lexical_cast<std::string>(doublesPreparedForDeckItem.size());
std::string parserSizeValue = boost::lexical_cast<std::string>(expectedItems);
throw std::invalid_argument("The number of parsed doubles (" + preparedDoubles + ") did not correspond to the expected number of items:(" + parserSizeValue + ")");
}
}
return deckItem;
}
}
}

26
opm/parser/eclipse/Parser/ParserDoubleItem.hpp
View File

@ -17,20 +17,40 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PARSERDOUBLEITEM_HPP
#define PARSERDOUBLEITEM_HPP
#include <opm/json/JsonObject.hpp>
#include <opm/parser/eclipse/Parser/ParserItem.hpp>
#include <opm/parser/eclipse/Parser/ParserEnums.hpp>
#include <opm/parser/eclipse/RawDeck/RawRecord.hpp>
namespace Opm {
class ParserDoubleItem : public ParserItem {
public:
ParserDoubleItem(const std::string& itemName, ParserItemSizeEnum sizeType) : ParserItem(itemName, sizeType) {};
ParserDoubleItem(const std::string& itemName, ParserItemSizeEnum sizeType);
ParserDoubleItem(const std::string& itemName, ParserItemSizeEnum sizeType, int defaultValue);
ParserDoubleItem( const Json::JsonObject& jsonConfig);
DeckItemConstPtr scan(size_t expectedItems , RawRecordPtr rawRecord) const;
DeckItemConstPtr scan(RawRecordPtr rawRecord) const;
double getDefault() const {
return m_default;
}
private:
DeckItemConstPtr scan__(size_t expectedItems , bool scanAll , RawRecordPtr rawRecord) const;
double m_default;
};
typedef boost::shared_ptr<const ParserDoubleItem> ParserDoubleItemConstPtr;
typedef boost::shared_ptr<ParserDoubleItem> ParserDoubleItemPtr;
}
#endif /* PARSERDOUBLEITEM_HPP */
#endif /* PARSERINTITEM_HPP */

9
opm/parser/eclipse/Parser/ParserKeyword.cpp
View File

@ -26,8 +26,10 @@
#include <opm/parser/eclipse/Parser/ParserConst.hpp>
#include <opm/parser/eclipse/Parser/ParserKeyword.hpp>
#include <opm/parser/eclipse/Parser/ParserIntItem.hpp>
#include <opm/parser/eclipse/Parser/ParserDoubleItem.hpp>
#include <opm/parser/eclipse/Parser/ParserStringItem.hpp>
namespace Opm {
@ -89,6 +91,7 @@ namespace Opm {
if (itemConfig.has_item("value_type")) {
ParserValueTypeEnum valueType = ParserValueTypeEnumFromString( itemConfig.get_string("value_type") );
std::cout << "ValueType : " << itemConfig.get_string("value_type") << "Numeric: " << valueType << std::endl;
switch( valueType ) {
case INT:
{
@ -102,6 +105,12 @@ namespace Opm {
m_record->addItem( item );
}
break;
case FLOAT:
{
ParserDoubleItemConstPtr item = ParserDoubleItemConstPtr(new ParserDoubleItem( itemConfig ));
m_record->addItem( item );
}
break;
default:
throw std::invalid_argument("Not implemented.");
}