From 78cc2b8ca42a7a410ced18cd3387d2b31ecb6555 Mon Sep 17 00:00:00 2001
From: Kai Bao <kai.bao@sintef.no>
Date: Fri, 20 Apr 2018 11:29:22 +0200
Subject: [PATCH] adapting to the interface change of VFP related in parser.

---
 opm/autodiff/VFPInjProperties.cpp  | 4 ++--
 opm/autodiff/VFPInjProperties.hpp  | 2 +-
 opm/autodiff/VFPProdProperties.cpp | 4 ++--
 opm/autodiff/VFPProdProperties.hpp | 2 +-
 opm/autodiff/VFPProperties.cpp     | 4 ++--
 opm/autodiff/VFPProperties.hpp     | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/opm/autodiff/VFPInjProperties.cpp b/opm/autodiff/VFPInjProperties.cpp
index acb85fc75..745bbe113 100644
--- a/opm/autodiff/VFPInjProperties.cpp
+++ b/opm/autodiff/VFPInjProperties.cpp
@@ -61,9 +61,9 @@ VFPInjProperties::VFPInjProperties(const VFPInjTable* table){
 
 
 
-VFPInjProperties::VFPInjProperties(const std::map<int, VFPInjTable>& tables) {
+VFPInjProperties::VFPInjProperties(const std::map<int, std::shared_ptr<const VFPInjTable> >& tables) {
     for (const auto& table : tables) {
-        m_tables[table.first] = &(table.second);
+        m_tables[table.first] = table.second.get();
     }
 }
 
diff --git a/opm/autodiff/VFPInjProperties.hpp b/opm/autodiff/VFPInjProperties.hpp
index 31cb16f5f..088db8341 100644
--- a/opm/autodiff/VFPInjProperties.hpp
+++ b/opm/autodiff/VFPInjProperties.hpp
@@ -57,7 +57,7 @@ public:
      * Takes *no* ownership of data.
      * @param inj_tables A map of different VFPINJ tables.
      */
-    explicit VFPInjProperties(const std::map<int, VFPInjTable>& inj_tables);
+    explicit VFPInjProperties(const std::map<int, std::shared_ptr<const VFPInjTable> >& inj_tables);
 
     /**
      * Linear interpolation of bhp as function of the input parameters.
diff --git a/opm/autodiff/VFPProdProperties.cpp b/opm/autodiff/VFPProdProperties.cpp
index bcc9da950..b57c4132e 100644
--- a/opm/autodiff/VFPProdProperties.cpp
+++ b/opm/autodiff/VFPProdProperties.cpp
@@ -48,9 +48,9 @@ VFPProdProperties::VFPProdProperties(const VFPProdTable* table){
 
 
 
-VFPProdProperties::VFPProdProperties(const std::map<int, VFPProdTable>& tables) {
+VFPProdProperties::VFPProdProperties(const std::map<int, std::shared_ptr<const VFPProdTable> >& tables) {
     for (const auto& table : tables) {
-        m_tables[table.first] = &(table.second);
+        m_tables[table.first] = table.second.get();
     }
 }
 
diff --git a/opm/autodiff/VFPProdProperties.hpp b/opm/autodiff/VFPProdProperties.hpp
index a436144df..32e6048c3 100644
--- a/opm/autodiff/VFPProdProperties.hpp
+++ b/opm/autodiff/VFPProdProperties.hpp
@@ -61,7 +61,7 @@ public:
      * Takes *no* ownership of data.
      * @param prod_tables A map of different VFPPROD tables.
      */
-    explicit VFPProdProperties(const std::map<int, VFPProdTable>& prod_tables);
+    explicit VFPProdProperties(const std::map<int, std::shared_ptr<const VFPProdTable> >& prod_tables);
 
     /**
      * Linear interpolation of bhp as function of the input parameters.
diff --git a/opm/autodiff/VFPProperties.cpp b/opm/autodiff/VFPProperties.cpp
index 61d46c942..91007090c 100644
--- a/opm/autodiff/VFPProperties.cpp
+++ b/opm/autodiff/VFPProperties.cpp
@@ -38,8 +38,8 @@ VFPProperties::VFPProperties(const VFPInjTable* inj_table, const VFPProdTable* p
     }
 }
 
-VFPProperties::VFPProperties(const std::map<int, VFPInjTable>& inj_tables,
-                             const std::map<int, VFPProdTable>& prod_tables) {
+VFPProperties::VFPProperties(const std::map<int, std::shared_ptr<const VFPInjTable> >& inj_tables,
+                             const std::map<int, std::shared_ptr<const VFPProdTable> >& prod_tables) {
     m_inj.reset(new VFPInjProperties(inj_tables));
     m_prod.reset(new VFPProdProperties(prod_tables));
 }
diff --git a/opm/autodiff/VFPProperties.hpp b/opm/autodiff/VFPProperties.hpp
index 4dbba3205..24bd000a9 100644
--- a/opm/autodiff/VFPProperties.hpp
+++ b/opm/autodiff/VFPProperties.hpp
@@ -52,8 +52,8 @@ public:
      * @param inj_tables A map of different VFPINJ tables.
      * @param prod_tables A map of different VFPPROD tables.
      */
-    VFPProperties(const std::map<int, VFPInjTable>& inj_tables,
-                  const std::map<int, VFPProdTable>& prod_tables);
+    VFPProperties(const std::map<int, std::shared_ptr<const VFPInjTable> >& inj_tables,
+                  const std::map<int, std::shared_ptr<const VFPProdTable> >& prod_tables);
 
     /**
      * Returns the VFP properties for injection wells