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

Add global_index to Connections

Browse Source
This commit is contained in:
Joakim Hove
2020-03-19 17:30:58 +01:00
parent ae858182eb
commit f87369713b
7 changed files with 63 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,6 +81,7 @@ namespace RestartIO {
Connection();
Connection(int i, int j , int k ,
std::size_t global_index,
int complnum,
double depth,
State state,
@@ -108,6 +109,7 @@ namespace RestartIO {
double r0,
double skinFactor,
const std::array<int,3>& IJK,
std::size_t global_index,
CTFKind kind,
std::size_t seqIndex,
double segDistStart,
@@ -124,6 +126,7 @@ namespace RestartIO {
int getI() const;
int getJ() const;
int getK() const;
std::size_t global_index() const;
State state() const;
Direction dir() const;
double depth() const;
@@ -175,6 +178,7 @@ namespace RestartIO {
serializer(m_r0);
serializer(m_skin_factor);
serializer(ijk);
serializer(m_global_index);
serializer(m_ctfkind);
serializer(m_seqIndex);
serializer(m_segDistStart);
@@ -199,6 +203,7 @@ namespace RestartIO {
std::array<int,3> ijk;
CTFKind m_ctfkind;
std::size_t m_global_index;
std::size_t m_seqIndex;
double m_segDistStart;
double m_segDistEnd;

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

@@ -40,6 +40,7 @@ namespace Opm {
// cppcheck-suppress noExplicitConstructor
WellConnections(const WellConnections& src, const EclipseGrid& grid);
void addConnection(int i, int j , int k ,
std::size_t global_index,
double depth,
Connection::State state ,
double CF,
@@ -99,6 +100,7 @@ namespace Opm {
private:
void addConnection(int i, int j , int k ,
std::size_t global_index,
int complnum,
double depth,
Connection::State state ,