From 081b87b5b4554979a3c524ea81856ce70b8efaf4 Mon Sep 17 00:00:00 2001
From: Joakim Hove <joakim.hove@gmail.com>
Date: Tue, 9 Dec 2014 11:26:01 +0100
Subject: [PATCH] Removed m_deckIndex property from DeckKeyword

---
 opm/parser/eclipse/Deck/DeckKeyword.cpp            | 10 ----------
 opm/parser/eclipse/Deck/DeckKeyword.hpp            |  4 ----
 opm/parser/eclipse/Deck/KeywordContainer.cpp       |  1 -
 opm/parser/eclipse/Deck/tests/DeckKeywordTests.cpp |  6 ------
 opm/parser/eclipse/IntegrationTests/ParseEQUIL.cpp |  4 ----
 5 files changed, 25 deletions(-)

diff --git a/opm/parser/eclipse/Deck/DeckKeyword.cpp b/opm/parser/eclipse/Deck/DeckKeyword.cpp
index fd699e0e0..12282f959 100644
--- a/opm/parser/eclipse/Deck/DeckKeyword.cpp
+++ b/opm/parser/eclipse/Deck/DeckKeyword.cpp
@@ -24,7 +24,6 @@ namespace Opm {
     DeckKeyword::DeckKeyword(const std::string& keywordName) {
         m_knownKeyword = true;
         m_keywordName = keywordName;
-        m_deckIndex = -1;
         m_isDataKeyword = false;
         m_fileName = "";
         m_lineNumber = -1;
@@ -33,7 +32,6 @@ namespace Opm {
     DeckKeyword::DeckKeyword(const std::string& keywordName, bool knownKeyword) {
         m_knownKeyword = knownKeyword;
         m_keywordName = keywordName;
-        m_deckIndex = -1;
         m_isDataKeyword = false;
         m_fileName = "";
         m_lineNumber = -1;
@@ -75,14 +73,6 @@ namespace Opm {
     }
 
 
-    ssize_t DeckKeyword::getDeckIndex() const {
-        return m_deckIndex;
-    }
-
-    void DeckKeyword::setDeckIndex(size_t deckIndex) {
-        m_deckIndex = deckIndex;
-    }
-
     std::string DeckKeyword::name() const {
         return m_keywordName;
     }
diff --git a/opm/parser/eclipse/Deck/DeckKeyword.hpp b/opm/parser/eclipse/Deck/DeckKeyword.hpp
index acb639ef6..43fb90dd2 100644
--- a/opm/parser/eclipse/Deck/DeckKeyword.hpp
+++ b/opm/parser/eclipse/Deck/DeckKeyword.hpp
@@ -47,9 +47,6 @@ namespace Opm {
         bool isKnown() const;
         bool isDataKeyword() const;
 
-        ssize_t getDeckIndex() const;
-        void    setDeckIndex(size_t deckIndex);
-
         const std::vector<int>& getIntData() const;
         const std::vector<double>& getRawDoubleData() const;
         const std::vector<double>& getSIDoubleData() const;
@@ -68,7 +65,6 @@ namespace Opm {
         std::shared_ptr<const ParserKeyword> m_parserKeyword;
         std::vector<DeckRecordConstPtr> m_recordList;
         bool m_knownKeyword;
-        ssize_t m_deckIndex;
         bool m_isDataKeyword;
     };
     typedef std::shared_ptr<DeckKeyword> DeckKeywordPtr;
diff --git a/opm/parser/eclipse/Deck/KeywordContainer.cpp b/opm/parser/eclipse/Deck/KeywordContainer.cpp
index e6c4e4ff0..3c4c08f2c 100644
--- a/opm/parser/eclipse/Deck/KeywordContainer.cpp
+++ b/opm/parser/eclipse/Deck/KeywordContainer.cpp
@@ -37,7 +37,6 @@ namespace Opm {
     }
 
     void KeywordContainer::addKeyword(DeckKeywordPtr keyword) {
-        keyword->setDeckIndex( m_keywordList.size());
         m_keywordList.push_back(keyword);
 
         if (!hasKeyword(keyword->name())) {
diff --git a/opm/parser/eclipse/Deck/tests/DeckKeywordTests.cpp b/opm/parser/eclipse/Deck/tests/DeckKeywordTests.cpp
index ba4e519ac..310a367a0 100644
--- a/opm/parser/eclipse/Deck/tests/DeckKeywordTests.cpp
+++ b/opm/parser/eclipse/Deck/tests/DeckKeywordTests.cpp
@@ -87,12 +87,6 @@ BOOST_AUTO_TEST_CASE(setUnknown_wasknown_nowunknown) {
 }
 
 
-BOOST_AUTO_TEST_CASE(DeckIndex) {
-    DeckKeywordPtr deckKeyword(new DeckKeyword("KW"));
-    BOOST_CHECK_EQUAL( -1 , deckKeyword->getDeckIndex());
-    deckKeyword->setDeckIndex( 10);
-    BOOST_CHECK_EQUAL(10 , deckKeyword->getDeckIndex());
-}
 
 
 
diff --git a/opm/parser/eclipse/IntegrationTests/ParseEQUIL.cpp b/opm/parser/eclipse/IntegrationTests/ParseEQUIL.cpp
index 2d296756e..d11b7b64b 100644
--- a/opm/parser/eclipse/IntegrationTests/ParseEQUIL.cpp
+++ b/opm/parser/eclipse/IntegrationTests/ParseEQUIL.cpp
@@ -43,10 +43,6 @@ BOOST_AUTO_TEST_CASE( parse_EQUIL_OK ) {
     DeckKeywordConstPtr kw1 = deck->getKeyword("EQUIL" , 0);
     BOOST_CHECK_EQUAL( 3U , kw1->size() );
 
-    BOOST_CHECK_EQUAL(0 , kw0->getDeckIndex());
-    BOOST_CHECK_EQUAL(1 , kw1->getDeckIndex());
-
-
     DeckRecordConstPtr rec1 = kw1->getRecord(0);
     BOOST_CHECK_EQUAL( 9U , rec1->size() );