OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved simple polymer tables EclipseState -> Tables

Browse Source
This commit is contained in:
Joakim Hove 2015-08-31 15:33:21 +02:00
parent 9cb2440068
commit 91d5facc4b
9 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
opm/parser/eclipse/EclipseState/EclipseState.cpp
View File

@ -184,29 +184,11 @@ namespace Opm {
return m_imptvdTables;
}
const std::vector<PlyadsTable>& EclipseState::getPlyadsTables() const {
return m_plyadsTables;
}
const std::vector<PlymaxTable>& EclipseState::getPlymaxTables() const {
return m_plymaxTables;
}
const std::vector<PlyrockTable>& EclipseState::getPlyrockTables() const {
return m_plyrockTables;
}
const std::vector<PlyviscTable>& EclipseState::getPlyviscTables() const {
return m_plyviscTables;
}
const std::vector<PlyshlogTable>& EclipseState::getPlyshlogTables() const {
return m_plyshlogTables;
}
const std::vector<PlydhflfTable>& EclipseState::getPlydhflfTables() const {
return m_plydhflfTables;
}
const std::vector<PvtgTable>& EclipseState::getPvtgTables() const {
return m_pvtgTables;
@ -291,11 +273,6 @@ namespace Opm {
initSimpleTables(deck, "ENPTVD", m_enptvdTables);
initSimpleTables(deck, "IMKRVD", m_imkrvdTables);
initSimpleTables(deck, "IMPTVD", m_imptvdTables);
initSimpleTables(deck, "PLYADS", m_plyadsTables);
initSimpleTables(deck, "PLYMAX", m_plymaxTables);
initSimpleTables(deck, "PLYROCK", m_plyrockTables);
initSimpleTables(deck, "PLYVISC", m_plyviscTables);
initSimpleTables(deck, "PLYDHFLF", m_plydhflfTables);
initSimpleTables(deck, "RSVD", m_rsvdTables);
initSimpleTables(deck, "RVVD", m_rvvdTables);

17
opm/parser/eclipse/EclipseState/EclipseState.hpp
View File

@ -36,15 +36,10 @@
#include <opm/parser/eclipse/EclipseState/Tables/Tables.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/EnkrvdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/EnptvdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlyshlogTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/GasvisctTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/ImkrvdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/ImptvdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlyadsTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlymaxTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlyrockTable.hpp>
#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/PvtgTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PvtoTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/RocktabTable.hpp>
@ -113,11 +108,6 @@ namespace Opm {
const std::vector<GasvisctTable>& getGasvisctTables() const;
const std::vector<ImkrvdTable>& getImkrvdTables() const;
const std::vector<ImptvdTable>& getImptvdTables() const;
const std::vector<PlyadsTable>& getPlyadsTables() const;
const std::vector<PlymaxTable>& getPlymaxTables() const;
const std::vector<PlyrockTable>& getPlyrockTables() const;
const std::vector<PlyviscTable>& getPlyviscTables() const;
const std::vector<PlydhflfTable>& getPlydhflfTables() const;
const std::vector<PlyshlogTable>& getPlyshlogTables() const;
const std::vector<PvtgTable>& getPvtgTables() const;
const std::vector<PvtoTable>& getPvtoTables() const;
@ -257,11 +247,6 @@ namespace Opm {
std::vector<GasvisctTable> m_gasvisctTables;
std::vector<ImkrvdTable> m_imkrvdTables;
std::vector<ImptvdTable> m_imptvdTables;
std::vector<PlyadsTable> m_plyadsTables;
std::vector<PlymaxTable> m_plymaxTables;
std::vector<PlyrockTable> m_plyrockTables;
std::vector<PlyviscTable> m_plyviscTables;
std::vector<PlydhflfTable> m_plydhflfTables;
std::vector<PlyshlogTable> m_plyshlogTables;
std::vector<PvtgTable> m_pvtgTables;
std::vector<PvtoTable> m_pvtoTables;

4
opm/parser/eclipse/EclipseState/Tables/PlyadsTable.hpp
View File

@ -23,12 +23,12 @@
namespace Opm {
// forward declaration
class EclipseState;
class Tables;
class PlyadsTable : protected SingleRecordTable {
typedef SingleRecordTable ParentType;
friend class EclipseState;
friend class Tables;
/*!
* \brief Read the PLYADS keyword and provide some convenience

4
opm/parser/eclipse/EclipseState/Tables/PlydhflfTable.hpp
View File

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

4
opm/parser/eclipse/EclipseState/Tables/PlymaxTable.hpp
View File

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

4
opm/parser/eclipse/EclipseState/Tables/PlyrockTable.hpp
View File

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

4
opm/parser/eclipse/EclipseState/Tables/PlyviscTable.hpp
View File

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

25
opm/parser/eclipse/EclipseState/Tables/TableManager.cpp
View File

@ -37,6 +37,11 @@ namespace Opm {
initSimpleTables(deck, "SGFN", m_sgfnTables);
initSimpleTables(deck, "SSFN", m_ssfnTables);
initSimpleTables(deck, "PVDS", m_pvdsTables);
initSimpleTables(deck, "PLYADS", m_plyadsTables);
initSimpleTables(deck, "PLYMAX", m_plymaxTables);
initSimpleTables(deck, "PLYROCK", m_plyrockTables);
initSimpleTables(deck, "PLYVISC", m_plyviscTables);
initSimpleTables(deck, "PLYDHFLF", m_plydhflfTables);
initSimpleTables(deck, "OILVISCT", m_oilvisctTables);
initSimpleTables(deck, "WATVISCT", m_watvisctTables);
}
@ -131,6 +136,26 @@ namespace Opm {
return m_watvisctTables;
}
const std::vector<PlyadsTable>& Tables::getPlyadsTables() const {
return m_plyadsTables;
}
const std::vector<PlymaxTable>& Tables::getPlymaxTables() const {
return m_plymaxTables;
}
const std::vector<PlyrockTable>& Tables::getPlyrockTables() const {
return m_plyrockTables;
}
const std::vector<PlyviscTable>& Tables::getPlyviscTables() const {
return m_plyviscTables;
}
const std::vector<PlydhflfTable>& Tables::getPlydhflfTables() const {
return m_plydhflfTables;
}
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);

16
opm/parser/eclipse/EclipseState/Tables/TableManager.hpp
View File

@ -34,6 +34,11 @@
#include <opm/parser/eclipse/EclipseState/Tables/SgfnTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SsfnTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PvdsTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlyadsTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlymaxTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlyrockTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlyviscTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlydhflfTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/OilvisctTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/WatvisctTable.hpp>
@ -57,6 +62,11 @@ namespace Opm {
const std::vector<SgfnTable>& getSgfnTables() const;
const std::vector<SsfnTable>& getSsfnTables() const;
const std::vector<PvdsTable>& getPvdsTables() const;
const std::vector<PlyadsTable>& getPlyadsTables() const;
const std::vector<PlymaxTable>& getPlymaxTables() const;
const std::vector<PlyrockTable>& getPlyrockTables() const;
const std::vector<PlyviscTable>& getPlyviscTables() const;
const std::vector<PlydhflfTable>& getPlydhflfTables() const;
const std::vector<WatvisctTable>& getWatvisctTables() const;
const std::vector<OilvisctTable>& getOilvisctTables() const;
@ -108,6 +118,12 @@ namespace Opm {
std::vector<SgofTable> m_sgofTables;
std::vector<SwofTable> m_swofTables;
std::vector<SlgofTable> m_slgofTables;
std::vector<PlyadsTable> m_plyadsTables;
std::vector<PlymaxTable> m_plymaxTables;
std::vector<PlyrockTable> m_plyrockTables;
std::vector<PlyviscTable> m_plyviscTables;
std::vector<PlydhflfTable> m_plydhflfTables;
std::vector<WatvisctTable> m_watvisctTables;
std::vector<OilvisctTable> m_oilvisctTables;
std::shared_ptr<Tabdims> m_tabdims;