From f278f87f1499824799e809a39845d7b4aa1f3360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Thu, 5 Jan 2012 16:43:57 +0100
Subject: [PATCH] Now initializes rock properties.

---
 opm/core/fluid/BlackoilPropertiesFromDeck.cpp | 4 +++-
 opm/core/fluid/BlackoilPropertiesFromDeck.hpp | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/opm/core/fluid/BlackoilPropertiesFromDeck.cpp b/opm/core/fluid/BlackoilPropertiesFromDeck.cpp
index 178e4823..84c00583 100644
--- a/opm/core/fluid/BlackoilPropertiesFromDeck.cpp
+++ b/opm/core/fluid/BlackoilPropertiesFromDeck.cpp
@@ -22,8 +22,10 @@
 namespace Opm
 {
 
-    BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck(const Dune::EclipseGridParser& deck)
+    BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck(const Dune::EclipseGridParser& deck,
+                                                           const std::vector<int>& global_cell)
     {
+        rock_.init(deck, global_cell);
         pvt_.init(deck);
         satprops_.init(deck);
     }
diff --git a/opm/core/fluid/BlackoilPropertiesFromDeck.hpp b/opm/core/fluid/BlackoilPropertiesFromDeck.hpp
index d710b067..12913c6d 100644
--- a/opm/core/fluid/BlackoilPropertiesFromDeck.hpp
+++ b/opm/core/fluid/BlackoilPropertiesFromDeck.hpp
@@ -35,8 +35,12 @@ namespace Opm
     class BlackoilPropertiesFromDeck : public BlackoilPropertiesInterface
     {
     public:
-        /// Construct from deck.
-        BlackoilPropertiesFromDeck(const Dune::EclipseGridParser& deck);
+        /// Construct from deck and cell mapping.
+        /// \param  deck         eclipse input parser
+        /// \param  global_cell  mapping from cell indices (typically from a processed grid)
+        ///                      to logical cartesian indices consistent with the deck.
+        BlackoilPropertiesFromDeck(const Dune::EclipseGridParser& deck,
+                                   const std::vector<int>& global_cell);
 
         /// Destructor.
         virtual ~BlackoilPropertiesFromDeck();