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

Removed unneccessary typedef.

Browse Source
This commit is contained in:
Joakim Hove
2015-09-14 16:28:46 +02:00
parent 2681d1cc8f
commit edad0b3795
2 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opm/parser/eclipse/EclipseState/Tables/PvtgOuterTable.hpp
View File

@@ -30,8 +30,6 @@ namespace Opm {
class PvtgInnerTable;
class PvtgOuterTable : protected MultiRecordTable {
typedef MultiRecordTable ParentType;
friend class PvtgTable;
friend class FullTable<PvtgOuterTable, PvtgInnerTable>;
PvtgOuterTable() = default;
@@ -47,11 +45,11 @@ namespace Opm {
tableIdx,
/*firstEntryOffset=*/0);
ParentType::checkNonDefaultable("P");
ParentType::checkMonotonic("P", /*isAscending=*/true);
ParentType::applyDefaultsLinear("RV");
ParentType::applyDefaultsLinear("BG");
ParentType::applyDefaultsLinear("MUG");
MultiRecordTable::checkNonDefaultable("P");
MultiRecordTable::checkMonotonic("P", /*isAscending=*/true);
MultiRecordTable::applyDefaultsLinear("RV");
MultiRecordTable::applyDefaultsLinear("BG");
MultiRecordTable::applyDefaultsLinear("MUG");
}
public:

32
opm/parser/eclipse/EclipseState/Tables/PvtoOuterTable.hpp
View File

@@ -30,8 +30,6 @@ namespace Opm {
class PvtoInnerTable;
class PvtoOuterTable : protected MultiRecordTable {
typedef MultiRecordTable ParentType;
friend class PvtoTable;
friend class FullTable<PvtoOuterTable, PvtoInnerTable>;
PvtoOuterTable() = default;
@@ -49,32 +47,32 @@ namespace Opm {
tableIdx,
/*firstEntryOffset=*/0);
ParentType::checkNonDefaultable("RS");
ParentType::checkMonotonic("RS", /*isAscending=*/true);
ParentType::applyDefaultsLinear("P");
ParentType::applyDefaultsLinear("BO");
ParentType::applyDefaultsLinear("MU");
MultiRecordTable::checkNonDefaultable("RS");
MultiRecordTable::checkMonotonic("RS", /*isAscending=*/true);
MultiRecordTable::applyDefaultsLinear("P");
MultiRecordTable::applyDefaultsLinear("BO");
MultiRecordTable::applyDefaultsLinear("MU");
}
public:
using ParentType::numTables;
using ParentType::numRows;
using ParentType::numColumns;
using ParentType::evaluate;
using ParentType::firstRecordIndex;
using ParentType::numRecords;
using MultiRecordTable::numTables;
using MultiRecordTable::numRows;
using MultiRecordTable::numColumns;
using MultiRecordTable::evaluate;
using MultiRecordTable::firstRecordIndex;
using MultiRecordTable::numRecords;
const std::vector<double> &getGasSolubilityColumn() const
{ return ParentType::getColumn(0); }
{ return MultiRecordTable::getColumn(0); }
const std::vector<double> &getPressureColumn() const
{ return ParentType::getColumn(1); }
{ return MultiRecordTable::getColumn(1); }
const std::vector<double> &getOilFormationFactorColumn() const
{ return ParentType::getColumn(2); }
{ return MultiRecordTable::getColumn(2); }
const std::vector<double> &getOilViscosityColumn() const
{ return ParentType::getColumn(3); }
{ return MultiRecordTable::getColumn(3); }
};
}