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

Merge pull request #1200 from andlaus/cp_to_cv

Browse Source 
rename c_p to c_v in specrock and specheat table classes
This commit is contained in:
Joakim Hove 2018-01-31 17:51:00 +01:00 committed by GitHub
commit 5ca0792801
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,9 +31,9 @@ namespace Opm {
SpecheatTable(const DeckItem& item);
const TableColumn& getTemperatureColumn() const;
const TableColumn& getCpOilColumn() const;
const TableColumn& getCpWaterColumn() const;
const TableColumn& getCpGasColumn() const;
const TableColumn& getCvOilColumn() const;
const TableColumn& getCvWaterColumn() const;
const TableColumn& getCvGasColumn() const;
};
}

2
opm/parser/eclipse/EclipseState/Tables/SpecrockTable.hpp
View File

@ -30,7 +30,7 @@ namespace Opm {
SpecrockTable(const DeckItem& item);
const TableColumn& getTemperatureColumn() const;
const TableColumn& getCpRockColumn() const;
const TableColumn& getCvRockColumn() const;
};
}

16
src/opm/parser/eclipse/EclipseState/Tables/Tables.cpp
View File

@ -108,9 +108,9 @@ PvtoTable::PvtoTable( const DeckKeyword& keyword, size_t tableIdx) :
SpecheatTable::SpecheatTable(const DeckItem& item)
{
m_schema.addColumn(ColumnSchema("TEMPERATURE", Table::STRICTLY_INCREASING, Table::DEFAULT_NONE));
m_schema.addColumn(ColumnSchema("CP_OIL", Table::RANDOM, Table::DEFAULT_LINEAR));
m_schema.addColumn(ColumnSchema("CP_WATER", Table::RANDOM, Table::DEFAULT_LINEAR));
m_schema.addColumn(ColumnSchema("CP_GAS", Table::RANDOM, Table::DEFAULT_LINEAR));
m_schema.addColumn(ColumnSchema("CV_OIL", Table::RANDOM, Table::DEFAULT_LINEAR));
m_schema.addColumn(ColumnSchema("CV_WATER", Table::RANDOM, Table::DEFAULT_LINEAR));
m_schema.addColumn(ColumnSchema("CV_GAS", Table::RANDOM, Table::DEFAULT_LINEAR));
SimpleTable::init(item);
}
@ -118,19 +118,19 @@ SpecheatTable::SpecheatTable(const DeckItem& item)
const TableColumn& SpecheatTable::getTemperatureColumn() const
{ return SimpleTable::getColumn(0); }
const TableColumn& SpecheatTable::getCpOilColumn() const
const TableColumn& SpecheatTable::getCvOilColumn() const
{ return SimpleTable::getColumn(1); }
const TableColumn& SpecheatTable::getCpWaterColumn() const
const TableColumn& SpecheatTable::getCvWaterColumn() const
{ return SimpleTable::getColumn(2); }
const TableColumn& SpecheatTable::getCpGasColumn() const
const TableColumn& SpecheatTable::getCvGasColumn() const
{ return SimpleTable::getColumn(3); }
SpecrockTable::SpecrockTable(const DeckItem& item)
{
m_schema.addColumn(ColumnSchema("TEMPERATURE", Table::STRICTLY_INCREASING, Table::DEFAULT_NONE));
m_schema.addColumn(ColumnSchema("CP_ROCK", Table::RANDOM, Table::DEFAULT_LINEAR));
m_schema.addColumn(ColumnSchema("CV_ROCK", Table::RANDOM, Table::DEFAULT_LINEAR));
SimpleTable::init(item);
}
@ -138,7 +138,7 @@ SpecrockTable::SpecrockTable(const DeckItem& item)
const TableColumn& SpecrockTable::getTemperatureColumn() const
{ return SimpleTable::getColumn(0); }
const TableColumn& SpecrockTable::getCpRockColumn() const
const TableColumn& SpecrockTable::getCvRockColumn() const
{ return SimpleTable::getColumn(1); }
SwofTable::SwofTable( const DeckItem& item , const bool jfunc) {