From c38b8928760595fdbcca486be12c634903f90c38 Mon Sep 17 00:00:00 2001
From: Joakim Hove <joakim.hove@gmail.com>
Date: Thu, 11 Jun 2015 23:11:29 +0200
Subject: [PATCH] Moved initialization of FaultCollection.

---
 .../eclipse/EclipseState/EclipseState.cpp     | 35 ++----------------
 .../EclipseState/Grid/FaultCollection.cpp     | 37 +++++++++++++++++++
 .../EclipseState/Grid/FaultCollection.hpp     |  5 +++
 3 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/opm/parser/eclipse/EclipseState/EclipseState.cpp b/opm/parser/eclipse/EclipseState/EclipseState.cpp
index 629018017..7b8eb9b77 100644
--- a/opm/parser/eclipse/EclipseState/EclipseState.cpp
+++ b/opm/parser/eclipse/EclipseState/EclipseState.cpp
@@ -431,42 +431,13 @@ namespace Opm {
 
     void EclipseState::initFaults(DeckConstPtr deck) {
         EclipseGridConstPtr grid = getEclipseGrid();
-        m_faults = std::make_shared<FaultCollection>();
-        std::shared_ptr<Opm::GRIDSection> gridSection(new Opm::GRIDSection(deck) );
-
-        for (size_t index=0; index < gridSection->count("FAULTS"); index++) {
-            DeckKeywordConstPtr faultsKeyword = gridSection->getKeyword("FAULTS" , index);
-            for (auto iter = faultsKeyword->begin(); iter != faultsKeyword->end(); ++iter) {
-                DeckRecordConstPtr faultRecord = *iter;
-                const std::string& faultName = faultRecord->getItem(0)->getString(0);
-                int I1 = faultRecord->getItem(1)->getInt(0) - 1;
-                int I2 = faultRecord->getItem(2)->getInt(0) - 1;
-                int J1 = faultRecord->getItem(3)->getInt(0) - 1;
-                int J2 = faultRecord->getItem(4)->getInt(0) - 1;
-                int K1 = faultRecord->getItem(5)->getInt(0) - 1;
-                int K2 = faultRecord->getItem(6)->getInt(0) - 1;
-                FaceDir::DirEnum faceDir = FaceDir::FromString( faultRecord->getItem(7)->getString(0) );
-                std::shared_ptr<const FaultFace> face = std::make_shared<const FaultFace>(grid->getNX() , grid->getNY() , grid->getNZ(),
-                                                                                          static_cast<size_t>(I1) , static_cast<size_t>(I2) ,
-                                                                                          static_cast<size_t>(J1) , static_cast<size_t>(J2) ,
-                                                                                          static_cast<size_t>(K1) , static_cast<size_t>(K2) ,
-                                                                                          faceDir);
-                if (!m_faults->hasFault(faultName)) {
-                    std::shared_ptr<Fault> fault = std::make_shared<Fault>( faultName );
-                    m_faults->addFault( fault );
-                }
-
-                {
-                    std::shared_ptr<Fault> fault = m_faults->getFault( faultName );
-                    fault->addFace( face );
-                }
-            }
-        }
+        std::shared_ptr<GRIDSection> gridSection = std::make_shared<GRIDSection>( deck );
 
+        m_faults = std::make_shared<FaultCollection>(gridSection , grid);
         setMULTFLT(gridSection);
 
         if (Section::hasEDIT(deck)) {
-            std::shared_ptr<Opm::EDITSection> editSection(new Opm::EDITSection(deck) );
+            std::shared_ptr<EDITSection> editSection = std::make_shared<EDITSection>( deck );
             setMULTFLT(editSection);
         }
 
diff --git a/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp b/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp
index d94804775..9570573d4 100644
--- a/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp
+++ b/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp
@@ -19,6 +19,8 @@
 
 #include <stdexcept>
 
+#include <opm/parser/eclipse/Parser/ParserKeywords.hpp>
+
 #include <opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp>
 
 namespace Opm {
@@ -28,6 +30,41 @@ namespace Opm {
 
     }
 
+
+    FaultCollection::FaultCollection( std::shared_ptr<const Deck> deck, std::shared_ptr<const EclipseGrid> grid) {
+        std::vector<std::shared_ptr<const DeckKeyword> > faultKeywords = deck->getKeywordList<ParserKeywords::FAULTS>();
+
+        for (auto keyword_iter = faultKeywords.begin(); keyword_iter != faultKeywords.end(); ++keyword_iter) {
+            std::shared_ptr<const DeckKeyword> faultsKeyword = *keyword_iter;
+            for (auto iter = faultsKeyword->begin(); iter != faultsKeyword->end(); ++iter) {
+                DeckRecordConstPtr faultRecord = *iter;
+                const std::string& faultName = faultRecord->getItem(0)->getString(0);
+                int I1 = faultRecord->getItem(1)->getInt(0) - 1;
+                int I2 = faultRecord->getItem(2)->getInt(0) - 1;
+                int J1 = faultRecord->getItem(3)->getInt(0) - 1;
+                int J2 = faultRecord->getItem(4)->getInt(0) - 1;
+                int K1 = faultRecord->getItem(5)->getInt(0) - 1;
+                int K2 = faultRecord->getItem(6)->getInt(0) - 1;
+                FaceDir::DirEnum faceDir = FaceDir::FromString( faultRecord->getItem(7)->getString(0) );
+                std::shared_ptr<const FaultFace> face = std::make_shared<const FaultFace>(grid->getNX() , grid->getNY() , grid->getNZ(),
+                                                                                          static_cast<size_t>(I1) , static_cast<size_t>(I2) ,
+                                                                                          static_cast<size_t>(J1) , static_cast<size_t>(J2) ,
+                                                                                          static_cast<size_t>(K1) , static_cast<size_t>(K2) ,
+                                                                                          faceDir);
+                if (!hasFault(faultName)) {
+                    std::shared_ptr<Fault> fault = std::make_shared<Fault>( faultName );
+                    addFault( fault );
+                }
+
+                {
+                    std::shared_ptr<Fault> fault = getFault( faultName );
+                    fault->addFace( face );
+                }
+            }
+        }
+    }
+
+
     size_t FaultCollection::size() const {
         return m_faults.size();
     }
diff --git a/opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp b/opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp
index a141a50c9..f86ba5eaa 100644
--- a/opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp
+++ b/opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp
@@ -27,6 +27,9 @@
 
 #include <opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp>
 
+#include <opm/parser/eclipse/Deck/Deck.hpp>
+
+#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/Fault.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/FaultFace.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/FaceDir.hpp>
@@ -37,6 +40,8 @@ namespace Opm {
 class FaultCollection {
 public:
     FaultCollection();
+    FaultCollection( std::shared_ptr<const Deck> deck, std::shared_ptr<const EclipseGrid> grid);
+
     size_t size() const;
     bool hasFault(const std::string& faultName) const;
     std::shared_ptr<Fault>  getFault(const std::string& faultName) const;