Moved PVDO & PVDG EclipseState -> Tables

This commit is contained in:
Joakim Hove 2015-08-28 20:20:39 +02:00
parent 805b14de09
commit d08d8799c7
6 changed files with 20 additions and 20 deletions

View File

@ -212,14 +212,6 @@ namespace Opm {
return m_plydhflfTables;
}
const std::vector<PvdgTable>& EclipseState::getPvdgTables() const {
return m_pvdgTables;
}
const std::vector<PvdoTable>& EclipseState::getPvdoTables() const {
return m_pvdoTables;
}
const std::vector<PvtgTable>& EclipseState::getPvtgTables() const {
return m_pvtgTables;
}
@ -327,8 +319,6 @@ namespace Opm {
initSimpleTables(deck, "PLYROCK", m_plyrockTables);
initSimpleTables(deck, "PLYVISC", m_plyviscTables);
initSimpleTables(deck, "PLYDHFLF", m_plydhflfTables);
initSimpleTables(deck, "PVDG", m_pvdgTables);
initSimpleTables(deck, "PVDO", m_pvdoTables);
initSimpleTables(deck, "RSVD", m_rsvdTables);
initSimpleTables(deck, "RVVD", m_rvvdTables);
initSimpleTables(deck, "SWFN", m_swfnTables);

View File

@ -46,8 +46,6 @@
#include <opm/parser/eclipse/EclipseState/Tables/PlyviscTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlyshlogTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlydhflfTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PvdgTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PvdoTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PvtgTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PvdsTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PvtoTable.hpp>
@ -128,8 +126,6 @@ namespace Opm {
const std::vector<PlyviscTable>& getPlyviscTables() const;
const std::vector<PlydhflfTable>& getPlydhflfTables() const;
const std::vector<PlyshlogTable>& getPlyshlogTables() const;
const std::vector<PvdgTable>& getPvdgTables() const;
const std::vector<PvdoTable>& getPvdoTables() const;
const std::vector<PvtgTable>& getPvtgTables() const;
const std::vector<PvdsTable>& getPvdsTables() const;
const std::vector<PvtoTable>& getPvtoTables() const;
@ -280,8 +276,6 @@ namespace Opm {
std::vector<PlyviscTable> m_plyviscTables;
std::vector<PlydhflfTable> m_plydhflfTables;
std::vector<PlyshlogTable> m_plyshlogTables;
std::vector<PvdgTable> m_pvdgTables;
std::vector<PvdoTable> m_pvdoTables;
std::vector<PvtgTable> m_pvtgTables;
std::vector<PvdsTable> m_pvdsTables;
std::vector<PvtoTable> m_pvtoTables;

View File

@ -23,12 +23,12 @@
namespace Opm {
// forward declaration
class EclipseState;
class Tables;
class PvdgTable : protected SingleRecordTable {
typedef SingleRecordTable ParentType;
friend class EclipseState;
friend class Tables;
PvdgTable() = default;

View File

@ -23,12 +23,12 @@
namespace Opm {
// forward declaration
class EclipseState;
class Tables;
class PvdoTable : protected SingleRecordTable {
typedef SingleRecordTable ParentType;
friend class EclipseState;
friend class Tables;
PvdoTable() = default;
/*!

View File

@ -31,6 +31,8 @@ namespace Opm {
initSimpleTables(deck, "SLGOF", m_slgofTables);
initSimpleTables(deck, "SOF2", m_sof2Tables);
initSimpleTables(deck, "SOF3", m_sof3Tables);
initSimpleTables(deck, "PVDG", m_pvdgTables);
initSimpleTables(deck, "PVDO", m_pvdoTables);
}
@ -91,6 +93,14 @@ namespace Opm {
return m_sof3Tables;
}
const std::vector<PvdgTable>& Tables::getPvdgTables() const {
return m_pvdgTables;
}
const std::vector<PvdoTable>& Tables::getPvdoTables() const {
return m_pvdoTables;
}
void Tables::complainAboutAmbiguousKeyword(const Deck& deck, const std::string& keywordName) const {
OpmLog::addMessage(Log::MessageType::Error, "The " + keywordName + " keyword must be unique in the deck. Ignoring all!");
auto keywords = deck.getKeywordList(keywordName);

View File

@ -28,6 +28,8 @@
#include <opm/parser/eclipse/EclipseState/Tables/SlgofTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Sof3Table.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PvdgTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PvdoTable.hpp>
namespace Opm {
@ -43,6 +45,8 @@ namespace Opm {
const std::vector<SwofTable>& getSwofTables() const;
const std::vector<SgofTable>& getSgofTables() const;
const std::vector<SlgofTable>& getSlgofTables() const;
const std::vector<PvdgTable>& getPvdgTables() const;
const std::vector<PvdoTable>& getPvdoTables() const;
private:
void complainAboutAmbiguousKeyword(const Deck& deck, const std::string& keywordName) const;
@ -80,6 +84,8 @@ namespace Opm {
}
}
std::vector<PvdgTable> m_pvdgTables;
std::vector<PvdoTable> m_pvdoTables;
std::vector<Sof2Table> m_sof2Tables;
std::vector<Sof3Table> m_sof3Tables;
std::vector<SgofTable> m_sgofTables;