From 38add2ed66b60aecbba8c45be35f0b3d39517a8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= <hakon.hagland@gmail.com>
Date: Fri, 16 Sep 2022 09:22:17 +0200
Subject: [PATCH] Rename dirId() to faceDirFromDirId()

---
 opm/models/blackoil/blackoillocalresidualtpfa.hh   |  2 +-
 opm/models/discretization/common/tpfalinearizer.hh |  2 +-
 opm/models/discretization/ecfv/ecfvstencil.hh      | 10 +++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/opm/models/blackoil/blackoillocalresidualtpfa.hh b/opm/models/blackoil/blackoillocalresidualtpfa.hh
index 5353e5874..e5fc3242b 100644
--- a/opm/models/blackoil/blackoillocalresidualtpfa.hh
+++ b/opm/models/blackoil/blackoillocalresidualtpfa.hh
@@ -271,7 +271,7 @@ public:
         const auto& materialLawManager = problem.materialLawManager();
         FaceDir::DirEnum facedir = FaceDir::DirEnum::Unknown; // Use an arbitrary
         if (materialLawManager->hasDirectionalRelperms()) {
-            facedir = scvf.dirId();
+            facedir = scvf.faceDirFromDirId();
         }
         Scalar thpres = problem.thresholdPressure(globalIndexIn, globalIndexEx);
 
diff --git a/opm/models/discretization/common/tpfalinearizer.hh b/opm/models/discretization/common/tpfalinearizer.hh
index 705943545..809d37dee 100644
--- a/opm/models/discretization/common/tpfalinearizer.hh
+++ b/opm/models/discretization/common/tpfalinearizer.hh
@@ -337,7 +337,7 @@ private:
                         const double area = scvf.area();
                         FaceDirection dirId = FaceDirection::Unknown;
                         if (materialLawManager->hasDirectionalRelperms()) {
-                            dirId = scvf.dirId();
+                            dirId = scvf.faceDirFromDirId();
                         }
                         loc_nbinfo[dofIdx - 1] = NeighborInfo{neighborIdx, trans, area, dirId};
                     }
diff --git a/opm/models/discretization/ecfv/ecfvstencil.hh b/opm/models/discretization/ecfv/ecfvstencil.hh
index 3b691365d..94322fc4e 100644
--- a/opm/models/discretization/ecfv/ecfvstencil.hh
+++ b/opm/models/discretization/ecfv/ecfvstencil.hh
@@ -212,7 +212,15 @@ public:
         /*!
          * \brief Returns the direction of the face
          */
-        FaceDir::DirEnum dirId() const
+        int dirId() const
+        {
+            return dirId_;
+        }
+
+        /*!
+         * \brief Returns the direction of the face
+         */
+        FaceDir::DirEnum faceDirFromDirId() const
         {
             if (dirId_ == -1) {
                 OPM_THROW(std::runtime_error, "NNC faces does not have a face id");