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

Renamed file Tables -> TableManager

Browse Source
This commit is contained in:
Joakim Hove 2015-09-01 10:48:46 +02:00
parent 8bf744e590
commit cf5b4e36f8
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/CMakeLists.txt
View File

@ -104,7 +104,7 @@ EclipseState/Tables/SingleRecordTable.cpp
EclipseState/Tables/MultiRecordTable.cpp
EclipseState/Tables/VFPProdTable.cpp
EclipseState/Tables/VFPInjTable.cpp
EclipseState/Tables/Tables.cpp
EclipseState/Tables/TableManager.cpp
#
EclipseState/Grid/GridProperty.cpp
EclipseState/Grid/Box.cpp
@ -256,7 +256,7 @@ EclipseState/Tables/WatvisctTable.hpp
EclipseState/Tables/PvtgOuterTable.hpp
EclipseState/Tables/VFPProdTable.hpp
EclipseState/Tables/VFPInjTable.hpp
EclipseState/Tables/Tables.hpp
EclipseState/Tables/TableManager.hpp
#
Utility/WconinjeWrapper.hpp
Utility/CompdatWrapper.hpp

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

@ -160,7 +160,7 @@ namespace Opm {
}
std::shared_ptr<const TableManager> EclipseState::getTables() const {
std::shared_ptr<const TableManager> EclipseState::getTableManager() const {
return m_tables;
}

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

@ -33,7 +33,7 @@
#include <opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/NNC.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Tables.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
#include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp>
@ -85,7 +85,7 @@ namespace Opm {
std::shared_ptr<const NNC> getNNC() const;
bool hasNNC() const;
std::shared_ptr<const TableManager> getTables() const;
std::shared_ptr<const TableManager> getTableManager() const;
size_t getNumPhases() const;
// the unit system used by the deck. note that it is rarely needed to convert

2
opm/parser/eclipse/EclipseState/Grid/GridPropertyInitializers.hpp
View File

@ -102,7 +102,7 @@ public:
return;
}
auto tables = m_eclipseState.getTables();
auto tables = m_eclipseState.getTableManager();
auto eclipseGrid = m_eclipseState.getEclipseGrid();
const std::vector<RtempvdTable>& rtempvdTables = tables->getRtempvdTables();
const std::vector<int>& eqlNum = m_eclipseState.getIntGridProperty("EQLNUM")->getData();

16
opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp
View File

@ -81,7 +81,7 @@ protected:
void findSaturationEndpoints( ) const {
auto tables = m_eclipseState.getTables();
auto tables = m_eclipseState.getTableManager();
auto tabdims = tables->getTabdims();
size_t numSatTables = tabdims->getNumSatTables();
m_minWaterSat.resize( numSatTables , 0 );
@ -144,7 +144,7 @@ protected:
void findCriticalPoints( ) const {
auto tables = m_eclipseState.getTables();
auto tables = m_eclipseState.getTableManager();
auto tabdims = tables->getTabdims();
size_t numSatTables = tabdims->getNumSatTables();
@ -246,7 +246,7 @@ protected:
}
case SaturationFunctionFamily::FamilyII: {
auto tables = m_eclipseState.getTables();
auto tables = m_eclipseState.getTableManager();
const std::vector<SwfnTable>& swfnTables = tables->getSwfnTables();
const std::vector<SgfnTable>& sgfnTables = tables->getSgfnTables();
const std::vector<Sof3Table>& sof3Tables = tables->getSof3Tables();
@ -311,7 +311,7 @@ protected:
}
void findVerticalPoints( ) const {
auto tables = m_eclipseState.getTables();
auto tables = m_eclipseState.getTableManager();
auto tabdims = tables->getTabdims();
size_t numSatTables = tabdims->getNumSatTables();
@ -374,7 +374,7 @@ protected:
break;
}
case SaturationFunctionFamily::FamilyII: {
auto tables = m_eclipseState.getTables();
auto tables = m_eclipseState.getTableManager();
const std::vector<SwfnTable>& swfnTables = tables->getSwfnTables();
const std::vector<SgfnTable>& sgfnTables = tables->getSgfnTables();
const std::vector<Sof3Table>& sof3Tables = tables->getSof3Tables();
@ -421,7 +421,7 @@ protected:
// If SWFN, SGFN and SOF3 are specified in the deck it return FamilyII
// If keywords are missing or mixed, an error is given.
const SaturationFunctionFamily getSaturationFunctionFamily() const{
auto tables = m_eclipseState.getTables( );
auto tables = m_eclipseState.getTableManager( );
const std::vector<SwofTable>& swofTables = tables->getSwofTables();
const std::vector<SgofTable>& sgofTables = tables->getSgofTables();
const std::vector<SlgofTable>& slgofTables = tables->getSlgofTables();
@ -522,7 +522,7 @@ public:
bool useOneMinusTableValue) const
{
auto eclipseGrid = this->m_eclipseState.getEclipseGrid();
auto tables = this->m_eclipseState.getTables();
auto tables = this->m_eclipseState.getTableManager();
auto tabdims = tables->getTabdims();
auto satnum = this->m_eclipseState.getIntGridProperty("SATNUM");
auto endnum = this->m_eclipseState.getIntGridProperty("ENDNUM");
@ -581,7 +581,7 @@ public:
bool useOneMinusTableValue) const
{
auto eclipseGrid = this->m_eclipseState.getEclipseGrid();
auto tables = this->m_eclipseState.getTables();
auto tables = this->m_eclipseState.getTableManager();
auto imbnum = this->m_eclipseState.getIntGridProperty("IMBNUM");
auto endnum = this->m_eclipseState.getIntGridProperty("ENDNUM");

2
opm/parser/eclipse/EclipseState/Tables/Tables.cpp → opm/parser/eclipse/EclipseState/Tables/TableManager.cpp
View File

@ -19,7 +19,7 @@
#include <opm/parser/eclipse/Parser/ParserKeywords.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Tables.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
#include <opm/parser/eclipse/OpmLog/OpmLog.hpp>
namespace Opm {

4
opm/parser/eclipse/EclipseState/Tables/Tables.hpp → opm/parser/eclipse/EclipseState/Tables/TableManager.hpp
View File

@ -17,8 +17,8 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef OPM_TABLES_HPP
#define OPM_TABLES_HPP
#ifndef OPM_TABLE_MANAGER_HPP
#define OPM_TABLE_MANAGER_HPP
#include <opm/parser/eclipse/OpmLog/OpmLog.hpp>

2
opm/parser/eclipse/EclipseState/Tables/tests/CMakeLists.txt
View File

@ -1,4 +1,4 @@
foreach(tapp TableTests TablesTests TabdimsTests)
foreach(tapp TableTests TableManagerTests TabdimsTests)
opm_add_test(run${tapp} SOURCES ${tapp}.cpp
LIBRARIES opmparser ${Boost_LIBRARIES})
endforeach()

2
opm/parser/eclipse/EclipseState/Tables/tests/TablesTests.cpp → opm/parser/eclipse/EclipseState/Tables/tests/TableManagerTests.cpp
View File

@ -31,7 +31,7 @@
#include <opm/parser/eclipse/EclipseState/Tables/SingleRecordTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/MultiRecordTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/FullTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Tables.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
// keyword specific table classes
#include <opm/parser/eclipse/EclipseState/Tables/PvtoTable.hpp>