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

Renamed variables related keyword inferring size from other keyword

Browse Source
This commit is contained in:
Joakim Hove 2013-08-14 08:43:54 +02:00
parent 134e4be5cf
commit 75de3033f9
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/parser/eclipse/Parser/Parser.cpp
View File

@ -122,12 +122,14 @@ namespace Opm {
if (parserKeyword->hasFixedSize())
targetSize = parserKeyword->getFixedSize();
else {
const std::pair<std::string,std::string> sizeKeyword = parserKeyword->getSizePair();
DeckKeywordConstPtr deckKeyword = deck->getKeyword(sizeKeyword.first);
DeckRecordConstPtr deckRecord = deckKeyword->getRecord(0);
DeckItemConstPtr deckItem = deckRecord->getItem(sizeKeyword.second);
targetSize = deckItem->getInt(0);
const std::pair<std::string,std::string> sizeKeyword = parserKeyword->getSizeDefinitionPair();
DeckKeywordConstPtr sizeDefinitionKeyword = deck->getKeyword(sizeKeyword.first);
DeckItemConstPtr sizeDefinitionItem;
{
DeckRecordConstPtr record = sizeDefinitionKeyword->getRecord(0);
sizeDefinitionItem = record->getItem(sizeKeyword.second);
}
targetSize = sizeDefinitionItem->getInt(0);
}
return RawKeywordPtr(new RawKeyword(keywordString , targetSize));
}

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

@ -86,7 +86,7 @@ namespace Opm {
void ParserKeyword::initSizeKeyword( const std::string& sizeKeyword, const std::string& sizeItem) {
m_keywordSizeType = OTHER;
m_sizeKeyword = std::pair<std::string , std::string>(sizeKeyword , sizeItem);
m_sizeDefinitionPair = std::pair<std::string , std::string>(sizeKeyword , sizeItem);
}
@ -175,8 +175,8 @@ namespace Opm {
return m_keywordSizeType;
}
const std::pair<std::string,std::string>& ParserKeyword::getSizePair() const {
return m_sizeKeyword;
const std::pair<std::string,std::string>& ParserKeyword::getSizeDefinitionPair() const {
return m_sizeDefinitionPair;
}
}

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

@ -47,9 +47,9 @@ namespace Opm {
DeckKeywordPtr parse(RawKeywordConstPtr rawKeyword) const;
enum ParserKeywordSizeEnum getSizeType() const;
const std::pair<std::string,std::string>& getSizePair() const;
const std::pair<std::string,std::string>& getSizeDefinitionPair() const;
private:
std::pair<std::string,std::string> m_sizeKeyword;
std::pair<std::string,std::string> m_sizeDefinitionPair;
std::string m_name;
ParserRecordPtr m_record;
enum ParserKeywordSizeEnum m_keywordSizeType;

4
opm/parser/eclipse/Parser/tests/ParserKeywordTests.cpp
View File

@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE(ParserKeyword_withSize_SizeTypeFIXED) {
BOOST_AUTO_TEST_CASE(ParserKeyword_withOtherSize_SizeTypeOTHER) {
std::string keyword("KEYWORD");
ParserKeyword parserKeyword(keyword, "EQUILDIMS" , "NTEQUIL");
const std::pair<std::string,std::string>& sizeKW = parserKeyword.getSizePair();
const std::pair<std::string,std::string>& sizeKW = parserKeyword.getSizeDefinitionPair();
BOOST_CHECK_EQUAL(OTHER , parserKeyword.getSizeType() );
BOOST_CHECK_EQUAL("EQUILDIMS", sizeKW.first );
BOOST_CHECK_EQUAL("NTEQUIL" , sizeKW.second );
@ -93,7 +93,7 @@ BOOST_AUTO_TEST_CASE(ConstructFromJsonObject_withSize) {
BOOST_AUTO_TEST_CASE(ConstructFromJsonObject_withSizeOther) {
Json::JsonObject jsonObject("{\"name\": \"BPR\", \"size\" : {\"keyword\" : \"Bjarne\" , \"item\": \"BjarneIgjen\"}}");
ParserKeyword parserKeyword(jsonObject);
const std::pair<std::string,std::string>& sizeKW = parserKeyword.getSizePair();
const std::pair<std::string,std::string>& sizeKW = parserKeyword.getSizeDefinitionPair();
BOOST_CHECK_EQUAL("BPR" , parserKeyword.getName());
BOOST_CHECK_EQUAL( false , parserKeyword.hasFixedSize() );
BOOST_CHECK_EQUAL( parserKeyword.getSizeType() , OTHER);