From 6af2bcdb6f4e827322ae44e6d90e2fd58d34d12d Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Tue, 3 Mar 2020 08:34:47 +0100 Subject: [PATCH] Use named public item for CFInDeck functionality --- opm/output/eclipse/VectorItems/connection.hpp | 2 +- src/opm/output/eclipse/AggregateConnectionData.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opm/output/eclipse/VectorItems/connection.hpp b/opm/output/eclipse/VectorItems/connection.hpp index a7b155c4a..a9dd383ff 100644 --- a/opm/output/eclipse/VectorItems/connection.hpp +++ b/opm/output/eclipse/VectorItems/connection.hpp @@ -57,7 +57,7 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems item30 = 29, // Unknown item31 = 30, // Unknown - item41 = 40, // = 0 for connection factor not defined, = 1 for connection factor defined + CFInDeck = 40, // = 0 for connection factor not defined, = 1 for connection factor defined }; } // SConn diff --git a/src/opm/output/eclipse/AggregateConnectionData.cpp b/src/opm/output/eclipse/AggregateConnectionData.cpp index 8707c0948..4dc2ee68c 100755 --- a/src/opm/output/eclipse/AggregateConnectionData.cpp +++ b/src/opm/output/eclipse/AggregateConnectionData.cpp @@ -191,7 +191,7 @@ namespace { sConn[Ix::item30] = -1.0e+20f; sConn[Ix::item31] = -1.0e+20f; - sConn[Ix::item41] = (conn.ctfAssignedFromInput()) ? 1 : 0; + sConn[Ix::CFInDeck] = (conn.ctfAssignedFromInput()) ? 1 : 0; } } // SConn