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

Added optional shift attribute in keyword size configuration.

Browse Source
This commit is contained in:
Joakim Hove
2017-11-28 10:09:41 +01:00
parent 94aafeb93c
commit 56bd653e51
5 changed files with 95 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
opm/parser/eclipse/Parser/ParserKeyword.hpp
View File

@@ -42,11 +42,40 @@ namespace Opm {
class string_view;
class MessageContainer;
/*
Small helper struct to assemble the information needed to infer the size
of a keyword based on another keyword in the deck.
*/
struct KeywordSize {
KeywordSize(const std::string& in_keyword, const std::string& in_item, int in_shift) :
keyword(in_keyword),
item(in_item),
shift(in_shift)
{}
KeywordSize() {}
bool operator==(const KeywordSize& other) const {
return ((this->keyword == other.keyword) &&
(this->item == other.item) &&
(this->shift == other.shift));
}
bool operator!=(const KeywordSize& other) const {
return !(*this == other);
}
std::string keyword;
std::string item;
int shift;
};
class ParserKeyword {
public:
ParserKeyword(const std::string& name ,
const std::string& sizeKeyword ,
const std::string& sizeItem,
int size_shift,
bool _isTableCollection = false);
explicit ParserKeyword(const std::string& name);
explicit ParserKeyword(const Json::JsonObject& jsonConfig);
@@ -54,7 +83,7 @@ namespace Opm {
void setFixedSize( size_t keywordSize);
void setSizeType( ParserKeywordSizeEnum sizeType );
void setTableCollection(bool _isTableCollection);
void initSizeKeyword( const std::string& sizeKeyword, const std::string& sizeItem);
void initSizeKeyword( const std::string& sizeKeyword, const std::string& sizeItem, int size_shift);
typedef std::set<std::string> DeckNameSet;
@@ -96,7 +125,7 @@ namespace Opm {
DeckKeyword parse(const ParseContext& parseContext , MessageContainer& msgContainer, std::shared_ptr< RawKeyword > rawKeyword) const;
enum ParserKeywordSizeEnum getSizeType() const;
const std::pair<std::string,std::string>& getSizeDefinitionPair() const;
const KeywordSize& getKeywordSize() const;
bool isDataKeyword() const;
std::string createDeclaration(const std::string& indent) const;
@@ -108,7 +137,7 @@ namespace Opm {
bool operator!=( const ParserKeyword& ) const;
private:
std::pair<std::string,std::string> m_sizeDefinitionPair;
KeywordSize keyword_size;
std::string m_name;
DeckNameSet m_deckNames;
DeckNameSet m_validSectionNames;