From 0cf00f240b39b805ffec1369ab79981b5ef3ad42 Mon Sep 17 00:00:00 2001
From: Joakim Hove <joakim.hove@gmail.com>
Date: Tue, 5 Jan 2016 12:12:29 +0100
Subject: [PATCH] Changed to use new table api from opm-parser.

---
 opm/core/simulator/initStateEquil.hpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/opm/core/simulator/initStateEquil.hpp b/opm/core/simulator/initStateEquil.hpp
index 6ce7f96bb..e439d0805 100644
--- a/opm/core/simulator/initStateEquil.hpp
+++ b/opm/core/simulator/initStateEquil.hpp
@@ -294,10 +294,11 @@ namespace Opm
                             if (rec[i].live_oil_table_index > 0) {
                                 if (rsvdTables.size() > 0 && size_t(rec[i].live_oil_table_index) <= rsvdTables.size()) { 
                                     const RsvdTable& rsvdTable = rsvdTables.getTable<RsvdTable>(i);
+                                    std::vector<double> depthColumn = rsvdTable.getColumn("DEPTH").vectorCopy();
+                                    std::vector<double> rsColumn = rsvdTable.getColumn("RS").vectorCopy();
                                     rs_func_.push_back(std::make_shared<Miscibility::RsVD>(props,
                                                                                            cell,
-                                                                                           rsvdTable.getDepthColumn(),
-                                                                                           rsvdTable.getRsColumn()));
+                                                                                           depthColumn , rsColumn));
                                 } else {
                                     OPM_THROW(std::runtime_error, "Cannot initialise: RSVD table " << (rec[i].live_oil_table_index) << " not available.");
                                 }
@@ -327,10 +328,13 @@ namespace Opm
                             if (rec[i].wet_gas_table_index > 0) {
                                 if (rvvdTables.size() > 0 && size_t(rec[i].wet_gas_table_index) <= rvvdTables.size()) { 
                                     const RvvdTable& rvvdTable = rvvdTables.getTable<RvvdTable>(i);
+                                    std::vector<double> depthColumn = rvvdTable.getColumn("DEPTH").vectorCopy();
+                                    std::vector<double> rvColumn = rvvdTable.getColumn("RV").vectorCopy();
+
                                     rv_func_.push_back(std::make_shared<Miscibility::RvVD>(props,
                                                                                            cell,
-                                                                                           rvvdTable.getDepthColumn(),
-                                                                                           rvvdTable.getRvColumn()));
+                                                                                           depthColumn , rvColumn));
+
                                 } else {
                                     OPM_THROW(std::runtime_error, "Cannot initialise: RVVD table " << (rec[i].wet_gas_table_index) << " not available.");
                                 }