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

Moved OILVISCT and WATVISCT EclipseState -> Tables

Browse Source
This commit is contained in:
Joakim Hove 2015-08-31 15:16:36 +02:00
parent 6709a7a377
commit 9cb2440068
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,10 +184,6 @@ namespace Opm {
return m_imptvdTables;
}
const std::vector<OilvisctTable>& EclipseState::getOilvisctTables() const {
return m_oilvisctTables;
}
const std::vector<PlyadsTable>& EclipseState::getPlyadsTables() const {
return m_plyadsTables;
}
@ -237,10 +233,6 @@ namespace Opm {
return m_rtempvdTables;
}
const std::vector<WatvisctTable>& EclipseState::getWatvisctTables() const {
return m_watvisctTables;
}
const std::map<int, VFPProdTable>& EclipseState::getVFPProdTables() const {
return m_vfpprodTables;
}
@ -299,7 +291,6 @@ namespace Opm {
initSimpleTables(deck, "ENPTVD", m_enptvdTables);
initSimpleTables(deck, "IMKRVD", m_imkrvdTables);
initSimpleTables(deck, "IMPTVD", m_imptvdTables);
initSimpleTables(deck, "OILVISCT", m_oilvisctTables);
initSimpleTables(deck, "PLYADS", m_plyadsTables);
initSimpleTables(deck, "PLYMAX", m_plymaxTables);
initSimpleTables(deck, "PLYROCK", m_plyrockTables);
@ -307,7 +298,6 @@ namespace Opm {
initSimpleTables(deck, "PLYDHFLF", m_plydhflfTables);
initSimpleTables(deck, "RSVD", m_rsvdTables);
initSimpleTables(deck, "RVVD", m_rvvdTables);
initSimpleTables(deck, "WATVISCT", m_watvisctTables);
// the number of columns of the GASVSISCT tables depends on the value of the
// COMPS keyword...

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

@ -39,7 +39,6 @@
#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/OilvisctTable.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>
@ -52,7 +51,6 @@
#include <opm/parser/eclipse/EclipseState/Tables/RsvdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/RvvdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/RtempvdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/WatvisctTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/VFPProdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/VFPInjTable.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
@ -115,7 +113,6 @@ namespace Opm {
const std::vector<GasvisctTable>& getGasvisctTables() const;
const std::vector<ImkrvdTable>& getImkrvdTables() const;
const std::vector<ImptvdTable>& getImptvdTables() const;
const std::vector<OilvisctTable>& getOilvisctTables() const;
const std::vector<PlyadsTable>& getPlyadsTables() const;
const std::vector<PlymaxTable>& getPlymaxTables() const;
const std::vector<PlyrockTable>& getPlyrockTables() const;
@ -128,7 +125,6 @@ namespace Opm {
const std::vector<RsvdTable>& getRsvdTables() const;
const std::vector<RvvdTable>& getRvvdTables() const;
const std::vector<RtempvdTable>& getRtempvdTables() const;
const std::vector<WatvisctTable>& getWatvisctTables() const;
const std::map<int, VFPProdTable>& getVFPProdTables() const;
const std::map<int, VFPInjTable>& getVFPInjTables() const;
size_t getNumPhases() const;
@ -261,7 +257,6 @@ namespace Opm {
std::vector<GasvisctTable> m_gasvisctTables;
std::vector<ImkrvdTable> m_imkrvdTables;
std::vector<ImptvdTable> m_imptvdTables;
std::vector<OilvisctTable> m_oilvisctTables;
std::vector<PlyadsTable> m_plyadsTables;
std::vector<PlymaxTable> m_plymaxTables;
std::vector<PlyrockTable> m_plyrockTables;
@ -274,7 +269,6 @@ namespace Opm {
std::vector<RsvdTable> m_rsvdTables;
std::vector<RvvdTable> m_rvvdTables;
std::vector<RtempvdTable> m_rtempvdTables;
std::vector<WatvisctTable> m_watvisctTables;
std::map<int, VFPProdTable> m_vfpprodTables;
std::map<int, VFPInjTable> m_vfpinjTables;

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

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

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

@ -37,6 +37,8 @@ namespace Opm {
initSimpleTables(deck, "SGFN", m_sgfnTables);
initSimpleTables(deck, "SSFN", m_ssfnTables);
initSimpleTables(deck, "PVDS", m_pvdsTables);
initSimpleTables(deck, "OILVISCT", m_oilvisctTables);
initSimpleTables(deck, "WATVISCT", m_watvisctTables);
}
@ -121,6 +123,13 @@ namespace Opm {
return m_pvdsTables;
}
const std::vector<OilvisctTable>& Tables::getOilvisctTables() const {
return m_oilvisctTables;
}
const std::vector<WatvisctTable>& Tables::getWatvisctTables() const {
return m_watvisctTables;
}
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!");

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

@ -34,6 +34,9 @@
#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/OilvisctTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/WatvisctTable.hpp>
namespace Opm {
@ -54,6 +57,8 @@ namespace Opm {
const std::vector<SgfnTable>& getSgfnTables() const;
const std::vector<SsfnTable>& getSsfnTables() const;
const std::vector<PvdsTable>& getPvdsTables() const;
const std::vector<WatvisctTable>& getWatvisctTables() const;
const std::vector<OilvisctTable>& getOilvisctTables() const;
private:
void complainAboutAmbiguousKeyword(const Deck& deck, const std::string& keywordName) const;
@ -103,6 +108,8 @@ namespace Opm {
std::vector<SgofTable> m_sgofTables;
std::vector<SwofTable> m_swofTables;
std::vector<SlgofTable> m_slgofTables;
std::vector<WatvisctTable> m_watvisctTables;
std::vector<OilvisctTable> m_oilvisctTables;
std::shared_ptr<Tabdims> m_tabdims;
};
}

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

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