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

allow constructing SkprpolyTable from variables

Browse Source 
also add equality operator
This commit is contained in:
Arne Morten Kvarving
2019-12-02 21:45:35 +01:00
parent d7acc1ee0f
commit 1ecbc75bfb
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
opm/parser/eclipse/EclipseState/Tables/SkprpolyTable.hpp
View File

@@ -28,12 +28,21 @@ namespace Opm {
class SkprpolyTable : public PolyInjTable {
public:
SkprpolyTable() = default;
SkprpolyTable(const std::vector<double>& throughputs,
const std::vector<double>& velocities,
int tableNumber,
const std::vector<std::vector<double>>& data,
double ref_polymer_concentration);
explicit SkprpolyTable(const DeckKeyword& table);
double referenceConcentration() const;
void setReferenceConcentration(double refConcentration);
const std::vector<std::vector<double>>& getSkinPressures() const;
bool operator==(const SkprpolyTable& data) const;
private:
double m_ref_polymer_concentration;

22
src/opm/parser/eclipse/EclipseState/Tables/PolyInjTables.cpp
View File

@@ -186,6 +186,17 @@ namespace Opm{
// SkprpolyTable
SkprpolyTable::SkprpolyTable(const std::vector<double>& throughputs,
const std::vector<double>& velocities,
int tableNumber,
const std::vector<std::vector<double>>& data,
double referenceConcentration)
: PolyInjTable(throughputs, velocities, tableNumber, data)
, m_ref_polymer_concentration(referenceConcentration)
{
}
SkprpolyTable::SkprpolyTable(const Opm::DeckKeyword &table)
{
using namespace ParserKeywords;
@@ -235,10 +246,21 @@ namespace Opm{
return m_ref_polymer_concentration;
}
void SkprpolyTable::setReferenceConcentration(double refConcentration)
{
m_ref_polymer_concentration = refConcentration;
}
const std::vector<std::vector<double>>&
SkprpolyTable::getSkinPressures() const
{
return getTableData();
}
bool SkprpolyTable::operator==(const SkprpolyTable& data) const
{
return this->referenceConcentration() == data.referenceConcentration() &&
static_cast<const PolyInjTable&>(*this) == static_cast<const PolyInjTable&>(data);
}
}