From d087d7c41bd0a06b5fba874e9747621428b88de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Mon, 28 Jan 2019 13:09:19 +0100
Subject: [PATCH] Use NNC support from CpGrid.

---
 ebos/eclcpgridvanguard.hh   | 3 ++-
 ebos/ecltransmissibility.hh | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ebos/eclcpgridvanguard.hh b/ebos/eclcpgridvanguard.hh
index bc97a89ab..04d66c224 100644
--- a/ebos/eclcpgridvanguard.hh
+++ b/ebos/eclcpgridvanguard.hh
@@ -253,7 +253,8 @@ protected:
                                     /*isPeriodic=*/false,
                                     /*flipNormals=*/false,
                                     /*clipZ=*/false,
-                                    porv);
+                                    porv,
+                                    this->eclState().getInputNNC());
 
         // we use separate grid objects: one for the calculation of the initial condition
         // via EQUIL and one for the actual simulation. The reason is that the EQUIL code
diff --git a/ebos/ecltransmissibility.hh b/ebos/ecltransmissibility.hh
index f1a793593..f3d29f9ca 100644
--- a/ebos/ecltransmissibility.hh
+++ b/ebos/ecltransmissibility.hh
@@ -275,6 +275,14 @@ public:
                 unsigned insideFaceIdx  = intersection.indexInInside();
                 unsigned outsideFaceIdx = intersection.indexInOutside();
 
+                if (insideFaceIdx == -1) {
+                    // NNC. Set zero transmissibility, as it will be
+                    // *added to* by applyNncToGridTrans_() later.
+                    assert(outsideFaceIdx == -1);
+                    trans_[isId_(elemIdx, outsideElemIdx)] = 0.0;
+                    continue;
+                }
+
                 DimVector faceCenterInside;
                 DimVector faceCenterOutside;
                 DimVector faceAreaNormal;