Merge pull request #1555 from joakim-hove/connection-def-segment-zero

The numerical value 0 is used to signify no connection <-> segment
This commit is contained in:
Bård Skaflestad
2020-03-11 14:14:17 -05:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@@ -175,8 +175,8 @@ namespace Opm {
std::size_t m_compSeg_seqIndex=0;
// related segment number
// -1 means the completion is not related to segment
int segment_number = -1;
// 0 means the completion is not related to segment
int segment_number = 0;
double wPi = 1.0;
static std::string CTFKindToString(const CTFKind);

View File

@@ -66,7 +66,7 @@ RstConnection::RstConnection(const ::Opm::UnitSystem& unit_system, const int* ic
imb_sat_table( icon[VI::IConn::Imbibition]),
completion( icon[VI::IConn::ComplNum]),
dir( from_int<Connection::Direction>(icon[VI::IConn::ConnDir])),
segment( icon[VI::IConn::Segment] - 1),
segment( icon[VI::IConn::Segment]),
tran( unit_system.to_si(M::transmissibility, scon[VI::SConn::ConnTrans])),
depth( unit_system.to_si(M::length, scon[VI::SConn::Depth])),
diameter( unit_system.to_si(M::length, scon[VI::SConn::Diameter])),