From eb69d85ee42db310bf51be80f24ebc7399e9a368 Mon Sep 17 00:00:00 2001
From: Joakim Hove <joakim.hove@gmail.com>
Date: Mon, 21 Sep 2015 15:41:14 +0200
Subject: [PATCH] TableContainer: PVDO, PVDS and PVDG.

---
 .../eclipse/EclipseState/Tables/PvdgTable.hpp |  6 ++----
 .../eclipse/EclipseState/Tables/PvdoTable.hpp |  6 ++----
 .../eclipse/EclipseState/Tables/PvdsTable.hpp |  6 ++----
 .../EclipseState/Tables/TableManager.cpp      | 19 +++++++++----------
 .../EclipseState/Tables/TableManager.hpp      |  9 +++------
 5 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/opm/parser/eclipse/EclipseState/Tables/PvdgTable.hpp b/opm/parser/eclipse/EclipseState/Tables/PvdgTable.hpp
index 7e2c132b6..6e7f64540 100644
--- a/opm/parser/eclipse/EclipseState/Tables/PvdgTable.hpp
+++ b/opm/parser/eclipse/EclipseState/Tables/PvdgTable.hpp
@@ -25,9 +25,8 @@ namespace Opm {
     // forward declaration
     class TableManager;
 
-    class PvdgTable : protected SimpleTable {
-        
-
+    class PvdgTable : public SimpleTable {
+    public:
         friend class TableManager;
 
         PvdgTable() = default;
@@ -51,7 +50,6 @@ namespace Opm {
             SimpleTable::checkMonotonic("MUG", /*isAscending=*/true, /*strictlyMonotonic=*/false);
         }
 
-    public:
         using SimpleTable::numTables;
         using SimpleTable::numRows;
         using SimpleTable::numColumns;
diff --git a/opm/parser/eclipse/EclipseState/Tables/PvdoTable.hpp b/opm/parser/eclipse/EclipseState/Tables/PvdoTable.hpp
index d9cafaae8..1c0f2b29d 100644
--- a/opm/parser/eclipse/EclipseState/Tables/PvdoTable.hpp
+++ b/opm/parser/eclipse/EclipseState/Tables/PvdoTable.hpp
@@ -25,9 +25,8 @@ namespace Opm {
     // forward declaration
     class TableManager;
 
-    class PvdoTable : protected SimpleTable {
-        
-
+    class PvdoTable : public SimpleTable {
+    public:
         friend class TableManager;
         PvdoTable() = default;
 
@@ -50,7 +49,6 @@ namespace Opm {
             SimpleTable::checkMonotonic("MUO", /*isAscending=*/true, /*strictlyMonotonic=*/false);
         }
 
-    public:
         using SimpleTable::numTables;
         using SimpleTable::numRows;
         using SimpleTable::numColumns;
diff --git a/opm/parser/eclipse/EclipseState/Tables/PvdsTable.hpp b/opm/parser/eclipse/EclipseState/Tables/PvdsTable.hpp
index f19b7cac7..3b085dce8 100644
--- a/opm/parser/eclipse/EclipseState/Tables/PvdsTable.hpp
+++ b/opm/parser/eclipse/EclipseState/Tables/PvdsTable.hpp
@@ -26,9 +26,8 @@ namespace Opm {
     // forward declaration
     class TableManager;
 
-    class PvdsTable : protected SimpleTable {
-        
-
+    class PvdsTable : public SimpleTable {
+    public:
         friend class TableManager;
 
         PvdsTable() = default;
@@ -52,7 +51,6 @@ namespace Opm {
             SimpleTable::checkMonotonic("MUG", /*isAscending=*/true, /*strictlyMonotonic=*/false);
         }
 
-    public:
         using SimpleTable::numTables;
         using SimpleTable::numRows;
         using SimpleTable::numColumns;
diff --git a/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp b/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp
index af287ef41..b955f33bc 100644
--- a/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp
+++ b/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp
@@ -190,13 +190,13 @@ namespace Opm {
             initSimpleTableContainer<ImkrvdTable>( deck , "IMKRVD", numEndScaleTables);
             initSimpleTableContainer<ImptvdTable>( deck , "IMPTVD", numEndScaleTables);
         }
+        initSimpleTableContainer<PvdgTable>(deck, "PVDG", m_tabdims->getNumPVTTables());
+        initSimpleTableContainer<PvdoTable>(deck, "PVDO", m_tabdims->getNumPVTTables());
+        initSimpleTableContainer<PvdsTable>(deck, "PVDS", m_tabdims->getNumPVTTables());
 
         /*****************************************************************/
 
 
-        initSimpleTable(deck, "PVDG", m_pvdgTables);
-        initSimpleTable(deck, "PVDO", m_pvdoTables);
-        initSimpleTable(deck, "PVDS", m_pvdsTables);
         initSimpleTable(deck, "PLYADS", m_plyadsTables);
         initSimpleTable(deck, "PLYVISC", m_plyviscTables);
         initSimpleTable(deck, "PLYDHFLF", m_plydhflfTables);
@@ -483,17 +483,16 @@ namespace Opm {
         return getTables("IMPTVD");
     }
 
-
-    const std::vector<PvdgTable>& TableManager::getPvdgTables() const {
-        return m_pvdgTables;
+    const TableContainer& TableManager::getPvdgTables() const {
+        return getTables("PVDG");
     }
 
-    const std::vector<PvdoTable>& TableManager::getPvdoTables() const {
-        return m_pvdoTables;
+    const TableContainer& TableManager::getPvdoTables() const {
+        return getTables("PVDO");
     }
 
-    const std::vector<PvdsTable>& TableManager::getPvdsTables() const {
-        return m_pvdsTables;
+    const TableContainer& TableManager::getPvdsTables() const {
+        return getTables("PVDS");
     }
 
     const std::vector<OilvisctTable>& TableManager::getOilvisctTables() const {
diff --git a/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp b/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp
index da67e3bdc..6495bce56 100644
--- a/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp
+++ b/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp
@@ -87,6 +87,9 @@ namespace Opm {
         const TableContainer& getEnptvdTables() const;
         const TableContainer& getImkrvdTables() const;
         const TableContainer& getImptvdTables() const;
+        const TableContainer& getPvdgTables() const;
+        const TableContainer& getPvdoTables() const;
+        const TableContainer& getPvdsTables() const;
 
 
         // the tables used by the deck. If the tables had some defaulted data in the
@@ -94,9 +97,6 @@ namespace Opm {
         // not present in the deck, the corresponding vector is of size zero.
         const std::vector<PvtgTable>& getPvtgTables() const;
         const std::vector<PvtoTable>& getPvtoTables() const;
-        const std::vector<PvdgTable>& getPvdgTables() const;
-        const std::vector<PvdoTable>& getPvdoTables() const;
-        const std::vector<PvdsTable>& getPvdsTables() const;
         const std::vector<PlyshlogTable>& getPlyshlogTables() const;
         const std::vector<PlyadsTable>& getPlyadsTables() const;
         const std::vector<PlymaxTable>& getPlymaxTables() const;
@@ -233,9 +233,6 @@ namespace Opm {
         std::map<int, VFPInjTable> m_vfpinjTables;
         std::vector<PvtgTable> m_pvtgTables;
         std::vector<PvtoTable> m_pvtoTables;
-        std::vector<PvdsTable> m_pvdsTables;
-        std::vector<PvdgTable> m_pvdgTables;
-        std::vector<PvdoTable> m_pvdoTables;
         std::vector<PlyadsTable> m_plyadsTables;
         std::vector<PlymaxTable> m_plymaxTables;
         std::vector<PlyrockTable> m_plyrockTables;