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

fixed: missing CTFKind parameter in Connection

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-01-13 11:49:54 +01:00
parent c4936d55e1
commit 13db196c5c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp
View File

@ -102,6 +102,7 @@ namespace Opm {
double r0,
double skinFactor,
const std::array<int,3>& IJK,
CTFKind kind,
std::size_t seqIndex,
double segDistStart,
double segDistEnd,
@ -128,6 +129,7 @@ namespace Opm {
double r0() const;
double skinFactor() const;
double wellPi() const;
CTFKind kind() const;
void setState(State state);
void setComplnum(int compnum);

10
src/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.cpp
View File

@ -75,7 +75,8 @@ namespace Opm {
Connection::Connection(Direction dir, double depth, State state,
int satTableId, int complnum, double CF,
double Kh, double rw, double r0, double skinFactor,
const std::array<int,3>& IJK, std::size_t seqIndex,
const std::array<int,3>& IJK,
CTFKind kind, std::size_t seqIndex,
double segDistStart, double segDistEnd,
bool defaultSatTabId, std::size_t compSegSeqIndex,
int segment, double wellPi)
@ -90,6 +91,7 @@ namespace Opm {
, m_r0(r0)
, m_skin_factor(skinFactor)
, ijk(IJK)
, m_ctfkind(kind)
, m_seqIndex(seqIndex)
, m_segDistStart(segDistStart)
, m_segDistEnd(segDistEnd)
@ -102,7 +104,7 @@ namespace Opm {
Connection::Connection()
: Connection(Direction::X, 1.0, State::SHUT,
0, 0, 0.0, 0.0, 0.0, 0.0, 0.0,
{0,0,0}, 0, 0.0, 0.0, false, 0, 0, 0.0)
{0,0,0}, CTFKind::Defaulted, 0, 0.0, 0.0, false, 0, 0, 0.0)
{}
bool Connection::sameCoordinate(const int i, const int j, const int k) const {
@ -389,4 +391,8 @@ std::string Connection::CTFKindToString(const CTFKind ctf_kind)
};
}
Connection::CTFKind Connection::kind() const {
return m_ctfkind;
}
}